From 1c81fda81374843f6ed14947b33c205c4ec9c194 Mon Sep 17 00:00:00 2001 From: Thomas Goirand Date: Sat, 23 Jan 2010 13:09:44 +0100 Subject: [PATCH] Various cleanup works. --- debian/README.source | 1 + debian/changelog | 18 ++++++++++++++++++ debian/control | 17 ++++++++++------- debian/docs | 1 + debian/patches/01_debian_make_mlmmj-ml.dpatch | 2 +- debian/patches/02_fix_mlmmj_php.dpatch | 2 +- .../patches/05_fix_displayed_full_paths.dpatch | 3 ++- debian/rules | 9 +++++---- 8 files changed, 39 insertions(+), 14 deletions(-) create mode 100644 debian/README.source mode change 100755 => 100644 debian/rules 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 64a1303..37960ba 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,21 @@ +mlmmj (1.2.15-1.2) unstable; urgency=low + + * 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. + * 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). + + -- Thomas Goirand Sat, 02 Jan 2010 07:44:06 +0800 + mlmmj (1.2.15-1.1) unstable; urgency=low * Non-maintainer upload. diff --git a/debian/control b/debian/control index 00f65c2..89af9b1 100644 --- a/debian/control +++ b/debian/control @@ -3,7 +3,8 @@ Section: mail Priority: optional Maintainer: Daniel Walrond Build-Depends: debhelper (>= 5), dpatch, sharutils -Standards-Version: 3.7.2 +Standards-Version: 3.8.3 +Homepage: http://mlmmj.org/ Package: mlmmj Architecture: any @@ -28,17 +29,19 @@ Description: mail server independent mailing list manager * Various web interfaces * VERP support . - http://mlmmj.mmj.dk/ 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/docs b/debian/docs index b335646..52a8fd9 100644 --- a/debian/docs +++ b/debian/docs @@ -2,3 +2,4 @@ FAQ README README.access TODO +debian/README.source \ No newline at end of file diff --git a/debian/patches/01_debian_make_mlmmj-ml.dpatch b/debian/patches/01_debian_make_mlmmj-ml.dpatch index 86030cf..f160de9 100644 --- a/debian/patches/01_debian_make_mlmmj-ml.dpatch +++ b/debian/patches/01_debian_make_mlmmj-ml.dpatch @@ -2,7 +2,7 @@ ## 01_debian_make_mlmmj-ml.dpatch by ## ## All lines beginning with `## DP:' are a description of the patch. -## DP: No description. +## DP: This patch adds a new mlmmj-make-ml @DPATCH@ diff -urNad --exclude=CVS --exclude=.svn ./debian/mlmmj-make-ml.sh /tmp/dpep-work.l7evJe/mlmmj-1.2.8/debian/mlmmj-make-ml.sh diff --git a/debian/patches/02_fix_mlmmj_php.dpatch b/debian/patches/02_fix_mlmmj_php.dpatch index e3c6aab..97c8e1f 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 ## ## All lines beginning with `## DP:' are a description of the patch. -## DP: No description. +## DP: Makes it so that mlmmj-php-web-admin uses the FHS of Debian with correct dirs. @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 diff --git a/debian/patches/05_fix_displayed_full_paths.dpatch b/debian/patches/05_fix_displayed_full_paths.dpatch index b97716a..26ec945 100644 --- a/debian/patches/05_fix_displayed_full_paths.dpatch +++ b/debian/patches/05_fix_displayed_full_paths.dpatch @@ -2,7 +2,8 @@ ## 05_fix_displayed_full_paths.dpatch by ## ## All lines beginning with `## DP:' are a description of the patch. -## DP: No description. +## DP: Changes path of a printf in mlmmj.h to be /usr/bin and +## DP: not /usr/local/bin when printing usages. if [ $# -lt 1 ]; then echo "`basename $0`: script expects -patch|-unpatch as argument" >&2 diff --git a/debian/rules b/debian/rules old mode 100755 new mode 100644 index 443c296..69e269c --- a/debian/rules +++ b/debian/rules @@ -86,22 +86,23 @@ install-arch: build-arch rm -f $(CURDIR)/debian/mlmmj/usr/bin/mlmmj-make-ml.sh install -m 755 -D $(CURDIR)/debian/mlmmj-make-ml.sh \ $(CURDIR)/debian/mlmmj/usr/bin/mlmmj-make-ml + rmdir $(CURDIR)/debian/mlmmj/usr/sbin dh_install -s install-indep: build-indep # mlmmj-php-web install -m 644 -D $(CURDIR)/contrib/web/php-user/mlmmj.php \ - $(CURDIR)/debian/mlmmj-php-web/var/www/mlmmj-php-web/mlmmj.php + $(CURDIR)/debian/mlmmj-php-web/usr/share/mlmmj-php-web/mlmmj.php install -m 644 -D $(CURDIR)/contrib/web/php-user/README \ $(CURDIR)/debian/mlmmj-php-web/usr/share/doc/mlmmj-php-web/README install -m 644 -D $(CURDIR)/contrib/web/php-user/example.html \ $(CURDIR)/debian/mlmmj-php-web/usr/share/doc/mlmmj-php-web/examples/examples.html # mlmmj-php-web-admin - install -d $(CURDIR)/debian/mlmmj-php-web-admin/var/www/mlmmj-php-web-admin + install -d $(CURDIR)/debian/mlmmj-php-web-admin/usr/share/mlmmj-php-web-admin install -m 644 $(CURDIR)/contrib/web/php-admin/htdocs/*.php \ - $(CURDIR)/debian/mlmmj-php-web-admin/var/www/mlmmj-php-web-admin/ + $(CURDIR)/debian/mlmmj-php-web-admin/usr/share/mlmmj-php-web-admin/ install -m 644 $(CURDIR)/contrib/web/php-admin/htdocs/dot.htaccess \ - $(CURDIR)/debian/mlmmj-php-web-admin/var/www/mlmmj-php-web-admin/.htaccess + $(CURDIR)/debian/mlmmj-php-web-admin/usr/share/mlmmj-php-web-admin/.htaccess install -m 644 -D $(CURDIR)/contrib/web/php-admin/README \ $(CURDIR)/debian/mlmmj-php-web-admin/usr/share/doc/mlmmj-php-web-admin/README install -d $(CURDIR)/debian/mlmmj-php-web-admin/usr/share/mlmmj-php-web-admin/conf -- 2.30.2