Package: ldaptor
Version: 0.0.43+debian1-2
Severity: important
Tags: patch
User: debian-pyt...@lists.debian.org
Usertags: python2.6
The package FTBFS in python 2.6
*** /tmp/tmp6Kj872
In Ubuntu, we've applied the attached patch to achieve the following:
* Merge from debian unstable (LP: #596891). Remaining changes:
- Remove empty POT files. Fixes FTBFS caused by pkgstriptranslations.
- Rename site-packages > dist-packages to fix FTBFS with python 2.6
We thought you might be interested in doing the same.
-- System Information:
Debian Release: squeeze/sid
APT prefers maverick-updates
APT policy: (500, 'maverick-updates'), (500, 'maverick-security'), (500,
'maverick')
Architecture: amd64 (x86_64)
Kernel: Linux 2.6.35-5-generic (SMP w/1 CPU core)
Locale: LANG=es_ES.utf8, LC_CTYPE=es_ES.utf8 (charmap=UTF-8)
Shell: /bin/sh linked to /bin/dash
diff -Nru ldaptor-0.0.43+debian1/debian/changelog ldaptor-0.0.43+debian1/debian/changelog
diff -Nru ldaptor-0.0.43+debian1/debian/control ldaptor-0.0.43+debian1/debian/control
--- ldaptor-0.0.43+debian1/debian/control 2010-06-12 02:00:32.000000000 +0200
+++ ldaptor-0.0.43+debian1/debian/control 2010-06-23 10:15:02.000000000 +0200
@@ -1,7 +1,8 @@
Source: ldaptor
Section: admin
Priority: optional
-Maintainer: Debian Python Modules Team <python-modules-t...@lists.alioth.debian.org>
+Maintainer: Ubuntu Developers <ubuntu-devel-disc...@lists.ubuntu.com>
+XSBC-Original-Maintainer: Debian Python Modules Team <python-modules-t...@lists.alioth.debian.org>
Uploaders: Jan Dittberner <ja...@debian.org>
Standards-Version: 3.8.4
Build-Depends-Indep: docbook-slides (>= 3.2.0), xsltproc,
diff -Nru ldaptor-0.0.43+debian1/debian/ldaptor-webui.install ldaptor-0.0.43+debian1/debian/ldaptor-webui.install
--- ldaptor-0.0.43+debian1/debian/ldaptor-webui.install 2009-03-09 20:20:55.000000000 +0100
+++ ldaptor-0.0.43+debian1/debian/ldaptor-webui.install 2010-06-23 10:15:02.000000000 +0200
@@ -1,3 +1,3 @@
debian/tmp/usr/bin/ldaptor-webui
-debian/tmp/usr/lib/python*/site-packages/ldaptor/apps/webui
+debian/tmp/usr/lib/python*/*-packages/ldaptor/apps/webui
debian/tmp/usr/share/locale/*/*/ldaptor-webui.mo
diff -Nru ldaptor-0.0.43+debian1/debian/python-ldaptor.install ldaptor-0.0.43+debian1/debian/python-ldaptor.install
--- ldaptor-0.0.43+debian1/debian/python-ldaptor.install 2009-03-28 17:52:11.000000000 +0100
+++ ldaptor-0.0.43+debian1/debian/python-ldaptor.install 2010-06-23 10:15:02.000000000 +0200
@@ -1,6 +1,6 @@
-debian/tmp/usr/lib/python*/site-packages/ldaptor/*.py
-debian/tmp/usr/lib/python*/site-packages/ldaptor/protocols
-debian/tmp/usr/lib/python*/site-packages/ldaptor/samba
-debian/tmp/usr/lib/python*/site-packages/ldaptor/test
+debian/tmp/usr/lib/python*/*-packages/ldaptor/*.py
+debian/tmp/usr/lib/python*/*-packages/ldaptor/protocols
+debian/tmp/usr/lib/python*/*-packages/ldaptor/samba
+debian/tmp/usr/lib/python*/*-packages/ldaptor/test
debian/global.cfg etc/ldaptor
ldaptor.schema etc/ldaptor
diff -Nru ldaptor-0.0.43+debian1/debian/rules ldaptor-0.0.43+debian1/debian/rules
--- ldaptor-0.0.43+debian1/debian/rules 2009-12-06 11:34:14.000000000 +0100
+++ ldaptor-0.0.43+debian1/debian/rules 2010-06-23 10:15:02.000000000 +0200
@@ -10,12 +10,16 @@
override_dh_install:
dh_install
rm -rf \
- debian/python-ldaptor/usr/lib/python*/site-packages/ldaptor/apps/webui \
- debian/python-ldaptor/usr/lib/python*/site-packages/ldaptor/test/test_webui.py \
+ debian/python-ldaptor/usr/lib/python*/*-packages/ldaptor/apps/webui \
+ debian/python-ldaptor/usr/lib/python*/*-packages/ldaptor/test/test_webui.py \
debian/ldaptor-utils/usr/bin/ldaptor-webui
- PYTHONPATH=$(CURDIR)/debian/python-ldaptor/usr/lib/$(PYDEFAULT)/site-packages \
+ PYTHONPATH=$(CURDIR)/debian/python-ldaptor/usr/lib/$(PYDEFAULT)/dist-packages \
trial --tbformat=emacs --reporter=text ldaptor
+
+
+
+
override_dh_auto_build: doc-stamp
doc-stamp:
make -C doc
@@ -29,3 +33,4 @@
make -C doc clean
rm -f doc-stamp
rm -rf _trial_temp
+ for pot in po/*.pot ; do test -s $$pot || rm -fv $$pot ; done
