* merged dokos patch

5 files changed, 47 insertions, 5 deletions

diff --git a/debian/changelog b/debian/changelog
index 9e0fe1be..387424d8 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-python-apt (0.6.20ubuntu6) feisty; urgency=low
+python-apt (0.6.20ubuntu7) feisty; urgency=low
 
   * aptsources/distro.py:
     - fix crash in add_source (LP#85806)
@@ -6,7 +6,14 @@ python-apt (0.6.20ubuntu6) feisty; urgency=low
     - handle invalid unicode more gracefully (LP#86215)
   * rebuild against latest apt
 
- -- Michael Vogt <michael.vogt@ubuntu.com>  Mon, 19 Feb 2007 16:34:52 +0100
+ -- Michael Vogt <michael.vogt@ubuntu.com>  Mon, 26 Feb 2007 14:31:00 +0100
+
+python-apt (0.6.20ubuntu6) feisty; urgency=low
+
+  * Build the extension for the debug interpreter.
+  * Set Ubuntu maintainer address.
+
+ -- Matthias Klose <doko@ubuntu.com>  Sat, 17 Feb 2007 02:10:37 +0100
 
 python-apt (0.6.20ubuntu5) feisty; urgency=low
 
diff --git a/debian/compat b/debian/compat
index 7813681f..7ed6ff82 100644
--- a/debian/compat
+++ b/debian/compat
@@ -1 +1 @@
-5
\ No newline at end of file
+5
diff --git a/debian/control b/debian/control
index b243adb1..0c50e35f 100644
--- a/debian/control
+++ b/debian/control
@@ -14,6 +14,7 @@ Priority: optional
 Replaces: python2.3-apt (<< 0.6.18), python2.4-apt (<< 0.6.18)
 Conflicts: python2.3-apt (<< 0.6.18), python2.4-apt (<< 0.6.18)
 Provides: ${python:Provides}
+Suggests: python-apt-dbg
 XB-Python-Version: ${python:Versions}
 Description: Python interface to libapt-pkg
  The apt_pkg Python interface will provide full access to the internal 
@@ -27,3 +28,14 @@ Description: Python interface to libapt-pkg
  .
  The included 'aptsources' Python interface provides an abstraction of 
  the sources.list configuration on the repository and the distro level.
+
+Package: python-apt-dbg
+Priority: extra
+Architecture: any
+Depends: python-dbg, python-apt (= ${Source-Version}), ${shlibs:Depends}
+Description: Python interface to libapt-pkg (debug extension)
+ The apt_pkg Python interface will provide full access to the internal 
+ libapt-pkg structures allowing Python programs to easily perform a
+ variety of functions.
+ .
+ This package contains the extension built for the python debug interpreter.
diff --git a/debian/rules b/debian/rules
index 32845c7a..7e837e8b 100755
--- a/debian/rules
+++ b/debian/rules
@@ -3,6 +3,8 @@
 DEB_AUTO_CLEANUP_RCS := yes
 DEB_PYTHON_SYSTEM=pycentral
 
+DEB_PYTHON_PACKAGES_EXCLUDE=python-apt-dbg
+
 # Add here any variable or target overrides you need
 include /usr/share/cdbs/1/rules/debhelper.mk
 include /usr/share/cdbs/1/class/python-distutils.mk
@@ -14,6 +16,27 @@ DEB_BUILD_PROG:=debuild --preserve-envvar PATH --preserve-envvar CCACHE_DIR -us
 arch-build::
 	rm -rf debian/arch-build
 	mkdir -p debian/arch-build/$(PKG)-$(DEBVER)
-	tar -c --exclude=arch-build --no-recursion -f - `bzr inventory` | (cd debian/arch-build/$(PKG)-$(DEBVER);tar xf -)
+	tar -c --exclude=arch-build --no-recursion -f - `bzr inventory` \
+	  | (cd debian/arch-build/$(PKG)-$(DEBVER);tar xf -)
 	(cd debian/arch-build/$(PKG)-$(DEBVER) && $(DEB_BUILD_PROG))
 
+build/python-apt-dbg::
+	set -e; \
+	for i in $(cdbs_python_build_versions); do \
+	  python$$i-dbg ./setup.py build; \
+	done
+
+install/python-apt-dbg::
+	for i in $(cdbs_python_build_versions); do \
+	  python$$i-dbg ./setup.py install --root $(CURDIR)/debian/python-apt-dbg; \
+	done
+	find debian/python-apt-dbg \
+		! -type d ! -name '*_d.so' | xargs rm -f
+	find debian/python-apt-dbg -depth -empty -exec rmdir {} \;
+
+binary-predeb/python-apt-dbg::
+	rm -rf debian/python-apt-dbg/usr/share/doc/python-apt-dbg
+	ln -s python-apt debian/python-apt-dbg/usr/share/doc/python-apt-dbg
+
+clean::
+	rm -rf build/lib* build/temp*
diff --git a/po/python-apt.pot b/po/python-apt.pot
index ba144165..d4f55396 100644
--- a/po/python-apt.pot
+++ b/po/python-apt.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-01-26 14:17+0100\n"
+"POT-Creation-Date: 2007-02-14 17:34+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"