diff -Nru dstat-0.7.2/debian/changelog dstat-0.7.2/debian/changelog --- dstat-0.7.2/debian/changelog 2013-04-21 10:35:10.000000000 +0000 +++ dstat-0.7.2/debian/changelog 2014-03-24 01:57:53.000000000 +0000 @@ -1,8 +1,9 @@ -dstat (0.7.2-3build1) raring; urgency=low +dstat (0.7.2-4) unstable; urgency=low - * no-change rebuild with newer dh_python2 to fix shebang (LP: #1171089) + * debian/control: bumped Standards-Version (no changes) + * Patched path to squidclient (closes: #629680) - -- Julian Taylor Sun, 21 Apr 2013 12:34:38 +0200 + -- Andrew Pollock Mon, 24 Mar 2014 11:57:53 +1000 dstat (0.7.2-3) unstable; urgency=low diff -Nru dstat-0.7.2/debian/control dstat-0.7.2/debian/control --- dstat-0.7.2/debian/control 2012-01-08 05:04:53.000000000 +0000 +++ dstat-0.7.2/debian/control 2014-03-24 01:56:25.000000000 +0000 @@ -4,7 +4,7 @@ Maintainer: Andrew Pollock Build-Depends: debhelper (>= 5.0.37.2) Build-Depends-Indep: python (>= 2.6.6-3~) -Standards-Version: 3.9.2 +Standards-Version: 3.9.5 Homepage: http://dag.wieers.com/home-made/dstat/ Package: dstat diff -Nru dstat-0.7.2/debian/patches/fix_629680 dstat-0.7.2/debian/patches/fix_629680 --- dstat-0.7.2/debian/patches/fix_629680 1970-01-01 00:00:00.000000000 +0000 +++ dstat-0.7.2/debian/patches/fix_629680 2014-03-24 01:55:58.000000000 +0000 @@ -0,0 +1,28 @@ +Description: Use the correct path to the squidclient binary for Debian + Upstream has been consulted as to their preferred solution to this problem, + but has been unresponsive +Author: Andrew Pollock +Bug-Debian: http://bugs.debian.org/629680 + +Index: dstat-0.7.2/plugins/dstat_squid.py +=================================================================== +--- dstat-0.7.2.orig/plugins/dstat_squid.py 2014-03-24 11:29:35.257840978 +1000 ++++ dstat-0.7.2/plugins/dstat_squid.py 2014-03-24 11:31:47.419288955 +1000 +@@ -30,14 +30,14 @@ + 'objsz') + + def check(self): +- if not os.access('/usr/sbin/squidclient', os.X_OK): ++ if not os.access('/usr/bin/squidclient', os.X_OK): + raise Exception, 'Needs squidclient binary' +- cmd_test('/usr/sbin/squidclient %s mgr:info' % squidclient_options) ++ cmd_test('/usr/bin/squidclient %s mgr:info' % squidclient_options) + return True + + def extract(self): + try: +- for l in cmd_splitlines('/usr/sbin/squidclient %s mgr:info' % squidclient_options, ':'): ++ for l in cmd_splitlines('/usr/bin/squidclient %s mgr:info' % squidclient_options, ':'): + if l[0].strip() in self.vars: + self.val[l[0].strip()] = l[1].strip() + break diff -Nru dstat-0.7.2/debian/patches/series dstat-0.7.2/debian/patches/series --- dstat-0.7.2/debian/patches/series 1970-01-01 00:00:00.000000000 +0000 +++ dstat-0.7.2/debian/patches/series 2014-03-24 02:02:19.000000000 +0000 @@ -0,0 +1 @@ +fix_629680