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/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
-

build/debian/install

@@ -1,6 +1,8 @@
-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

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
+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:
+

build/debian/wash

@@ -0,0 +1,3 @@
+# 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