From 76ef880682584895992fd638ad915cf0bb0ea952 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@users.sourceforge.net>
Date: Fri, 22 Jul 2011 16:40:17 +0000
Subject: [PATCH] Work on packages

---
 build/deb/README           | 4 ----
 build/deb/compat           | 1 -
 build/deb/control.DEBIAN   | 2 +-
 build/deb/control.debian   | 3 +--
 build/deb/format           | 1 -
 build/deb/rules            | 4 ----
 build/makepack-dolibarr.pl | 7 ++-----
 7 files changed, 4 insertions(+), 18 deletions(-)
 delete mode 100644 build/deb/compat
 delete mode 100644 build/deb/format

diff --git a/build/deb/README b/build/deb/README
index 72a5d50c821..bdeb2f85951 100644
--- a/build/deb/README
+++ b/build/deb/README
@@ -36,7 +36,3 @@ 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/compat b/build/deb/compat
deleted file mode 100644
index c7930257dfe..00000000000
--- a/build/deb/compat
+++ /dev/null
@@ -1 +0,0 @@
-7
\ No newline at end of file
diff --git a/build/deb/control.DEBIAN b/build/deb/control.DEBIAN
index a0bac2f1772..41a2ba37d19 100755
--- a/build/deb/control.DEBIAN
+++ b/build/deb/control.DEBIAN
@@ -4,7 +4,7 @@ Version: __VERSION__
 Architecture: all
 Maintainer: Laurent Destailleur <eldy@users.sourceforge.net>
 Installed-Size: 61200
-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
+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
 Section: web
 Priority: optional
 Recommends: firefox
diff --git a/build/deb/control.debian b/build/deb/control.debian
index 1eb4a37489f..38688b12e1b 100755
--- a/build/deb/control.debian
+++ b/build/deb/control.debian
@@ -4,5 +4,4 @@ Standards-Version: 3.9.1
 Section: web
 Priority: optional
 Homepage: http://www.dolibarr.org
-Architecture: all
-Build-Depends: debhelper
\ No newline at end of file
+Build-Depends:
\ No newline at end of file
diff --git a/build/deb/format b/build/deb/format
deleted file mode 100644
index 9f8e9b69a33..00000000000
--- a/build/deb/format
+++ /dev/null
@@ -1 +0,0 @@
-1.0
\ No newline at end of file
diff --git a/build/deb/rules b/build/deb/rules
index b353c0fff53..b875626b494 100644
--- a/build/deb/rules
+++ b/build/deb/rules
@@ -1,8 +1,4 @@
 #!/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 8fde5827572..bc96628066f 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.114 2011/07/25 23:20:14 eldy Exp $
+# \version      $Id: makepack-dolibarr.pl,v 1.113 2011/07/22 16:40:18 eldy Exp $
 # \author       (c)2004-2011 Laurent Destailleur  <eldy@users.sourceforge.net>
 #----------------------------------------------------------------------------
 
@@ -48,7 +48,7 @@ if (-d "/usr/src/RPM") {
 
 
 use vars qw/ $REVISION $VERSION /;
-$REVISION='$Revision: 1.114 $'; $REVISION =~ /\s(.*)\s/; $REVISION=$1;
+$REVISION='$Revision: 1.113 $'; $REVISION =~ /\s(.*)\s/; $REVISION=$1;
 $VERSION="1.0 (build $REVISION)";
 
 
@@ -590,15 +590,12 @@ 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"`;