[Python-modules-commits] r9359 - in packages/python-glpk/trunk/debian (5 files)

[jmw-guest at users.alioth.debian.org]

    Date: Sunday, August 16, 2009 @ 11:10:09
  Author: jmw-guest
Revision: 9359

Overhaul packaging. Use debhelper 7 and dh autosequencer

Added:
  packages/python-glpk/trunk/debian/python-glpk.install
Modified:
  packages/python-glpk/trunk/debian/changelog
  packages/python-glpk/trunk/debian/compat
  packages/python-glpk/trunk/debian/control
  packages/python-glpk/trunk/debian/rules

Modified: packages/python-glpk/trunk/debian/changelog
===================================================================
--- packages/python-glpk/trunk/debian/changelog	2009-08-16 10:15:51 UTC (rev 9358)
+++ packages/python-glpk/trunk/debian/changelog	2009-08-16 11:10:09 UTC (rev 9359)
@@ -12,8 +12,9 @@
   [ Jonathan Wiltshire ]
   * Make DPMT maintainer, add me as uploader (closes: #524938)
   * New upstream release (closes: #515994)
+  * Overhaul packaging to use debhelper 7 and dh autosequencer
 
- -- Jonathan Wiltshire <debian at jwiltshire.org.uk>  Sat, 15 Aug 2009 23:40:28 +0100
+ -- Jonathan Wiltshire <debian at jwiltshire.org.uk>  Sun, 16 Aug 2009 12:09:33 +0100
 
 python-glpk (0.1.16-1) unstable; urgency=low
 

Modified: packages/python-glpk/trunk/debian/compat
===================================================================
--- packages/python-glpk/trunk/debian/compat	2009-08-16 10:15:51 UTC (rev 9358)
+++ packages/python-glpk/trunk/debian/compat	2009-08-16 11:10:09 UTC (rev 9359)
@@ -1 +1 @@
-5
+7

Modified: packages/python-glpk/trunk/debian/control
===================================================================
--- packages/python-glpk/trunk/debian/control	2009-08-16 10:15:51 UTC (rev 9358)
+++ packages/python-glpk/trunk/debian/control	2009-08-16 11:10:09 UTC (rev 9359)
@@ -3,7 +3,7 @@
 Priority: optional
 Maintainer: Debian Python Modules Team <python-modules-team at lists.alioth.debian.org>
 Uploaders: Jonathan Wiltshire <debian at jwiltshire.org.uk>
-Build-Depends: debhelper (>= 5.0.38), python-support (>= 0.6), python-all-dev (>= 2.4-1), swig, libglpk-dev (>= 4.16)
+Build-Depends: debhelper (>= 7.0.50), python-support (>= 0.6), python-all-dev (>= 2.4-1), swig, libglpk-dev (>= 4.16)
 Standards-Version: 3.7.2
 Homepage: http://www.ncc.up.pt/~jpp/code/python-glpk/
 Vcs-Svn: svn://svn.debian.org/python-modules/packages/python-glpk/trunk/
@@ -11,7 +11,7 @@
 
 Package: python-glpk
 Architecture: any
-Depends: ${python:Depends}, ${shlibs:Depends}
+Depends: ${python:Depends}, ${shlibs:Depends}, ${misc:Depends}
 Provides: ${python:Provides}
 XB-Python-Version: ${python:Versions}
 Description: Python bindings to the GNU Linear Programming Kit

Added: packages/python-glpk/trunk/debian/python-glpk.install
===================================================================
--- packages/python-glpk/trunk/debian/python-glpk.install	                        (rev 0)
+++ packages/python-glpk/trunk/debian/python-glpk.install	2009-08-16 11:10:09 UTC (rev 9359)
@@ -0,0 +1,2 @@
+*.py			usr/share/python-support/python-glpk
+build/usr/lib		usr

Modified: packages/python-glpk/trunk/debian/rules
===================================================================
--- packages/python-glpk/trunk/debian/rules	2009-08-16 10:15:51 UTC (rev 9358)
+++ packages/python-glpk/trunk/debian/rules	2009-08-16 11:10:09 UTC (rev 9359)
@@ -1,9 +1,10 @@
 #!/usr/bin/make -f
 
-#export DH_VERBOSE=1
+export DH_VERBOSE=1
 
 PYVERS=$(shell pyversions -vr)
 DEB_DESTDIR=$(CURDIR)/debian/python-glpk
+DEB_BUILD_DIR=$(CURDIR)/build
 
 CFLAGS = -Wall -g
 
@@ -13,51 +14,21 @@
 	CFLAGS += -O2
 endif
 
-clean:
-	dh_testdir
-	dh_testroot
-	#rm -rf dist build
-	$(MAKE) clean
-	find . -name '*\.pyc' -exec rm '{}' \;
-	rm -f *-stamp build-ext-*
-	dh_clean
-
 glpkpi_wrap.c:
 	swig -python glpkpi.i
 
-build: build-stamp
-build-stamp: $(PYVERS:%=build-ext-%)
-	touch $@
+override_dh_clean:
+	rm -rf build
+	dh_clean
 
-build-ext-%: glpkpi_wrap.c
+override_dh_auto_build: $(PYVERS:%=build-ext-%-stamp)
+
+build-ext-%-stamp: glpkpi_wrap.c
 	dh_testdir
-	install -d $(DEB_DESTDIR)/usr/lib/python$*/site-packages/
+	install -d $(DEB_BUILD_DIR)/usr/lib/python$*/site-packages/
 	$(CC) $(CFLAGS) -c -fPIC glpkpi_wrap.c glpkpi.c -DHAVE_CONFIG_H -I/usr/include/python$* -I/usr/lib/python$*/config
-	$(CC) $(CFLAGS) -shared glpkpi.o glpkpi_wrap.o -lm -lglpk -o $(DEB_DESTDIR)/usr/lib/python$*/site-packages/_glpkpi.so
+	$(CC) $(CFLAGS) -shared glpkpi.o glpkpi_wrap.o -lm -lglpk -o $(DEB_BUILD_DIR)/usr/lib/python$*/site-packages/_glpkpi.so
 	touch $@
 
-install: install-stamp
-install-stamp: build-stamp
-	install -d $(DEB_DESTDIR)/usr/share/python-support/python-glpk
-	install -m 0644 *.py $(DEB_DESTDIR)/usr/share/python-support/python-glpk/
-
-binary-indep:
-
-binary-arch: build install
-	dh_testdir -a
-	dh_testroot -a
-	dh_installchangelogs -a ChangeLog
-	dh_installdocs -a
-	dh_pysupport -a
-	dh_strip -a
-	dh_compress -a -X.py
-	dh_fixperms -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 configure
+%:
+	dh $@