Merge remote-tracking branch 'origin/3.3' into 3.4

build/debian/get-orig-source.sh

@@ -12,7 +12,7 @@ uscan --noconf --force-download --no-symlink --verbose --destdir=$tmpdir $uscan_
 
 cd $tmpdir
 
-tgzfile=$(echo *.tar.gz)
+tgzfile=$(echo *.tgz)
 version=$(echo "$tgzfile" | perl -pi -e 's/^dolibarr_//; s/\.zip$//; s/_/./g; s/\+nmu1//; s/$/+dfsg/;')
 
 # Extract the zip file

build/debian/watch

 # 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
+http://www.dolibarr.org/files/stable/standard/dolibarr-(.+)\.tgz