Update package scripts

build/deb/changelog

@@ -1,23 +0,0 @@
-dolibarr (1.0.0_RC1-1) unstable; urgency=low
-
-  * Upstream update
-
- -- Rodolphe Quiedeville <rq@quiedeville.org>  Sun, 14 Sep 2003 11:40:15 +0200
-
-dolibarr (0.7.1-1) unstable; urgency=low
-
-  * Upstream update
-
- -- Loic Dachary (OuoU) <loic@debian.org>  Fri, 12 Sep 2003 15:18:50 +0200
-
-dolibarr (0.7.0-2) unstable; urgency=low
-
-  * Install scripts and fix php install
-
- -- Loic Dachary (OuoU) <loic@debian.org>  Thu, 11 Sep 2003 17:14:40 +0200
-
-dolibarr (0.7.0-1) unstable; urgency=low
-
-  * initial version
-
- -- Loic Dachary (OuoU) <loic@debian.org>  Sat,  6 Sep 2003 02:49:31 +0200

build/deb/control

@@ -1,16 +1,17 @@
 Source: dolibarr
+Version: __VERSION__
 Section: web
 Priority: optional
-Maintainer: Loic Dachary (OuoU) <loic@debian.org>
+Maintainer: Laurent Destailleur <eldy@users.sourceforge.net>
-Build-Depends: debhelper (>> 4.0.0), 
-Standards-Version: 3.5.8
-
 Package: dolibarr
 Section: web
 Architecture: all
-Depends: apache, wwwconfig-common (>= 0.0.7), php4, php4-cgi, php4-mysql, php4-curl, php4-pear | libapache-mod-auth-mysql, debconf, perl
+Essential: no
-Description: Company account management software.
+Depends: apache2, httpd, libapache2-mod-php5, libapache-mod-php5, php5, php5-cgi, libapache2-mod-php4, libapache-mod-php4, php4-cgi, php4, perl
+Recommends: mozilla | netscape
+Installed-Size: 30000000
+Description: Company or foundation management software.
  Dolibarr is a small and simple Web interface with ERP and CRM
- capabilities. It is designed for small companies and freelancers, and
+ capabilities. It is designed for small companies freelancers, or
- can be used to deal with the bills and documentation required for
+ foundations and can be used to deal with invoices and documentation
- company management.
+ required for activity management.

build/deb/copyright

