Hi, Attached is the diff for my jabber.py 0.5.0-1.2 NMU.
-- ·O· Pierre Habouzit ··O [EMAIL PROTECTED] OOO http://www.madism.org
diff -u jabber.py-0.5.0/debian/control jabber.py-0.5.0/debian/control
--- jabber.py-0.5.0/debian/control
+++ jabber.py-0.5.0/debian/control
@@ -5,30 +5,14 @@
-Build-Depends: debhelper (>> 4.0.0),
-Build-Depends-Indep: python, python-all-dev, sharutils
-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), sharutils
+Standards-Version: 3.7.2
Package: python-jabber
Architecture: all
Depends: ${python:Depends}
-Description: Python module for the Jabber instant messaging platform
- Jabber.py is a set of python modules to handle jabber XML-based protocol.
- .
- This package is a dependency package, which depends on Debian's default
- Python version and respective jabber.py package version (currently v2.3).
-
-Package: python2.3-jabber
-Architecture: all
-Depends: python2.3
+Provides: ${python:Provides}
+Replaces: python2.3-jabber (<< 0.5.0-1.2), python2.4-jabber (<< 0.5.0-1.2)
+Conflicts: python2.3-jabber (<< 0.5.0-1.2), python2.4-jabber (<< 0.5.0-1.2)
+XB-Python-Version: ${python:Versions}
Suggests: python2.3-xml
Description: Python module for the Jabber instant messaging platform
Jabber.py is a set of python modules to handle jabber XML-based protocol.
- .
- This package provides modules for python 2.3
-
-Package: python2.4-jabber
-Architecture: all
-Depends: python2.4
-Suggests: python2.4-xml
-Description: Python module for the Jabber instant messaging platform
- Jabber.py is a set of python modules to handle jabber XML-based protocol.
- .
- This package provides modules for python 2.4
reverted:
--- jabber.py-0.5.0/debian/python2.3-jabber.examples
+++ jabber.py-0.5.0.orig/debian/python2.3-jabber.examples
@@ -1 +0,0 @@
-examples/*
diff -u jabber.py-0.5.0/debian/rules jabber.py-0.5.0/debian/rules
--- jabber.py-0.5.0/debian/rules
+++ jabber.py-0.5.0/debian/rules
@@ -9,7 +9,7 @@
export DH_COMPAT=4
# python version for which a pkg will be build
-export PYVERSIONS=python2.3 python2.4
+PYVERS:=$(shell pyversions -r)
ifneq (,$(findstring debug,$(DEB_BUILD_OPTIONS)))
CFLAGS += -g
@@ -18,22 +18,13 @@
INSTALL_PROGRAM += -s
endif
-configure: configure-stamp
-configure-stamp:
- dh_testdir
- # Add here commands to configure the package.
- touch configure-stamp
-
-
build: build-stamp
-
-build-stamp: configure-stamp
+build-stamp:
dh_testdir
- # Add here commands to compile the package.
- #python $(CURDIR)/setup.py build
- #python2.1 $(CURDIR)/setup.py build
- #python2.2 $(CURDIR)/setup.py build --build-purelib $(CURDIR)/debian/tmp
+ set -e; \
+ for py in $(PYVERS); do \
+ $$py setup.py build; done
#/usr/bin/docbook-to-man debian/python-jabber.sgml > python-jabber.1
@@ -42,15 +33,13 @@
clean:
dh_testdir
dh_testroot
+ -for py in $(PYVERS); do \
+ $$py setup.py clean --all; done
+
find $(CURDIR) -name \*.pyc -exec rm -f {} \;
find $(CURDIR) -name \*.pyo -exec rm -f {} \;
- rm -rf $(CURDIR)/build/ $(CURDIR)/docs/img $(CURDIR)/docs/docs
- rm -f build-stamp configure-stamp
+ rm -f build-stamp
- # Add here commands to clean up after the build process.
- #python $(CURDIR)/setup.py clean
- #python2.1 $(CURDIR)/setup.py clean
- #python2.2 $(CURDIR)/setup.py clean
dh_clean
install: build
@@ -59,15 +48,10 @@
dh_clean -k
dh_installdirs -v
- # Add here commands to install the package into debian/python-jabber.
- #python $(CURDIR)/setup.py install \
- # --no-compile --prefix $(CURDIR)/debian/python-jabber/usr/
- #python2.1 $(CURDIR)/setup.py install \
- # --no-compile --prefix $(CURDIR)/debian/python2.1-jabber/usr/
- python2.3 $(CURDIR)/setup.py install \
- --no-compile --prefix $(CURDIR)/debian/python2.3-jabber/usr/
- python2.4 $(CURDIR)/setup.py install \
- --no-compile --prefix $(CURDIR)/debian/python2.4-jabber/usr/
+ set -e; \
+ for py in $(PYVERS); do \
+ $$py setup.py install --root=debian/python-jabber; \
+ done
# Build architecture-independent files here.
@@ -93,6 +77,7 @@
dh_link -i
dh_compress -i -X.py -X.xpm
dh_fixperms -i
+ dh_pysupport -i
dh_python -i
# dh_makeshlibs -i
dh_installdeb -i
@@ -108 +93 @@
-.PHONY: build clean binary-indep binary-arch binary install configure
+.PHONY: build clean binary-indep binary-arch binary install
diff -u jabber.py-0.5.0/debian/changelog jabber.py-0.5.0/debian/changelog
--- jabber.py-0.5.0/debian/changelog
+++ jabber.py-0.5.0/debian/changelog
@@ -1,3 +1,10 @@
+jabber.py (0.5.0-1.2) unstable; urgency=low
+
+ * Non-maintainer upload.
+ * Update package to the last python policy (Closes: #373446).
+
+ -- Pierre Habouzit <[EMAIL PROTECTED]> Fri, 30 Jun 2006 15:37:19 +0200
+
jabber.py (0.5.0-1.1) unstable; urgency=low
* Non-maintainer upload.
reverted:
--- jabber.py-0.5.0/debian/python2.3-jabber.docs
+++ jabber.py-0.5.0.orig/debian/python2.3-jabber.docs
@@ -1,4 +0,0 @@
-docs/
-patches/
-README
-CREDITS
reverted:
--- jabber.py-0.5.0/debian/python2.4-jabber.examples
+++ jabber.py-0.5.0.orig/debian/python2.4-jabber.examples
@@ -1 +0,0 @@
-examples/*
reverted:
--- jabber.py-0.5.0/debian/python2.4-jabber.docs
+++ jabber.py-0.5.0.orig/debian/python2.4-jabber.docs
@@ -1,4 +0,0 @@
-docs/
-patches/
-README
-CREDITS
only in patch2:
unchanged:
--- jabber.py-0.5.0.orig/debian/python-jabber.examples
+++ jabber.py-0.5.0/debian/python-jabber.examples
@@ -0,0 +1 @@
+examples/*
only in patch2:
unchanged:
--- jabber.py-0.5.0.orig/debian/python-jabber.docs
+++ jabber.py-0.5.0/debian/python-jabber.docs
@@ -0,0 +1,4 @@
+docs/
+patches/
+README
+CREDITS
only in patch2:
unchanged:
--- jabber.py-0.5.0.orig/debian/pycompat
+++ jabber.py-0.5.0/debian/pycompat
@@ -0,0 +1 @@
+2
signature.asc
Description: Digital signature
