[Python-modules-commits] r20406 - in packages/pycurl/trunk/debian (4 files)

Sat Feb 11 15:20:25 UTC 2012

Date: Saturday, February 11, 2012 @ 15:20:22
  Author: morph
Revision: 20406

Convert to Debhelper 7

Modified:
  packages/pycurl/trunk/debian/changelog
  packages/pycurl/trunk/debian/compat
  packages/pycurl/trunk/debian/control
  packages/pycurl/trunk/debian/rules

Modified: packages/pycurl/trunk/debian/changelog
===================================================================

--- packages/pycurl/trunk/debian/changelog	2012-02-11 15:00:57 UTC (rev 20405)
+++ packages/pycurl/trunk/debian/changelog	2012-02-11 15:20:22 UTC (rev 20406)
@@ -10,8 +10,9 @@
     - added libssh2-1-dev to build-depends; thanks to Jakub Wilk for the report;
       Closes: #658952
   * Convert to 3.0 (quilt) source format
+  * Convert to Debhelper 7
 
- -- Sandro Tosi <morph at debian.org>  Sat, 11 Feb 2012 15:03:13 +0100
+ -- Sandro Tosi <morph at debian.org>  Sat, 11 Feb 2012 16:14:47 +0100
 
 pycurl (7.19.0-4) unstable; urgency=low
 

Modified: packages/pycurl/trunk/debian/compat
===================================================================
--- packages/pycurl/trunk/debian/compat	2012-02-11 15:00:57 UTC (rev 20405)
+++ packages/pycurl/trunk/debian/compat	2012-02-11 15:20:22 UTC (rev 20406)
@@ -1 +1 @@
-5
+7

Modified: packages/pycurl/trunk/debian/control
===================================================================
--- packages/pycurl/trunk/debian/control	2012-02-11 15:00:57 UTC (rev 20405)
+++ packages/pycurl/trunk/debian/control	2012-02-11 15:20:22 UTC (rev 20406)
@@ -3,8 +3,9 @@
 Priority: optional
 Maintainer: Debian Python Modules Team <python-modules-team at lists.alioth.debian.org>
 Uploaders: Sandro Tosi <morph at debian.org>, Bernd Zeimetz <bzed at debian.org>
-Build-Depends: debhelper (>= 5.0.37.1), python-all-dev (>= 2.3.5-9), python-all-dbg, python-support (>= 0.7.1), libcurl4-gnutls-dev (>= 7.19.0), librtmp-dev, libssh2-1-dev
+Build-Depends: debhelper (>= 7.0.50~), python-all-dev (>= 2.3.5-9), python-all-dbg, python-support (>= 0.7.1), libcurl4-gnutls-dev (>= 7.19.0), librtmp-dev, libssh2-1-dev
 Standards-Version: 3.9.2
+X-Python-Version: all
 Homepage: http://pycurl.sourceforge.net
 Vcs-Svn: svn://svn.debian.org/python-modules/packages/pycurl/trunk/
 Vcs-Browser: http://svn.debian.org/viewsvn/python-modules/packages/pycurl/trunk/

Modified: packages/pycurl/trunk/debian/rules
===================================================================
--- packages/pycurl/trunk/debian/rules	2012-02-11 15:00:57 UTC (rev 20405)
+++ packages/pycurl/trunk/debian/rules	2012-02-11 15:20:22 UTC (rev 20406)
@@ -12,45 +12,42 @@
 unexport LDFLAGS
 export FFLAGS="-fPIC"
 
+%:
+	dh $@
 
-build: build-stamp
-build-stamp: DH_OPTIONS=
-build-stamp: $(PYVERS:%=build-python%)
-	touch build-stamp
-
-build-python%:
-	dh_testdir
-	python$* setup.py build
-	python$*-dbg setup.py build
-
+override_dh_auto_build:
 	set -e ;\
-	for test in "tests/test_internals.py" "tests/test_memleak.py" ; do \
-	    PYTHONPATH=`ls -d $(CURDIR)/build/lib.*-*-$*` \
-	        python$* $$test; \
+	for py in $(PYVERS) ; do \
+		python$$py setup.py build ; \
+		python$$py-dbg setup.py build ; \
 	done
