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/?p=pkg-mlmmj.git;a=commitdiff_plain;h=72880b69fb234a3b23edf2f3a73b1be852c22e10;hp=6c6d7108be843667917d6cb201d6fbcb33c6c042 Merged branch 'tg/master'. --- diff --git a/debian/README.source b/debian/README.source new file mode 100644 index 0000000..6946e65 --- /dev/null +++ b/debian/README.source @@ -0,0 +1 @@ +This package is using dpatch, so that it can be easily backported to Stable. \ No newline at end of file diff --git a/debian/changelog b/debian/changelog index 9fd5ce1..b308eac 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,5 +1,6 @@ mlmmj (1.2.16-0.1) unstable; urgency=low + [ Sebastian Harl ] * Non-maintainer upload. * New upstream release. * Fixed .diff.gz - do not include the reverse diff to some previous version @@ -9,7 +10,6 @@ mlmmj (1.2.16-0.1) unstable; urgency=low - 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: @@ -31,7 +31,7 @@ mlmmj (1.2.16-0.1) unstable; urgency=low - 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 @@ -50,6 +50,18 @@ mlmmj (1.2.16-0.1) unstable; urgency=low * 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 + * debian/rules: + - Removed useless /usr/sbin dir in the mlmmj package. + -- Sebastian Harl Thu, 05 Mar 2009 13:25:24 +0100 mlmmj (1.2.15-1.1) unstable; urgency=low diff --git a/debian/control b/debian/control index dd65aad..5306a18 100644 --- a/debian/control +++ b/debian/control @@ -3,8 +3,8 @@ Section: mail Priority: optional Maintainer: Daniel Walrond Build-Depends: debhelper (>= 5), dpatch, sharutils -Standards-Version: 3.8.0 -Homepage: http://mlmmj.mmj.dk/ +Standards-Version: 3.8.3 +Homepage: http://mlmmj.org/ Package: mlmmj Architecture: any @@ -31,13 +31,16 @@ Description: mail server independent mailing list manager Package: mlmmj-php-web Architecture: all -Depends: php5 | php4 +Depends: ${misc:Depends}, mlmmj, php5 | php4 Description: web interface for mlmmj, written in php - Web based tools for mlmmj written in php. + A web based tool for mlmmj written in php, so that your users can subscribe + or unsubscribe through some HTML forms, which sometimes, might be more + convenient than just using the list commands. Package: mlmmj-php-web-admin Architecture: all -Depends: mlmmj, php5 | php4 +Depends: ${misc:Depends}, mlmmj, php5 | php4 Description: administrative web interface for mlmmj, written in php - Web based administrative tools for mlmmj written in php. - + This web based administrative tool for mlmmj written in php will help you + to configure each mailing list individualy, through the web. You will be + able with mlmmj-php-web-admin to set each individual tunable of the list. diff --git a/debian/patches/02_fix_mlmmj_php.dpatch b/debian/patches/02_fix_mlmmj_php.dpatch index 34f8bb7..2df52a2 100644 --- a/debian/patches/02_fix_mlmmj_php.dpatch +++ b/debian/patches/02_fix_mlmmj_php.dpatch @@ -2,7 +2,7 @@ ## 02_fix_mlmmj_php.dpatch by Søren Boll Overgaard ## ## DP: Adapt pathes and settings used in the web interface to match the -## DP: installation paths. +## DP: (FHS compliant) installation paths. @DPATCH@ diff --git a/debian/rules b/debian/rules old mode 100755 new mode 100644 index 7133dcb..ec2b7a9 --- a/debian/rules +++ b/debian/rules @@ -68,6 +68,7 @@ install-arch: build debian/mlmmj/usr/bin/mlmmj-make-ml mv debian/mlmmj/usr/share/man/man1/mlmmj-make-ml.sh.1 \ debian/mlmmj/usr/share/man/man1/mlmmj-make-ml.1 + rmdir $(CURDIR)/debian/mlmmj/usr/sbin dh_install -s install-indep: