Please merge phpldapadmin 1.1.0.7-1 (universe) from Debian unstable (universe)

I think this the appropriate debdiff, but if not or I need to make additional changes please let me know.

Thanks,
Adam

Thank you for your patch. Here are some problems I see with it:

You mention "Removed the "-m 644" because files are already set to 644." in debian/changelog but this is already done in the latest Debian revision; you also fail to mention the "php_value memory_limit 32M" change. Additionally, bug 223842 and perhaps also bug 333620 will be fixed with this upload, so it wouldn't hurt to mention them in the changelog.

Further, are you sure you want all the changes in the locale/ directory?

Hey guys,

This is my first time installing phpldapadmin. Seeing that 1.1.0.5 is more than a year old, I was about to create this bug report, but Adam beat me to it by 2 days!! o_O

Cheers,
Yonas

Thanks Siegfried for reviewing my patch. Here's a better one that I think addresses the issues you brought up.

If there are additional changes needed please let me know.

Uploaded, thanks.

This bug was fixed in the package phpldapadmin - 1.1.0.7-1ubuntu1

---------------
phpldapadmin (1.1.0.7-1ubuntu1) karmic; urgency=low

  [ Adam Sommer ]
  * Merge from debian unstable, remaining changes (LP: #376766):
    - Merged call to dh_install to install debian/additional-templates/*
    - Adds php_value memory_limit 32M to the apache.conf.
  * Configuration error fix. (LP: #333620)
  * Alias objects now work. (LP: #223842)

phpldapadmin (1.1.0.7-1) unstable; urgency=low

  * New upstream release.
  * debian/po/es.po: added. (Closes: #520504)

phpldapadmin (1.1.0.6-1) unstable; urgency=low

  * New upstream release. (Closes: #518578)
  * debian/rules: removed "-m 644" from the dh_install call. (Closes: #518847)
  * debian/postrm: remove config.php at purge time. (Closes: #519086)
  * debian/patches/hungarian.dpatch: fixed a hungarian translation.
    (Closes: #505559)

 -- Adam Sommer <email address hidden> Thu, 14 May 2009 22:05:53 -0400