Hi,

Attached is the diff for my python-dhm 0.5-2.3 NMU.

-- 
·O·  Pierre Habouzit
··O                                                [EMAIL PROTECTED]
OOO                                                http://www.madism.org
diff -u python-dhm-0.5/debian/control python-dhm-0.5/debian/control
--- python-dhm-0.5/debian/control
+++ python-dhm-0.5/debian/control
@@ -5,40 +5,17 @@
-Build-Depends: debhelper (>> 4.0.0)
-Build-Depends-Indep: python, python-all-dev
-Standards-Version: 3.6.2
+Build-Depends: debhelper (>= 5.0.37.2), python-all-dev (>= 2.3.5-11)
+Build-Depends-Indep: python-support (>= 0.3)
+Standards-Version: 3.7.2
 
 Package: python-dhm
 Architecture: all
 Depends: ${python:Depends}
+Provides: ${python:Provides}
+Replaces: python2.3-dhm (<< 0.5-2.3), python2.4-dhm (<< 0.5-2.3)
+Conflicts: python2.3-dhm (<< 0.5-2.3), python2.4-dhm (<< 0.5-2.3)
+XB-Python-Version: ${python:Versions}
 Description: Collection of Python utilities
  A collection of various tools wich cover a broad range of things: classes
  to make it easier to deal with LDAP and SQL databases, CGI-related tools,
  general string manipulation, process handling, etc.
  .
  For more information, see: http://www.wiggy.net/code/python-dhm.xhtml
- .
- This is a dummy package that makes sure the right package for the default
- Debian python version is installed.
-
-Package: python2.3-dhm
-Architecture: all
-Depends: ${python:Depends}
-Description: Collection of Python utilities, python2.3 version
- A collection of various tools wich cover a broad range of things: classes
- to make it easier to deal with LDAP and SQL databases, CGI-related tools,
- general string manipulation, process handling, etc.
- .
- For more information, see: http://www.wiggy.net/code/python-dhm.xhtml
- .
- This package is built for Python 2.3.
-
-Package: python2.4-dhm
-Architecture: all
-Depends: ${python:Depends}
-Description: Collection of Python utilities, python2.3 version
- A collection of various tools wich cover a broad range of things: classes
- to make it easier to deal with LDAP and SQL databases, CGI-related tools,
- general string manipulation, process handling, etc.
- .
- For more information, see: http://www.wiggy.net/code/python-dhm.xhtml
- .
- This package is built for Python 2.4.
diff -u python-dhm-0.5/debian/rules python-dhm-0.5/debian/rules
--- python-dhm-0.5/debian/rules
+++ python-dhm-0.5/debian/rules
@@ -5,23 +5,36 @@
 # Uncomment this to turn on verbose mode.
 #export DH_VERBOSE=1
 
-build build-stamp:
-       python2.3 setup.py build
-       python2.4 setup.py build        
-       touch build-stamp
+PYVERS := $(shell pyversions -r)
 
-clean:
+build: build-stamp
+build-stamp: $(PYVERS:%=build-ext-%)
+       touch $@
+
+build-ext-%:
+       dh_testdir
+       $* setup.py build
+       touch $@
+
+clean: $(PYVERS:%=clean-ext-%)
        dh_testdir
-       rm -f build-stamp 
-       rm -rf build
-       dh_clean 
+       rm -f build-stamp
+       dh_clean
+
+clean-ext-%:
+       dh_testdir
+       $* setup.py clean --all
+
+install: build $(PYVERS:%=install-ext-%)
+install-ext-%:
+       $* setup.py install --root $(CURDIR)/debian/python-dhm
 
 # Build architecture-independent files here.
 binary-arch: 
 # We have nothing to do by default.
 
 # Build architecture-dependent files here.
-binary-indep: build-stamp
+binary-indep: build install
        dh_testdir
        dh_testroot
        dh_install
@@ -29,8 +42,7 @@
        dh_installdocs
        dh_compress
        dh_fixperms
-       python2.4 setup.py install --prefix=$(shell 
pwd)/debian/python2.4-dhm/usr
-       python2.3 setup.py install --prefix=$(shell 
pwd)/debian/python2.3-dhm/usr
+       dh_pysupport
        dh_python
        dh_installdeb
        dh_shlibdeps
diff -u python-dhm-0.5/debian/changelog python-dhm-0.5/debian/changelog
--- python-dhm-0.5/debian/changelog
+++ python-dhm-0.5/debian/changelog
@@ -1,3 +1,10 @@
+python-dhm (0.5-2.3) unstable; urgency=low
+
+  * Non-maintainer upload.
+  * Update package to the last python policy (Closes: #373527).
+
+ -- Pierre Habouzit <[EMAIL PROTECTED]>  Sat,  1 Jul 2006 13:20:08 +0200
+
 python-dhm (0.5-2.2) unstable; urgency=low
 
   * Non-maintainer upload.
only in patch2:
unchanged:
--- python-dhm-0.5.orig/debian/pycompat
+++ python-dhm-0.5/debian/pycompat
@@ -0,0 +1 @@
+2

Attachment: signature.asc
Description: Digital signature

Reply via email to