Work on packaging RPM & DEB

build/deb/README

@@ -6,3 +6,16 @@ DEB Package tools
 This directory contains files used by makepack-dolibarr.pl
 script to build a package, ready to be distributed,
 with format .DEB (for Debian, Ubuntu, ...).
+
+# This is standard command to work on Debian packaging:
+#
+# lintian package       To test a package   
+#
+# dpkg -l               List all packages
+# dpkg -b               To build package
+# dpkg -c package.deb   List content of package
+# dpkg -I package.deb   Give informations on package
+# dpkg -i package.deb   Install a package
+#
+# dpkg -L packagename   List content of installed package 
+# dpkg --purge          Remove config files and interactive saved answers

build/deb/config

@@ -1,17 +1,6 @@
 #!/bin/sh
 # Debian install package run: config, preinst, prerm, postinst, postrm
 #
-# lintian package   To test a package   
-#
-# dpkg -l list all packages
-# dpkg -b is to build package
-# dpkg -c package.deb list content of package
-# dpkg -I package.deb give informations on package
-# dpkg -i package.deb install a package
-#
-# dpkg -L packagename list content of installed package 
-# dpkg --purge remove interactive saved answers
-#
 
 set -e
 

build/deb/control

@@ -3,7 +3,7 @@ Version: __VERSION__
 Architecture: all
 Maintainer: Laurent Destailleur <eldy@users.sourceforge.net>
 Essential: no
-Installed-Size: 31200
+Installed-Size: 61200
 Depends: apache2, libapache2-mod-php5, php5, php5-cli, php5-cgi, php5-curl, php5-gd, php5-ldap, php5-mysql, mysql-server, perl
 Section: web
 Priority: optional
@@ -14,6 +14,7 @@ Description: Easy to use ERP & CRM software to manage your activity.
  and medium companies, foundations or freelances. It includes different 
  features for Enterprise Resource Planning (ERP) and Customer Relationship
  Management (CRM) but also for different other activities.
+ Dolibarr was designed to provide only features you need and be easy to use.
  .
  Only features you need are visible, depending on which module were activated.
  Most common used modules are:
@@ -41,4 +42,6 @@ Description: Easy to use ERP & CRM software to manage your activity.
  * LDAP connectivity
  * PDF exports
  * And a lot of more modules...
+ .
  You can also add third parties external modules or develop yours.
+ 

build/deb/dolibarr.desktop

@@ -3,15 +3,20 @@
 # It must be saved into directory /usr/share/applications
 Version=1.0
 Encoding=UTF-8
-Name=Dolibarr ERP/CRM
+Name=Dolibarr ERP & CRM
-GenericName=Dolibarr ERP/CRM
+Name[fr]=Dolibarr ERP & CRM
-Comment=The easy to use manager for small and medium enterprises or foundations
+GenericName=Dolibarr ERP & CRM
-# xdg-open use default bowser to open url (exo-open for xfde, gnome-open for gnome, ...)
+Comment=The easy to use manager (ERP & CRM) for small and medium enterprises or foundations
-Exec=xdg-open http://localhost/dolibarr
+Comment[fr]=L'ERP & CRM simple pour la gestion des PME et associations
+# Command to open an URL
+# For Fedora: xdg-open 
+# For Debian/Ubuntu: x-www-browser
+# (exo-open for xfde, gnome-open for gnome, ...)
+Exec=x-www-browser http://localhost/dolibarr
 Icon=dolibarr
 Terminal=false
 Type=Application
-Category=Application;Office;
+Categories=Office
 StartupNotify=true
 InitialPreference=5
 #NoDisplay=true

build/deb/postinst

@@ -108,12 +108,6 @@ 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 "Install menu entry"
 		# This one is for Gnome ubuntu
 		#fileorig="/usr/share/dolibarr/build/deb/dolibarr.desktop"

build/rpm/README

@@ -6,3 +6,10 @@ RPM Package tools
 This directory contains files used by makepack-dolibarr.pl
 script to build a package, ready to be distributed,
 with format RPM (for Redhat, Mandriva, ...).
+
+
+# This is standard command to work on Debian packaging:
+#
+# yum install dolibarr      To remove package   
+# yum erase dolibarr        To remove package   
+#

build/rpm/dolibarr.desktop

