Package: release.debian.org
Severity: normal
User: release.debian....@packages.debian.org
Usertags: unblock
Please unblock package pmacct
This upload ensures smooth upgrades from sysv to systemd and
fixes some bugs in the systemd config.
unblock pmacct/1.5.0-3
thanks,
Bernd
--
Bernd Zeimetz Debian GNU/Linux Developer
http://bzed.de http://www.debian.org
GPG Fingerprint: ECA1 E3F2 8E11 2432 D485 DD95 EB36 171A 6FF9 435F
diff --git a/debian/changelog b/debian/changelog
index a4c8fb4..1ba0d1c 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,15 @@
+pmacct (1.5.0-3) unstable; urgency=medium
+
+ * [e9cf7671] Add Homepage and Vcs information.
+ * [3783d4a2] Fix dpkg dependency for easy backporting.
+ * [7090c1cc] Fix systemd service files.
+ - Read the appropriate config file
+ - Use Type=forking to make upgrades easier.
+ Thanks to Malcolm Scott (Closes: #767977)
+ * [9cc618e2] Add ${misc:Depends} to Depends.
+
+ -- Bernd Zeimetz <b...@debian.org> Wed, 05 Nov 2014 18:27:55 +0100
+
pmacct (1.5.0-2) unstable; urgency=medium
* [5ede5bde] Build with ulog support on linux only.
diff --git a/debian/control b/debian/control
index 7443a63..69b8555 100644
--- a/debian/control
+++ b/debian/control
@@ -15,11 +15,14 @@ Build-Depends: debhelper (>= 9),
autotools-dev,
dh-systemd
Standards-Version: 3.9.6
+Homepage: http://www.pmacct.net/
+Vcs-Git: https://github.com/bzed/pkg-pmacct.git
+Vcs-Browser: https://github.com/bzed/pkg-pmacct
Package: pmacct
Architecture: any
-Depends: ${shlibs:Depends}, net-tools [linux-any] | freebsd-net-tools [kfreebsd-any], psmisc, lsb-base (>= 3.2-14)
-Pre-Depends: dpkg (>= 1.17.5)
+Depends: ${shlibs:Depends}, net-tools [linux-any] | freebsd-net-tools [kfreebsd-any], psmisc, lsb-base (>= 3.2-14), ${misc:Depends}
+Pre-Depends: dpkg (>= 1.15.8)
Description: promiscuous mode traffic accountant
pmacct is a tool designed to gather traffic information (bytes and number
of packets) by listening on a promiscuous interface or for Netflow data,
diff --git a/debian/pmacct.nfacctd.service b/debian/pmacct.nfacctd.service
index 4494bec..86cf431 100644
--- a/debian/pmacct.nfacctd.service
+++ b/debian/pmacct.nfacctd.service
@@ -3,8 +3,9 @@ Description=netflow accounting daemon
After=network.target
[Service]
+Type=forking
EnvironmentFile=-/etc/default/nfacctd
-ExecStart=/usr/sbin/nfacctd -f ${PMACCTD_CONF} $DAEMON_OPTS
+ExecStart=/usr/sbin/nfacctd -f ${NFACCTD_CONF} $DAEMON_OPTS
[Install]
WantedBy=multi-user.target
diff --git a/debian/pmacct.pmacctd.service b/debian/pmacct.pmacctd.service
index f4dc7d8..70c1ec3 100644
--- a/debian/pmacct.pmacctd.service
+++ b/debian/pmacct.pmacctd.service
@@ -3,6 +3,7 @@ Description=promiscuous mode accounting daemon
After=network.target
[Service]
+Type=forking
EnvironmentFile=-/etc/default/pmacctd
ExecStart=/usr/sbin/pmacctd -f ${PMACCTD_CONF} $DAEMON_OPTS
diff --git a/debian/pmacct.sfacctd.service b/debian/pmacct.sfacctd.service
index 965bc56..29d76ff 100644
--- a/debian/pmacct.sfacctd.service
+++ b/debian/pmacct.sfacctd.service
@@ -3,8 +3,9 @@ Description=sflow accounting daemon
After=network.target
[Service]
+Type=forking
EnvironmentFile=-/etc/default/sfacctd
-ExecStart=/usr/sbin/sfacctd -f ${PMACCTD_CONF} $DAEMON_OPTS
+ExecStart=/usr/sbin/sfacctd -f ${SFACCTD_CONF} $DAEMON_OPTS
[Install]
WantedBy=multi-user.target
diff --git a/debian/pmacct.uacctd.service b/debian/pmacct.uacctd.service
index f990b92..3862a02 100644
--- a/debian/pmacct.uacctd.service
+++ b/debian/pmacct.uacctd.service
@@ -3,8 +3,9 @@ Description=ulog accounting daemon
After=network.target
[Service]
+Type=forking
EnvironmentFile=-/etc/default/uacctd
-ExecStart=/usr/sbin/uacctd -f ${PMACCTD_CONF} $DAEMON_OPTS
+ExecStart=/usr/sbin/uacctd -f ${UACCTD_CONF} $DAEMON_OPTS
[Install]
WantedBy=multi-user.target
