Merge ldaptor 0.0.43+debian1-3 (universe) from Debian unstable (main)

Hi,

Please get the python2.6 stuff fixed in Debian (it seems I didn't report it previously): a FTBFS with python2.6 is considered RC at the moment, so it will be quickly fixed. So that it appears in the Debian python team, you should use:
- tag: python2.6
- users: <email address hidden>

Thanks,
Fabrice

Hi fabrice!

Here is the updated diff

Regards

Hi Bhavani,

and thanks to take care of it. However, as Angel as done all the work, I'd rather sponsor a debdiff from him. Hope you don't mind
Angel?

Thanks,
Fabrice

hi fabrice,

okay! here is the modified rebuilt diff containing angel's name for you to sponsor :)

Regards

Hi, here i am, please wait, the debian maintainer has uploaded new version with this fixes. But i dont know why the package dont entry in unstable.

Thanks!

Ya! The new debian version 0.0.43+debian1-3 compiles well in maverick pbuilder

ldaptor (0.0.43+debian1-3) unstable; urgency=low

  [ Jakub Wilk ]
  * Don't hardcode ‘site-packages’ in debian/*.install, debian/rules
    (Closes: #586884). Thanks to Angel Abad for the bug report and the initial
    patch.

  [ Jan Dittberner ]
  * add debian/ldaptor-doc.doc-base.api,
    debian/ldaptor-doc.doc-base.ldap-intro, and
    debian/ldaptor-doc.doc-base.addressbook-slides to register
    documentation with doc-base

 -- Jan Dittberner <email address hidden> Wed, 23 Jun 2010 20:23:03 +0200

I think is not necesary merge, only sync. Fabrice, could you sync this package? or I need to fill a new sync bug?

I will retitle.

Thanks!

Hi angel

the version is in unstable with the transition fix below

http://ftp.debian.org/debian/pool/main/l/ldaptor/ldaptor_0.0.43+debian1-3.dsc

as far as 2nd change is concerned its a ubuntu specific buildd change so it has to be carried forward :)

Regards

Agree with Bhavani: the following change:
Remove empty POT files. Fixes FTBFS caused by pkgstriptranslations.
has to be kept as it seems there are still some empty pot files (as otherwise, the package will FTBFS)

Ok, you are right, so we will do no duplicate work, upload Bhavani merge please.

Best Regards,

This bug was fixed in the package ldaptor - 0.0.43+debian1-3ubuntu1

---------------
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 <email address hidden> Fri, 25 Jun 2010 13:25:15 +0530