[Pkg-javascript-commits] [datatables.js] 07/08: fix watchfile

[Sascha Steinbiss]

This is an automated email from the git hooks/post-receive script.

sascha-guest pushed a commit to branch master
in repository datatables.js.

commit 1cfdebf4641dd670d377b958381c91eca8478c6b
Author: Sascha Steinbiss <satta at debian.org>
Date:   Fri Dec 9 08:11:35 2016 +0000

    fix watchfile
---
 debian/README.source | 1 -
 debian/changelog     | 1 +
 debian/rules         | 4 ----
 debian/watch         | 2 +-
 4 files changed, 2 insertions(+), 6 deletions(-)

diff --git a/debian/README.source b/debian/README.source
deleted file mode 100644
index 4d34407..0000000
--- a/debian/README.source
+++ /dev/null
@@ -1 +0,0 @@
-Get source with debian/rules get-orig-source.
diff --git a/debian/changelog b/debian/changelog
index 94dbed6..a02230f 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -4,6 +4,7 @@ datatables.js (1.10.13+dfsg-1) UNRELEASED; urgency=medium
   * Update maintainer email address.
   * d/copyright: 'tests' -> 'old-tests'
   * Remove unused override.
+  * Fix watchfile to directly prepare orig tarball.
 
  -- Sascha Steinbiss <satta at debian.org>  Fri, 09 Dec 2016 07:51:39 +0000
 
diff --git a/debian/rules b/debian/rules
index 97d8544..70d87c4 100755
--- a/debian/rules
+++ b/debian/rules
@@ -26,7 +26,3 @@ override_dh_auto_install:
 	  debian/libjs-jquery-datatables/usr/share/javascript/jquery-datatables/images
 	cp images/*png \
 	  debian/libjs-jquery-datatables/usr/share/javascript/jquery-datatables/images
-
-get-orig-source:
-	uscan --verbose --force-download --repack --destdir=..
-	mv ../datatables.js_$(OVERSION).orig.tar.gz ../datatables.js_$(VERSION).orig.tar.gz
diff --git a/debian/watch b/debian/watch
index ab390d0..acdccf0 100644
--- a/debian/watch
+++ b/debian/watch
@@ -1,4 +1,4 @@
 version=3
-opts=uversionmangle=s/(\d)[_\.\-\+]?((RC|rc|pre|dev|beta|alpha|b|a)\d*)$/$1~$2/,dversionmangle=s/\+(debian|dfsg|ds|deb)\d*$// \
+opts=repacksuffix=+dfsg,dversionmangle=s/\+dfsg//g,repack,compression=xz \
 https://github.com/DataTables/DataTablesSrc/releases .*/archive/(\d[\d.-]+)\.(?:tar(?:\.gz|\.bz2)?|tgz)
 

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-javascript/datatables.js.git