Hi,

Attached is the diff for my pyinotify 0.5.2-1.1 NMU.

-- 
·O·  Pierre Habouzit
··O                                                [EMAIL PROTECTED]
OOO                                                http://www.madism.org
diff -u pyinotify-0.5.2/debian/control pyinotify-0.5.2/debian/control
--- pyinotify-0.5.2/debian/control
+++ pyinotify-0.5.2/debian/control
@@ -2,8 +2,8 @@
 Section: python
 Priority: optional
 Maintainer: Hans Ulrich Niedermann <[EMAIL PROTECTED]>
-Build-Depends: debhelper (>> 4.1.65), python2.3-dev, python2.4-dev, python
-Standards-Version: 3.6.2
+Build-Depends: debhelper (>= 5.0.37.2), python-all-dev (>= 2.3.5-11), 
python-support (>= 0.3)
+Standards-Version: 3.7.2
 
 # Notes on the Architecture: field for the binary packages:
 #  * inotify is Linux-only.
@@ -25,17 +25,18 @@
 #       of "linux-".
 
 Package: python-pyinotify
-Architecture: all
-Depends: python2.3-pyinotify
+Architecture: alpha amd64 arm i386 ia64 powerpc ppc64 s390 sh sparc sparc64
+Depends: ${python:Depends}, ${shlibs:Depends}
+Provides: ${python:Provides}
+Replaces: python2.3-pyinotify (<< 0.5.2-1.1), python2.4-pyinotify (<< 
0.5.2-1.1)
+Conflicts: python2.3-pyinotify (<< 0.5.2-1.1), python2.4-pyinotify (<< 
0.5.2-1.1)
+XB-Python-Version: ${python:Versions}
 Description: Simple Linux inotify Python bindings [dummy package]
  pyinotify is a simple wrapper for the Linux inotify mechanism.
  .
  inotify is a Linux Kernel feature available since 2.6.13. inotify makes
  it possible for applications to easily be notified of filesystem changes.
  .
- This package is an empty dummy package which always depends on a package
- built for Debian's default Python version.
- .
  Homepage: http://pyinotify.sourceforge.net/
 
 Package: python-pyinotify-doc
@@ -55,25 +55,0 @@
-Package: python2.3-pyinotify
-Architecture: alpha amd64 arm i386 ia64 powerpc ppc64 s390 sh sparc sparc64
-Depends: python2.3, ${shlibs:Depends}
-Description: Simple Linux inotify Python bindings
- pyinotify is a simple wrapper for the Linux inotify mechanism.
- .
- inotify is a Linux Kernel feature available since 2.6.13. inotify makes
- it possible for applications to easily be notified of filesystem changes.
- .
- This package has been built with Python 2.3.
- .
- Homepage: http://pyinotify.sourceforge.net/
-
-Package: python2.4-pyinotify
-Architecture: alpha amd64 arm i386 ia64 powerpc ppc64 s390 sh sparc sparc64
-Depends: python2.4, ${shlibs:Depends}
-Description: Simple Linux inotify Python bindings
- pyinotify is a simple wrapper for the Linux inotify mechanism.
- .
- inotify is a Linux Kernel feature available since 2.6.13. inotify makes
- it possible for applications to easily be notified of filesystem changes.
- .
- This package has been built with Python 2.4.
- .
- Homepage: http://pyinotify.sourceforge.net/
diff -u pyinotify-0.5.2/debian/rules pyinotify-0.5.2/debian/rules
--- pyinotify-0.5.2/debian/rules
+++ pyinotify-0.5.2/debian/rules
@@ -9,21 +9,21 @@
 
 # List of python versions this package will be compiled for.
 # This list has to match the package list in debian/control.
-PYVERS = 2.3 2.4
+PYVERS = $(shell pyversions -r)
 
 configure: configure-stamp
 configure-stamp:
        dh_testdir
-       for ver in $(PYVERS); do \
-               "python$${ver}" setup.py config; \
+       for python in $(PYVERS); do \
+               "$${python}" setup.py config; \
        done
        touch $@
 
 build: build-stamp
 build-stamp:
        dh_testdir
-       for ver in $(PYVERS); do \
-               "python$${ver}" setup.py build; \
+       for python in $(PYVERS); do \
+               "$${python}" setup.py build; \
        done
        touch $@
 
@@ -32,8 +32,8 @@
        dh_testroot
        rm -f build-stamp configure-stamp
 
-       for ver in $(PYVERS); do \
-               "python$${ver}" setup.py clean --all; \
+       for python in $(PYVERS); do \
+               "$${python}" setup.py clean --all; \
        done
        $(MAKE) clean
 
@@ -45,9 +45,8 @@
        dh_clean -k
        dh_installdirs
 
-       for ver in $(PYVERS); do \
-               mkdir -p 
"$(CURDIR)/debian/python$${ver}-pyinotify/usr/lib/python$${ver}/site-packages/";
 \
-               "python$${ver}" setup.py install --prefix 
"$(CURDIR)/debian/python$${ver}-pyinotify/usr"; \
+       for python in $(PYVERS); do \
+               $$python setup.py install 
--root=$(CURDIR)/debian/python-pyinotify; \
        done
 
 # Build architecture-independent files here.
@@ -61,6 +60,7 @@
        dh_strip -i
        dh_compress -i -Xexamples
        dh_fixperms -i
+       dh_pysupport -i
        dh_python -i
        dh_installdeb -i
        dh_shlibdeps -i
@@ -78,6 +78,7 @@
        dh_strip -a
        dh_compress -a
        dh_fixperms -a
+       dh_pysupport -a
        dh_python -a
        dh_installdeb -a
        dh_shlibdeps -a 
reverted:
--- pyinotify-0.5.2/debian/python2.4-pyinotify.docs
+++ pyinotify-0.5.2.orig/debian/python2.4-pyinotify.docs
@@ -1,4 +0,0 @@
-AUTHORS
-NEWS
-README
-TODO
reverted:
--- pyinotify-0.5.2/debian/python2.3-pyinotify.docs
+++ pyinotify-0.5.2.orig/debian/python2.3-pyinotify.docs
@@ -1,4 +0,0 @@
-AUTHORS
-NEWS
-README
-TODO
diff -u pyinotify-0.5.2/debian/changelog pyinotify-0.5.2/debian/changelog
--- pyinotify-0.5.2/debian/changelog
+++ pyinotify-0.5.2/debian/changelog
@@ -1,3 +1,10 @@
+pyinotify (0.5.2-1.1) unstable; urgency=low
+
+  * Non-maintainer upload.
+  * Update package for new python policy (Closes: #373497).
+
+ -- Pierre Habouzit <[EMAIL PROTECTED]>  Fri, 30 Jun 2006 10:30:52 +0200
+
 pyinotify (0.5.2-1) unstable; urgency=low
 
   * New upstream release.
only in patch2:
unchanged:
--- pyinotify-0.5.2.orig/debian/python-pyinotify.docs
+++ pyinotify-0.5.2/debian/python-pyinotify.docs
@@ -0,0 +1,4 @@
+AUTHORS
+NEWS
+README
+TODO
only in patch2:
unchanged:
--- pyinotify-0.5.2.orig/debian/pycompat
+++ pyinotify-0.5.2/debian/pycompat
@@ -0,0 +1 @@
+2

Attachment: signature.asc
Description: Digital signature

Reply via email to