diff -pruN 0.0.43+debian1-6/debian/changelog 0.0.43+debian1-6ubuntu1/debian/changelog --- 0.0.43+debian1-6/debian/changelog 2011-12-31 19:54:30.000000000 +0000 +++ 0.0.43+debian1-6ubuntu1/debian/changelog 2012-01-02 07:48:28.000000000 +0000 @@ -1,3 +1,9 @@ +ldaptor (0.0.43+debian1-6ubuntu1) precise; urgency=low + + * Merge with Debian; remaining changes: + + -- Matthias Klose Mon, 02 Jan 2012 08:46:34 +0100 + ldaptor (0.0.43+debian1-6) unstable; urgency=low * debian/control: @@ -8,6 +14,19 @@ ldaptor (0.0.43+debian1-6) unstable; urg -- Jan Dittberner Sat, 31 Dec 2011 20:49:34 +0100 +ldaptor (0.0.43+debian1-4ubuntu2) precise; urgency=low + + * Rebuild to drop python2.6 dependencies. + + -- Matthias Klose Sat, 31 Dec 2011 02:04:38 +0000 + +ldaptor (0.0.43+debian1-4ubuntu1) oneiric; urgency=low + + * Merge from debian unstable. Remaining change: + - Remove empty POT files. Fixes FTBFS caused by pkgstriptranslations. + + -- Bhavani Shankar Sun, 01 May 2011 12:09:17 +0530 + ldaptor (0.0.43+debian1-4) unstable; urgency=low * remove broken binary package ldaptor-webui @@ -28,6 +47,16 @@ ldaptor (0.0.43+debian1-4) unstable; urg -- Jan Dittberner Sun, 13 Feb 2011 17:58:57 +0100 +ldaptor (0.0.43+debian1-3ubuntu1) maverick; urgency=low + + * Merge from debian unstable. Remaining changes: LP: #596891 + - Remove empty POT files. Fixes FTBFS caused by pkgstriptranslations. + * Deleted change: + - Rename site-packages > dist-packages to fix FTBFS with python 2.6 (thanks + Angel Abad for getting it fixed in Debian) + + -- Bhavani Shankar Fri, 25 Jun 2010 13:25:15 +0530 + ldaptor (0.0.43+debian1-3) unstable; urgency=low [ Jakub Wilk ] @@ -55,6 +84,28 @@ ldaptor (0.0.43+debian1-2) unstable; urg -- Jan Dittberner Sat, 12 Jun 2010 01:59:44 +0200 +ldaptor (0.0.43+debian1-1ubuntu3) lucid; urgency=low + + * debian/rules: the previous included rule only works with cdbs. Included the + deletion of empty .pot file in override_dh_auto_clean. + + -- Fabrice Coutadeur Tue, 19 Jan 2010 19:08:57 +0000 + +ldaptor (0.0.43+debian1-1ubuntu2) lucid; urgency=low + + * debian/rules: put back the deletion of empty POT file I wrongly deleted + before. This fix still fix a FTBFS. + + -- Fabrice Coutadeur Tue, 19 Jan 2010 06:07:29 +0000 + +ldaptor (0.0.43+debian1-1ubuntu1) lucid; urgency=low + + * Merge from debian testing (LP: #508455). Remaining changes: + - Remove empty POT files. Fixes FTBFS caused by pkgstriptranslations. + * Rename site-packages > dist-packages to fix FTBFS with python 2.6 + + -- Bhavani Shankar Mon, 18 Jan 2010 18:30:06 +0530 + ldaptor (0.0.43+debian1-1) unstable; urgency=low * repack tarball to remove upstream debian directory (fix lintian warnings @@ -116,6 +167,14 @@ ldaptor (0.0.43-4) unstable; urgency=low -- 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 ] @@ -169,6 +228,15 @@ ldaptor (0.0.43-3) unstable; urgency=low -- 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. @@ -177,6 +245,21 @@ ldaptor (0.0.43-2) unstable; urgency=low -- 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. @@ -211,6 +294,14 @@ ldaptor (0.0.43-0.6) unstable; urgency=l -- 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. @@ -218,6 +309,23 @@ ldaptor (0.0.43-0.5) unstable; urgency=l -- 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. @@ -225,6 +333,12 @@ ldaptor (0.0.43-0.4) unstable; urgency=l -- 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. @@ -232,6 +346,20 @@ ldaptor (0.0.43-0.3) unstable; urgency=m -- 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. @@ -333,6 +461,26 @@ ldaptor (0.0.43) unstable; urgency=low -- 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 -pruN 0.0.43+debian1-6/debian/control 0.0.43+debian1-6ubuntu1/debian/control --- 0.0.43+debian1-6/debian/control 2011-05-27 14:21:53.000000000 +0000 +++ 0.0.43+debian1-6ubuntu1/debian/control 2012-01-02 07:48:28.000000000 +0000 @@ -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.9.2 Build-Depends-Indep: docbook-slides (>= 3.2.0), xsltproc, diff -pruN 0.0.43+debian1-6/debian/rules 0.0.43+debian1-6ubuntu1/debian/rules --- 0.0.43+debian1-6/debian/rules 2011-12-31 19:47:35.000000000 +0000 +++ 0.0.43+debian1-6ubuntu1/debian/rules 2012-01-02 07:48:08.000000000 +0000 @@ -35,3 +35,4 @@ override_dh_auto_clean: rm -f doc-stamp rm -rf _trial_temp rm -f ldaptor/test/test_webui.py + for pot in po/*.pot ; do test -s $$pot || rm -fv $$pot ; done