diff -Nru acct-6.5.5/debian/acct.init.d acct-6.5.5/debian/acct.init.d --- acct-6.5.5/debian/acct.init.d 2014-01-26 00:49:40.000000000 +0000 +++ acct-6.5.5/debian/acct.init.d 2014-04-30 10:56:10.000000000 +0000 @@ -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.5/debian/changelog acct-6.5.5/debian/changelog --- acct-6.5.5/debian/changelog 2014-03-26 14:22:47.000000000 +0000 +++ acct-6.5.5/debian/changelog 2014-04-30 10:56:54.000000000 +0000 @@ -1,3 +1,10 @@ +acct (6.5.5-2.1ubuntu1) utopic; urgency=medium + + * Resynchronise with Debian. Remaining changes: + - Remove stop links from rc0 and rc6. + + -- Colin Watson Wed, 30 Apr 2014 11:56:50 +0100 + acct (6.5.5-2.1) unstable; urgency=low * Non-maintainer upload. @@ -29,6 +36,48 @@ -- Mathieu Trudel-Lapierre Sun, 26 Jan 2014 18:17:38 +0000 +acct (6.5.5-1ubuntu5) trusty; urgency=medium + + * Use dh-autoreconf rather than various other less-complete methods. + + -- Colin Watson Wed, 18 Dec 2013 12:19:43 +0000 + +acct (6.5.5-1ubuntu4) saucy; urgency=low + + * Fix FTBFS with new texinfo. + + -- Dmitrijs Ledkovs Thu, 19 Sep 2013 16:25:28 +0100 + +acct (6.5.5-1ubuntu3) raring; urgency=low + + * Correct cross-build handling in debian/rules to pass the proper + --host, --build arguments to configure instead of trying to set CC + directly. + * debian/patches/cross-build-support.patch: remove pointless configure + check that tries to run a program to define wtmp/acct file paths; we can + just as well include this in files.h.in and use the results of the macro + checks directly. + * add build-dependency on libtool, needed for a full autoreconf. + * Call autoreconf -f to force update of the libtool macros. + * debian/patches/gnulib-c11-compat.patch: Fix gnulib stdio.h + compatibility with C11. + * Call dpkg-buildflags in debian/rules, to build with hardening support. + + -- Steve Langasek Mon, 17 Dec 2012 18:55:23 -0800 + +acct (6.5.5-1ubuntu2) quantal; urgency=low + + * Rebuild for new armel compiler default of ARMv5t. + + -- Colin Watson Mon, 01 Oct 2012 16:42:03 +0100 + +acct (6.5.5-1ubuntu1) oneiric; urgency=low + + * Merge from debian unstable. Remaining changes: + - Remove stop links from rc0 and rc6. + + -- Stéphane Graber Fri, 06 May 2011 14:01:39 -0400 + acct (6.5.5-1) unstable; urgency=low * Acknowledge NMU. @@ -50,6 +99,13 @@ -- Mathieu Trudel-Lapierre Fri, 25 Feb 2011 20:31:15 -0500 +acct (6.5.4-2.1ubuntu1) natty; urgency=low + + * Merge from Debian unstable (LP: #661056), remaining changes: + - Remove stop links from rc0 and rc6. + + -- Artur Rona Thu, 14 Oct 2010 17:20:42 +0200 + acct (6.5.4-2.1) unstable; urgency=low * NMU with maintainer's blessing. @@ -60,6 +116,13 @@ -- Ralf Treinen Mon, 27 Sep 2010 22:06:24 +0200 +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 @@ -104,6 +167,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) @@ -130,6 +200,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. @@ -166,6 +243,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 @@ -184,6 +271,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. @@ -194,6 +288,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 @@ -204,6 +305,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). @@ -227,6 +335,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.5/debian/control acct-6.5.5/debian/control --- acct-6.5.5/debian/control 2014-01-26 00:49:40.000000000 +0000 +++ acct-6.5.5/debian/control 2014-04-30 10:58:29.000000000 +0000 @@ -1,7 +1,8 @@ Source: acct Section: admin Priority: optional -Maintainer: Mathieu Trudel-Lapierre +Maintainer: Ubuntu Developers +XSBC-Original-Maintainer: Mathieu Trudel-Lapierre Build-Depends: debhelper (>= 9), dh-autoreconf, texi2html, texinfo Standards-Version: 3.9.4 Homepage: http://www.gnu.org/software/acct/ diff -Nru acct-6.5.5/debian/rules acct-6.5.5/debian/rules --- acct-6.5.5/debian/rules 2014-01-26 00:49:40.000000000 +0000 +++ acct-6.5.5/debian/rules 2014-04-30 10:56:02.000000000 +0000 @@ -25,3 +25,6 @@ # Removing last, it's in the sysvinit package instead. rm -f debian/tmp/usr/bin/last rm -f debian/tmp/usr/share/man/man1/last.1 + +override_dh_installinit: + dh_installinit -- start 20 2 3 4 5 . stop 20 1 .