diff -u phpldapadmin-0.9.8.4/debian/control phpldapadmin-0.9.8.4/debian/control --- phpldapadmin-0.9.8.4/debian/control +++ phpldapadmin-0.9.8.4/debian/control @@ -4,7 +4,7 @@ Maintainer: Ubuntu MOTU Developers XSBC-Original-Maintainer: Fabio Tranchitella Build-Depends: debhelper (>= 5.0.0), po-debconf, dpatch -Standards-Version: 3.7.2 +Standards-Version: 3.7.3 Package: phpldapadmin Architecture: all diff -u phpldapadmin-0.9.8.4/debian/patches/00list phpldapadmin-0.9.8.4/debian/patches/00list --- phpldapadmin-0.9.8.4/debian/patches/00list +++ phpldapadmin-0.9.8.4/debian/patches/00list @@ -2,0 +3 @@ +fix_locales_doc diff -u phpldapadmin-0.9.8.4/debian/changelog phpldapadmin-0.9.8.4/debian/changelog --- phpldapadmin-0.9.8.4/debian/changelog +++ phpldapadmin-0.9.8.4/debian/changelog @@ -1,3 +1,19 @@ +phpldapadmin (0.9.8.4-2ubuntu1) hardy; urgency=low + + * Merge from Debian unstable. 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) @@ -11,6 +27,7 @@ * New upstream release. * debian/watch: updated. + * debian/po/pt.po: added, thanks Rui Branco. (Closes: #414837) -- Fabio Tranchitella Fri, 23 Mar 2007 11:23:04 +0100 only in patch2: unchanged: --- phpldapadmin-0.9.8.4.orig/debian/patches/fix_locales_doc.dpatch +++ phpldapadmin-0.9.8.4/debian/patches/fix_locales_doc.dpatch @@ -0,0 +1,22 @@ +#! /bin/sh /usr/share/dpatch/dpatch-run +## fix_locales.dpatch by dAniel hAhler +## +## All lines beginning with `## DP:' are a description of the patch. +## DP: Fix documentation of language/locale param, LP: #118322. + +@DPATCH@ +diff -urNad phpldapadmin-0.9.8.4~/config/config.php.example phpldapadmin-0.9.8.4/config/config.php.example +--- phpldapadmin-0.9.8.4~/config/config.php.example 2007-03-18 02:22:57.000000000 +0100 ++++ phpldapadmin-0.9.8.4/config/config.php.example 2007-12-11 21:40:00.437654016 +0100 +@@ -49,8 +49,9 @@ + $config->custom->session['blowfish'] = ''; + + /* The language setting. If you set this to 'auto', phpLDAPadmin will attempt +- to determine your language automatically. Otherwise, available lanaguages +- are: 'ct', 'de', 'en', 'es', 'fr', 'it', 'nl', and 'ru' ++ to determine your language automatically. Otherwise, available languages ++ are: 'ca_ES', 'cs_CZ', 'de_DE', 'es_ES', 'fr_FR', 'hu_HU', 'it_IT', ++ 'ja_JP', 'nl_BE', 'pl_PL', 'pt_BR', 'ru_RU', 'sv_FI', 'zh_CN' and 'zh_TW'. + Localization is not complete yet, but most strings have been translated. + Please help by writing language files. See lang/en.php for an example. */ + // $config->custom->appearance['language'] = 'auto';