From 81f4779e23a9633ace72de94b2fa39c53e86b871 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@users.sourceforge.net>
Date: Wed, 9 Feb 2011 11:53:37 +0000
Subject: [PATCH] Fix: Debian package

---
 build/deb/postinst         | 23 +++++++++++++----------
 build/deb/postrm           | 10 +++++-----
 build/makepack-dolibarr.pl | 16 +++++++++++++---
 3 files changed, 31 insertions(+), 18 deletions(-)

diff --git a/build/deb/postinst b/build/deb/postinst
index 337a7aa1c3c..68a067f8cd7 100644
--- a/build/deb/postinst
+++ b/build/deb/postinst
@@ -120,18 +120,21 @@ case "$1" in
 		done
 
 		# Copy icon file
-		echo "Copy icon file"
-		fileorig="/usr/share/dolibarr/doc/images/dolibarr.xpm"
-		target="/usr/share/pixmaps/"
-		cp -f $fileorig $target
+		#echo "Copy icon file"
+		#fileorig="/usr/share/dolibarr/doc/images/dolibarr.xpm"
+		#target="/usr/share/pixmaps/"
+		#cp -f $fileorig $target
 
-		echo "Install menu entry"
+		#echo "Install menu entry"
 		# This one is for Gnome ubuntu
-		fileorig="/usr/share/dolibarr/build/deb/dolibarr.desktop"
-		target="/usr/share/applications/"
-		cp -f $fileorig $target
-		# Not sure this one is usefull
-		if test -x /usr/bin/update-menus; then update-menus; fi
+		#fileorig="/usr/share/dolibarr/build/deb/dolibarr.desktop"
+		#target="/usr/share/applications/"
+		#cp -f $fileorig $target
+		# Not sure this is usefull
+		if test -x /usr/bin/update-menus; then 
+			echo "update-menus"
+			update-menus;
+		fi
 		
 		# TODO Create the file to force parameters in Web installer
 		#if grep DBHOST /usr/share/dolibarr/htdocs/conf/conf.php > /dev/null
diff --git a/build/deb/postrm b/build/deb/postrm
index 992875bcb15..49ddb659461 100644
--- a/build/deb/postrm
+++ b/build/deb/postrm
@@ -221,11 +221,11 @@ case "$1" in
 		echo "postrm Force remove of /usr/share/dolibarr/htdocs/install"
 		rm -fr /usr/share/dolibarr/htdocs/install
 
-		echo "postrm Remove menu entry and image"
-		fileorig="/usr/share/applications/dolibarr.desktop"
-		rm -f $fileorig
-		fileorig="/usr/share/pixmaps/dolibarr.xpm"
-		rm -f $fileorig
+		#echo "postrm Remove menu entry and image"
+		#fileorig="/usr/share/applications/dolibarr.desktop"
+		#rm -f $fileorig
+		#fileorig="/usr/share/pixmaps/dolibarr.xpm"
+		#rm -f $fileorig
 		# Not sure this is usefull
 		if test -x /usr/bin/update-menus; then update-menus; fi
 	;;
diff --git a/build/makepack-dolibarr.pl b/build/makepack-dolibarr.pl
index 8877081c97b..0e2cb9e15b8 100644
--- a/build/makepack-dolibarr.pl
+++ b/build/makepack-dolibarr.pl
@@ -10,7 +10,7 @@ use Cwd;
 
 $PROJECT="dolibarr";
 $MAJOR="3";
-$MINOR="0";
+$MINOR="1";
 $BUILD="0-dev";		# Mettre x pour release, x-dev pour dev, x-beta pour beta, x-rc pour release candidate
 $RPMSUBVERSION="1";		# A incrementer au moment de la release
 
@@ -431,9 +431,16 @@ if ($nboftargetok) {
             close SPECFROM;
             close SPECTO;
 			print "Version set to $MAJOR.$MINOR.$newbuild\n";
+			
+	   		print "Create directory $BUILDROOT/$PROJECT/usr/share/applications\n";
+    		$ret=`mkdir -p "$BUILDROOT/$PROJECT/usr/share/applications"`;
+    		print "Copy desktop file into $BUILDROOT/$PROJECT/usr/share/applications/dolibarr.desktop\n";
+    		$ret=`cp "$SOURCE/build/deb/dolibarr.desktop" "$BUILDROOT/$PROJECT/usr/share/applications/dolibarr.desktop"`;
 
-    		print "Create directory $BUILDROOT/$PROJECT/usr/share/$PROJECT/documents\n";
-    		$ret=`mkdir -p "$BUILDROOT/$PROJECT/usr/share/$PROJECT/documents"`;
+	   		print "Create directory $BUILDROOT/$PROJECT/usr/share/pixmaps\n";
+    		$ret=`mkdir -p "$BUILDROOT/$PROJECT/usr/share/pixmaps"`;
+    		print "Copy pixmap file into $BUILDROOT/$PROJECT/usr/share/pixmaps/dolibarr.xpm\n";
+    		$ret=`cp "$SOURCE/doc/images/dolibarr.xpm" "$BUILDROOT/$PROJECT/usr/share/pixmaps/dolibarr.xpm"`;
 
     		#print "Create directory $BUILDROOT/$PROJECT/etc/$PROJECT\n";
     		#$ret=`mkdir -p "$BUILDROOT/$PROJECT/etc/$PROJECT"`;
@@ -450,6 +457,9 @@ if ($nboftargetok) {
     		#print "Copy apache conf file into $BUILDROOT/$PROJECT/etc/$PROJECT\n";
     		#$ret=`cp "$SOURCE/build/deb/apache.conf" "$BUILDROOT/$PROJECT/etc/$PROJECT"`;
 
+    		print "Create directory $BUILDROOT/$PROJECT/usr/share/$PROJECT/documents\n";
+    		$ret=`mkdir -p "$BUILDROOT/$PROJECT/usr/share/$PROJECT/documents"`;
+
 			print "Set permissions/owners on files/dir\n";
 		    $ret=`chown -R root.root $BUILDROOT/$PROJECT`;
 		    $ret=`chown -R www-data.www-data $BUILDROOT/$PROJECT/usr/share/$PROJECT/documents`;