[Python-modules-commits] [python-httplib2] 01/01: Update debian/watch and get-orig-source rule to work with current upstream location

[Scott Kitterman]

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

kitterman pushed a commit to branch master
in repository python-httplib2.

commit 5640788adba84f08d1e6816409a09f80b484b476
Author: Scott Kitterman <scott at kitterman.com>
Date:   Wed Nov 9 16:00:01 2016 -0500

    Update debian/watch and get-orig-source rule to work with current upstream location
---
 debian/changelog | 7 ++++++-
 debian/rules     | 9 ++++++---
 debian/watch     | 2 +-
 3 files changed, 13 insertions(+), 5 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 91f3213..f23d55a 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,8 +1,13 @@
 python-httplib2 (0.9.1+dfsg-2) UNRELEASED; urgency=medium
 
+  [ Ondřej Nový ]
   * Fixed VCS URL (https)
 
- -- Ondřej Nový <novy at ondrej.org>  Tue, 29 Mar 2016 22:08:23 +0200
+  [ Scott Kitterman ]
+  * Update debian/watch and get-orig-source rule to work with current upstream
+    location
+
+ -- Scott Kitterman <scott at kitterman.com>  Wed, 09 Nov 2016 15:59:05 -0500
 
 python-httplib2 (0.9.1+dfsg-1) unstable; urgency=medium
 
diff --git a/debian/rules b/debian/rules
index 1891d56..7f76697 100755
--- a/debian/rules
+++ b/debian/rules
@@ -7,9 +7,12 @@ VERSION = $(shell head -n1 debian/changelog | sed -e 's/.*(//;s/+.*).*//')
 	dh $@ --buildsystem pybuild --with python2,python3
 
 get-orig-source:
-	wget https://github.com/jcgregorio/httplib2/archive/v${VERSION}.tar.gz -O ../python-httplib2-${VERSION}.tar.gz
-	tar fxz ../python-httplib2-${VERSION}.tar.gz -C ../ && mv ../httplib2-${VERSION} ../python-httplib2-${VERSION}+dfsg
+	uscan --force-download
+	#wget https://github.com/jcgregorio/httplib2/archive/v${VERSION}.tar.gz -O ../python-httplib2-${VERSION}.tar.gz
+	tar fxz ../python-httplib2_${VERSION}.orig.tar.gz -C ../ && mv ../httplib2-${VERSION} ../python-httplib2-${VERSION}+dfsg
 	find ../python-httplib2-${VERSION}+dfsg -name "*searchindex.js" -delete
 	find ../python-httplib2-${VERSION}+dfsg -name "*interface.js" -delete
 	tar czf ../python-httplib2_${VERSION}+dfsg.orig.tar.gz ../python-httplib2-${VERSION}+dfsg
-	rm -fr ../python-httplib2-${VERSION}.tar.gz ../python-httplib2-${VERSION}+dfsg
+	rm -fr ../python-httplib2_${VERSION}.orig.tar.gz ../python-httplib2-${VERSION}+dfsg ../httplib2-${VERSION}.tar.gz
+
+.PHONY: get-orig-source
diff --git a/debian/watch b/debian/watch
index 06d01b4..f8d6acd 100644
--- a/debian/watch
+++ b/debian/watch
@@ -1,3 +1,3 @@
 version=3
 opts=filenamemangle=s/.+\/v?(\d\S*)\.tar\.gz/httplib2-$1\.tar\.gz/,dversionmangle=s/\+dfsg// \
-  https://github.com/jcgregorio/httplib2/tags .*/v?(\d\S*)\.tar\.gz
+  https://github.com/httplib2/httplib2/tags .*/v?(\d\S*)\.tar\.gz

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/python-modules/packages/python-httplib2.git