[Pkg-mozext-commits] [adblock-plus] 88/98: Use upstream source archive with dependencies included

[David Prévot]

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

taffit pushed a commit to branch master
in repository adblock-plus.

commit 90e22be9440788e9962319417482510d54700584
Author: David Prévot <david at tilapin.org>
Date:   Sun Oct 22 16:52:30 2017 -1000

    Use upstream source archive with dependencies included
---
 debian/rules | 12 +-----------
 debian/watch |  3 ++-
 2 files changed, 3 insertions(+), 12 deletions(-)

diff --git a/debian/rules b/debian/rules
index 6ba9365..2ff1fe5 100755
--- a/debian/rules
+++ b/debian/rules
@@ -13,14 +13,4 @@ override_dh_installchangelogs:
 	dh_installchangelogs $(CURDIR)/debian/adblock-plus.upstream-changelog
 
 get-orig-source:
-	VERSION=$(shell uscan --force --dehs | \
-		grep upstream-version | \
-		sed 's,<upstream-version>\(.*\)</upstream-version>,\1+dfsg,') ; \
-		wget -O ../adblock-plus_$$VERSION.orig-buildtools.tar.gz \
-		https://github.com/adblockplus/buildtools/archive/master.tar.gz ; \
-		wget -O ../adblock-plus_$$VERSION.orig-jshydra.tar.gz \
-		https://github.com/adblockplus/jshydra/archive/master.tar.gz ; \
-		wget -O ../adblock-plus_$$VERSION.orig-adblockplusui.tar.gz \
-		https://github.com/adblockplus/adblockplusui/archive/master.tar.gz ; \
-		wget -O ../adblock-plus_$$VERSION.orig-adblockpluscore.tar.gz \
-		https://github.com/adblockplus/adblockpluscore/archive/master.tar.gz
+	uscan --rename --verbose --force
diff --git a/debian/watch b/debian/watch
index fdb8b9e..f64b984 100644
--- a/debian/watch
+++ b/debian/watch
@@ -1,3 +1,4 @@
 version=3
-options=dversionmangle=s/\+dfsg$//,uversionmangle=s/-signed$//,repacksuffix=+dfsg \
+options=dversionmangle=s/\+dfsg$//,uversionmangle=s/-signed$//,repacksuffix=+dfsg,\
+downloadurlmangle=s#github.com/adblockplus/adblockplus/archive/(\d.*)\.tar\.#downloads.adblockplus.org/adblockplus-$1-source.t# \
 https://github.com/adblockplus/adblockplus/releases .*/archive/(\d.*)\.tar\.gz

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-mozext/adblock-plus.git