From 2d5bcc2fcfe6848814026a7283b452a5d516b78e Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@users.sourceforge.net>
Date: Thu, 28 Jul 2011 18:31:45 +0000
Subject: [PATCH] Work on debian package
---
build/deb/postinst | 6 ++++++
build/makepack-dolibarr.pl | 9 ++++++---
2 files changed, 12 insertions(+), 3 deletions(-)
diff --git a/build/deb/postinst b/build/deb/postinst
index 0bc4d297b70..dd03156a6d2 100644
--- a/build/deb/postinst
+++ b/build/deb/postinst
@@ -32,6 +32,12 @@ docdir='/var/lib/dolibarr/documents'
case "$1" in
configure)
+ # Copy apache.conf file into target directory.
+ #fileorig="/usr/share/dolibarr/build/deb/apache.conf"
+ #config="/etc/dolibarr/apache.conf"
+ #mkdir -p /etc/dolibarr
+ #cp -p $fileorig $config
+
# Edit install.forced.php to match Debian values
fileorig="/usr/share/dolibarr/build/deb/install.forced.php.install"
config="/usr/share/dolibarr/htdocs/install/install.forced.php"
diff --git a/build/makepack-dolibarr.pl b/build/makepack-dolibarr.pl
index 0428a324f10..64d50b88a64 100644
--- a/build/makepack-dolibarr.pl
+++ b/build/makepack-dolibarr.pl
@@ -2,7 +2,7 @@
#----------------------------------------------------------------------------
# \file build/makepack-dolibarr.pl
# \brief Dolibarr package builder (tgz, zip, rpm, deb, exe, aps)
-# \version $Id: makepack-dolibarr.pl,v 1.119 2011/07/27 23:51:07 eldy Exp $
+# \version $Id: makepack-dolibarr.pl,v 1.120 2011/07/28 18:32:00 eldy Exp $
# \author (c)2004-2011 Laurent Destailleur <eldy@users.sourceforge.net>
#----------------------------------------------------------------------------
@@ -48,7 +48,7 @@ if (-d "/usr/src/RPM") {
use vars qw/ $REVISION $VERSION /;
-$REVISION='$Revision: 1.119 $'; $REVISION =~ /\s(.*)\s/; $REVISION=$1;
+$REVISION='$Revision: 1.120 $'; $REVISION =~ /\s(.*)\s/; $REVISION=$1;
$VERSION="1.0 (build $REVISION)";
@@ -555,11 +555,14 @@ if ($nboftargetok) {
# To remove once stable
$ret=`rm -fr $BUILDROOT/$PROJECT.tmp/usr/share/$PROJECT/htdocs/htdocs/theme/bureau2crea`;
- # apache.conf
+ # Apache conf files
print "Copy apache.conf file into $BUILDROOT/$PROJECT.tmp/etc/$PROJECT/apache.conf\n";
$ret=`mkdir -p "$BUILDROOT/$PROJECT.tmp/etc/$PROJECT"`;
$ret=`cp "$SOURCE/build/deb/apache.conf" "$BUILDROOT/$PROJECT.tmp/etc/$PROJECT/apache.conf"`;
+ # Dolibarr conf files
+ # TODO
+
# dolibarr.desktop
print "Create directory $BUILDROOT/$PROJECT.tmp/usr/share/applications\n";
$ret=`mkdir -p "$BUILDROOT/$PROJECT.tmp/usr/share/applications"`;
--
GitLab