From 8c4044195472162ae9492b918aabd73906f861ab Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Frings-F=C3=BCrst?= Date: Tue, 27 Jun 2017 20:18:18 +0200 Subject: Fix documentation error --- debian/README.Debian | 13 ++++++++++--- debian/README.source | 18 ++++++++++++++++++ debian/changelog | 8 ++++++++ debian/mailgraph.docs | 1 + 4 files changed, 37 insertions(+), 3 deletions(-) create mode 100644 debian/README.source diff --git a/debian/README.Debian b/debian/README.Debian index 931689c..30c12a0 100644 --- a/debian/README.Debian +++ b/debian/README.Debian @@ -4,9 +4,16 @@ README.Debian for mailgraph This Debian package installs itself, optionally, as a daemon that will constantly gather the statistics it needs. You really need to turn this option on for it to be of any use. The statistics themselves are -served up by a web CGI program, /usr/lib/cgi-bin/mailgraph.cgi. With any -normal Debian web server install, this should be accessible as -http://localhost/cgi-bin/mailgraph.cgi +served up by a web CGI program, /usr/share/mailgraph/mailgraph.cgi. + +Note for Apache2.4 users: + + There is a mailgraph.conf at /usr/share/doc/mailgraph/examples. + You can copy the file to /etc/apache2/conf-available and enable it + with "a2enconf mailgraph" as root. + + Mailgraph is after them accessible as + http://localhost/mailgraph/mailgraph.cgi Note for Lighttpd users: diff --git a/debian/README.source b/debian/README.source new file mode 100644 index 0000000..e4f2b3d --- /dev/null +++ b/debian/README.source @@ -0,0 +1,18 @@ +Hello, + +now I use the branching model from Vincent Driessen[1]. + +I use the gitflow-avh[2]. with the Documentation[3]. +The Debian package can be found here[4]. + +Please upload unattended uploads use a branch feature/. + + +Many thanks. + + -- Jörg Frings-Fürst Fri, 02 Jun 2017 19:00:40 +0200 + +[1] http://nvie.com/posts/a-successful-git-branching-model/ +[2] https://github.com/petervanderdoes/gitflow-avh +[3] https://github.com/petervanderdoes/gitflow-avh/wiki +[4] https://tracker.debian.org/pkg/git-flow diff --git a/debian/changelog b/debian/changelog index 6fb4952..3dafce2 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,11 @@ +mailgraph (1.14-16) UNRELEASED; urgency=medium + + * Fix documentation error (Closes: #865914): + - Add debian/NEWS.Debian to mailgraph.docs. + - Correct debian/README.Debian. + + -- Jörg Frings-Fürst Tue, 27 Jun 2017 19:47:59 +0200 + mailgraph (1.14-15) unstable; urgency=medium * Move to /usr/share/mailgraph for compliance with Apache 2.4 diff --git a/debian/mailgraph.docs b/debian/mailgraph.docs index 95f19c1..74728e1 100644 --- a/debian/mailgraph.docs +++ b/debian/mailgraph.docs @@ -1,2 +1,3 @@ README debian/README.fetchmail +debian/NEWS.Debian -- cgit v1.2.3 From 6bb685cbab18780f440213cb3fa7e88a13bd81d9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Frings-F=C3=BCrst?= Date: Tue, 27 Jun 2017 20:30:27 +0200 Subject: Declare compliance with Debian Policy 4.0.0 --- debian/changelog | 1 + debian/control | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/debian/changelog b/debian/changelog index 3dafce2..2f35131 100644 --- a/debian/changelog +++ b/debian/changelog @@ -3,6 +3,7 @@ mailgraph (1.14-16) UNRELEASED; urgency=medium * Fix documentation error (Closes: #865914): - Add debian/NEWS.Debian to mailgraph.docs. - Correct debian/README.Debian. + * Declare compliance with Debian Policy 4.0.0. (No changes needed). -- Jörg Frings-Fürst Tue, 27 Jun 2017 19:47:59 +0200 diff --git a/debian/control b/debian/control index 193ad11..24e8fd1 100644 --- a/debian/control +++ b/debian/control @@ -5,7 +5,7 @@ Maintainer: Jörg Frings-Fürst Build-Depends: debhelper (>= 10), po-debconf -Standards-Version: 3.9.8 +Standards-Version: 4.0.0 Homepage: http://mailgraph.schweikert.ch Vcs-Git: git://anonscm.debian.org/collab-maint/mailgraph.git Vcs-Browser: https://anonscm.debian.org/cgit/collab-maint/mailgraph.git -- cgit v1.2.3 From 1c34d56e45f262a708cec06eec8df3ee9ebb5398 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Frings-F=C3=BCrst?= Date: Sun, 9 Sep 2018 09:07:10 +0200 Subject: Change to my new email address --- debian/changelog | 3 ++- debian/control | 2 +- debian/copyright | 2 +- 3 files changed, 4 insertions(+), 3 deletions(-) diff --git a/debian/changelog b/debian/changelog index 2f35131..ea01c22 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,11 +1,12 @@ mailgraph (1.14-16) UNRELEASED; urgency=medium + * Change to my new email address. * Fix documentation error (Closes: #865914): - Add debian/NEWS.Debian to mailgraph.docs. - Correct debian/README.Debian. * Declare compliance with Debian Policy 4.0.0. (No changes needed). - -- Jörg Frings-Fürst Tue, 27 Jun 2017 19:47:59 +0200 + -- Jörg Frings-Fürst Tue, 27 Jun 2017 19:47:59 +0200 mailgraph (1.14-15) unstable; urgency=medium diff --git a/debian/control b/debian/control index 24e8fd1..7f2a90f 100644 --- a/debian/control +++ b/debian/control @@ -1,7 +1,7 @@ Source: mailgraph Section: admin Priority: extra -Maintainer: Jörg Frings-Fürst +Maintainer: Jörg Frings-Fürst Build-Depends: debhelper (>= 10), po-debconf diff --git a/debian/copyright b/debian/copyright index a103548..fa866af 100644 --- a/debian/copyright +++ b/debian/copyright @@ -11,7 +11,7 @@ License: GPL-2 Files: debian/* Copyright: 2002-2008 Norbert Tretkowski 2010-2012 Julien Valroff - 2014-2017 Jörg Frings-Fürst + 2014-2017 Jörg Frings-Fürst License: GPL-2 License: GPL-2 -- cgit v1.2.3 From 8eff56e7c6231bbeeee05141afb54e783f132643 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Frings-F=C3=BCrst?= Date: Sun, 9 Sep 2018 09:08:00 +0200 Subject: Declare compliance with Debian Policy 4.2.1 --- debian/changelog | 2 +- debian/control | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/debian/changelog b/debian/changelog index ea01c22..739135c 100644 --- a/debian/changelog +++ b/debian/changelog @@ -4,7 +4,7 @@ mailgraph (1.14-16) UNRELEASED; urgency=medium * Fix documentation error (Closes: #865914): - Add debian/NEWS.Debian to mailgraph.docs. - Correct debian/README.Debian. - * Declare compliance with Debian Policy 4.0.0. (No changes needed). + * Declare compliance with Debian Policy 4.2.1. (No changes needed). -- Jörg Frings-Fürst Tue, 27 Jun 2017 19:47:59 +0200 diff --git a/debian/control b/debian/control index 7f2a90f..c30ea23 100644 --- a/debian/control +++ b/debian/control @@ -5,7 +5,7 @@ Maintainer: Jörg Frings-Fürst Build-Depends: debhelper (>= 10), po-debconf -Standards-Version: 4.0.0 +Standards-Version: 4.2.1 Homepage: http://mailgraph.schweikert.ch Vcs-Git: git://anonscm.debian.org/collab-maint/mailgraph.git Vcs-Browser: https://anonscm.debian.org/cgit/collab-maint/mailgraph.git -- cgit v1.2.3 From 646b59ab1380dff7049c62d3ffa44fa9f1c04a08 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Frings-F=C3=BCrst?= Date: Sun, 9 Sep 2018 09:10:10 +0200 Subject: Migrate to debhelper 11 --- debian/changelog | 3 +++ debian/compat | 2 +- debian/control | 2 +- 3 files changed, 5 insertions(+), 2 deletions(-) diff --git a/debian/changelog b/debian/changelog index 739135c..98c20bd 100644 --- a/debian/changelog +++ b/debian/changelog @@ -5,6 +5,9 @@ mailgraph (1.14-16) UNRELEASED; urgency=medium - Add debian/NEWS.Debian to mailgraph.docs. - Correct debian/README.Debian. * Declare compliance with Debian Policy 4.2.1. (No changes needed). + * Migrate to debhelper 11: + - Change debian/compat to 11. + - Bump minimum debhelper version in debian/control to >= 11. -- Jörg Frings-Fürst Tue, 27 Jun 2017 19:47:59 +0200 diff --git a/debian/compat b/debian/compat index 021ea30..9f1d48e 100644 --- a/debian/compat +++ b/debian/compat @@ -1,2 +1,2 @@ -10 +11 diff --git a/debian/control b/debian/control index c30ea23..93f3f80 100644 --- a/debian/control +++ b/debian/control @@ -3,7 +3,7 @@ Section: admin Priority: extra Maintainer: Jörg Frings-Fürst Build-Depends: - debhelper (>= 10), + debhelper (>= 11), po-debconf Standards-Version: 4.2.1 Homepage: http://mailgraph.schweikert.ch -- cgit v1.2.3 From 99c305bafea3fedc58d562da60464b6988c35b26 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Frings-F=C3=BCrst?= Date: Sun, 9 Sep 2018 09:17:18 +0200 Subject: d/control: Change Vcs-* to point to the new repository --- debian/changelog | 2 ++ debian/control | 4 ++-- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/debian/changelog b/debian/changelog index 98c20bd..a1fb492 100644 --- a/debian/changelog +++ b/debian/changelog @@ -8,6 +8,8 @@ mailgraph (1.14-16) UNRELEASED; urgency=medium * Migrate to debhelper 11: - Change debian/compat to 11. - Bump minimum debhelper version in debian/control to >= 11. + * debian/control: + - Change Vcs-* to point to the new repository. -- Jörg Frings-Fürst Tue, 27 Jun 2017 19:47:59 +0200 diff --git a/debian/control b/debian/control index 93f3f80..c08ff28 100644 --- a/debian/control +++ b/debian/control @@ -7,8 +7,8 @@ Build-Depends: po-debconf Standards-Version: 4.2.1 Homepage: http://mailgraph.schweikert.ch -Vcs-Git: git://anonscm.debian.org/collab-maint/mailgraph.git -Vcs-Browser: https://anonscm.debian.org/cgit/collab-maint/mailgraph.git +Vcs-Git: git://jff.email/opt/git//mailgraph.git +Vcs-Browser: https://jff.email/cgit//mailgraph.git Package: mailgraph Architecture: all -- cgit v1.2.3 From ff4e615a9ddadf93916854d6d85fec49f6e46d15 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Frings-F=C3=BCrst?= Date: Sun, 9 Sep 2018 09:19:42 +0200 Subject: d/changlog: Remove trailing whitespaces --- debian/changelog | 30 ++++++++++++++++-------------- 1 file changed, 16 insertions(+), 14 deletions(-) diff --git a/debian/changelog b/debian/changelog index a1fb492..7d17958 100644 --- a/debian/changelog +++ b/debian/changelog @@ -8,6 +8,8 @@ mailgraph (1.14-16) UNRELEASED; urgency=medium * Migrate to debhelper 11: - Change debian/compat to 11. - Bump minimum debhelper version in debian/control to >= 11. + * debian/changelog: + - Remove trailing whitespaces. * debian/control: - Change Vcs-* to point to the new repository. @@ -15,7 +17,7 @@ mailgraph (1.14-16) UNRELEASED; urgency=medium mailgraph (1.14-15) unstable; urgency=medium - * Move to /usr/share/mailgraph for compliance with Apache 2.4 + * Move to /usr/share/mailgraph for compliance with Apache 2.4 (Closes: #802775): - Changed files: + debian/mailgraph.install @@ -82,17 +84,17 @@ mailgraph (1.14-12) unstable; urgency=medium mailgraph (1.14-11) unstable; urgency=low - * Update copyright file as per DEP-5 1.0 format + * Update copyright file as per DEP-5 1.0 format * Add patch from Pascal Volk to deal with Postfix enable_long_queue_ids parameter (Closes: #677747) - * Update to new policy 3.9.3 (no changes needed) + * Update to new policy 3.9.3 (no changes needed) -- Julien Valroff Tue, 28 Feb 2012 18:44:18 +0100 mailgraph (1.14-10) unstable; urgency=low * Add VCS fields - * Update DEP-5 uri + * Update DEP-5 uri * Add support for "status" action to init.d script - thanks to Peter Eisentraut (Closes: #652998) * Updated Debconf translation for Norwegian Bokmål - thanks to Bjørn @@ -103,12 +105,12 @@ mailgraph (1.14-10) unstable; urgency=low mailgraph (1.14-9) unstable; urgency=low - * Fix patch to set default location of rrd files (Closes: #617411) + * Fix patch to set default location of rrd files (Closes: #617411) * Add patch to create greylisting RRD and graph (supports postgrey and grossd) * Remove Norbert from Uploaders, thanks to him for his work on this - package - * Update DEP-5 url to the latest revision + package + * Update DEP-5 url to the latest revision * Update to new policy 3.9.2 (no changes needed) -- Julien Valroff Sat, 09 Apr 2011 07:55:10 +0200 @@ -117,14 +119,14 @@ mailgraph (1.14-8) unstable; urgency=low * Add patch from Malte S. Stretz to replace rrdtool badge by a simple text link which prevents tracking by oss.oetiker.ch - * Bump debhelper compat to 8 + * Bump debhelper compat to 8 -- Julien Valroff Sat, 12 Feb 2011 15:11:19 +0100 mailgraph (1.14-7) unstable; urgency=low - * Make use of perl:Depends substvar - * Update copyright information as per latest DEP-5 + * Make use of perl:Depends substvar + * Update copyright information as per latest DEP-5 * Add patch from Adrian von Bidder to fix virus notification with clamav-milter (Closes: #610521) @@ -133,9 +135,9 @@ mailgraph (1.14-7) unstable; urgency=low mailgraph (1.14-6) unstable; urgency=low * Debconf templates translation update: - + nl - thanks to Remco Rijnders (Closes: #600552) + + nl - thanks to Remco Rijnders (Closes: #600552) * Remove duplicate description from README.Debian - * Update my email address + * Update my email address * Remove DMUA field, now useless -- Julien Valroff Wed, 10 Nov 2010 21:46:34 +0100 @@ -172,7 +174,7 @@ mailgraph (1.14-4) unstable; urgency=low + ru - thanks to Yuri Kozlov + sk - thanks to Ivan Masár + sv - thanks to Martin Bagge - * Fix typo in watch file + * Fix typo in watch file -- Julien Valroff Sat, 09 Oct 2010 20:54:02 +0200 @@ -199,7 +201,7 @@ mailgraph (1.14-2) unstable; urgency=low * Use dh minimal rules * Update copyright information and switch for machine-readble format * Add manpage, thanks to Gregory Colpart - (Closes: #189033, #462294) + (Closes: #189033, #462294) * Add watch file (Closes: #489719) * Add patch to account for infected mail as logged by DSPAM (Closes: #370091) -- cgit v1.2.3 From d1ef943236d8d2305be48dca1c5ac629caf8ff34 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Frings-F=C3=BCrst?= Date: Sun, 9 Sep 2018 09:25:33 +0200 Subject: d/control: Use secure URI for homepage --- debian/changelog | 1 + debian/control | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/debian/changelog b/debian/changelog index 7d17958..14633b1 100644 --- a/debian/changelog +++ b/debian/changelog @@ -12,6 +12,7 @@ mailgraph (1.14-16) UNRELEASED; urgency=medium - Remove trailing whitespaces. * debian/control: - Change Vcs-* to point to the new repository. + - Use secure URI for homepage. -- Jörg Frings-Fürst Tue, 27 Jun 2017 19:47:59 +0200 diff --git a/debian/control b/debian/control index c08ff28..7d56f7e 100644 --- a/debian/control +++ b/debian/control @@ -6,7 +6,7 @@ Build-Depends: debhelper (>= 11), po-debconf Standards-Version: 4.2.1 -Homepage: http://mailgraph.schweikert.ch +Homepage: https://mailgraph.schweikert.ch Vcs-Git: git://jff.email/opt/git//mailgraph.git Vcs-Browser: https://jff.email/cgit//mailgraph.git -- cgit v1.2.3 From 8c1b226440105946805065f363def6e19df0054b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Frings-F=C3=BCrst?= Date: Sun, 9 Sep 2018 09:28:40 +0200 Subject: d/copyright: Use secure URI for copyright format and source --- debian/changelog | 2 ++ debian/copyright | 4 ++-- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/debian/changelog b/debian/changelog index 14633b1..efaeb84 100644 --- a/debian/changelog +++ b/debian/changelog @@ -13,6 +13,8 @@ mailgraph (1.14-16) UNRELEASED; urgency=medium * debian/control: - Change Vcs-* to point to the new repository. - Use secure URI for homepage. + * debian/copyright: + - Use secure URI for copyright format and source. -- Jörg Frings-Fürst Tue, 27 Jun 2017 19:47:59 +0200 diff --git a/debian/copyright b/debian/copyright index fa866af..6b9b389 100644 --- a/debian/copyright +++ b/debian/copyright @@ -1,7 +1,7 @@ -Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/ +Format: https://www.debian.org/doc/packaging-manuals/copyright-format/1.0/ Upstream-Name: mailgraph Upstream-Contact: David Schweikert -Source: http://mailgraph.schweikert.ch/pub/ +Source: https://mailgraph.schweikert.ch/pub/ Files: * Copyright: 2000-2007 David Schweikert -- cgit v1.2.3 From 13ff8cfbe02ad7328f51331984ea26c83738fbef Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Frings-F=C3=BCrst?= Date: Sun, 9 Sep 2018 09:32:07 +0200 Subject: d/copyright: Change year to 2018 for packaging --- debian/changelog | 1 + debian/copyright | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/debian/changelog b/debian/changelog index efaeb84..b703ece 100644 --- a/debian/changelog +++ b/debian/changelog @@ -15,6 +15,7 @@ mailgraph (1.14-16) UNRELEASED; urgency=medium - Use secure URI for homepage. * debian/copyright: - Use secure URI for copyright format and source. + - Change year to 2018 for packaging. -- Jörg Frings-Fürst Tue, 27 Jun 2017 19:47:59 +0200 diff --git a/debian/copyright b/debian/copyright index 6b9b389..b4b09cd 100644 --- a/debian/copyright +++ b/debian/copyright @@ -11,7 +11,7 @@ License: GPL-2 Files: debian/* Copyright: 2002-2008 Norbert Tretkowski 2010-2012 Julien Valroff - 2014-2017 Jörg Frings-Fürst + 2014-2018 Jörg Frings-Fürst License: GPL-2 License: GPL-2 -- cgit v1.2.3 From f582ae71c56c17555e8a7c71912f0e98b3666060 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Frings-F=C3=BCrst?= Date: Sun, 9 Sep 2018 09:39:09 +0200 Subject: d/control: Change priority from deprecated extra to optional --- debian/changelog | 1 + debian/control | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/debian/changelog b/debian/changelog index b703ece..ece5f60 100644 --- a/debian/changelog +++ b/debian/changelog @@ -13,6 +13,7 @@ mailgraph (1.14-16) UNRELEASED; urgency=medium * debian/control: - Change Vcs-* to point to the new repository. - Use secure URI for homepage. + - Change priority from deprecated extra to optional. * debian/copyright: - Use secure URI for copyright format and source. - Change year to 2018 for packaging. diff --git a/debian/control b/debian/control index 7d56f7e..b7cfad0 100644 --- a/debian/control +++ b/debian/control @@ -1,6 +1,6 @@ Source: mailgraph Section: admin -Priority: extra +Priority: optional Maintainer: Jörg Frings-Fürst Build-Depends: debhelper (>= 11), -- cgit v1.2.3 From 1826162ee750b1f5061ef675710d08013295cd27 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Frings-F=C3=BCrst?= Date: Sun, 9 Sep 2018 09:46:26 +0200 Subject: d/NEWS.debian: Use paragraphs instead bulleted lists --- debian/NEWS.Debian | 24 ++++++++++++------------ debian/changelog | 2 ++ 2 files changed, 14 insertions(+), 12 deletions(-) diff --git a/debian/NEWS.Debian b/debian/NEWS.Debian index 3cf3d06..a614270 100644 --- a/debian/NEWS.Debian +++ b/debian/NEWS.Debian @@ -1,21 +1,21 @@ mailgraph (1.14-15) unstable; urgency=medium - * mailgraph are now installed at /usr/share/mailgraph. For use with - apache2 there is a mailgraph.conf at /usr/share/doc/mailgraph/examples. - You can copy the file to /etc/apache2/conf-available and enable it - with "a2enconf mailgraph" as root. + mailgraph are now installed at /usr/share/mailgraph. For use with + apache2 there is a mailgraph.conf at /usr/share/doc/mailgraph/examples. + You can copy the file to /etc/apache2/conf-available and enable it + with "a2enconf mailgraph" as root. -- Jörg Frings-Fürst Sun, 15 Jan 2017 13:35:50 +0100 mailgraph (1.14-9) unstable; urgency=low - * mailgraph now allows the creation of both RRD and graph for greylisting, - supporting postgrey and grossd (contributions to support more greylisting - applications are welcome). - If you used the --only-mail-rrd and/or --only-virus-rrd options, please make - sure you update your configuration for the following new options: - --no-mail-rrd Do not update the mail rrd. - --no-virus-rrd Do not update the virus rrd. - --no-greylist-rrd Do not update the greylist rrd. + mailgraph now allows the creation of both RRD and graph for greylisting, + supporting postgrey and grossd (contributions to support more greylisting + applications are welcome). + If you used the --only-mail-rrd and/or --only-virus-rrd options, please make + sure you update your configuration for the following new options: + --no-mail-rrd Do not update the mail rrd. + --no-virus-rrd Do not update the virus rrd. + --no-greylist-rrd Do not update the greylist rrd. -- Julien Valroff Sun, 13 Mar 2011 08:40:00 +0100 diff --git a/debian/changelog b/debian/changelog index ece5f60..2aaa61e 100644 --- a/debian/changelog +++ b/debian/changelog @@ -17,6 +17,8 @@ mailgraph (1.14-16) UNRELEASED; urgency=medium * debian/copyright: - Use secure URI for copyright format and source. - Change year to 2018 for packaging. + * debian/NEWS.debian: + - Use paragraphs instead bulleted lists. -- Jörg Frings-Fürst Tue, 27 Jun 2017 19:47:59 +0200 -- cgit v1.2.3 From 8166f5de52be8c706e9e35385b2965e0364301fb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Frings-F=C3=BCrst?= Date: Sun, 9 Sep 2018 09:48:22 +0200 Subject: d/watch: Use secure URI --- debian/changelog | 2 ++ debian/watch | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/debian/changelog b/debian/changelog index 2aaa61e..a5d80ab 100644 --- a/debian/changelog +++ b/debian/changelog @@ -19,6 +19,8 @@ mailgraph (1.14-16) UNRELEASED; urgency=medium - Change year to 2018 for packaging. * debian/NEWS.debian: - Use paragraphs instead bulleted lists. + * debian/watch: + - Use secure URI. -- Jörg Frings-Fürst Tue, 27 Jun 2017 19:47:59 +0200 diff --git a/debian/watch b/debian/watch index a3a91b9..da96973 100644 --- a/debian/watch +++ b/debian/watch @@ -1,2 +1,2 @@ version=4 -http://mailgraph.schweikert.ch/pub/mailgraph-(.*)\.tar\.gz +https://mailgraph.schweikert.ch/pub/mailgraph-(.*)\.tar\.gz -- cgit v1.2.3 From a41f37deb7e29b9b80f23b8199df98570aff635d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Frings-F=C3=BCrst?= Date: Sun, 9 Sep 2018 09:58:17 +0200 Subject: d/mailgraph.preinst: Remove outdated --- debian/changelog | 3 +++ debian/mailgraph.preinst | 39 --------------------------------------- 2 files changed, 3 insertions(+), 39 deletions(-) delete mode 100644 debian/mailgraph.preinst diff --git a/debian/changelog b/debian/changelog index a5d80ab..e54d1e2 100644 --- a/debian/changelog +++ b/debian/changelog @@ -19,6 +19,9 @@ mailgraph (1.14-16) UNRELEASED; urgency=medium - Change year to 2018 for packaging. * debian/NEWS.debian: - Use paragraphs instead bulleted lists. + * debian/mailgraph.preinst (Closes: #900507): + - Remove outdated script. It was used to update releases before 1.13-1.1. + Oldstable has 1.14-13. * debian/watch: - Use secure URI. diff --git a/debian/mailgraph.preinst b/debian/mailgraph.preinst deleted file mode 100644 index 729ecc5..0000000 --- a/debian/mailgraph.preinst +++ /dev/null @@ -1,39 +0,0 @@ -#!/bin/sh - -set -e - -# summary of how this script can be called: -# * `install' -# * `install' -# * `upgrade' -# * `abort-upgrade' - - -case "$1" in - upgrade) - if [ "$2" \< "1.13-1.1" ]; then - if [ -r /etc/default/mailgraph ]; then - . /usr/share/debconf/confmodule - . /etc/default/mailgraph - db_set mailgraph/start_on_boot "$BOOT_START" - db_set mailgraph/mail_log "$MAIL_LOG" - db_set mailgraph/ignore_localhost "$IGNORE_LOCALHOST" - fi - fi - ;; - - install|abort-upgrade) - ;; - - *) - echo "preinst called with unknown argument \`$1'" >&2 - exit 1 - ;; -esac - -# dh_installdeb will replace this with shell code automatically -# generated by other debhelper scripts. - -#DEBHELPER# - -exit 0 -- cgit v1.2.3 From 2be71b968c88c5150fd96fe31aae4243fe377ae0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Frings-F=C3=BCrst?= Date: Sun, 9 Sep 2018 10:20:03 +0200 Subject: d/NEWS.debian: Reformat to make lintian happy --- debian/NEWS.Debian | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/debian/NEWS.Debian b/debian/NEWS.Debian index a614270..2a092cd 100644 --- a/debian/NEWS.Debian +++ b/debian/NEWS.Debian @@ -1,21 +1,21 @@ mailgraph (1.14-15) unstable; urgency=medium - mailgraph are now installed at /usr/share/mailgraph. For use with - apache2 there is a mailgraph.conf at /usr/share/doc/mailgraph/examples. - You can copy the file to /etc/apache2/conf-available and enable it - with "a2enconf mailgraph" as root. + mailgraph are now installed at /usr/share/mailgraph. For use with + apache2 there is a mailgraph.conf at /usr/share/doc/mailgraph/examples. + You can copy the file to /etc/apache2/conf-available and enable it + with "a2enconf mailgraph" as root. -- Jörg Frings-Fürst Sun, 15 Jan 2017 13:35:50 +0100 mailgraph (1.14-9) unstable; urgency=low - mailgraph now allows the creation of both RRD and graph for greylisting, - supporting postgrey and grossd (contributions to support more greylisting - applications are welcome). - If you used the --only-mail-rrd and/or --only-virus-rrd options, please make - sure you update your configuration for the following new options: - --no-mail-rrd Do not update the mail rrd. - --no-virus-rrd Do not update the virus rrd. - --no-greylist-rrd Do not update the greylist rrd. + mailgraph now allows the creation of both RRD and graph for greylisting, + supporting postgrey and grossd (contributions to support more greylisting + applications are welcome). + If you used the --only-mail-rrd and/or --only-virus-rrd options, please make + sure you update your configuration for the following new options: + --no-mail-rrd Do not update the mail rrd. + --no-virus-rrd Do not update the virus rrd. + --no-greylist-rrd Do not update the greylist rrd. -- Julien Valroff Sun, 13 Mar 2011 08:40:00 +0100 -- cgit v1.2.3 From 2caff90d837ea25e7892bd7fc2ecbf8f3bbb941c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Frings-F=C3=BCrst?= Date: Sun, 9 Sep 2018 12:07:36 +0200 Subject: Add missing mailgraph.service file; d/control: Add requested default-mta to recommends --- debian/changelog | 2 ++ debian/control | 2 +- debian/mailgraph.service | 11 +++++++++++ debian/rules | 3 +++ 4 files changed, 17 insertions(+), 1 deletion(-) create mode 100644 debian/mailgraph.service diff --git a/debian/changelog b/debian/changelog index e54d1e2..2aae34e 100644 --- a/debian/changelog +++ b/debian/changelog @@ -5,6 +5,7 @@ mailgraph (1.14-16) UNRELEASED; urgency=medium - Add debian/NEWS.Debian to mailgraph.docs. - Correct debian/README.Debian. * Declare compliance with Debian Policy 4.2.1. (No changes needed). + * Add missing mailgraph.service file. * Migrate to debhelper 11: - Change debian/compat to 11. - Bump minimum debhelper version in debian/control to >= 11. @@ -14,6 +15,7 @@ mailgraph (1.14-16) UNRELEASED; urgency=medium - Change Vcs-* to point to the new repository. - Use secure URI for homepage. - Change priority from deprecated extra to optional. + - Add requested default-mta to recommends. * debian/copyright: - Use secure URI for copyright format and source. - Change year to 2018 for packaging. diff --git a/debian/control b/debian/control index b7cfad0..d12c77c 100644 --- a/debian/control +++ b/debian/control @@ -22,7 +22,7 @@ Depends: Pre-Depends: debconf (>= 0.5) | debconf-2.0 Recommends: - httpd | apache2, exim4 | postfix | sendmail | mail-transport-agent + httpd | apache2, default-mta | 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/mailgraph.service b/debian/mailgraph.service new file mode 100644 index 0000000..a4d9810 --- /dev/null +++ b/debian/mailgraph.service @@ -0,0 +1,11 @@ +[Unit] +Description=mailgraph mail log file analyzer +After= + +[Service] +Nice=19 +Type=forking +ExecStart=/usr/sbin/mailgraph -d -l /var/log/mail.log --daemon-rrd=/var/lib/mailgraph --ignore-localhost + +[Install] +WantedBy=multi-user.target diff --git a/debian/rules b/debian/rules index 76a9cb2..6714255 100755 --- a/debian/rules +++ b/debian/rules @@ -8,3 +8,6 @@ override_dh_auto_configure: override_dh_auto_clean: rm -f mailgraph dh_auto_clean + +override_dh_installsystemd: + dh_installsystemd -pmailgraph --no-enable --name=mailgraph -- cgit v1.2.3 From 0277893e643f76d056dc018776bf9bfe90c2e0cf Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Frings-F=C3=BCrst?= Date: Sun, 9 Sep 2018 12:16:31 +0200 Subject: d/changelog: add mising lines; change date/time to release --- debian/changelog | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/debian/changelog b/debian/changelog index 2aae34e..5386476 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,11 +1,12 @@ -mailgraph (1.14-16) UNRELEASED; urgency=medium +mailgraph (1.14-16) unstable; urgency=medium * Change to my new email address. * Fix documentation error (Closes: #865914): - Add debian/NEWS.Debian to mailgraph.docs. - Correct debian/README.Debian. - * Declare compliance with Debian Policy 4.2.1. (No changes needed). + * Declare compliance with Debian Policy 4.2.1 (No changes needed). * Add missing mailgraph.service file. + * New README.source to explain the branching model used. * Migrate to debhelper 11: - Change debian/compat to 11. - Bump minimum debhelper version in debian/control to >= 11. @@ -27,7 +28,7 @@ mailgraph (1.14-16) UNRELEASED; urgency=medium * debian/watch: - Use secure URI. - -- Jörg Frings-Fürst Tue, 27 Jun 2017 19:47:59 +0200 + -- Jörg Frings-Fürst Sun, 09 Sep 2018 12:15:23 +0200 mailgraph (1.14-15) unstable; urgency=medium -- cgit v1.2.3