--- phpldapadmin-1.1.0.7/debian/changelog +++ phpldapadmin-1.1.0.7/debian/changelog @@ -1,3 +1,14 @@ +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) + + -- Adam Sommer Thu, 14 May 2009 22:05:53 -0400 + phpldapadmin (1.1.0.7-1) unstable; urgency=low * New upstream release. @@ -15,12 +26,44 @@ -- Fabio Tranchitella Mon, 16 Mar 2009 14:54:15 +0100 +phpldapadmin (1.1.0.5-6ubuntu3) jaunty; urgency=low + + * Adds php_value memory_limit 32M to the apache.conf (LP: #270468) + + -- Andreas Olsson Sat, 07 Mar 2009 01:21:41 +0100 + +phpldapadmin (1.1.0.5-6ubuntu2) jaunty; urgency=low + + * Removes /usr/share/phpldapadmin/config/config.php during purge. (LP: #315136) + + -- Andreas Olsson Fri, 06 Mar 2009 00:24:35 +0100 + +phpldapadmin (1.1.0.5-6ubuntu1) intrepid; urgency=low + + * Merge from debian unstable, remaining changes: + + debian/additional-templates/*: + - added groupOfNames.xml + + debian/rules: + - added call to dh_install to install debian/additional-templates/* + + -- Emanuele Gentili Wed, 20 Aug 2008 02:36:45 +0200 + phpldapadmin (1.1.0.5-6) unstable; urgency=low * debian/po/pt_BR.po: added, thanks Herbert P Fortes Neto. (Closes: #494442) -- Fabio Tranchitella Sat, 09 Aug 2008 20:22:42 +0200 +phpldapadmin (1.1.0.5-5ubuntu1) intrepid; urgency=low + + * Merge from debian unstable, remaining changes: + + debian/additional-templates/*: + - added groupOfNames.xml + + debian/rules: + - added call to dh_install to install debian/additional-templates/* + + -- Emanuele Gentili Thu, 07 Aug 2008 16:51:01 +0200 + phpldapadmin (1.1.0.5-5) unstable; urgency=low * debian/patches/add_attr_form.dpatch: added, thanks Grzegorz MarszaƂek. @@ -28,6 +71,16 @@ -- Fabio Tranchitella Sun, 03 Aug 2008 09:14:48 +0200 +phpldapadmin (1.1.0.5-4ubuntu1) intrepid; urgency=low + + * Merge from debian unstable, remaining changes: + + debian/additional-templates/*: + - added groupOfNames.xml (a commonly used object, see lp: #72779) + + debian/rules: + + added call to dh_install to install debian/additional-templates/* + + -- Emanuele Gentili Fri, 01 Aug 2008 13:52:05 +0200 + phpldapadmin (1.1.0.5-4) unstable; urgency=low * debian/po/sv.po: added, thanks Martin Bagge. (Closes: #493014) @@ -35,6 +88,22 @@ -- Fabio Tranchitella Thu, 31 Jul 2008 08:25:04 +0200 +phpldapadmin (1.1.0.5-3ubuntu1) intrepid; urgency=low + + * Merge from debian unstable. (closes lp: #192034) + - dropped superflous removal of unused dpatch system and e-mailed + Debian maintainer to please make the change in Debian. + - install groupOfNames template to templates/creation/ instead of + templates/additional-templates/ so that users will be able to use it. + * Remaining Ubuntu changes: + - debian/additional-templates/*: + . added groupOfNames.xml (a commonly used object, see lp: #72779) + - debian/rules: + . added call to dh_install to install debian/additional-templates/* + - debian/control: Maintainer fields updated. + + -- Cody A.W. Somerville Sat, 12 Jul 2008 05:45:57 -0300 + phpldapadmin (1.1.0.5-3) unstable; urgency=low * debian/conf/apache.conf: use php5 instead of php4. (Closes: #487617) @@ -55,6 +124,25 @@ -- Fabio Tranchitella Sun, 03 Feb 2008 12:34:37 +0100 +phpldapadmin (1.1.0.4-2ubuntu1) hardy; urgency=low + + * Merge from debian unstable + * debian/additional-templates/*: (LP: #72779) + - added groupOfNames.xml + * debian/rules: + - added find command for debian/additional-templates/* installation + - get rid of all unneeded dpatch targets + * debian/dirs: + - added etc/phpldapadmin/templates/additional-templates/ + * debian/control: + - removed dpatch from build-deps + * debian/patches/*: removed it from debian directory + * Modify Maintainer value to match the DebianMaintainerField + specification. + + + -- Stephan Hermann Thu, 31 Jan 2008 20:49:20 +0100 + phpldapadmin (1.1.0.4-2) unstable; urgency=low * debian/rules: some of the upstream gettext message catalogs are corrupted, @@ -86,12 +174,31 @@ -- Fabio Tranchitella Sun, 16 Dec 2007 10:01:44 +0100 +phpldapadmin (0.9.8.4-2ubuntu1) hardy; urgency=low + + * Merge from Debian unstable (LP: #175701). Remaining Ubuntu changes: + - debian/control: Remove Depends on php4/libapache packages + * Fix documentation of language/locale config variable + (LP: #118322) + * debian/control: Standards-Version 3.7.3 + + -- dAniel hAhler Tue, 11 Dec 2007 21:46:39 +0100 + phpldapadmin (0.9.8.4-2) unstable; urgency=low * debian/control: fix dependencies on php. (Closes: #444354) -- Fabio Tranchitella Thu, 11 Oct 2007 13:31:51 +0200 +phpldapadmin (0.9.8.4-1ubuntu1) gutsy; urgency=low + + * debian/control: Optionally depend on php5-cgi (think lighttpd) + (LP: #126746) + * debian/control: Remove Depends on php4 packages, because they are not + supported in Ubuntu anymore. + + -- dAniel hAhler Tue, 11 Sep 2007 01:01:33 +0200 + phpldapadmin (0.9.8.4-1) unstable; urgency=low * New upstream release. --- phpldapadmin-1.1.0.7/debian/rules +++ phpldapadmin-1.1.0.7/debian/rules @@ -51,6 +51,7 @@ dh_compress dh_fixperms dh_install debian/conf/apache.conf /etc/phpldapadmin/ + dh_install debian/additional-templates/* etc/phpldapadmin/templates/creation/ dh_link /etc/phpldapadmin/templates /usr/share/phpldapadmin/templates dh_link /usr/share/doc/phpldapadmin /usr/share/phpldapadmin/doc dh_installdebconf -pphpldapadmin --- phpldapadmin-1.1.0.7/debian/control +++ phpldapadmin-1.1.0.7/debian/control @@ -1,7 +1,8 @@ Source: phpldapadmin Section: admin Priority: extra -Maintainer: Fabio Tranchitella +Maintainer: Ubuntu MOTU Developers +XSBC-Original-Maintainer: Fabio Tranchitella Build-Depends: debhelper (>= 5.0.0), po-debconf, dpatch, gettext Standards-Version: 3.8.0 --- phpldapadmin-1.1.0.7/debian/conf/apache.conf +++ phpldapadmin-1.1.0.7/debian/conf/apache.conf @@ -30,6 +30,7 @@ php_flag track_vars On php_flag register_globals On php_value include_path . + php_value memory_limit 32M --- phpldapadmin-1.1.0.7.orig/debian/additional-templates/groupOfNames.xml +++ phpldapadmin-1.1.0.7/debian/additional-templates/groupOfNames.xml @@ -0,0 +1,41 @@ + + +