Fix: debian key dfsg and not dsfg

build/debian/README.howto

@@ -155,20 +155,16 @@ from origin/upstream and origin/pristine.
 > debian/get-orig-source.sh
 If script fails with error Bad certificate, you can set "export PERL_LWP_SSL_VERIFY_HOSTNAME=0" to solve this.
 
-* Edit tgz file to remove 
+* Some files are removed from archive by the get-orig-source.sh 
-- includes/sRGB.icc
-And rename file into 
-tcpdf_x.y.z+dfsg.tar.xz
-(x.y.z = version, w start from 1 and is increased for each new import)
 
 * Staying into git root directory, run
-> git-import-orig -vv ../tcpdf_x.y.z+dfsg.tar.xz
+> git-import-orig -vv ../tcpdf_x.y.z+dfsg.orig.tar.xz
 
 Note: If there was errors solved manually, you may need to make a git commit
 
 * Add an entry into debian/changelog
-> dch -v x.y.z+dsfg-1 "My comment" will add entry.
+> dch -v x.y.z+dfsg-1 "My comment" will add entry.
-For example: dch -v x.y.z+dsfg-1 "New upstream release." for a new version
+For example: dch -v x.y.z+dfsg-1 "New upstream release." for a new version
 Then modify changelog to replace "version" or "unstable" with "UNRELEASED".
 
 Warning: Date must have format reported by "date -R"
@@ -242,13 +238,13 @@ If script fails with error Bad certificate, you can set "export PERL_LWP_SSL_VER
 - phpexcel
 - tcpdf
 And rename file into 
-dolibarr-x.y.z+dsfgw.tgz
+dolibarr-x.y.z+dfsgw.tgz
 (x.y.z = version, w start from 1 and is increased for each new import)
 
 * Staying into git root directory, run
-> git-import-orig -vv ../dolibarr-x.y.z+dsfgw.tgz
+> git-import-orig -vv ../dolibarr-x.y.z+dfsgw.tgz
 and enter version when requested with format
-x.y.z+dsfgw
+x.y.z+dfsgw
 (x.y.z = version, w start from 1 and is increased for each new import)
 
 Note: If there was errors solved manually after get-orig-sources.sh, you may need to make a git commit

build/debian/get-orig-source.sh

@@ -1,23 +1,46 @@
 #!/bin/sh
-# Scan for new official sources and download file
-# run with debian/get-orig-source.sh [x.y.z]
 
 tmpdir=$(mktemp -d)
-echo "tmpdir = $tmpdir"
 
+
+# Download source file
 if [ -n "$1" ]; then
     uscan_opts="--download-version=$1"
 fi
-uscan --noconf --force-download --no-symlink --verbose --destdir=$tmpdir $uscan_opts
+#uscan --noconf --force-download --no-symlink --destdir=$tmpdir $uscan_opts
 
 cd $tmpdir
 
-tgzfile=$(echo *.tgz)
+# Other method to download (comment uscan if you use this)
-version=$(echo "$tgzfile" | perl -pi -e 's/^dolibarr-//; s/\.tgz$//; s/_/./g; s/\+nmu1//; ')
+wget http://sourceforge.net/projects/tcpdf/files/tcpdf_6_0_093.zip
+
+# Rename file to add +dfsg
+zipfile=$(echo *.zip)
+version=$(echo "$zipfile" | perl -pi -e 's/^tcpdf_//; s/\.zip$//; s/_/./g; s/$/+dfsg/;')
+
+# Extract the zip file
+unzip -q $zipfile
+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
+
+# Cleanup unwanted files
+rm -rf $srcdir/fonts/free*
+
+# Repack as tar.xz
+tar Jcf tcpdf_${version}.orig.tar.xz $srcdir
 
 cd - >/dev/null
 
-mv $tmpdir/dolibarr-${version}.tgz ../
+if [ -e ../tcpdf_${version}.orig.tar.xz ]; then
-echo "File ../dolibarr-${version}.tgz is ready for git-import"
+    echo "Not overwriting ../tcpdf_${version}.orig.tar.xz";
+else
+    echo "Created ../tcpdf_${version}.orig.tar.xz"
+    mv $tmpdir/tcpdf_${version}.orig.tar.xz ../
+fi
 
 rm -rf $tmpdir