Merge branch '3.3' of https://github.com/Dolibarr/dolibarr.git into 3.3

build/debian/changelog

@@ -1,9 +1,6 @@
-dolibarr (3.3.4+nmu1) unstable; urgency=low
+dolibarr (3.3.4) unstable; urgency=low
 
-  * Non-maintainer upload.
+  [ Laurent Destailleur (eldy) ]
   * New upstream release.
-    closes: bug#634783
     
- -- Dolibarr team <contact@dolibarr.org>  Mon, 22 Apr 2013 12:00:00 +0100     
+ -- Laurent Destailleur (eldy) <eldy@users.sourceforge.net>  Mon, 22 Apr 2013 12:00:00 +0100     
-
-# For a changelog file dedicated to end users, see /usr/share/doc/dolibarr/ChangeLog.gz  

build/debian/control

@@ -1,5 +1,6 @@
 Source: dolibarr
-Maintainer: Laurent Destailleur <eldy@users.sourceforge.net>
+Maintainer: Laurent Destailleur (eldy) <eldy@users.sourceforge.net>
+Uploaders: Laurent Destailleur (eldy) <eldy@users.sourceforge.net>
 Standards-Version: 3.9.2
 Section: web
 Priority: optional

build/debian/get-orig-source.sh

@@ -0,0 +1,40 @@
+#!/bin/sh
+# run with
+# debian/get-orig-source.sh [x.y.z]
+
+tmpdir=$(mktemp -d)
+echo "tmpdir = $tmpdir"
+
+if [ -n "$1" ]; then
+    uscan_opts="--download-version=$1"
+fi
+uscan --noconf --force-download --no-symlink --verbose --destdir=$tmpdir $uscan_opts
+
+cd $tmpdir
+
+tgzfile=$(echo *.tar.gz)
+version=$(echo "$tgzfile" | perl -pi -e 's/^dolibarr_//; s/\.zip$//; s/_/./g; s/\+nmu1//; s/$/+dfsg/;')
+
+# Extract the zip file
+tar -xvf $tgzfile
+srcdir=$(find . -maxdepth 1 -mindepth 1 -type d | sed -e 's/\.\///')
+
+if [ ! -d "$srcdir" ]; then
+    echo "ERROR: Failed to identify the extracted directory in $tmpdir (got $srcdir)" >&2
+    rm -rf $tmpdir
+    exit 1
+fi
+
+# Repack as tar.xz
+tar Jcf dolibarr_${version}.orig.tar.xz $srcdir
+
+cd - >/dev/null
+
+if [ -e ../dolibarr_${version}.orig.tar.xz ]; then
+    echo "Not overwriting ../dolibarr_${version}.orig.tar.xz";
+else
+    echo "Created ../dolibarr_${version}.orig.tar.xz"
+    mv $tmpdir/dolibarr_${version}.orig.tar.xz ../
+fi
+
+#rm -rf $tmpdir

build/debian/wash

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

@@ -0,0 +1,4 @@
+# watch control file for uscan
+version=3
+#http://sf.net/dolibarr/dolibarr-(.+)\.tgz
+http://www.dolibarr.org/files/stable/package_debian-ubuntu/dolibarr_(.+)\.tar\.gz

build/makepack-dolibarr.pl

@@ -547,7 +547,7 @@ if ($nboftargetok) {
             $build = $newbuild;
             $build =~ s/-.*$//g;
 			# now build is 0 for example
-			$build .= '+nmu1';
+			# $build .= '+nmu1';
 			# now build is 0+nmu1 for example
 			
     		print "Remove target ${FILENAMEDEB}_all.deb...\n";