@@ -1,26 +0,0 @@
-This package was debianized by Loic Dachary (OuoU) <loic@debian.org> on
-Sat, 6 Sep 2003 02:49:31 +0200.
-
-It was downloaded from http://nongnu.org/download/dolibarr/
-
-Upstream Author: Rodolphe Quiedeville <rodolphe@quiedeville.org>
-
-Copyright:
-
-   This package is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 dated June, 1991.
-
-   This package is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
-
-   You should have received a copy of the GNU General Public License
-   along with this package; if not, write to the Free Software
-   Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
-   02111-1307, USA.
-
-On Debian systems, the complete text of the GNU General
-Public License can be found in `/usr/share/common-licenses/GPL'.
-

build/makepack-dolibarr.pl

@@ -20,7 +20,7 @@ $RPMSUBVERSION="1";		# A incrementer au moment de la release
 "TGZ"=>"tar",
 "ZIP"=>"7z",
 "RPM"=>"rpmbuild",
-"DEB"=>"dpkg-buildpackage",
+"DEB"=>"dpkg",
 "EXE"=>"makensis.exe",
 "EXEDOLIWAMP"=>"iscc.exe"
 );
@@ -247,10 +247,14 @@ if ($nboftargetok) {
         print "\nBuild package for target $target\n";
 
     	if ($target eq 'SNAPSHOT') {
+    		print "Rename $BUILDROOT/$PROJECT to $BUILDROOT/$FILENAMESNAPSHOT\n";
 			rename("$BUILDROOT/$PROJECT","$BUILDROOT/$FILENAMESNAPSHOT");
     		unlink $FILENAMESNAPSHOT.tgz;
-    		print "Compress $SOURCE into $FILENAMESNAPSHOT.tgz...\n";
+    		
-   		    $cmd="tar --exclude $FILENAMESNAPSHOT.tgz --exclude .cache --exclude .settings --exclude conf.php --directory \"$BUILDROOT\" -czvf \"$FILENAMESNAPSHOT.tgz\" $FILENAMESNAPSHOT";
+    		print "Compress $BUILDROOT into $FILENAMESNAPSHOT.tgz...\n";
+   		    #$cmd="tar --exclude \"$BUILDROOT/tgz/tar_exclude.txt\" --exclude .cache --exclude .settings --exclude conf.php --directory \"$BUILDROOT\" -czvf \"$FILENAMESNAPSHOT.tgz\" $FILENAMESNAPSHOT";
+   		    $cmd="tar --exclude .cache --exclude .settings --exclude conf.php --directory \"$BUILDROOT\" -czvf \"$FILENAMESNAPSHOT.tgz\" $FILENAMESNAPSHOT";
+			print $cmd."\n";
 			$ret=`$cmd`;
             if ($OS =~ /windows/i)
             {
@@ -265,6 +269,7 @@ if ($nboftargetok) {
     	}
 
     	if ($target eq 'TGZ') {
+    		print "Rename $BUILDROOT/$PROJECT to $BUILDROOT/$FILENAMETGZ\n";
 			rename("$BUILDROOT/$PROJECT","$BUILDROOT/$FILENAMETGZ");
     		unlink $FILENAMETGZ.tgz;
     		print "Compress $FILENAMETGZ into $FILENAMETGZ.tgz...\n";
@@ -283,19 +288,25 @@ if ($nboftargetok) {
     	}
 
     	if ($target eq 'ZIP') {
+    		print "Rename $BUILDROOT/$PROJECT to $BUILDROOT/$FILENAMETGZ\n";
 			rename("$BUILDROOT/$PROJECT","$BUILDROOT/$FILENAMETGZ");
     		unlink $FILENAMEZIP.zip;
     		print "Compress $FILENAMETGZ into $FILENAMEZIP.zip...\n";
+     		print "Go to directory $BUILDROOT\n";
      		chdir("$BUILDROOT");
-    		$cmd= "7z a -r -tzip -xr\@\"$DESTI\/zip\/zip_exclude.txt\" -mx $BUILDROOT/$FILENAMEZIP.zip $FILENAMETGZ\\*.*";
+    		$cmd= "7z a -r -tzip -xr\@\"$BUILDROOT\/$FILENAMETGZ\/build\/zip\/zip_exclude.txt\" -mx $BUILDROOT/$FILENAMEZIP.zip $FILENAMETGZ\\*.*";
+			print $cmd."\n";
 			$ret= `$cmd`;
 			#print $ret;
+			#print "Go to directory $DESTI\n";
+     		#chdir("$DESTI");
 			print "Move $FILENAMEZIP.zip to $DESTI\n";
     		rename("$BUILDROOT/$FILENAMEZIP.zip","$DESTI/$FILENAMEZIP.zip");
     		next;
     	}
     
     	if ($target eq 'RPM') {                 # Linux only
+    		print "Rename $BUILDROOT/$PROJECT to $BUILDROOT/$FILENAMETGZ\n";
 			rename("$BUILDROOT/$PROJECT","$BUILDROOT/$FILENAMETGZ");
     		unlink $FILENAMETGZ.tgz;
     		print "Compress $FILENAMETGZ into $FILENAMETGZ.tgz...\n";
@@ -306,9 +317,9 @@ if ($nboftargetok) {
             $ret=`$cmd`;
 
     		$BUILDFIC="$FILENAME.spec";
-    		print "Copy $SOURCE/make/rpm/${BUILDFIC} to $BUILDROOT\n";
+    		print "Copy $SOURCE/build/rpm/${BUILDFIC} to $BUILDROOT\n";
-#    		$ret=`cp -p "$SOURCE/make/rpm/${BUILDFIC}" "$BUILDROOT"`;
+#    		$ret=`cp -p "$SOURCE/build/rpm/${BUILDFIC}" "$BUILDROOT"`;
-            open (SPECFROM,"<$SOURCE/make/rpm/${BUILDFIC}") || die "Error";
+            open (SPECFROM,"<$SOURCE/build/rpm/${BUILDFIC}") || die "Error";
             open (SPECTO,">$BUILDROOT/$BUILDFIC") || die "Error";
             while (<SPECFROM>) {
                 $_ =~ s/__VERSION__/$MAJOR.$MINOR.$BUILD/;
@@ -327,7 +338,24 @@ if ($nboftargetok) {
     	}
     	
     	if ($target eq 'DEB') {
-            print "Automatic build for DEB is not yet supported.\n";
+#            print "Automatic build for DEB is not yet supported.\n";
+    		print "Create directory $BUILDROOT/DEBIAN\n";
+    		$ret=`mkdir "$BUILDROOT/$PROJECT/DEBIAN"`;
+    		print "Copy $SOURCE/build/deb to $BUILDROOT/$PROJECTDEBIAN\n";
+    		$ret=`cp -p "$SOURCE/build/deb" "$BUILDROOT/$PROJECTDEBIAN"`;
+ 
+            open (SPECFROM,"<$BUILDROOT/$PROJECT/DEBIAN/control") || die "Error";
+            open (SPECTO,">$BUILDROOT/$PROJECT/DEBIAN/control") || die "Error";
+            while (<SPECFROM>) {
+                $_ =~ s/__VERSION__/$MAJOR.$MINOR.$BUILD/;
+                print SPECTO $_;
+            }
+            close SPECFROM;
+            close SPECTO;
+        
+    		print "Launch DEB build (dpkg -b $PROJECT)\n";
+    		$ret=`$DEB -b $BUILDROOT/$PROJECT $BUILDROOT/${FILENAMEDEB}.deb`;
+        	next;
         }
         
     	if ($target eq 'EXE') {