Merge branch 'develop' of git+ssh://git@github.com/Dolibarr/dolibarr.git into develop

This commit is contained in:
Regis Houssin 2012-01-23 16:39:17 +01:00
commit 1f46bbdae6
2 changed files with 24 additions and 1 deletions

22
build/launchpad/README Normal file
View File

@ -0,0 +1,22 @@
README (English)
##################################################
Launchpad Package tools
##################################################
This directory contains files to explain how to publish
a package onto LaunchPad
# This is standard command to work on RPM packaging:
#
# To install all packagers tools:
# apt-get install bzr-builder bzr pbuilder
To submit a package on LaunchPad:
- Create account on launchpad.org
- Create Project
- Link project to official SCM server
- Upload SSH public key onto account
- Run from command line: bzr launchpad-login yourlogin
- ...

View File

@ -2,7 +2,7 @@
#----------------------------------------------------------------------------
# \file build/makepack-dolibarr.pl
# \brief Dolibarr package builder (tgz, zip, rpm, deb, exe, aps)
# \author (c)2004-2011 Laurent Destailleur <eldy@users.sourceforge.net>
# \author (c)2004-2012 Laurent Destailleur <eldy@users.sourceforge.net>
#----------------------------------------------------------------------------
use Cwd;
@ -638,6 +638,7 @@ if ($nboftargetok) {
$ret=`rm -f $BUILDROOT/$PROJECT.tmp/usr/share/$PROJECT/build/deb/wash`;
$ret=`rm -fr $BUILDROOT/$PROJECT.tmp/usr/share/$PROJECT/build/doap`;
$ret=`rm -fr $BUILDROOT/$PROJECT.tmp/usr/share/$PROJECT/build/exe`;
$ret=`rm -fr $BUILDROOT/$PROJECT.tmp/usr/share/$PROJECT/build/launchpad`;
$ret=`rm -fr $BUILDROOT/$PROJECT.tmp/usr/share/$PROJECT/build/live`;
$ret=`rm -fr $BUILDROOT/$PROJECT.tmp/usr/share/$PROJECT/build/patch`;
$ret=`rm -fr $BUILDROOT/$PROJECT.tmp/usr/share/$PROJECT/build/perl`;