diff --git a/build/deb/control.debian b/build/deb/control.debian index e28258d8dbc..6055a785027 100755 --- a/build/deb/control.debian +++ b/build/deb/control.debian @@ -9,15 +9,12 @@ Build-Depends: debhelper (>= 7), po-debconf Package: dolibarr Depends: libapache2-mod-php5 | libapache2-mod-php5filter | php5-cgi | php5-fpm | php5, php5-mysql | php5-mysqli, - php5-cli, php5-cgi, php5-curl, php5-gd, php5-ldap, php-pear, php-mail-mime, + php5-cli, php5-curl, php5-gd, php5-ldap, php-pear, php-mail-mime, ${misc:Depends}, xdg-utils, mysql-server, perl Recommends: apache2 | lighttpd | httpd, mysql-client Suggests: www-browser Architecture: all -Section: web -Priority: optional -Homepage: http://www.dolibarr.org Description: Easy to use web based ERP & CRM software Dolibarr ERP & CRM is an easy to use open source/free software for small and medium companies, foundations or freelances. It includes different diff --git a/build/deb/dolibarr.lintian-overrides b/build/deb/dolibarr.lintian-overrides index 9022acc3e75..3faef718ea8 100755 --- a/build/deb/dolibarr.lintian-overrides +++ b/build/deb/dolibarr.lintian-overrides @@ -6,4 +6,13 @@ embedded-javascript-library usr/share/dolibarr/htdocs/includes/fckeditor/fckedit embedded-php-library usr/share/dolibarr/htdocs/includes/magpierss/extlib/Snoopy.class.inc embedded-php-library usr/share/dolibarr/htdocs/includes/magpierss/rss_parse.inc embedded-php-library usr/share/dolibarr/htdocs/includes/nusoap/lib/nusoap.php -embedded-php-library usr/share/dolibarr/htdocs/includes/odtphp/zip/pclzip/pclzip.lib.php \ No newline at end of file +embedded-php-library usr/share/dolibarr/htdocs/includes/odtphp/zip/pclzip/pclzip.lib.php +# embedded fonts, wich are specific to Dolibarr usage +font-in-non-font-package usr/share/dolibarr/htdocs/includes/artichow/font/Tuffy.ttf +font-in-non-font-package usr/share/dolibarr/htdocs/includes/artichow/font/TuffyBold.ttf +font-in-non-font-package usr/share/dolibarr/htdocs/includes/artichow/font/TuffyBoldItalic.ttf +font-in-non-font-package usr/share/dolibarr/htdocs/includes/artichow/font/TuffyItalic.ttf +font-in-non-font-package usr/share/dolibarr/htdocs/includes/barcode/php-barcode/fonts/Aerial.ttf +font-in-non-font-package usr/share/dolibarr/htdocs/includes/barcode/php-barcode/fonts/AerialBd.ttf +font-in-non-font-package usr/share/dolibarr/htdocs/includes/barcode/php-barcode/fonts/AerialBdIt.ttf +font-in-non-font-package usr/share/dolibarr/htdocs/includes/barcode/php-barcode/fonts/AerialIt.ttf \ No newline at end of file diff --git a/build/deb/install b/build/deb/install index 2928d378abc..d3566d3a59e 100755 --- a/build/deb/install +++ b/build/deb/install @@ -1,6 +1,6 @@ etc/dolibarr/apache.conf etc/dolibarr/lighttpd.conf usr/share/applications/dolibarr.desktop -usr/share/doc/dolibarr usr/share/dolibarr +usr/share/doc/dolibarr usr/share/pixmaps diff --git a/build/deb/postinst b/build/deb/postinst index e0bba1be4da..e5ba6135f8d 100644 --- a/build/deb/postinst +++ b/build/deb/postinst @@ -144,7 +144,7 @@ case "$1" in echo ---------- - echo "Call Dolibarr page http://localhost/dolibarr/ to complete the installation and use Dolibarr." + echo "Call Dolibarr page http://localhost/dolibarr/ to complete the setup and use Dolibarr." echo ---------- ;; diff --git a/build/makepack-dolibarr.pl b/build/makepack-dolibarr.pl index af7d522b167..c3745572fe5 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.131 2011/08/03 01:43:26 eldy Exp $ +# \version $Id: makepack-dolibarr.pl,v 1.132 2011/08/03 20:00:00 eldy Exp $ # \author (c)2004-2011 Laurent Destailleur #---------------------------------------------------------------------------- @@ -48,7 +48,7 @@ if (-d "/usr/src/RPM") { use vars qw/ $REVISION $VERSION /; -$REVISION='$Revision: 1.131 $'; $REVISION =~ /\s(.*)\s/; $REVISION=$1; +$REVISION='$Revision: 1.132 $'; $REVISION =~ /\s(.*)\s/; $REVISION=$1; $VERSION="1.0 (build $REVISION)"; @@ -280,9 +280,10 @@ if ($nboftargetok) { $ret=`rm -f $BUILDROOT/$PROJECT/htdocs/install/mysql/README`; $ret=`rm -f $BUILDROOT/$PROJECT/htdocs/install/pgsql/README`; + $ret=`rm -fr $BUILDROOT/$PROJECT/dev/iso-normes`; + $ret=`rm -fr $BUILDROOT/$PROJECT/dev/licence`; $ret=`rm -fr $BUILDROOT/$PROJECT/dev/test`; $ret=`rm -fr $BUILDROOT/$PROJECT/dev/spec`; - $ret=`rm -fr $BUILDROOT/$PROJECT/dev/licence`; $ret=`rm -fr $BUILDROOT/$PROJECT/dev/uml`; $ret=`rm -fr $BUILDROOT/$PROJECT/dev/xdebug`; $ret=`rm -f $BUILDROOT/$PROJECT/doc/images/dolibarr_screenshot2.png`; @@ -452,6 +453,10 @@ if ($nboftargetok) { $ret=`$cmd`; print "Remove other files\n"; + $ret=`rm -f $BUILDROOT/$FILENAMETGZ2/var/www/$PROJECT/ChangeLog`; + $ret=`rm -f $BUILDROOT/$FILENAMETGZ2/var/www/$PROJECT/COPYING`; + #$ret=`rm -f $BUILDROOT/$FILENAMETGZ2/var/www/$PROJECT/COPYRIGHT`; + $ret=`rm -f $BUILDROOT/$FILENAMETGZ2/var/www/$PROJECT/INSTALL`; $ret=`rm -f $BUILDROOT/$FILENAMETGZ2/var/www/$PROJECT/README`; $ret=`rm -f $BUILDROOT/$FILENAMETGZ2/var/www/$PROJECT/README-FR`; $ret=`rm -f $BUILDROOT/$FILENAMETGZ2/var/www/$PROJECT/build/README`; @@ -487,6 +492,8 @@ if ($nboftargetok) { $ret=`rm -fr $BUILDROOT/$FILENAMETGZ2/var/www/$PROJECT/htdocs/includes/nusoap/lib/Mail`; $ret=`rm -fr $BUILDROOT/$FILENAMETGZ2/var/www/$PROJECT/htdocs/includes/odtphp/zip/.svn`; $ret=`rm -fr $BUILDROOT/$FILENAMETGZ2/var/www/$PROJECT/htdocs/includes/odtphp/zip/pclzip/.svn`; + $ret=`rm -fr $BUILDROOT/$FILENAMETGZ2/var/www/$PROJECT/htdocs/includes/odtphp/zip/pclzip/gnu-lgpl.txt`; + $ret=`rm -fr $BUILDROOT/$FILENAMETGZ2/var/www/$PROJECT/htdocs/includes/php_writeexcel/LICENSE`; $ret=`rm -fr $BUILDROOT/$FILENAMETGZ2/var/www/$PROJECT/htdocs/includes/smarty`; $ret=`rm -f $BUILDROOT/$FILENAMETGZ2/var/www/$PROJECT/COPYING`; @@ -624,6 +631,8 @@ if ($nboftargetok) { print "Version set to $MAJOR.$MINOR.$newbuild\n"; print "Remove other files\n"; + $ret=`rm -f $BUILDROOT/$PROJECT.tmp/usr/share/$PROJECT/ChangeLog`; + $ret=`rm -f $BUILDROOT/$PROJECT.tmp/usr/share/$PROJECT/COPYING`; $ret=`rm -f $BUILDROOT/$PROJECT.tmp/usr/share/$PROJECT/COPYRIGHT`; $ret=`rm -f $BUILDROOT/$PROJECT.tmp/usr/share/$PROJECT/INSTALL`; $ret=`rm -f $BUILDROOT/$PROJECT.tmp/usr/share/$PROJECT/README`; @@ -686,7 +695,6 @@ if ($nboftargetok) { $ret=`rm -f $BUILDROOT/$PROJECT.tmp/usr/share/$PROJECT/htdocs/includes/jquery/plugins/flot/LICENSE.txt`; $ret=`rm -f $BUILDROOT/$PROJECT.tmp/usr/share/$PROJECT/htdocs/includes/php_writeexcel/LICENSE`; $ret=`rm -f $BUILDROOT/$PROJECT.tmp/usr/share/$PROJECT/htdocs/includes/tcpdf/LICENSE.TXT`; - $ret=`rm -f $BUILDROOT/$PROJECT.tmp/usr/share/$PROJECT/COPYING`; $ret=`rm -fr $BUILDROOT/$PROJECT.tmp/usr/share/$PROJECT/htdocs/includes/barcode/php-barcode/genbarcode`; # To remove once stable $ret=`rm -fr $BUILDROOT/$PROJECT.tmp/usr/share/$PROJECT/htdocs/htdocs/theme/bureau2crea`; @@ -714,6 +722,9 @@ if ($nboftargetok) { print "Create directory $BUILDROOT/$PROJECT.tmp/usr/share/doc/$PROJECT\n"; $ret=`mkdir -p "$BUILDROOT/$PROJECT.tmp/usr/share/doc/$PROJECT"`; + # changelog (to build binary package directly without sources. Useless if we build from sources) + $ret=`gzip -9 -c "$SOURCE/build/deb/changelog" > $BUILDROOT/$PROJECT.tmp/usr/share/doc/$PROJECT/changelog.gz`; + # Set owners print "Set owners on files/dir\n"; $ret=`chown -R root.root $BUILDROOT/$PROJECT.tmp`; diff --git a/build/rpm/dolibarr.spec b/build/rpm/dolibarr.spec index 4a03f222ab3..7a9224b0574 100644 --- a/build/rpm/dolibarr.spec +++ b/build/rpm/dolibarr.spec @@ -7,7 +7,7 @@ # -------------------------------------------------------- %define name dolibarr -%define version __VERSION__ +%define version __VERSION__ %define release __RELEASE__ Name: %{name} @@ -105,15 +105,13 @@ echo Building %{name}-%{version}-%{release} %{__mkdir} -p $RPM_BUILD_ROOT%{_datadir}/applications %{__install} -m 644 var/www/dolibarr/build/rpm/dolibarr.desktop $RPM_BUILD_ROOT%{_datadir}/applications/dolibarr.desktop -%{__mkdir} -p $RPM_BUILD_ROOT/var/www/dolibarr/build -%{__mkdir} -p $RPM_BUILD_ROOT/var/www/dolibarr/doc %{__mkdir} -p $RPM_BUILD_ROOT/var/www/dolibarr/htdocs %{__mkdir} -p $RPM_BUILD_ROOT/var/www/dolibarr/scripts -%{__cp} -pr var/www/dolibarr/build $RPM_BUILD_ROOT/var/www/dolibarr -%{__cp} -pr var/www/dolibarr/doc $RPM_BUILD_ROOT/var/www/dolibarr +%{__mkdir} -p $RPM_BUILD_ROOT%{_datadir}/doc/dolibarr %{__cp} -pr var/www/dolibarr/htdocs $RPM_BUILD_ROOT/var/www/dolibarr %{__cp} -pr var/www/dolibarr/scripts $RPM_BUILD_ROOT/var/www/dolibarr -%{__install} -m 644 var/www/dolibarr/COPYRIGHT $RPM_BUILD_ROOT/var/www/dolibarr/doc/COPYRIGHT +%{__cp} -pr var/www/dolibarr/doc/* $RPM_BUILD_ROOT%{_datadir}/doc/dolibarr +%{__install} -m 644 var/www/dolibarr/COPYRIGHT $RPM_BUILD_ROOT%{_datadir}/doc/dolibarr/COPYRIGHT #---- clean @@ -125,13 +123,11 @@ echo Building %{name}-%{version}-%{release} %files %defattr(-,root,root) -%doc /var/www/dolibarr/doc/* -%dir /var/www/dolibarr/build +%doc %{_datadir}/doc/dolibarr/* %dir /var/www/dolibarr/htdocs %dir /var/www/dolibarr/scripts %_datadir/pixmaps/dolibarr.png %_datadir/applications/%{name}.desktop -/var/www/dolibarr/build/* /var/www/dolibarr/htdocs/* /var/www/dolibarr/scripts/* @@ -213,11 +209,11 @@ fi # Create an empty conf.php with permission to web server if [ ! -f $config ] -then - echo Create empty file $config - touch $config - %{__chown} -R root:$apachegroup $config - %{__chmod} -R 660 $config +then + echo Create empty file $config + touch $config + %{__chown} -R root:$apachegroup $config + %{__chmod} -R 660 $config fi # Create config file for apache $apacheconfig @@ -267,7 +263,7 @@ fi # Restart mysql echo Restart mysql if [ -f /etc/init.d/mysqld ]; then - /etc/init.d/mysqld restart + /etc/init.d/mysqld restart fi # Show result