Hi, Attached is the diff for my pyxmpp 1.0.0-1.1 NMU.
-- ·O· Pierre Habouzit ··O [EMAIL PROTECTED] OOO http://www.madism.org
reverted:
--- pyxmpp-1.0.0/debian/cdbs/1/class/python-distutils-vars.mk
+++ pyxmpp-1.0.0.orig/debian/cdbs/1/class/python-distutils-vars.mk
@@ -1,51 +0,0 @@
-# -*- mode: makefile; coding: utf-8 -*-
-# Copyright © 2003 Colin Walters <[EMAIL PROTECTED]>
-# Copyright © 2004-2005 Jonas Smedegaard <dr$jones.dk>
-# Description: Defines useful variables for Python libraries and programs
-#
-# This program is free software; you can redistribute it and/or
-# modify it under the terms of the GNU General Public License as
-# published by the Free Software Foundation; either version 2, or (at
-# your option) any later version.
-#
-# This program is distributed in the hope that it will be useful, but
-# WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-# General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
-# 02111-1307 USA.
-
-
-ifndef _cdbs_bootstrap
-_cdbs_scripts_path ?= /usr/lib/cdbs
-_cdbs_rules_path ?= /usr/share/cdbs/1/rules
-_cdbs_class_path ?= /usr/share/cdbs/1/class
-endif
-
-ifndef _cdbs_class_python_distutils_vars
-_cdbs_class_python_distutils_vars := 1
-
-# These should reflect the system
-DEB_PYTHON_DEFAULT_VERSION := $(shell /usr/bin/python -V 2>&1 | sed
's/^[^0-9]*\([0-9]\+.[0-9]\+\)[^0-9].*/\1/')
-DEB_PYTHON_NEXT_VERSION := $(shell expr '$(DEB_PYTHON_DEFAULT_VERSION)' :
'[^0-9]*\([0-9]\+\).').$(shell expr '(' '$(DEB_PYTHON_DEFAULT_VERSION)' :
'[^0-9]*[0-9]\+.\([0-9]\+\)' ')' + 1)
-
-# Common build options
-DEB_PYTHON_SETUP_CMD = setup.py
-DEB_PYTHON_CLEAN_ARGS = -a
-DEB_PYTHON_BUILD_ARGS = --build-base="$(DEB_BUILDDIR)/build"
-DEB_PYTHON_INSTALL_ARGS_ALL = --no-compile -O0
-DEB_PYTHON_DESTDIR = debian/$(cdbs_curpkg)
-
-# Properly named Python libraries are preferred
-DEB_PYTHON_VERSIONS = 2.1 2.2 2.3 2.4
-DEB_PYTHON_REAL_LIB_PACKAGES := $(strip $(filter $(patsubst
%,python%%,$(DEB_PYTHON_VERSIONS)),$(DEB_ALL_PACKAGES)))
-
-# Alternatively package simpler packages using default Python
-DEB_PYTHON_SIMPLE_PACKAGES := $(strip $(filter python-%,$(DEB_ALL_PACKAGES)))
-# Force using a non-default Python for simpler packages
-DEB_PYTHON_COMPILE_VERSION =
-
-endif
reverted:
--- pyxmpp-1.0.0/debian/cdbs/1/class/python-distutils.mk
+++ pyxmpp-1.0.0.orig/debian/cdbs/1/class/python-distutils.mk
@@ -1,89 +0,0 @@
-# -*- mode: makefile; coding: utf-8 -*-
-# Copyright © 2003 Colin Walters <[EMAIL PROTECTED]>
-# Copyright © 2004-2005 Jonas Smedegaard <[EMAIL PROTECTED]>
-# Description: configure, compile, binary, and clean Python libraries and
programs
-# This class works for Python packages which use the Python
-# "distutils". Note that optionally it can also use the
-# dh_python program which does some nice stuff. See
-# the manual page for that program for more information.
-#
-# This program is free software; you can redistribute it and/or
-# modify it under the terms of the GNU General Public License as
-# published by the Free Software Foundation; either version 2, or (at
-# your option) any later version.
-#
-# This program is distributed in the hope that it will be useful, but
-# WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-# General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
-# 02111-1307 USA.
-
-
-ifndef _cdbs_bootstrap
-_cdbs_scripts_path ?= /usr/lib/cdbs
-_cdbs_rules_path ?= /usr/share/cdbs/1/rules
-_cdbs_class_path ?= /usr/share/cdbs/1/class
-endif
-
-ifndef _cdbs_class_python_distutils
-_cdbs_class_python_distutils := 1
-
-## FIXME: Correct path when included officially!!!
-#include $(_cdbs_class_path)/python-distutils-vars.mk$(_cdbs_makefile_suffix)
-include debian/cdbs/1/class/python-distutils-vars.mk$(_cdbs_makefile_suffix)
-
-# make: *** No rule to make target `voodoo'. Stop.
-# If no versioned python library packages found, grab all simpler ones
-ifeq (,$(DEB_PYTHON_REAL_LIB_PACKAGES))
-CDBS_BUILD_DEPENDS := $(CDBS_BUILD_DEPENDS), python-dev (>=
$(DEB_PYTHON_DEFAULT_VERSION)), python-dev (<< $(DEB_PYTHON_NEXT_VERSION))
-else
-DEB_PYTHON_REAL_VERSIONS := $(filter-out -%,$(subst -, -,$(patsubst
python%,%,$(DEB_PYTHON_REAL_LIB_PACKAGES))))
-comma := ,
-CDBS_BUILD_DEPENDS := $(CDBS_BUILD_DEPENDS), $(patsubst
%,python%-dev$(comma),$(DEB_PYTHON_REAL_VERSIONS)) python
-endif
-
-cdbs_python_ver = $(filter-out -%,$(subst -, -,$(patsubst
python%,%,$(cdbs_curpkg))))
-
-common-build-arch common-build-indep:: common-build-impl
-common-build-impl::
- cd $(DEB_SRCDIR) && /usr/bin/python$(DEB_PYTHON_COMPILE_VERSION)
$(DEB_PYTHON_SETUP_CMD) build $(DEB_PYTHON_BUILD_ARGS)
-
-clean::
-# Ignore errors from this rule. In a tarball build, the file
-# may not exist.
-# Try all flavors of Python used.
-ifeq (,$(DEB_PYTHON_REAL_LIB_PACKAGES))
- -/usr/bin/python$(DEB_PYTHON_COMPILE_VERSION) $(DEB_PYTHON_SETUP_CMD)
clean $(DEB_PYTHON_CLEAN_ARGS)
-else
- -$(patsubst %, /usr/bin/python% $(DEB_PYTHON_SETUP_CMD) clean
$(DEB_PYTHON_CLEAN_ARGS);, $(DEB_PYTHON_REAL_VERSIONS))
-endif
-
-# Use specific Python binary if needed
-ifeq (,$(DEB_PYTHON_REAL_LIB_PACKAGES))
-$(patsubst %,install/%,$(DEB_PYTHON_SIMPLE_PACKAGES)) :: install/% :
- cd $(DEB_SRCDIR) && /usr/bin/python$(DEB_PYTHON_COMPILE_VERSION)
$(DEB_PYTHON_SETUP_CMD) install --root="$(DEB_PYTHON_DESTDIR)"
$(DEB_PYTHON_INSTALL_ARGS_ALL) $(DEB_PYTHON_INSTALL_ARGS_$(cdbs_curpkg)
-else
-$(patsubst %,install/%,$(DEB_PYTHON_REAL_LIB_PACKAGES)) :: install/% :
- cd $(DEB_SRCDIR) && /usr/bin/python$(cdbs_python_ver)
$(DEB_PYTHON_SETUP_CMD) install --root="$(DEB_PYTHON_DESTDIR)"
$(DEB_PYTHON_INSTALL_ARGS_ALL) $(DEB_PYTHON_INSTALL_ARGS_$(cdbs_curpkg)
-endif
-
-# This class can optionally utilize debhelper's "dh_python" command. Just
-# be sure you include debhelper.mk before including this file.
-ifdef _cdbs_rules_debhelper
-ifneq (,$(strip $(filter 2.4,$(DEB_PYTHON_REAL_VERSIONS))))
-# Python 2.4 support
-CDBS_BUILD_DEPENDS := $(CDBS_BUILD_DEPENDS), debhelper (>= 4.2.28)
-else
-# Python 2.3 support
-CDBS_BUILD_DEPENDS := $(CDBS_BUILD_DEPENDS), debhelper (>= 4.1.60)
-endif
-
-$(patsubst %,binary-install/%,$(DEB_PACKAGES)) :: binary-install/%:
- dh_python -p$(cdbs_curpkg)
-endif
-
-endif
diff -u pyxmpp-1.0.0/debian/changelog pyxmpp-1.0.0/debian/changelog
--- pyxmpp-1.0.0/debian/changelog
+++ pyxmpp-1.0.0/debian/changelog
@@ -1,3 +1,11 @@
+pyxmpp (1.0.0-1.1) unstable; urgency=low
+
+ * Non-maintainer upload.
+ * Drop custom class, use cdbs one.
+ * Update package to the new python policy (Closes: #373375).
+
+ -- Pierre Habouzit <[EMAIL PROTECTED]> Thu, 29 Jun 2006 14:28:32 +0200
+
pyxmpp (1.0.0-1) unstable; urgency=low
[ Patrick Dreker ]
diff -u pyxmpp-1.0.0/debian/rules pyxmpp-1.0.0/debian/rules
--- pyxmpp-1.0.0/debian/rules
+++ pyxmpp-1.0.0/debian/rules
@@ -1,10 +1,14 @@
#!/usr/bin/make -f
+DEB_PYTHON_SYSTEM=pysupport
+
include /usr/share/cdbs/1/rules/debhelper.mk
-include debian/cdbs/1/class/python-distutils.mk
+include /usr/share/cdbs/1/class/python-distutils.mk
include debian/cdbs/1/rules/buildinfo.mk
#include /usr/share/cdbs/1/rules/simple-patchsys.mk
+DEB_DESTDIR := debian/python-pyxmpp
+
DEB_INSTALL_DOCS_ALL = TODO
UPSTREAM_EXAMPLES := examples/*.py
DEB_INSTALL_EXAMPLES_python-pyxmpp-doc := examples/*.py
diff -u pyxmpp-1.0.0/debian/control pyxmpp-1.0.0/debian/control
--- pyxmpp-1.0.0/debian/control
+++ pyxmpp-1.0.0/debian/control
@@ -3,12 +3,16 @@
Priority: optional
Maintainer: Patrick Dreker <[EMAIL PROTECTED]>
Uploaders: Florian Ragwitz <[EMAIL PROTECTED]>
-Build-Depends: cdbs (>= 0.4.23-1.1), debhelper (>= 5.0.0), python2.3-dev,
python2.4-dev, python, dh-buildinfo, libxml2-dev
-Standards-Version: 3.6.2
+Build-Depends: debhelper (>= 5.0.37.2), cdbs (>= 0.4.43), dh-buildinfo,
+ libxml2-dev, python-all-dev (>= 2.3.5-11), python-support (>= 0.3)
+Standards-Version: 3.7.2
Package: python-pyxmpp
-Architecture: all
-Depends: python (>= 2.3), python (<< 2.4), python2.3-pyxmpp
+Architecture: any
+Depends: ${python:Depends}
+Provides: ${python:Provides}
+Conflicts: python2.3-pyxmpp (<< 1.0.0-1.1), python2.4-pyxmpp (<< 1.0.0-1.1)
+Replaces: python2.3-pyxmpp (<< 1.0.0-1.1), python2.4-pyxmpp (<< 1.0.0-1.1)
Suggests: python-pyxmpp-doc
Description: XMPP and Jabber implementation for Python
PyXMPP is a Python XMPP (RFC 3920,3921) and Jabber
@@ -32,9 +36,6 @@
* vCards -- both Jabber "vcard-temp" and RFC 2426
* basic parts of the Multi-User Chat protocol (JEP-0045)
* delayed delivery timestamps (JEP-0091).
- .
- This package is an empty dummy package that always depends on the package
- built for Debian's default Python version.
Package: python-pyxmpp-doc
Architecture: all
@@ -66,56 +66,0 @@
-Package: python2.3-pyxmpp
-Architecture: any
-Depends: ${python:Depends}, python2.3-dnspython, python2.3-libxml2,
${shlibs:Depends}
-Recommends: m2crypto
-Description: XMPP and Jabber implementation for Python
- PyXMPP is a Python XMPP (RFC 3920,3921) and Jabber
- (http://www.jabber.org/protocol/) implementation. It is based on libxml2 --
- fast and fully-featured XML parser.
- .
- PyXMPP provides most core features of the XMPP protocol and several
- JSF-defined extensions. PyXMPP provides building blocks for creating Jabber
- clients and components. Developer uses them to setup XMPP streams, handle
- incoming events and create outgoing stanzas (XMPP "packets").
- .
- Features:
- * nearly complete XMPP Core (RFC 3920) protocol for client connections
- (includes SASL, TLS and Stringprep)
- * mostly complete XMPP IM (RFC 3921) protocol (lacks privacy lists)
- * XMPP error objects including translations to and from legacy codes for
- backward compatibility (JEP-0086).
- * legacy authentication ("digest" and "plain") (JEP-0078).
- * component protocol (JEP-0114).
- * Service Discovery (JEP-0030).
- * vCards -- both Jabber "vcard-temp" and RFC 2426
- * basic parts of the Multi-User Chat protocol (JEP-0045)
- * delayed delivery timestamps (JEP-0091).
- .
- This package contains the libraries for Python 2.3.
-
-Package: python2.4-pyxmpp
-Architecture: any
-Depends: ${python:Depends}, python2.4-dnspython, python2.4-libxml2,
${shlibs:Depends}
-Description: XMPP and Jabber implementation for Python
- PyXMPP is a Python XMPP (RFC 3920,3921) and Jabber
- (http://www.jabber.org/protocol/) implementation. It is based on libxml2 --
- fast and fully-featured XML parser.
- .
- PyXMPP provides most core features of the XMPP protocol and several
- JSF-defined extensions. PyXMPP provides building blocks for creating Jabber
- clients and components. Developer uses them to setup XMPP streams, handle
- incoming events and create outgoing stanzas (XMPP "packets").
- .
- Features:
- * nearly complete XMPP Core (RFC 3920) protocol for client connections
- (includes SASL, TLS and Stringprep)
- * mostly complete XMPP IM (RFC 3921) protocol (lacks privacy lists)
- * XMPP error objects including translations to and from legacy codes for
- backward compatibility (JEP-0086).
- * legacy authentication ("digest" and "plain") (JEP-0078).
- * component protocol (JEP-0114).
- * Service Discovery (JEP-0030).
- * vCards -- both Jabber "vcard-temp" and RFC 2426
- * basic parts of the Multi-User Chat protocol (JEP-0045)
- * delayed delivery timestamps (JEP-0091).
- .
- This package contains the libraries for Python 2.4.
only in patch2:
unchanged:
--- pyxmpp-1.0.0.orig/debian/pycompat
+++ pyxmpp-1.0.0/debian/pycompat
@@ -0,0 +1 @@
+2
signature.asc
Description: Digital signature
