diff options
| -rw-r--r-- | .gitignore | 4 | ||||
| -rw-r--r-- | debian/changelog | 24 | ||||
| -rw-r--r-- | debian/compat | 2 | ||||
| -rw-r--r-- | debian/control | 25 | ||||
| -rw-r--r-- | debian/copyright | 6 | ||||
| -rw-r--r-- | debian/mailgraph.dirs | 2 | ||||
| -rw-r--r-- | debian/patches/110_mailgraph.cgi.patch | 18 | ||||
| -rw-r--r-- | debian/patches/series | 2 | ||||
| -rwxr-xr-x | debian/rules | 5 | ||||
| -rw-r--r-- | debian/source/local-options | 2 |
10 files changed, 68 insertions, 22 deletions
@@ -1 +1,3 @@ -.pc +.bzr +.bzrignore +.pc
\ No newline at end of file diff --git a/debian/changelog b/debian/changelog index 2087163..c12664d 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,27 @@ +mailgraph (1.14-12) unstable; urgency=medium + + * New Maintainer (Closes: #753569). + * debian/control: + - Set myself as maintainer. + - Bump Standards-Version to 3.9.5 (no changes required). + - Change Vcs-Browser to cgit. + * debian/patches: + - Add debian/patches/105_postscreen.diff (Closes: #730826). + (Thanks to Vaclav Ovsik <vaclav.ovsik@gmail.com>) + + Add output of postscreen into analysis. + - Add debian/patches/110_mailgraph.cgi.patch. + + move from debian/rules into this patch. + * debian/copyright: + - Add myself to the list of authors for debian/*. + - Update copyright years for 2014. + * Add debian/source/options: + - Set compression to xz & compression-level to 9 to save space. + * Change debian/compat to 9 (no changes required). + * debian/rules: + - Move manipulating mailgraph.cgi into a new patch. + + -- Jörg Frings-Fürst <debian@jff-webhosting.net> Sat, 23 Aug 2014 08:40:48 +0200 + mailgraph (1.14-11) unstable; urgency=low * Update copyright file as per DEP-5 1.0 format diff --git a/debian/compat b/debian/compat index 45a4fb7..ec63514 100644 --- a/debian/compat +++ b/debian/compat @@ -1 +1 @@ -8 +9 diff --git a/debian/control b/debian/control index e2c5ad9..6a38e34 100644 --- a/debian/control +++ b/debian/control @@ -1,18 +1,27 @@ Source: mailgraph Section: admin Priority: extra -Maintainer: Julien Valroff <julien@debian.org> -Build-Depends: debhelper (>= 8), po-debconf -Standards-Version: 3.9.3 +Maintainer: Jörg Frings-Fürst <debian@jff-webhosting.net> +Build-Depends: + debhelper (>= 9), + po-debconf +Standards-Version: 3.9.5 Homepage: http://mailgraph.schweikert.ch -Vcs-Git: git://git.kirya.net/debian/mailgraph.git -Vcs-Browser: http://git.kirya.net/?p=debian/mailgraph.git;a=summary +Vcs-Git: git://anonscm.debian.org/collab-maint/mailgraph.git +Vcs-Browser: http://anonscm.debian.org/cgit/collab-maint/mailgraph.git Package: mailgraph Architecture: all -Depends: ${misc:Depends}, ${perl:Depends}, libfile-tail-perl, librrds-perl, ucf (>= 0.28) -Pre-Depends: debconf (>= 0.5) | debconf-2.0 -Recommends: httpd | apache2, exim4 | postfix | sendmail | mail-transport-agent +Depends: + ${misc:Depends}, + ${perl:Depends}, + libfile-tail-perl, + librrds-perl, + ucf (>= 0.28) +Pre-Depends: + debconf (>= 0.5) | debconf-2.0 +Recommends: + httpd | apache2, exim4 | postfix | sendmail | mail-transport-agent Description: RRDtool frontend for Mail statistics Mailgraph is a very simple mail statistics RRDtool frontend for Postfix, Sendmail or Exim that produces daily, weekly, monthly and diff --git a/debian/copyright b/debian/copyright index b6357f3..0f66eb0 100644 --- a/debian/copyright +++ b/debian/copyright @@ -9,8 +9,9 @@ Copyright: 2000-2007 David Schweikert <david@schweikert.ch> License: GPL-2 Files: debian/* -Copyright: 2002-2009 Norbert Tretkowski <nobse@debian.org> - 2010-2011 Julien Valroff <julien@debian.org> +Copyright: 2002-2008 Norbert Tretkowski <nobse@debian.org> + 2010-2012 Julien Valroff <julien@debian.org> + 2014 Jörg Frings-Fürst <debian@jff-webhosting.net> License: GPL-2 License: GPL-2 @@ -33,4 +34,3 @@ License: GPL-2 On Debian systems, the full text of the GNU General Public License version 2 can be found in the file `/usr/share/common-licenses/GPL-2'. - diff --git a/debian/mailgraph.dirs b/debian/mailgraph.dirs index 5af1b35..07d42c1 100644 --- a/debian/mailgraph.dirs +++ b/debian/mailgraph.dirs @@ -1,3 +1 @@ -usr/sbin -usr/lib/cgi-bin var/lib/mailgraph diff --git a/debian/patches/110_mailgraph.cgi.patch b/debian/patches/110_mailgraph.cgi.patch new file mode 100644 index 0000000..a5338cf --- /dev/null +++ b/debian/patches/110_mailgraph.cgi.patch @@ -0,0 +1,18 @@ +Description: patch mailgraph.cgi for valid code + move the changes from debina/rules into this patch +Author: Jörg Frings-Fürst <debian@jff-webhosting.net> +Last-Update: 2014-08-23 +--- +This patch header follows DEP-3: http://dep.debian.net/deps/dep3/ +Index: trunk/mailgraph.cgi +=================================================================== +--- trunk.orig/mailgraph.cgi 2014-08-23 08:19:59.810656652 +0200 ++++ trunk/mailgraph.cgi 2014-08-23 08:20:15.282979723 +0200 +@@ -197,6 +197,7 @@ + <meta http-equiv="Refresh" content="300" /> + <meta http-equiv="Pragma" content="no-cache" /> + <link rel="stylesheet" href="mailgraph.css" type="text/css" /> ++</style> + </head> + <body> + HEADER diff --git a/debian/patches/series b/debian/patches/series index 843aec2..84357cf 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -5,3 +5,5 @@ 101_dspam-virus-notifications.diff 102_clamav-milter.diff 103_postfix-long-queue-IDs.diff +105_postscreen.diff +110_mailgraph.cgi.patch diff --git a/debian/rules b/debian/rules index 68fa942..76a9cb2 100755 --- a/debian/rules +++ b/debian/rules @@ -4,12 +4,7 @@ override_dh_auto_configure: ln mailgraph.pl mailgraph - cp -f -a mailgraph.cgi mailgraph.cgi.orig - sed -i -e 's/^<link rel="stylesheet" href="mailgraph.css" type="text\/css" \/>$$/<style type="text\/css">/' \ - -e '/<style type="text\/css">/r mailgraph.css' \ - -e '/<\/head>/i <\/style>' mailgraph.cgi override_dh_auto_clean: rm -f mailgraph - [ ! -f mailgraph.cgi.orig ] || mv -f mailgraph.cgi.orig mailgraph.cgi dh_auto_clean diff --git a/debian/source/local-options b/debian/source/local-options deleted file mode 100644 index 9cdfca9..0000000 --- a/debian/source/local-options +++ /dev/null @@ -1,2 +0,0 @@ -unapply-patches -abort-on-upstream-changes |