@@ -0,0 +1,23 @@
+[Desktop Entry]
+# This file is used to add Ubuntu menu entry
+# It must be saved into directory /usr/share/applications
+Version=1.0
+Encoding=UTF-8
+Name=Dolibarr ERP & CRM
+Name[fr]=Dolibarr ERP & CRM
+GenericName=Dolibarr ERP & CRM
+Comment=The easy to use manager (ERP & CRM) for small and medium enterprises or foundations
+Comment[fr]=L'ERP & CRM simple pour la gestion des PME et associations
+# Command to open an URL
+# For Fedora: xdg-open 
+# For Debian/Ubuntu: x-www-browser
+# (exo-open for xfde, gnome-open for gnome, ...)
+Exec=xdg-open http://localhost/dolibarr
+Icon=dolibarr
+Terminal=false
+Type=Application
+Categories=Office
+StartupNotify=true
+InitialPreference=5
+#NoDisplay=true
+#OnlyShowIn=GNOME

build/rpm/dolibarr.spec

@@ -36,7 +36,12 @@ AutoReqProv: yes
 
 
 %description
-Dolibarr ERP & CRM
+Dolibarr ERP & CRM is an easy to use open source/free software for small  
+and medium companies, foundations or freelances. It includes different 
+features for Enterprise Resource Planning (ERP) and Customer Relationship 
+Management (CRM) but also for different other activities.
+Dolibarr was designed to provide only features you need and be easy to 
+use.
 
 %description -l fr
 Dolibarr ERP & CRM est un logiciel de gestion de PME/PMI, autoentrepreneurs, 
@@ -67,6 +72,11 @@ mkdir -p $RPM_BUILD_ROOT/var/www/dolibarr/scripts
 #mkdir -p $RPM_BUILD_ROOT/%{_sysconfdir}/dolibarr
 #mkdir -p $RPM_BUILD_ROOT/%{_sysconfdir}/cron.daily
 
+mkdir -p $RPM_BUILD_ROOT%{_datadir}/pixmaps
+cp doc/images/dolibarr_48x48.png $RPM_BUILD_ROOT%{_datadir}/pixmaps/dolibarr.png
+mkdir -p $RPM_BUILD_ROOT%{_datadir}/applications
+cp build/rpm/dolibarr.desktop $RPM_BUILD_ROOT/%{_datadir}/applications/dolibarr.desktop
+
 install -m 444 README  $RPM_BUILD_ROOT/var/www/dolibarr/README
 install -m 444 COPYRIGHT  $RPM_BUILD_ROOT/var/www/dolibarr/COPYRIGHT
 cp -pr build $RPM_BUILD_ROOT/var/www/dolibarr
@@ -74,6 +84,17 @@ cp -pr doc $RPM_BUILD_ROOT/var/www/dolibarr
 cp -pr htdocs $RPM_BUILD_ROOT/var/www/dolibarr
 cp -pr scripts $RPM_BUILD_ROOT/var/www/dolibarr
 
+# menu
+#%{__install} -d $RPM_BUILD_ROOT%{_menudir}
+#%{__cat} <<EOF >$RPM_BUILD_ROOT%{_menudir}/%{name}
+#?package(%{name}):\
+#command="Dolibarr" \
+#section="Office" \
+#title="Dolibarr" \
+#icon="dolibarr_48x48.png" \
+#longtitle="Dolibarr ERP & CRM"
+#EOF
+
 
 #---- clean
 %clean
@@ -89,6 +110,8 @@ rm -rf $RPM_BUILD_ROOT
 %dir /var/www/dolibarr/build
 %dir /var/www/dolibarr/htdocs
 %dir /var/www/dolibarr/scripts
+%_datadir/pixmaps/*
+%_datadir/applications/%{name}.desktop
 /var/www/dolibarr/build/*
 /var/www/dolibarr/htdocs/*
 /var/www/dolibarr/scripts/*
@@ -96,8 +119,10 @@ rm -rf $RPM_BUILD_ROOT
 /var/www/dolibarr/COPYRIGHT
 #%config /var/www/dolibarr/htdocs/conf/conf.php
 
+
 #---- post (after install)
 %post
+%update_menus
 
 # Dolibarr files are stored into /var/www
 export targetdir='/var/www/dolibarr'
@@ -187,6 +212,7 @@ echo
 
 #---- postun (after uninstall)
 %postun
+%clean_menus
 
 # Dolibarr files are stored into /var/www
 export targetdir='/var/www/dolibarr'