diff -u phpldapadmin-1.1.0.5/debian/dirs phpldapadmin-1.1.0.5/debian/dirs --- phpldapadmin-1.1.0.5/debian/dirs +++ phpldapadmin-1.1.0.5/debian/dirs @@ -7,0 +8 @@ +etc/phpldapadmin/templates/additional-templates diff -u phpldapadmin-1.1.0.5/debian/rules phpldapadmin-1.1.0.5/debian/rules --- phpldapadmin-1.1.0.5/debian/rules +++ phpldapadmin-1.1.0.5/debian/rules @@ -6,13 +6,13 @@ # Uncomment this to turn on verbose mode. #export DH_VERBOSE=1 -clean: unpatch +clean: dh_testdir dh_testroot debconf-updatepo dh_clean -build: patch-stamp +build: install: dh_testdir @@ -30,6 +30,7 @@ -name 'COPYING' -or \ -name 'build-stamp' \ \) -exec install -D --mode=644 {} debian/phpldapadmin/usr/share/phpldapadmin/{} \; + cp -ar debian/additional-templates ./templates find ./templates -type f -exec install -D --mode=644 {} debian/phpldapadmin/etc/phpldapadmin/{} \; for po in debian/phpldapadmin/usr/share/phpldapadmin/locale/*/LC_MESSAGES/*.po; do \ (cd `dirname $$po`; msgfmt messages.po); \ @@ -62 +62,0 @@ -include /usr/share/dpatch/dpatch.make diff -u phpldapadmin-1.1.0.5/debian/control phpldapadmin-1.1.0.5/debian/control --- phpldapadmin-1.1.0.5/debian/control +++ phpldapadmin-1.1.0.5/debian/control @@ -1,8 +1,9 @@ Source: phpldapadmin Section: admin Priority: extra -Maintainer: Fabio Tranchitella -Build-Depends: debhelper (>= 5.0.0), po-debconf, dpatch, gettext +Maintainer: Ubuntu MOTU Developers +XSBC-Original-Maintainer: Fabio Tranchitella +Build-Depends: debhelper (>= 5.0.0), po-debconf, gettext Standards-Version: 3.7.2 Package: phpldapadmin diff -u phpldapadmin-1.1.0.5/debian/changelog phpldapadmin-1.1.0.5/debian/changelog --- phpldapadmin-1.1.0.5/debian/changelog +++ phpldapadmin-1.1.0.5/debian/changelog @@ -1,3 +1,21 @@ +phpldapadmin (1.1.0.5-2ubuntu1) intrepid; urgency=low + + * Merge from debian unstable, remaining changes (LP: #241505): + - 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. + + -- Nicolas Valcárcel Thu, 19 Jun 2008 21:36:18 -0500 + phpldapadmin (1.1.0.5-2) unstable; urgency=low * debian/rules: ship tools/po/*. (Closes: #466204) @@ -12,6 +30,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, @@ -43,12 +80,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. reverted: --- phpldapadmin-1.1.0.5/debian/patches/DPATCH +++ phpldapadmin-1.1.0.5.orig/debian/patches/DPATCH @@ -1,16 +0,0 @@ -[ -f debian/patches/00patch-opts ] && . debian/patches/00patch-opts -patch_opts="${patch_opts:--f --no-backup-if-mismatch}" - -if [ $# -ne 1 ]; then - echo >&2 "`basename $0`: script expects -patch|-unpatch as argument" - exit 1 -fi -case "$1" in - -patch) patch $patch_opts -p1 < $0;; - -unpatch) patch $patch_opts -p1 -R < $0;; - *) - echo >&2 "`basename $0`: script expects -patch|-unpatch as argument" - exit 1;; -esac - -exit 0 only in patch2: unchanged: --- phpldapadmin-1.1.0.5.orig/debian/additional-templates/groupOfNames.xml +++ phpldapadmin-1.1.0.5/debian/additional-templates/groupOfNames.xml @@ -0,0 +1,41 @@ + + + only in patch2: unchanged: --- phpldapadmin-1.1.0.5.orig/locale/it_IT/LC_MESSAGES/messages.po +++ phpldapadmin-1.1.0.5/locale/it_IT/LC_MESSAGES/messages.po @@ -2595,3 +2595,38 @@ #: ../../htdocs/compare_form.php:29 msgid "with " msgstr "con" + +#: ../../lib/functions.php:1140 +msgid "Backtrace" +msgstr "Backtrace" + +#: ../../lib/server_functions.php:366 +msgid "Could not bind to the LDAP server." +msgstr "Impossibile collegarsi al server LDAP." + +#: ../../htdocs/login_form.php:45 +msgid "Login Name" +msgstr "Nome d'accesso" + +#: ../../lib/EntryWriter1.php:1886 ../../htdocs/compare.php:123 +#, php-format +msgid "Note: '%s' is an alias for '%s'" +msgstr "Nota: '%s' è un alias per '%s'" + +#: ../../htdocs/index.php:77 +#, php-format +msgid "" +"You need to configure phpLDAPadmin. Edit the file \"%s\" to do so. An " +"example config file is provided in \"%s.example\"." +msgstr "" +"Bisogna configurare phpLDAPadmin. Si editi il file \"%s\" per farlo. Un file " +"di configurazione di esempio è fornito in \"%s.example\"." + +#: ../../lib/functions.php:2195 +#, php-format +msgid "" +"Your config.php specifies an invalid value for $default_search_display: %s. " +"Please fix it" +msgstr "" +"Il file config.php specifica un valore non valido per " +"$default_search_display: %s. Si deve correggerlo" only in patch2: unchanged: --- phpldapadmin-1.1.0.5.orig/locale/pl_PL/LC_MESSAGES/messages.po +++ phpldapadmin-1.1.0.5/locale/pl_PL/LC_MESSAGES/messages.po @@ -2593,6 +2593,20 @@ msgid "with " msgstr "z" +#: ../../htdocs/compare.php:123 ../../lib/EntryWriter1.php:1886 +#, php-format +msgid "Note: '%s' is an alias for '%s'" +msgstr "Uwaga: '%s' jest aliasem dla '%s'" + +#: ../../htdocs/index.php:77 +#, php-format +msgid "" +"You need to configure phpLDAPadmin. Edit the file \"%s\" to do so. An " +"example config file is provided in \"%s.example\"." +msgstr "" +"Musisz skonfigurować phpLDAPadmin. Wyedytuj plik \"%s\" aby to zrobić. " +"Przykład pliku konfiguracji znajduje się w \"%s.example\"." + #~ msgid "Login Name" #~ msgstr "Nazwa użytkownika"