From 8ecafa35daa62e2923c63f48e9a053a4137dbe8c Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Tue, 26 Jul 2011 22:53:13 +0000 Subject: [PATCH] Work on debian package --- build/.cvsignore | 1 + build/makepack-dolibarr.pl | 6 +++--- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/build/.cvsignore b/build/.cvsignore index d97289222c3..830b8b91924 100644 --- a/build/.cvsignore +++ b/build/.cvsignore @@ -13,3 +13,4 @@ module_pibarcode-1.0.tgz version-phpsane.txt makepack-phpsane.conf html +*.deb diff --git a/build/makepack-dolibarr.pl b/build/makepack-dolibarr.pl index 9e55dcac19b..825da0e5258 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.115 2011/07/26 22:25:51 eldy Exp $ +# \version $Id: makepack-dolibarr.pl,v 1.116 2011/07/26 22:53:13 eldy Exp $ # \author (c)2004-2011 Laurent Destailleur #---------------------------------------------------------------------------- @@ -34,7 +34,7 @@ $FILENAMESNAPSHOT="$PROJECT-snapshot"; $FILENAMETGZ="$PROJECT-$MAJOR.$MINOR.$BUILD"; $FILENAMEZIP="$PROJECT-$MAJOR.$MINOR.$BUILD"; $FILENAMERPM="$PROJECT-$MAJOR.$MINOR.$BUILD-$RPMSUBVERSION"; -$FILENAMEDEB="$PROJECT-$MAJOR.$MINOR.$BUILD"; +$FILENAMEDEB="$PROJECT_$MAJOR.$MINOR.$BUILD"; $FILENAMEAPS="$PROJECT-$MAJOR.$MINOR.$BUILD.app"; $FILENAMEEXEDOLIWAMP="$PROJECT-$MAJOR.$MINOR.$BUILD"; if (-d "/usr/src/redhat") { @@ -48,7 +48,7 @@ if (-d "/usr/src/RPM") { use vars qw/ $REVISION $VERSION /; -$REVISION='$Revision: 1.115 $'; $REVISION =~ /\s(.*)\s/; $REVISION=$1; +$REVISION='$Revision: 1.116 $'; $REVISION =~ /\s(.*)\s/; $REVISION=$1; $VERSION="1.0 (build $REVISION)";