diff -Nru acct-6.5.4/debian/acct.init.d acct-6.5.4/debian/acct.init.d --- acct-6.5.4/debian/acct.init.d 2010-07-23 14:39:28.000000000 +0200 +++ acct-6.5.4/debian/acct.init.d 2010-07-25 15:57:36.000000000 +0200 @@ -5,7 +5,7 @@ # Required-Start: $remote_fs $syslog # Required-Stop: $remote_fs $syslog # Default-Start: 2 3 4 5 -# Default-Stop: 0 1 6 +# Default-Stop: 1 # Short-Description: process and login accounting # Description: GNU Accounting Utilities is a set of utilities which # reports and summarizes data about user connect times and diff -Nru acct-6.5.4/debian/acct.postinst acct-6.5.4/debian/acct.postinst --- acct-6.5.4/debian/acct.postinst 2010-07-23 14:39:28.000000000 +0200 +++ acct-6.5.4/debian/acct.postinst 2010-07-25 15:57:36.000000000 +0200 @@ -8,6 +8,12 @@ touch /var/log/account/pacct chmod 0640 /var/log/account/pacct* chown root:adm /var/log/account/pacct* + + # Remove shutdown and reboot links; this init script does + # not need them. + if dpkg --compare-versions "$2" lt "6.3.99+6.4pre1-4ubuntu1"; then + rm -f /etc/rc0.d/K20acct /etc/rc6.d/K20acct + fi ;; abort-upgrade|abort-remove|abort-deconfigure) diff -Nru acct-6.5.4/debian/changelog acct-6.5.4/debian/changelog --- acct-6.5.4/debian/changelog 2010-07-23 14:39:28.000000000 +0200 +++ acct-6.5.4/debian/changelog 2010-08-05 00:08:51.000000000 +0200 @@ -1,3 +1,10 @@ +acct (6.5.4-2ubuntu1) maverick; urgency=low + + * Merge from Debian testing, remaining changes: (LP: #609754) + - Remove stop links from rc0 and rc6. + + -- Artur Rona Thu, 05 Aug 2010 00:08:34 +0200 + acct (6.5.4-2) unstable; urgency=low * Re-add patch 03-acct-file.patch applied upstream in 6.5.1, seems the @@ -42,6 +49,13 @@ -- Mathieu Trudel Sun, 25 Apr 2010 23:08:23 -0400 +acct (6.5.1-1ubuntu1) lucid; urgency=low + + * Merge from Debian testing, remaining changes: (LP: #510177) + - Remove stop links from rc0 and rc6. + + -- Mathieu Trudel Wed, 20 Jan 2010 12:26:23 -0500 + acct (6.5.1-1) unstable; urgency=low * New maintainer (Closes: #543825) @@ -68,6 +82,13 @@ -- Mathieu Trudel Sat, 05 Dec 2009 00:35:01 -0500 +acct (6.4~pre1-9ubuntu1) lucid; urgency=low + + * Resynchronise with Debian. Remaining changes: + - Remove stop links from rc0 and rc6. + + -- Colin Watson Fri, 20 Nov 2009 19:00:51 -0600 + acct (6.4~pre1-9) unstable; urgency=low * QA upload. @@ -104,6 +125,16 @@ -- Daniel Baumann Tue, 07 Jul 2009 00:41:35 +0200 +acct (6.4~pre1-6ubuntu1) intrepid; urgency=low + + * Resynchronise with Debian. Remaining changes: + - Remove stop links from rc0 and rc6. + * Switch from deprecated update-rc.d multiuser to manual arguments. + * Update LSB init script header. + * Update Maintainer for Ubuntu. + + -- Colin Watson Tue, 24 Jun 2008 12:18:43 +0100 + acct (6.4~pre1-6) unstable; urgency=medium * Adjusted lsb header of init script, thanks Petter Reinholdtsen @@ -122,6 +153,13 @@ -- Daniel Baumann Thu, 27 Dec 2007 08:45:00 +0100 +acct (6.4~pre1-4ubuntu1) gutsy; urgency=low + + * Merge from debian unstable, remaining changes: + - Remove stop links from rc0 and rc6. + + -- Stephan Hermann Sun, 27 May 2007 00:28:26 +0200 + acct (6.4~pre1-4) unstable; urgency=low * Minor cleanups. @@ -132,6 +170,13 @@ -- Daniel Baumann Sun, 29 Apr 2007 12:27:00 +0200 +acct (6.4~pre1-3ubuntu1) feisty; urgency=low + + * Merge from Debian unstable, remaining change: + - Remove stop links from rc0 and rc6. + + -- ville palo Tue, 05 Dec 2006 01:29:51 +0000 + acct (6.4~pre1-3) unstable; urgency=medium * Adapted the patch from Dean Gaudet to add @@ -142,6 +187,13 @@ -- Daniel Baumann Sun, 5 Nov 2006 13:55:00 +0100 +acct (6.4~pre1-2ubuntu1) feisty; urgency=low + + * Merge from debian unstable, remaining changes: + - remove stop links from rc0 and rc6 + + -- Scott James Remnant Mon, 27 Nov 2006 14:16:04 +0000 + acct (6.4~pre1-2) unstable; urgency=medium * Forgot to remove unused var in init.d (Closes: #397134). @@ -165,6 +217,12 @@ -- Daniel Baumann Sat, 04 Nov 2006 10:10:00 +0100 +acct (6.3.99+6.4pre1-4ubuntu1) edgy; urgency=low + + * Remove stop script symlinks from rc0 and rc6. + + -- Scott James Remnant Fri, 15 Sep 2006 16:48:04 +0100 + acct (6.3.99+6.4pre1-4) unstable; urgency=low * Fixed typo in init.d (Closes: #361109, #361109). diff -Nru acct-6.5.4/debian/control acct-6.5.4/debian/control --- acct-6.5.4/debian/control 2010-07-23 14:39:28.000000000 +0200 +++ acct-6.5.4/debian/control 2010-08-05 00:07:47.000000000 +0200 @@ -1,7 +1,8 @@ Source: acct Section: admin Priority: optional -Maintainer: Mathieu Trudel +Maintainer: Ubuntu Developers +XSBC-Original-Maintainer: Mathieu Trudel Build-Depends: debhelper (>= 7), autotools-dev, texi2html, quilt, texinfo Standards-Version: 3.9.0 Homepage: http://www.gnu.org/software/acct/ diff -Nru acct-6.5.4/debian/rules acct-6.5.4/debian/rules --- acct-6.5.4/debian/rules 2010-07-23 14:39:28.000000000 +0200 +++ acct-6.5.4/debian/rules 2010-07-25 15:57:36.000000000 +0200 @@ -65,7 +65,7 @@ dh_install dh_installchangelogs ChangeLog dh_installdocs - dh_installinit + dh_installinit -- start 20 2 3 4 5 . stop 20 1 . dh_installcron dh_installinfo dh_installman