From: Sebastian Harl Date: Sat, 23 Jan 2010 12:29:41 +0000 (+0100) Subject: Merged branch 'tg/master'. X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=72880b69fb234a3b23edf2f3a73b1be852c22e10;p=pkg-mlmmj.git Merged branch 'tg/master'. --- 72880b69fb234a3b23edf2f3a73b1be852c22e10 diff --cc debian/changelog index 9fd5ce1,37960ba..b308eac --- a/debian/changelog +++ b/debian/changelog @@@ -1,56 -1,20 +1,68 @@@ -mlmmj (1.2.15-1.2) unstable; urgency=low +mlmmj (1.2.16-0.1) unstable; urgency=low ++ [ Sebastian Harl ] * Non-maintainer upload. - * Moved files from /var/www/mlmmj-php-web to /usr/share/mlmmj-php-web - and same for mlmmj-php-web-admin (Closes: #553550). - * Added dependency to mlmmj for the mlmmj-php-web package. - * Added ${misc:Depends} dependency for both mlmmj-php-web and - mlmmj-php-web-admin packages. - * Bumped Standard-Version: to 3.8.3. - * Added descriptions in all dpatch patches. + * New upstream release. + * Fixed .diff.gz - do not include the reverse diff to some previous version + (Closes: #516948). + * debian/po/: + - Added sv.po, thanks to Martin Bagge (Closes: #503607). + - Added ja.po, thanks to Hideki Yamane (Closes: #512988). + * debian/control: + - Moved "Homepage" field from package description to the source stanza. - - Updated standards-version to 3.8.0. + * debian/attic/: + - Removed. It's the job of a VCS to keep track of old versions. + * debian/mlmmj.templates.old: + - Removed. It's the job of a VCS to keep track of old versions. + * debian/dirs: + - Removed. This file is not needed. + * debian/rules: + - Cleanup: There is no need to have build-arch and build-indep - + especially if the latter is empty. Removed configure from .PHONY to + prevent configure being called twice. Removed unnecessary occurrences of + $(CURDIR). + - Actually pass CFLAGS to configure. + - Rename mlmmj-make-ml.sh.1 to mlmmj-make-ml.1, since we rename the binary + as well. + - Do not manually install listtexts - the upstream build system takes care + of that itself. + - Do not include the AUTHORS and VERSION files in the binary packages - + they do not contribute any further information. + - Include all upstream README files in the binary packages - the MTA + specific files have been left out so far. + - Install the web-interfaces to /usr/share/PACKAGE/www - /var/www is for - the user of the local admin only. ++ the user of the local admin only (Closes: #553548, #553550). + * debian/patches/: + - Added short descriptions to all patches. + - Cleaned up patches: Don't use a custom /bin/sh script to execute the + patches but use dpatch instead. Use prefix "a" and "b" for path names. + - Removed 01_debian_make_mlmmj-ml - instead added mlmmj-make-ml to debian/ + directly. + - Removed unused 05_fix_call_to_free. + - Added 01_fix_manpages to fix the what-is entry of the mlmmj-sub and + mlmmj-unsub manpages. + - Added 01_fix_hyphen_used_as_minus_sign to fix the use of '-' in + manpages. + * debian/bogus-conffiles: + - Removed. This file is not used. + * debian/docs: + - Removed. This file is not needed. + * debian/mlmmj-php-web-admin.apache.conf, debian/mlmmj-php-web.apache.conf: + - Added example configurations for the Apache webserver. + ++ [ Thomas Goirand ] ++ * debian/control: ++ - Added dependency to mlmmj for the mlmmj-php-web package. ++ - Added ${misc:Depends} dependency for both mlmmj-php-web and ++ mlmmj-php-web-admin packages. ++ - Bumped Standard-Version to 3.8.3. ++ - Wrote a more comprehensive long description. ++ - Updated homepage field. + * Added a README.source - * Wrote a more comprehensive long description. - * Removed useless /usr/sbin dir in the mlmmj package. - * Removed homepage from long description, added a homepage field, and used - the correct new URL (mlmmj.org). ++ * debian/rules: ++ - Removed useless /usr/sbin dir in the mlmmj package. + - -- Thomas Goirand Sat, 02 Jan 2010 07:44:06 +0800 + -- Sebastian Harl Thu, 05 Mar 2009 13:25:24 +0100 mlmmj (1.2.15-1.1) unstable; urgency=low diff --cc debian/patches/02_fix_mlmmj_php.dpatch index 34f8bb7,97c8e1f..2df52a2 --- a/debian/patches/02_fix_mlmmj_php.dpatch +++ b/debian/patches/02_fix_mlmmj_php.dpatch @@@ -1,14 -1,13 +1,14 @@@ #! /bin/sh /usr/share/dpatch/dpatch-run -## 02_fix_mlmmj_php.dpatch by +## 02_fix_mlmmj_php.dpatch by Søren Boll Overgaard ## -## All lines beginning with `## DP:' are a description of the patch. -## DP: Makes it so that mlmmj-php-web-admin uses the FHS of Debian with correct dirs. +## DP: Adapt pathes and settings used in the web interface to match the - ## DP: installation paths. ++## DP: (FHS compliant) installation paths. @DPATCH@ -diff -urNad mlmmj-1.2.7/contrib/web/php-admin/conf/config.php /tmp/dpep.1ZV6mc/mlmmj-1.2.7/contrib/web/php-admin/conf/config.php ---- mlmmj-1.2.7/contrib/web/php-admin/conf/config.php 2005-05-12 18:36:37.000000000 +0200 -+++ /tmp/dpep.1ZV6mc/mlmmj-1.2.7/contrib/web/php-admin/conf/config.php 2005-05-12 18:52:05.000000000 +0200 + +diff a/contrib/web/php-admin/conf/config.php b/contrib/web/php-admin/conf/config.php +--- a/contrib/web/php-admin/conf/config.php ++++ b/contrib/web/php-admin/conf/config.php @@ -1,6 +1,6 @@