From 556827c818d19823ab0da7241114a23b79bdcd1f Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Thu, 5 Sep 2013 22:58:11 +0200 Subject: [PATCH 1/4] Fix: wash file --- build/debian/wash | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/build/debian/wash b/build/debian/wash index 7d3ec07d7a5..d755cf4b112 100644 --- a/build/debian/wash +++ b/build/debian/wash @@ -1,3 +1,4 @@ # watch control file for uscan -#version=3 -#http://http://sourceforge.net/projects/dolibarr/files/Dolibarr%20installer%20for%20Debian-Ubuntu%20%28DoliDeb%29/ debian uupdate +version=3 +#http://sourceforge.net/projects/dolibarr/files/Dolibarr%20installer%20for%20Debian-Ubuntu%20%28DoliDeb%29/ debian uupdate +http://www.dolibarr.org/files/stable/package_debian-ubuntu/dolibarr_(.+)\.tar\.gz \ No newline at end of file From c71c4e86f67d639eed68e563d61db9878d500e90 Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Thu, 5 Sep 2013 23:52:13 +0200 Subject: [PATCH 2/4] Fix: watch file for debian package. --- build/debian/get-orig-source.sh | 40 +++++++++++++++++++++++++++++++++ build/debian/wash | 4 ---- build/debian/watch | 4 ++++ 3 files changed, 44 insertions(+), 4 deletions(-) create mode 100755 build/debian/get-orig-source.sh delete mode 100644 build/debian/wash create mode 100644 build/debian/watch diff --git a/build/debian/get-orig-source.sh b/build/debian/get-orig-source.sh new file mode 100755 index 00000000000..e3d201d672f --- /dev/null +++ b/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 diff --git a/build/debian/wash b/build/debian/wash deleted file mode 100644 index d755cf4b112..00000000000 --- a/build/debian/wash +++ /dev/null @@ -1,4 +0,0 @@ -# watch control file for uscan -version=3 -#http://sourceforge.net/projects/dolibarr/files/Dolibarr%20installer%20for%20Debian-Ubuntu%20%28DoliDeb%29/ debian uupdate -http://www.dolibarr.org/files/stable/package_debian-ubuntu/dolibarr_(.+)\.tar\.gz \ No newline at end of file diff --git a/build/debian/watch b/build/debian/watch new file mode 100644 index 00000000000..0f84815a48e --- /dev/null +++ b/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 From a9c14c80f00168c6202a04a12b7b292633236355 Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Fri, 6 Sep 2013 01:27:11 +0200 Subject: [PATCH 3/4] Fix: debian files --- build/debian/changelog | 9 +++------ build/debian/control | 3 ++- 2 files changed, 5 insertions(+), 7 deletions(-) diff --git a/build/debian/changelog b/build/debian/changelog index b8b2826d43c..3a798d0d3cd 100644 --- a/build/debian/changelog +++ b/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 Mon, 22 Apr 2013 12:00:00 +0100 - -# For a changelog file dedicated to end users, see /usr/share/doc/dolibarr/ChangeLog.gz \ No newline at end of file + -- Laurent Destailleur (eldy) Mon, 22 Apr 2013 12:00:00 +0100 diff --git a/build/debian/control b/build/debian/control index 9f0a0fb2ef5..0f2e6a6006a 100755 --- a/build/debian/control +++ b/build/debian/control @@ -1,5 +1,6 @@ Source: dolibarr -Maintainer: Laurent Destailleur +Maintainer: Laurent Destailleur (eldy) +Uploaders: Laurent Destailleur (eldy) Standards-Version: 3.9.2 Section: web Priority: optional From 5db9505f40c71fcc2cd2c9724c93a7182a7865c7 Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Fri, 6 Sep 2013 01:30:49 +0200 Subject: [PATCH 4/4] Fix debian package --- build/makepack-dolibarr.pl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build/makepack-dolibarr.pl b/build/makepack-dolibarr.pl index fe171e3f32a..173773523d2 100755 --- a/build/makepack-dolibarr.pl +++ b/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";