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 (limited to 'debian') 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