From 65ea609bac8bcea7f0a8fd4df552dc09360b0d93 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@users.sourceforge.net>
Date: Sun, 18 Dec 2005 23:00:08 +0000
Subject: [PATCH] =?UTF-8?q?Mise=20a=20jour=20script=20pour=20pr=E9paration?=
 =?UTF-8?q?=20release?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 build/deb/apache.conf      |  8 --------
 build/makepack-dolibarr.pl | 18 +++++++++---------
 2 files changed, 9 insertions(+), 17 deletions(-)

diff --git a/build/deb/apache.conf b/build/deb/apache.conf
index 81cd142043c..2957644a8cd 100644
--- a/build/deb/apache.conf
+++ b/build/deb/apache.conf
@@ -45,11 +45,3 @@ Alias /dolibarr /usr/share/dolibarr
 #</DirectoryMatch>
 #
 
-#
-# Not yet obsolete (donation module)
-#
-SetEnv LLX_DBTYPE mysql
-SetEnv LLX_DBHOST localhost
-SetEnv LLX_DBUSER user
-SetEnv LLX_DBPASS pass
-SetEnv LLX_DBNAME dolibarr
diff --git a/build/makepack-dolibarr.pl b/build/makepack-dolibarr.pl
index 2f473d297f2..cc7c65200f9 100644
--- a/build/makepack-dolibarr.pl
+++ b/build/makepack-dolibarr.pl
@@ -11,7 +11,7 @@ use Cwd;
 $PROJECT="dolibarr";
 $MAJOR="2";
 $MINOR="0";
-$BUILD="0-alpha2";
+$BUILD="0-beta1";
 $RPMSUBVERSION="1";
 
 @LISTETARGET=("TGZ","ZIP","RPM","DEB","EXE");   # Possible packages
@@ -240,7 +240,7 @@ if ($nboftargetok) {
             #print "cd $BUILDROOTNT & 7z a -r -tzip -mx $BUILDROOT/$FILENAMEZIP.zip $FILENAMETGZ\\*.*\n";
             #$ret=`cd $BUILDROOTNT & 7z a -r -tzip -mx $BUILDROOT/$FILENAMEZIP.zip $FILENAMETGZ\\*.*`;
     		$ret=`7z a -r -tzip -mx $BUILDROOT/$FILENAMEZIP.zip $FILENAMETGZ\\*.*`;
-		print "Move $FILENAMEZIP.zip to $DESTI\n";
+		print "Move $FILENAMEZIP.zip to $DESTI\n";
     		rename("$BUILDROOT/$FILENAMEZIP.zip","$DESTI/$FILENAMEZIP.zip");
     		next;
     	}
@@ -257,13 +257,13 @@ if ($nboftargetok) {
 
     		print "Copy $SOURCE/make/rpm/${BUILDFIC} to $BUILDROOT\n";
 #    		$ret=`cp -p "$SOURCE/make/rpm/${BUILDFIC}" "$BUILDROOT"`;
-            open (SPECFROM,"<$SOURCE/make/rpm/${BUILDFIC}") || die "Error";
-            open (SPECTO,">$BUILDROOT/$BUILDFIC") || die "Error";
-            while (<SPECFROM>) {
-                $_ =~ s/__VERSION__/$MAJOR.$MINOR.$BUILD/;
-                print SPECTO $_;
-            }
-            close SPECFROM;
+            open (SPECFROM,"<$SOURCE/make/rpm/${BUILDFIC}") || die "Error";
+            open (SPECTO,">$BUILDROOT/$BUILDFIC") || die "Error";
+            while (<SPECFROM>) {
+                $_ =~ s/__VERSION__/$MAJOR.$MINOR.$BUILD/;
+                print SPECTO $_;
+            }
+            close SPECFROM;
             close SPECTO;
     
     		print "Launch RPM build (rpm --clean -ba $BUILDROOT/${BUILDFIC})\n";