[Python-modules-commits] r22600 - in packages/pyopenssl/trunk/debian (changelog control rules)

[morph at users.alioth.debian.org]

    Date: Wednesday, August 29, 2012 @ 20:32:17
  Author: morph
Revision: 22600

* debian/{control, rules}
  - migrate to dh sequences, implicitly Closes: #675414

Modified:
  packages/pyopenssl/trunk/debian/changelog
  packages/pyopenssl/trunk/debian/control
  packages/pyopenssl/trunk/debian/rules

Modified: packages/pyopenssl/trunk/debian/changelog
===================================================================
--- packages/pyopenssl/trunk/debian/changelog	2012-08-28 19:53:13 UTC (rev 22599)
+++ packages/pyopenssl/trunk/debian/changelog	2012-08-29 20:32:17 UTC (rev 22600)
@@ -1,3 +1,10 @@
+pyopenssl (0.13-3) UNRELEASED; urgency=low
+
+  * debian/{control, rules}
+    - migrate to dh sequences, implicitly Closes: #675414
+
+ -- Sandro Tosi <morph at debian.org>  Wed, 29 Aug 2012 22:31:27 +0200
+
 pyopenssl (0.13-2) unstable; urgency=low
 
   [ Barry Warsaw ]

Modified: packages/pyopenssl/trunk/debian/control
===================================================================
--- packages/pyopenssl/trunk/debian/control	2012-08-28 19:53:13 UTC (rev 22599)
+++ packages/pyopenssl/trunk/debian/control	2012-08-29 20:32:17 UTC (rev 22600)
@@ -3,7 +3,7 @@
 Priority: optional
 Maintainer: Debian Python Modules Team <python-modules-team at lists.alioth.debian.org>
 Uploaders: Sandro Tosi <morph at debian.org>
-Build-Depends: debhelper (>= 5.0.37.2), python-all-dev (>= 2.5.4-1~), python-all-dbg (>= 2.5.4-1~), python3-all-dev, python3-all-dbg, python-support (>= 0.6.4), libssl-dev (>= 0.9.8), tex4ht, w3m, texlive-latex-base, texlive-latex-recommended, openssl
+Build-Depends: debhelper (>= 7.0.50~), python-all-dev (>= 2.5.4-1~), python-all-dbg (>= 2.5.4-1~), python3-all-dev, python3-all-dbg, python-support (>= 0.6.4), libssl-dev (>= 0.9.8), tex4ht, w3m, texlive-latex-base, texlive-latex-recommended, openssl
 Standards-Version: 3.9.3
 Homepage: http://launchpad.net/pyopenssl
 Vcs-Svn: svn://svn.debian.org/python-modules/packages/pyopenssl/trunk/

Modified: packages/pyopenssl/trunk/debian/rules
===================================================================
--- packages/pyopenssl/trunk/debian/rules	2012-08-28 19:53:13 UTC (rev 22599)
+++ packages/pyopenssl/trunk/debian/rules	2012-08-29 20:32:17 UTC (rev 22600)
@@ -7,18 +7,20 @@
 PY3VERS := $(shell py3versions -r -v)
 PYVERS := $(PY2VERS) $(PY3VERS)
 
-build: build-arch build-indep
-build-arch: build-stamp
-build-indep: build-stamp
-build-stamp:
-	dh_testdir
+%:
+	dh $@ --with python3
 
+override_dh_auto_build:
 	set -e; \
 	for py in $(PYVERS); do  \
 	    python$$py setup.py build; \
 	    python$$py-dbg setup.py build; \
 	done
 
+	$(MAKE) -C doc all
+
+override_dh_auto_test:
+ifeq ($(filter nocheck,$(DEB_BUILD_OPTIONS)),)
 	# run tests
 	-for py in $(PYVERS); do  \
 	    for test in OpenSSL/test/test*; do \
@@ -27,16 +29,10 @@
 	        PYTHONPATH=`ls -d build/lib_d.*-$$py || ls -d build/lib.*-$$py-pydebug` python$$py-dbg $$test; \
 	    done; \
 	done
+endif
      
 
-	$(MAKE) -C doc all
-
-	touch build-stamp
-
-clean:
-	dh_testdir
-	dh_testroot
-
+override_dh_auto_clean:
 	-for py in $(PYVERS); do \
 	    python$$py setup.py clean --all; \
 	    python$$py-dbg setup.py clean --all; \
@@ -50,13 +46,8 @@
 
 	dh_clean build-stamp version.pyc
 
-install: DH_OPTIONS=
-install: build
-	dh_testdir
-	dh_testroot
-	dh_clean -k
-	dh_installdirs
-
+override_dh_auto_install: DH_OPTIONS=
+override_dh_auto_install:
 	set -e; \
 	for py in $(PY2VERS); do \
 	    echo "installing for python$$py ..."; \
@@ -74,44 +65,15 @@
 	find debian/python-openssl-dbg ! -type d ! -name '*_d.so' | xargs rm -f
 	find debian/python-openssl-dbg -depth -empty -exec rmdir {} \;
 
-# Build architecture-independent files here.
-# Pass -i to all debhelper commands in this target to reduce clutter.
-binary-indep: build install
-	dh_testdir -i
-	dh_testroot -i
-	dh_installdocs -i
-	dh_installexamples -i
-	dh_installchangelogs ChangeLog -i
-	dh_compress -i
-	dh_fixperms -i
-	dh_pysupport -i
-	dh_python3 -i
-	dh_installdeb -i
-	dh_gencontrol -i
-	dh_md5sums -i
-	dh_builddeb -i
+override_dh_installchangelogs:
+	dh_installchangelogs ChangeLog
 
-# Build architecture-dependent files here.
-binary-arch: build install
-	dh_testdir -a
-	dh_testroot -a
-	dh_installdocs -a
-	dh_installexamples -a
-	dh_installchangelogs ChangeLog -a
+override_dh_strip:
 	dh_strip -ppython-openssl --dbg-package=python-openssl-dbg
 	dh_strip -ppython3-openssl --dbg-package=python3-openssl-dbg
 	rm -rf debian/python-openssl-dbg/usr/share/doc/python-openssl-dbg
 	ln -s python-openssl debian/python-openssl-dbg/usr/share/doc/python-openssl-dbg
-	dh_compress -a
-	dh_fixperms -a
-	dh_pysupport -a
-	dh_python3 -a
-	dh_makeshlibs -a
-	dh_installdeb -a
-	dh_shlibdeps -a
-	dh_gencontrol -a
-	dh_md5sums -a
-	dh_builddeb -a
 
-binary: binary-indep binary-arch
-.PHONY: build clean binary-indep binary-arch binary install
+# we need to run dh_strip before dh_pysupport will move extensions in pyshared dirs
+override_dh_pysupport: override_dh_strip
+	dh_pysupport