-	touch $@
 
-clean:
-	dh_testdir
-	dh_testroot
-	rm -f build-*
-
-	for py in $(PYVERS); do \
-	    python$$py setup.py clean; \
-	    python$$py-dbg setup.py clean; \
+override_dh_auto_test:
+ifeq ($(filter nocheck,$(DEB_BUILD_OPTIONS)),)
+	set -e ;\
+	for py in $(PYVERS) ; do \
+		for test in "tests/test_internals.py" "tests/test_memleak.py" ; do \
+		    PYTHONPATH=`ls -d $(CURDIR)/build/lib.*-*-$$py` \
+	        	python$$py $$test; \
+		done; \
 	done
+endif
 
-	rm -rf build
-	-find -name '*.py[co]' | xargs rm -f
-	dh_clean
+#clean:
+#	dh_testdir
+#	dh_testroot
+#	rm -f build-*
+#
+#	for py in $(PYVERS); do \
+#	    python$$py setup.py clean; \
+#	    python$$py-dbg setup.py clean; \
+#	done
+#
+#	rm -rf build
+#	-find -name '*.py[co]' | xargs rm -f
+#	dh_clean
 
-install: DH_OPTIONS=
-install: build
-	dh_testdir
-	dh_testroot
-	dh_clean -k
-	dh_installdirs
-
+override_dh_auto_install:
 	for py in $(PYVERS); do \
   	    python$$py setup.py install --root=$(CURDIR)/debian/python-pycurl --install-layout=deb; \
  	    python$$py-dbg setup.py install --root=$(CURDIR)/debian/python-pycurl-dbg --install-layout=deb; \
@@ -59,33 +56,29 @@
 	rm -rf $(CURDIR)/debian/python-pycurl-dbg/usr/lib/python*/*-packages/curl
 	rm -f $(CURDIR)/debian/python-pycurl-dbg/usr/lib/python*/*-packages/pycurl-*.egg-info
 
-# Build architecture-independent files here.
-binary-indep: DH_OPTIONS=-i
-binary-indep: build install
-# We have nothing to do by default.
+	rm -rf debian/python-pycurl-dbg/usr/share/doc/python-pycurl-dbg
+	dh_link -ppython-pycurl-dbg usr/share/doc/python-pycurl usr/share/doc/python-pycurl-dbg
 
-# Build architecture-dependent files here.
-binary-arch: build install
-	dh_testdir
-	dh_testroot
+override_dh_installdocs:
 	cp -a doc/*.html debian/python-pycurl/usr/share/doc/python-pycurl/html
-	dh_installdocs -a -A TODO
-	dh_installexamples -a -A examples/* 
-	dh_installchangelogs -a ChangeLog
-	dh_pysupport -a
+	dh_installdocs TODO
+
+override_dh_installexamples:
+	dh_installexamples examples/*
+
+override_dh_installchangelogs:
+	dh_installchangelogs ChangeLog
+
+override_dh_strip:
+ifeq (,$(filter nostrip,$(DEB_BUILD_OPTIONS)))
 	dh_strip -ppython-pycurl --dbg-package=python-pycurl-dbg
 	# fix python-debug-in-wrong-location lintian warning
 	cd debian/*-dbg/usr/lib/debug/usr/lib && mv pyshared pymodules
-	rm -rf debian/python-pycurl-dbg/usr/share/doc/python-pycurl-dbg
-	ln -s python-pycurl debian/python-pycurl-dbg/usr/share/doc/python-pycurl-dbg
-	dh_compress -a -X.py
-	dh_fixperms -a
-	dh_installdeb -a
+endif
+
+override_dh_compress:
+	dh_compress -X.py
+
+override_dh_shlibdeps:
 	dh_shlibdeps -a
 	sed -i '/shlibs:Depends/s,\(libcurl[0-9]*-gnutls (>= \)[^)]*\().*\),\1$(CURLVERS)\2,' debian/python-pycurl*.substvars
-	dh_gencontrol -a
-	dh_md5sums -a
-	dh_builddeb -a
-
-binary: binary-indep binary-arch
-.PHONY: build clean binary-indep binary-arch binary install


