Work on debian package

ChangeLog

@@ -43,6 +43,7 @@ For users:
 - New: Chart are faster to build
 - New: Value of data into charts are visible on mouse hover.
 - New: Import wizard can import contacts.
+- New: Install process is now two times faster.
 - Fix: Can use POS module with several concurrent users.
 
 For developers:

build/debian/README.debian

-README (english)
---------------------------------
-Starter documentation
---------------------------------
-
-1) Install Dolibarr
-2) Upgrade Dolibarr from an older version
-3) What's new in this version
-4) What Dolibarr can do
-5) What Dolibarr can't do yet, todo list
-
-
-I - DOLIBARR INSTALL
---------------------
-
-Dolibarr files and its dependencies are automatically installed when you install
-the dolibarr Debian package.
-  
-Once package is installed, go on menu entry called Dolibarr or use your web browser
-to call page http://localhost/dolibarr
-
-
-
-II - DOLIBARR UPGRADE
----------------------
-
-Dolibarr files and its dependencies are automatically upgraded when you install
-the dolibarr Debian package.
-
-Once new package is installed, go on menu entry called Dolibarr or use your web browser
-to call page http://localhost/dolibarr
-If a database upgrade is required, you will be prompted to. 
-
-  
-
-III - WHAT'S NEW
-----------------
-
-See ChangeLog file.
-
-
-
-IV - WHAT DOLIBARR CAN DO
--------------------------
-
-Main modules/features:
-- Products and services catalog
-- Customers, Prospects or Suppliers directory
-- Address book
-- Stock management
-- Bank accounts management
-- Orders management with PDF export
-- Commercial proposals management with PDF export
-- Contracts management
-- Invoices management with PDF export
-- Payments management
-- Standing orders management
-- Shipping management
-- ECM (Electronic Content Management)
-- EMailings
-- Agenda with ical,vcal export for third tools integration
-- Management of foundation members
-- Donation management
-
-Other modules:
-- Bookmarks management
-- Can reports Dolibarr events inside Webcalendar or Phenix
-- Data export tools
-- LDAP connectivity
-- Third parties or products categories 
-- ClickToDial phone numbers
-- RSS
-
-Miscellanous:
-- Mutli-user, with several permissions levels for each feature.
-- Serveral menu managers (can be used by internal users, as a back-office,
-  with a particular menu, or by external users, as a front-office, with
-  another menu and permissions).
-- Very user friendly and easy to use.
-- Optional WYSIWYG forms, optional Ajax forms.
-- Several skins.
-- Code is highly customizable (a lot of use of modules and submodules).
-- Works with Mysql 3.1 or higher, experimental support for PostgreSql.
-- Works with PHP 4.3 or higher.
-- An easy to understand and maintain code (PHP with no heavy frameworks).
-- A trigger architecture to allow you to make Dolibarr business events run
-  PHP code to update your own information system.
-- "NPR VAT Rate" (French particularity for managing VAT in DOM-TOM 
-  called "Non Perçue Récupérable").
-
-
-
-V - WHAT DOLIBARR CAN'T DO YET (TODO LIST)
-------------------------------------------
-This is features that Dolibarr does not support completely yet:
-- Accountancy.
-- Dolibarr can manage only one currency.
-- Dolibarr does not support the double Canadian Tax.
-- Dolibarr does not make coffee (not yet).
-- Stock management with option increase/decrease on invoice works on
-  warehouse number one only (no way to choose warehouse).
-- Stock management with option increase/decrease on orders works on
-  warehouse number one only (no way to choose warehouse).

build/debian/control

@@ -4,7 +4,7 @@ Standards-Version: 3.9.2
 Section: web
 Priority: optional
 Homepage: http://www.dolibarr.org
-Build-Depends: debhelper (>= 7), po-debconf
+Build-Depends: debhelper (>= 7), po-debconf, dpatch
 
 Package: dolibarr
 Depends: libapache2-mod-php5 | libapache2-mod-php5filter | php5-cgi | php5-fpm | php5,

build/debian/copyright

@@ -36,39 +36,8 @@ License: GPL-2+
  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., 51 Franklin St, Fifth Floor,
