diff --git a/build/deb/README b/build/deb/README index bdeb2f85951..72a5d50c821 100644 --- a/build/deb/README +++ b/build/deb/README @@ -36,3 +36,7 @@ For first ITP submission of Dolibarr, bug id was 634783. - Add a line for upstream into file changelog with bug number - Call for a mentor on ML debian-mentors to upload packages + +- Once package is uploaded, following URL are available: +http://packages.qa.debian.org/package +http://bugs.debian.org/package diff --git a/build/deb/control.DEBIAN b/build/deb/control.DEBIAN index 41a2ba37d19..a0bac2f1772 100755 --- a/build/deb/control.DEBIAN +++ b/build/deb/control.DEBIAN @@ -4,7 +4,7 @@ Version: __VERSION__ Architecture: all Maintainer: Laurent Destailleur Installed-Size: 61200 -Depends: debconf, apache2, libapache2-mod-php5, php5, php5-cli, php5-cgi, php5-curl, php5-gd, php5-ldap, php5-mysql, php-pear, php-mail-mime, mysql-server, perl +Depends: debconf, xdg-utils, apache2, libapache2-mod-php5, php5, php5-cli, php5-cgi, php5-curl, php5-gd, php5-ldap, php5-mysql, php-pear, php-mail-mime, mysql-server, perl Section: web Priority: optional Recommends: firefox diff --git a/build/deb/control.debian b/build/deb/control.debian index 38688b12e1b..1eb4a37489f 100755 --- a/build/deb/control.debian +++ b/build/deb/control.debian @@ -4,4 +4,5 @@ Standards-Version: 3.9.1 Section: web Priority: optional Homepage: http://www.dolibarr.org -Build-Depends: \ No newline at end of file +Architecture: all +Build-Depends: debhelper \ No newline at end of file diff --git a/build/deb/rules b/build/deb/rules index b875626b494..b353c0fff53 100644 --- a/build/deb/rules +++ b/build/deb/rules @@ -1,4 +1,8 @@ #!/usr/bin/make -f +# This is the debhelper compatability version to use. +#export DH_COMPAT=7 # Now defined into compat file + + %: dh $@ \ No newline at end of file diff --git a/build/makepack-dolibarr.pl b/build/makepack-dolibarr.pl index bc96628066f..8fde5827572 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.113 2011/07/22 16:40:18 eldy Exp $ +# \version $Id: makepack-dolibarr.pl,v 1.114 2011/07/25 23:20:14 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.113 $'; $REVISION =~ /\s(.*)\s/; $REVISION=$1; +$REVISION='$Revision: 1.114 $'; $REVISION =~ /\s(.*)\s/; $REVISION=$1; $VERSION="1.0 (build $REVISION)"; @@ -590,12 +590,15 @@ if ($nboftargetok) { # Creation of source package print "Create directory $BUILDROOT/$PROJECT.tmp/debian\n"; $ret=`mkdir "$BUILDROOT/$PROJECT.tmp/debian"`; + $ret=`mkdir "$BUILDROOT/$PROJECT.tmp/debian/source"`; $ret=`rm -fr "$BUILDROOT/$PROJECT.tmp/DEBIAN"`; print "Copy $SOURCE/build/deb/xxx to $BUILDROOT/$PROJECT.tmp/debian\n"; $ret=`cp -f "$SOURCE/build/deb/changelog" "$BUILDROOT/$PROJECT.tmp/debian/changelog"`; $ret=`cp -f "$SOURCE/build/deb/control.debian" "$BUILDROOT/$PROJECT.tmp/debian/control"`; $ret=`cp -f "$SOURCE/build/deb/rules" "$BUILDROOT/$PROJECT.tmp/debian/rules"`; $ret=`cp -f "$SOURCE/build/deb/copyright" "$BUILDROOT/$PROJECT.tmp/debian/copyright"`; + $ret=`cp -f "$SOURCE/build/deb/compat" "$BUILDROOT/$PROJECT.tmp/debian/compat"`; + $ret=`cp -f "$SOURCE/build/deb/format" "$BUILDROOT/$PROJECT.tmp/debian/source/format"`; #$ret=`cp -f "$SOURCE/build/deb/postinst" "$BUILDROOT/$PROJECT.tmp/debian"`; #$ret=`cp -f "$SOURCE/build/deb/postrm" "$BUILDROOT/$PROJECT.tmp/debian"`; #$ret=`cp -f "$SOURCE/build/deb/templates" "$BUILDROOT/$PROJECT.tmp/debian"`;