diff -Nru ldaptor-0.0.43+debian1/debian/changelog ldaptor-0.0.43+debian1/debian/changelog --- ldaptor-0.0.43+debian1/debian/changelog 2009-12-06 16:04:14.000000000 +0530 +++ ldaptor-0.0.43+debian1/debian/changelog 2010-01-16 22:41:51.000000000 +0530 @@ -1,3 +1,12 @@ +ldaptor (0.0.43+debian1-1ubuntu1) lucid; urgency=low + + * Merge from debian testing. Remaining changes: LP: #508455 + - add missing conflicts/replace to python2.4-ldaptor + - Remove empty POT files. Fixes FTBFS caused by pkgstriptranslations. + * Rename site-packages > dist-packages to fix FTBFS with python 2.6 + + -- Bhavani Shankar Sat, 16 Jan 2010 22:17:21 +0530 + ldaptor (0.0.43+debian1-1) unstable; urgency=low * repack tarball to remove upstream debian directory (fix lintian warnings @@ -59,6 +68,14 @@ -- Jan Dittberner Wed, 21 Oct 2009 20:21:51 +0200 +ldaptor (0.0.43-3ubuntu1) karmic; urgency=low + + * Merge from debian unstable, remaining changes (LP: #384197): + - add missing conflicts/replace to python2.4-ldaptor + - Remove empty POT files. Fixes FTBFS caused by pkgstriptranslations. + + -- Nick Ellery Fri, 05 Jun 2009 22:30:09 -0700 + ldaptor (0.0.43-3) unstable; urgency=low [ Sandro Tosi ] @@ -112,6 +129,15 @@ -- Sandro Tosi Sat, 28 Mar 2009 16:47:21 +0100 +ldaptor (0.0.43-2ubuntu1) intrepid; urgency=low + + * Merge from Debian unstable. Remaining Ubuntu changes: + - add missing conflicts/replace to python2.4-ldaptor + - Remove empty POT files. Fixes FTBFS caused by pkgstriptranslations. + - Modify Maintainer value to match the DebianMaintainerField specification. + + -- Albin Tonnerre Sat, 31 May 2008 20:21:53 +0200 + ldaptor (0.0.43-2) unstable; urgency=low * QA upload. @@ -120,6 +146,21 @@ -- Peter Eisentraut Fri, 04 Apr 2008 17:46:27 +0200 +ldaptor (0.0.43-1ubuntu2) hardy; urgency=low + + * add missing conflicts/replace to python2.4-ldaptor + + -- Michael Vogt Tue, 08 Apr 2008 22:02:50 +0200 + +ldaptor (0.0.43-1ubuntu1) hardy; urgency=low + + * Merge from Debian unstable. Remaining Ubuntu changes: + - Remove empty POT files. Fixes FTBFS caused by pkgstriptranslations. + * Debian version fixes LP: #76438 + * Modify Maintainer value to match the DebianMaintainerField specification. + + -- Albin Tonnerre Tue, 05 Feb 2008 17:55:20 +0100 + ldaptor (0.0.43-1) unstable; urgency=low * QA upload. @@ -154,6 +195,14 @@ -- Josselin Mouette Tue, 22 Jan 2008 10:44:24 +0100 +ldaptor (0.0.43-0.5ubuntu1) hardy; urgency=low + + * Merge from debian unstable, remaining changes: + - Remove empty POT files so that pkgstriptranslations doesn't get + upset. + + -- David Ames Thu, 06 Dec 2007 11:41:52 -0800 + ldaptor (0.0.43-0.5) unstable; urgency=low * Non-maintainer upload. @@ -161,6 +210,23 @@ -- Mario Iseli Fri, 17 Aug 2007 10:35:21 +0200 +ldaptor (0.0.43-0.4ubuntu2) feisty; urgency=low + + * Rebuild for python2.5 as the default python version. + + -- Matthias Klose Fri, 12 Jan 2007 13:21:49 +0000 + +ldaptor (0.0.43-0.4ubuntu1) feisty; urgency=low + + * Merge from Debian unstable. + * Remaining Ubuntu changes: + - Remove empty POT files so that pkgstriptranslations doesn't get + upset. + * Ubuntu changes dropped: + - Correct ldaptor-webui.install to work with any python version. + + -- Steve Kowalik Sun, 12 Nov 2006 17:40:44 +1100 + ldaptor (0.0.43-0.4) unstable; urgency=low * Non-maintainer upload. @@ -168,6 +234,12 @@ -- Jaakko Niemi Sun, 1 Oct 2006 10:46:28 +0300 +ldaptor (0.0.43-0.3ubuntu1) edgy; urgency=low + + * Merge from Debian unstable. + + -- Steve Kowalik Sat, 26 Aug 2006 21:53:56 +1000 + ldaptor (0.0.43-0.3) unstable; urgency=medium * Non-maintainer upload. @@ -175,6 +247,20 @@ -- Luk Claes Tue, 1 Aug 2006 19:28:41 +0200 +ldaptor (0.0.43-0.2ubuntu2) edgy; urgency=low + + * Forward-port the missed change from 0.0.42ubuntu3 that removes empty + POT files so that pkgstriptranslations doesn't get upset. + + -- Steve Kowalik Fri, 28 Jul 2006 13:08:01 +1000 + +ldaptor (0.0.43-0.2ubuntu1) edgy; urgency=low + + * Merge from Debian unstable. + * Correct ldaptor-webui.install to work with any python version. + + -- Steve Kowalik Tue, 25 Jul 2006 21:35:16 +1000 + ldaptor (0.0.43-0.2) unstable; urgency=low * Non-maintainer upload. @@ -276,6 +362,26 @@ -- Tommi Virtanen Tue, 7 Mar 2006 01:59:00 +0200 +ldaptor (0.0.42ubuntu3) dapper; urgency=low + + * Sigh. It seems l10n-update wants net access. Don't call it instead. + + -- Steve Kowalik Wed, 3 May 2006 22:21:20 +1000 + +ldaptor (0.0.42ubuntu2) dapper; urgency=low + + * Run admin/l10n-update on build, and remove empty POT files. This stops + pkgstriptranslations breaking. + + -- Steve Kowalik Wed, 3 May 2006 17:53:25 +1000 + +ldaptor (0.0.42ubuntu1) dapper; urgency=low + + * Rip out the built-against-python2.3 version. + * Correct multiple FTBFSes. + + -- Steve Kowalik Sun, 30 Apr 2006 21:51:29 +1000 + ldaptor (0.0.42) unstable; urgency=low * Applications changes: diff -Nru ldaptor-0.0.43+debian1/debian/control ldaptor-0.0.43+debian1/debian/control --- ldaptor-0.0.43+debian1/debian/control 2009-12-06 16:04:14.000000000 +0530 +++ ldaptor-0.0.43+debian1/debian/control 2010-01-16 17:53:27.000000000 +0530 @@ -1,7 +1,8 @@ Source: ldaptor Section: admin Priority: optional -Maintainer: Debian Python Modules Team +Maintainer: Ubuntu Developers +XSBC-Original-Maintainer: Debian Python Modules Team Uploaders: Jan Dittberner Standards-Version: 3.8.3 Build-Depends-Indep: docbook-slides (>= 3.2.0), xsltproc, @@ -56,8 +57,8 @@ python-twisted-mail (>= 0.2), python-twisted-web (>= 0.5), python-pyparsing Provides: ${python:Provides} -Replaces: python2.3-ldaptor, ldaptor-common -Conflicts: python2.3-ldaptor, ldaptor-common +Replaces: python2.3-ldaptor, python2.4-ldaptor, ldaptor-common +Conflicts: python2.3-ldaptor, python2.4-ldaptor,ldaptor-common Description: pure-Python library for LDAP operations Ldaptor is a pure-Python library that implements: . 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-10 00:50:55.000000000 +0530 +++ ldaptor-0.0.43+debian1/debian/ldaptor-webui.install 2010-01-16 21:50:10.000000000 +0530 @@ -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*/dist-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 22:22:11.000000000 +0530 +++ ldaptor-0.0.43+debian1/debian/python-ldaptor.install 2010-01-16 21:59:34.000000000 +0530 @@ -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*/dist-packages/ldaptor/*.py +debian/tmp/usr/lib/python*/dist-packages/ldaptor/protocols +debian/tmp/usr/lib/python*/dist-packages/ldaptor/samba +debian/tmp/usr/lib/python*/dist-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 16:04:14.000000000 +0530 +++ ldaptor-0.0.43+debian1/debian/rules 2010-01-16 21:21:54.000000000 +0530 @@ -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*/dist-packages/ldaptor/apps/webui \ + debian/python-ldaptor/usr/lib/python*/dist-packages/ldaptor/test/test_webui.py \ debian/ldaptor-utils/usr/bin/ldaptor-webui PYTHONPATH=$(CURDIR)/debian/python-ldaptor/usr/lib/$(PYDEFAULT)/site-packages \ trial --tbformat=emacs --reporter=text ldaptor + +build/ldaptor-utils:: + for pot in po/*.pot ; do test -s $$pot || rm -fv $$pot ; done + override_dh_auto_build: doc-stamp doc-stamp: make -C doc