- Boston, MA  02110-1301 USA
- .
- On Debian systems, the full text of the GNU General Public
- License version 2 can be found in the file
- `/usr/share/common-licenses/GPL-2'.
-  
-Files: htdocs/includes/artichow/*
-Copyright: Artichow team
-License: Public Domain
- This work is not subject to copyright in any jurisdiction
-
-Files: htdocs/includes/ckeditor/*
-Copyright: CKeditor team
-License: GPL-2+
- This program 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; either
- version 2 of the License, or (at your option) any later
- version.
- .
- This program 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., 51 Franklin St, Fifth Floor,
- Boston, MA  02110-1301 USA
+ You should have received a copy of the GNU General Public License
+ along with this program. If not, see <http://www.gnu.org/licenses/>.
  .
  On Debian systems, the full text of the GNU General Public
  License version 2 can be found in the file
@@ -89,10 +58,8 @@ License: GPL-2+
  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., 51 Franklin St, Fifth Floor,
- Boston, MA  02110-1301 USA
+ You should have received a copy of the GNU General Public License
+ along with this program. If not, see <http://www.gnu.org/licenses/>.
  .
  On Debian systems, the full text of the GNU General Public
  License version 2 can be found in the file
@@ -113,10 +80,8 @@ License: MIT or GPL-2+
  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., 51 Franklin St, Fifth Floor,
- Boston, MA  02110-1301 USA
+ You should have received a copy of the GNU General Public License
+ along with this program. If not, see <http://www.gnu.org/licenses/>.
  .
  On Debian systems, the full text of the GNU General Public
  License version 2 can be found in the file
@@ -160,10 +125,8 @@ License: GPL-2+
  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., 51 Franklin St, Fifth Floor,
- Boston, MA  02110-1301 USA
+ You should have received a copy of the GNU General Public License
+ along with this program. If not, see <http://www.gnu.org/licenses/>.
  .
  On Debian systems, the full text of the GNU General Public
  License version 2 can be found in the file
@@ -191,10 +154,8 @@ License: GPL-2+
  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., 51 Franklin St, Fifth Floor,
- Boston, MA  02110-1301 USA
+ You should have received a copy of the GNU General Public License
+ along with this program. If not, see <http://www.gnu.org/licenses/>.
  .
  On Debian systems, the full text of the GNU General Public
  License version 2 can be found in the file
@@ -204,4 +165,3 @@ Files: htdocs/includes/tcpdf/*
 Copyright: TCPDF team
 License: LGPL 3.0
   See http://www.gnu.org/licenses/old-licenses/lgpl-3.0-standalone.html
- 
\ No newline at end of file

build/debian/install

-etc/dolibarr/apache.conf
-etc/dolibarr/lighttpd.conf
-usr/share/applications/dolibarr.desktop
-usr/share/dolibarr
-usr/share/doc/dolibarr
-usr/share/pixmaps
+debian/dolibarr.desktop usr/share/applications
+debian/dolibarr.xpm usr/share/pixmaps
+build/debian/apache.conf etc/dolibarr
+build/debian/lighttpd.conf etc/dolibarr
+build usr/share/dolibarr
+dev usr/share/dolibarr
+htdocs usr/share/dolibarr
+scripts usr/share/dolibarr
\ No newline at end of file

build/debian/rules

@@ -6,5 +6,31 @@ export DH_OPTIONS=-v
 
 #export DH_COMPAT=7    # This is the debhelper compatability version to use, now defined into compat file
 
-%:
-	dh $@
+
+# use dpatch
\ No newline at end of file
+include /usr/share/dpatch/dpatch.make
+
+
+configure:
+	dh $@
+
+build: patch
+	dh $@
+
+build-arch: patch
+	dh $@
+
+build-indep: patch
+	dh $@
+
+binary:
+	dh $@
+
+binary-indep:
+	dh $@
+	
+clean:
+	dh $@
+
+binary-arch:
+	
\ No newline at end of file

build/debian/wash

+# watch control file for uscan
+#version=3
+#http://http://sourceforge.net/projects/dolibarr/files/Dolibarr%20installer%20for%20Debian-Ubuntu%20%28DoliDeb%29/ debian uupdate

build/launchpad/README

@@ -17,22 +17,35 @@ To submit a package on LaunchPad:
 - Create Project
 - Link project to official SCM server
 - Upload SSH public key onto account
-- Run from command line: bzr launchpad-login yourlogin
-
-- Create a debian directory and upload it onto bzr branch ~yourlogin/dolibarr/debian
-
-- Create an empty directory dolibarr and go into it.
+- Run from command line: 
+    bzr launchpad-login yourlogin
+    bzr whoami "Your Name <email@email.com>"
+- Create a Bazzar directory
+    mkdir bzr
+- Create debian directory and upload it onto bzr branch ~yourlogin/dolibarr/debian
+    cd bzr
+    mkdir debian
+    cd debian
+    bzr init
+    cp -pr dolibarr_root/debian bzr/debian
+    bzr add debian
+    bzr commit
+    bzr push lp:~eldy/dolibarr/debian
+  or download it from launchpad bazaar:
+    cd bzr
+    bzr branch lp:~eldy/dolibarr/debian
 - Create a file dolibarr.recipe with content
-    # bzr-builder format 0.3 deb-version {debupstream}+{revno}+{revno:packaging}
-    lp:dolibarr
-    merge packaging lp:~eldy/dolibarr/debian
+    cd bzr
+    vi dolibarr.recipe
+        # bzr-builder format 0.3 deb-version {debupstream}+{revno}+{revno:packaging}
+        lp:dolibarr
+        merge packaging lp:~eldy/dolibarr/debian
 - Run command
+    cd bzr
     bzr dailydeb dolibarr.recipe working-dir
   This will create a directory "working-dir" with dolibarr sources and will add sources from ~eldy/dolibarr/debian
-
 - Create a file /.pbuilderrc with content
     $BUILDROOT/$PROJECT-$MAJOR.$MINOR.$build
-
 - Create chroot ubuntu env
     sudo pbuilder create
 - Test package sources

build/rpm/dolibarr-forrpm.patch

 diff -up htdocs/filefunc.inc.php.patch htdocs/filefunc.inc.php
 --- htdocs/filefunc.inc.php.patch	2011-09-03 02:32:48.666952000 +0200
 +++ htdocs/filefunc.inc.php	2011-09-03 02:33:00.510952001 +0200
-@@ -64,8 +64,8 @@ $conffiletoshowshort = "conf.php";
+@@ -64,8 +64,8 @@ 
  $conffile = "conf/conf.php";
  $conffiletoshow = "htdocs/conf/conf.php";
  // For debian/redhat like systems
@@ -15,7 +15,7 @@ diff -up htdocs/filefunc.inc.php.patch htdocs/filefunc.inc.php
 diff -up htdocs/install/inc.php.patch htdocs/install/inc.php
 --- htdocs/install/inc.php.patch	2011-09-03 02:33:26.450952000 +0200
 +++ htdocs/install/inc.php	2011-09-03 02:33:36.286952001 +0200
-@@ -75,8 +75,8 @@ $conffiletoshowshort = "conf.php";
+@@ -84,8 +84,8 @@
  $conffile = "../conf/conf.php";
  $conffiletoshow = "htdocs/conf/conf.php";
  // For debian/redhat like systems
@@ -29,7 +29,7 @@ diff -up htdocs/install/inc.php.patch htdocs/install/inc.php
 diff -up htdocs/support/inc.php.patch htdocs/support/inc.php
 --- htdocs/support/inc.php.patch	2011-09-03 02:34:39.606952000 +0200
 +++ htdocs/support/inc.php	2011-09-03 02:33:59.814952000 +0200
-@@ -69,8 +69,8 @@ $conffiletoshowshort = "conf.php";
+@@ -79,8 +79,8 @@
  $conffile = "../conf/conf.php";
  $conffiletoshow = "htdocs/conf/conf.php";
  // For debian/redhat like systems

htdocs/filefunc.inc.php

@@ -32,7 +32,7 @@
 if (! defined('DOL_VERSION')) define('DOL_VERSION','3.2.0-alpha');	// Also defined in htdocs/install/inc.php (Ex: x.y.z-alpha, x.y.z)
 if (! defined('EURO')) define('EURO',chr(128));
 
-// Definition des constantes syslog
+// Define syslog constants
 if (! defined('LOG_DEBUG'))
 {
     if (function_exists("define_syslog_variables"))

htdocs/install/inc.php

@@ -18,9 +18,10 @@
  * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
-/**	    \file       htdocs/install/inc.php
- * 		\ingroup	core
- *		\brief      File that define environment for install pages
+/**
+ * 	\file       htdocs/install/inc.php
+ * 	\ingroup	core
+ *	\brief      File that define environment for support pages
  */
 
 define('DOL_VERSION','3.2.0-alpha');	// Also defined in htdocs/master.inc.php (Ex: x.y.z-alpha, x.y.z)
@@ -53,25 +54,25 @@ if (isset($_SERVER["DOCUMENT_URI"]) && $_SERVER["DOCUMENT_URI"])
 }
 
 
-// Definition des constantes syslog
-if (function_exists("define_syslog_variables"))
+// Define syslog constants
+if (! defined('LOG_DEBUG'))
 {
-    if (version_compare(PHP_VERSION, '5.3.0', '<'))
+    if (function_exists("define_syslog_variables"))
     {
         define_syslog_variables(); // Deprecated since php 5.3.0, syslog variables no longer need to be initialized
     }
-}
-else
-{
-    // Pour PHP sans syslog (comme sous Windows)
-    define('LOG_EMERG',0);
-    define('LOG_ALERT',1);
-    define('LOG_CRIT',2);
-    define('LOG_ERR',3);
-    define('LOG_WARNING',4);
-    define('LOG_NOTICE',5);
-    define('LOG_INFO',6);
-    define('LOG_DEBUG',7);
+    else
+    {
+        // Pour PHP sans syslog (comme sous Windows)
+        define('LOG_EMERG',0);
+        define('LOG_ALERT',1);
+        define('LOG_CRIT',2);
+        define('LOG_ERR',3);
+        define('LOG_WARNING',4);
+        define('LOG_NOTICE',5);
+        define('LOG_INFO',6);
+        define('LOG_DEBUG',7);
+    }
 }
 
 $includeconferror='';

htdocs/support/inc.php

@@ -19,8 +19,9 @@
  */
 
 /**
- * 	    \file       htdocs/support/inc.php
- *		\brief      File that define environment for support pages
+ * 	\file       htdocs/support/inc.php
+ * 	\ingroup	core
+ *	\brief      File that define environment for support pages
  */
 
 define('DOL_VERSION','3.2.0-alpha');	// Also defined in htdocs/master.inc.php
@@ -49,27 +50,26 @@ if (isset($_SERVER["DOCUMENT_URI"]) && $_SERVER["DOCUMENT_URI"])
 }
 
 
-// Definition des constantes syslog
-if (function_exists("define_syslog_variables"))
+// Define syslog constants
+if (! defined('LOG_DEBUG'))
 {
-	if (version_compare(PHP_VERSION, '5.3.0', '<'))
-	{
-		define_syslog_variables(); // Deprecated since php 5.3.0, syslog variables no longer need to be initialized
-	}
+    if (function_exists("define_syslog_variables"))
+    {
+    	define_syslog_variables(); // Deprecated since php 5.3.0, syslog variables no longer need to be initialized
+    }
+    else
+    {
+    	// Pour PHP sans syslog (comme sous Windows)
+    	define('LOG_EMERG',0);
+    	define('LOG_ALERT',1);
+    	define('LOG_CRIT',2);
+    	define('LOG_ERR',3);
+    	define('LOG_WARNING',4);
+    	define('LOG_NOTICE',5);
+    	define('LOG_INFO',6);
+    	define('LOG_DEBUG',7);
+    }
 }
-else
-{
-	// Pour PHP sans syslog (comme sous Windows)
-	define('LOG_EMERG',0);
-	define('LOG_ALERT',1);
-	define('LOG_CRIT',2);
-	define('LOG_ERR',3);
-	define('LOG_WARNING',4);
-	define('LOG_NOTICE',5);
-	define('LOG_INFO',6);
-	define('LOG_DEBUG',7);
-}
-
 
 $includeconferror='';