[Python-modules-commits] [urlgrabber] 03/04: Switch to debhelper 9.

[Michal Cihar]

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

nijel pushed a commit to branch master
in repository urlgrabber.

commit a65262e3183673fcd25991f37cc4ba9178b4a879
Author: Michal Čihař <michal at cihar.com>
Date:   Mon Oct 31 09:05:26 2016 +0100

    Switch to debhelper 9.
    
    - fixes lintian warning about deprecated level
    - avoids running testsuite through dh_auto_test (Closes: #842248)
---
 debian/changelog                  |  8 +++++
 debian/compat                     |  2 +-
 debian/control                    |  2 +-
 debian/dirs                       |  1 -
 debian/python-urlgrabber.manpages |  1 +
 debian/rules                      | 68 +++------------------------------------
 6 files changed, 15 insertions(+), 67 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index ada6cf2..21f02ae 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+urlgrabber (3.10.1-2) UNRELEASED; urgency=medium
+
+  * Switch to debhelper 9.
+    - fixes lintian warning about deprecated level
+    - avoids running testsuite through dh_auto_test (Closes: #842248)
+
+ -- Michal Čihař <nijel at debian.org>  Mon, 31 Oct 2016 09:05:12 +0100
+
 urlgrabber (3.10.1-1) unstable; urgency=low
 
   * Team upload.
diff --git a/debian/compat b/debian/compat
index 7f8f011..ec63514 100644
--- a/debian/compat
+++ b/debian/compat
@@ -1 +1 @@
-7
+9
diff --git a/debian/control b/debian/control
index 4d6e536..56c834e 100644
--- a/debian/control
+++ b/debian/control
@@ -3,7 +3,7 @@ Section: python
 Priority: optional
 Maintainer: Kevin Coyner <kcoyner at debian.org>
 Uploaders: Debian Python Modules Team <python-modules-team at lists.alioth.debian.org>
-Build-Depends: debhelper (>= 7.4~), dh-python, python-all (>= 2.6.6-3~), python-pycurl, quilt (>= 0.46-7~)
+Build-Depends: debhelper (>= 9), dh-python, python-all (>= 2.6.6-3~), python-pycurl
 Standards-Version: 3.9.8
 Homepage: http://urlgrabber.baseurl.org/
 Vcs-Git: https://anonscm.debian.org/git/python-modules/packages/urlgrabber.git
diff --git a/debian/dirs b/debian/dirs
deleted file mode 100644
index e772481..0000000
--- a/debian/dirs
+++ /dev/null
@@ -1 +0,0 @@
-usr/bin
diff --git a/debian/python-urlgrabber.manpages b/debian/python-urlgrabber.manpages
new file mode 100644
index 0000000..085b824
--- /dev/null
+++ b/debian/python-urlgrabber.manpages
@@ -0,0 +1 @@
+debian/urlgrabber.1
diff --git a/debian/rules b/debian/rules
index f2472f2..7590fbf 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,72 +1,12 @@
 #!/usr/bin/make -f
-# -*- makefile -*-
-# Sample debian/rules that uses debhelper.
-# This file was originally written by Joey Hess and Craig Small.
-# As a special exception, when this file is copied by dh-make into a
-# dh-make output file, you may use that output file without restriction.
-# This special exception was added by Craig Small in version 0.37 of dh-make.
-
-# Uncomment this to turn on verbose mode.
-#export DH_VERBOSE=1
 %:
-	dh --with quilt $@
-
-
-PYVERS = $(shell pyversions -r)
-
-configure: configure-stamp
-configure-stamp:
-	dh_testdir
-	touch configure-stamp
+	dh $@ --with python2 --buildsystem=pybuild
 
-build: build-stamp
-
-build-stamp: configure-stamp
-	dh_testdir
-	python setup.py build
-	touch build-stamp
-
-clean: 
-	dh_testdir
-	dh_testroot
-	-rm -f build-stamp configure-stamp
-	for py in $(PYVERS); do \
-		$$py setup.py clean; \
-	done
-	python setup.py clean
-	find $(CURDIR) -name "*.pyc" -exec rm -f '{}' \;
-	dh_clean
-
-install: build
-	dh_testdir
-	dh_testroot
-	dh_prep
-	dh_installdirs
-	# Add here commands to install the package into debian/urlgrabber.
-	python setup.py install --prefix=/usr --root=$(CURDIR)/debian/python-urlgrabber
+override_dh_auto_install:
+	dh_auto_install
 	# remove unneeded documents installed by setup.py
 	-rm -rf $(CURDIR)/debian/python-urlgrabber/usr/share/doc/urlgrabber-3*
 
-# Build architecture-independent files here.
-binary-indep: build install
-	dh_testdir
-	dh_testroot
+override_dh_installchangelogs:
 	dh_installchangelogs ChangeLog
-	dh_installdocs
-	dh_installman debian/urlgrabber.1
-	dh_link
-	dh_strip
-	dh_compress
-	dh_fixperms
-	dh_python2
-	dh_installdeb
-	dh_shlibdeps
-	dh_gencontrol
-	dh_md5sums
-	dh_builddeb
-
-# Build architecture-dependent files here.
-binary-arch: build install
 
-binary: binary-indep binary-arch
-.PHONY: build clean binary-indep binary-arch binary install configure

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