diff -Nru etckeeper-1.18.10/debian/changelog etckeeper-1.18.10/debian/changelog --- etckeeper-1.18.10/debian/changelog 2019-01-16 18:51:37.000000000 +0000 +++ etckeeper-1.18.10/debian/changelog 2019-04-29 14:24:23.000000000 +0100 @@ -1,3 +1,17 @@ +etckeeper (1.18.10-1ubuntu3) eoan; urgency=medium + + * Add breezy python3 plugin + * Drop optional python2/python3 dependencies LP: #1826855 + + -- Dimitri John Ledkov Mon, 29 Apr 2019 14:24:23 +0100 + +etckeeper (1.18.10-1ubuntu1) disco; urgency=medium + + * Merge with Debian unstable (LP: #1815612). Remaining changes: + - Use C.UTF-8 for LANG for consistent unicode support + + -- Karl Stenerud Wed, 13 Feb 2019 12:17:24 +0100 + etckeeper (1.18.10-1) unstable; urgency=medium * New upstream release @@ -41,6 +55,13 @@ -- Joey Hess Tue, 05 Jun 2018 16:00:41 -0400 +etckeeper (1.18.7-1ubuntu1) cosmic; urgency=low + + * Merge from Debian unstable LP: #1556563. Remaining changes: + - Use C.UTF-8 for LANG for consistent unicode support + + -- Dimitri John Ledkov Sat, 26 May 2018 00:02:27 +0100 + etckeeper (1.18.7-1) unstable; urgency=medium * New upstream release @@ -78,6 +99,20 @@ -- Joey Hess Sun, 29 Jan 2017 14:37:24 -0400 +etckeeper (1.18.5-1ubuntu1) zesty; urgency=medium + + * Merge from Debian unstable. Remaining changes: + - etckeeper: Ensure that LANG is set, default to UTF8, necessary for bzr + to function properly in non-interactive shells (eg, cron); user's local + LANG will override if set. (Patch sent upstream) + * Drop changes: + - Erroneous commit in last merge + - commit.d/50cvs-commit: ensure that bzr has valid user+email as check + added by upstream + - hostname as a dependency as this is an essential package + + -- Joshua Powers Wed, 08 Feb 2017 09:36:35 -0600 + etckeeper (1.18.5-1) unstable; urgency=medium [Joey Hess] @@ -135,6 +170,23 @@ -- Joey Hess Mon, 15 Feb 2016 13:11:20 -0400 +etckeeper (1.18.2-1ubuntu1) xenial; urgency=medium + + * Merge from Debian unstable. Remaining changes: + - etckeeper: Ensure that LANG is set, default to UTF8, necessary for bzr + to function properly in non-interactive shells (eg, cron); user's local + LANG will override if set. (Patch sent upstream) + - d/control: add hostname to build-depends + - commit.d/50cvs-commit: ensure that bzr has valid user+email. Note this + patch has been sent upstream, so can hopefully be dropped soon. + - preinst, postinst: do not change the default vcs if it etckeeper was + already installed. This is only needed because we are changing the + default (Ubuntu used to default to bzr). If admin hasn't changed + anything, dpkg tries to be smart and update to the new default. This + can be removed in 16.10. + + -- Serge Hallyn Mon, 08 Feb 2016 17:21:33 -0800 + etckeeper (1.18.2-1) unstable; urgency=medium * Prepare upload to Debian unstable @@ -161,6 +213,31 @@ -- Joey Hess Tue, 04 Aug 2015 10:13:08 -0400 +etckeeper (1.18.1ubuntu2) xenial; urgency=medium + + * Remove etckeeper delta for defaulting LANG to UTF8 - this appears to + have been fixed in bzr, as I cannot reproduce. This drops another + piece of our delta from debian. + + -- Serge Hallyn Tue, 01 Dec 2015 13:44:23 -0600 + +etckeeper (1.18.1ubuntu1) xenial; urgency=medium + + * Merge from Debian unstable. Remaining changes: + - etckeeper: Ensure that LANG is set, default to UTF8, necessary for bzr + to function properly in non-interactive shells (eg, cron); user's local + LANG will override if set. (Patch sent upstream) + - d/control: add hostname to build-depends + - commit.d/50cvs-commit: ensure that bzr has valid user+email. Note this + patch has been sent upstream, so can hopefully be dropped soon. + * preinst, postinst: do not change the default vcs if it etckeeper was + already installed. This is only needed because we are changing the + default (Ubuntu used to default to bzr). If admin hasn't changed anything, + dpkg tries to be smart and update to the new default. This can be removed + in 16.10. + + -- Serge Hallyn Sat, 21 Nov 2015 04:56:10 +0000 + etckeeper (1.18.1) unstable; urgency=medium * Add myself as maintainer (Closes: #768516) @@ -198,6 +275,35 @@ -- Joey Hess Fri, 07 Nov 2014 21:30:50 -0400 +etckeeper (1.15ubuntu3) vivid; urgency=medium + + * supplement the last upload. make sure to fix permission on package + upgrade as well, LP: #1402657 + + -- Nobuto Murata Thu, 05 Mar 2015 22:51:17 +0900 + +etckeeper (1.15ubuntu2) vivid; urgency=medium + + * restore executable permission of /etc/etckeeper/commit.d/50vcs-commit, + thanks to Hilario J. Montoliu for offering a patch, LP: #1402657 + + -- Nobuto Murata Sat, 14 Feb 2015 18:55:13 +0900 + +etckeeper (1.15ubuntu1) vivid; urgency=low + + * Merge from Debian unstable. Remaining changes: + - commit.d/50vcs-commit: Avoid failure in initial commit if etckeeper is + not installed from a tty (like early during installation). + - etckeeper.conf, debian/control: default to bzr + - etckeeper: Ensure that LANG is set, default to UTF8, necessary for bzr + to function properly in non-interactive shells (eg, cron); user's local + LANG will override if set. + - Makefile: Do not call the etckeeper.spec target in clean because it + modifies the spec file instead of cleaning it. + - README.md: Update tutorial to use bzr. + + -- Michael Vogt Mon, 27 Oct 2014 10:35:02 +0100 + etckeeper (1.15) unstable; urgency=medium * Recommend cron-daemon, rather than cron, as etckeeper only needs @@ -237,6 +343,21 @@ -- Joey Hess Fri, 13 Jun 2014 12:03:06 -0400 +etckeeper (1.11ubuntu1) utopic; urgency=low + + * Merge from Debian unstable. Remaining changes: + - commit.d/50vcs-commit: Avoid failure in initial commit if etckeeper is + not installed from a tty (like early during installation). + - etckeeper.conf, debian/control: default to bzr + - etckeeper: Ensure that LANG is set, default to UTF8, necessary for bzr + to function properly in non-interactive shells (eg, cron); user's local + LANG will override if set. + - Makefile: Do not call the etckeeper.spec target in clean because it + modifies the spec file instead of cleaning it. + - README: Update tutorial to use bzr. + + -- Michael Vogt Wed, 04 Jun 2014 08:27:24 +0200 + etckeeper (1.11) unstable; urgency=low * Fix too broad matching of .gitignored files. @@ -253,6 +374,27 @@ -- Joey Hess Sun, 03 Nov 2013 12:14:02 -0400 +etckeeper (1.9ubuntu2) trusty; urgency=medium + + * Rebuild to drop files installed into /usr/share/pyshared. + + -- Matthias Klose Sun, 23 Feb 2014 13:47:25 +0000 + +etckeeper (1.9ubuntu1) trusty; urgency=low + + * Merge from Debian unstable (LP: #1246411). Remaining changes: + - commit.d/50vcs-commit: Avoid failure in initial commit if etckeeper is + not installed from a tty (like early during installation). + - etckeeper.conf, debian/control: default to bzr + - etckeeper: Ensure that LANG is set, default to UTF8, necessary for bzr + to function properly in non-interactive shells (eg, cron); user's local + LANG will override if set. + - Makefile: Do not call the etckeeper.spec target in clean because it + modifies the spec file instead of cleaning it. + - README: Update tutorial to use bzr. + + -- Andres Rodriguez Wed, 30 Oct 2013 12:58:55 -0400 + etckeeper (1.9) unstable; urgency=low * Fix git update-ignore syntax. Closes: #721873 @@ -291,12 +433,43 @@ -- Joey Hess Fri, 26 Jul 2013 11:03:48 -0400 +etckeeper (1.4ubuntu1) saucy; urgency=low + + * Merge from Debian unstable (LP: #1200508). Remaining changes: + - commit.d/50vcs-commit: Avoid failure in initial commit if etckeeper is + not installed from a tty (like early during installation). + - etckeeper.conf, debian/control: default to bzr + - etckeeper: Ensure that LANG is set, default to UTF8, necessary for bzr + to function properly in non-interactive shells (eg, cron); user's local + LANG will override if set. + - Makefile: Do not call the etckeeper.spec target in clean because it + modifies the spec file instead of cleaning it. + - README: Update tutorial to use bzr. + + -- Yolanda Robla Fri, 12 Jul 2013 09:28:51 +0200 + etckeeper (1.4) unstable; urgency=low * Deal with unix^wlinux portability nonsense. -- Joey Hess Mon, 17 Jun 2013 12:00:59 -0400 +etckeeper (1.3ubuntu1) saucy; urgency=low + + * Merge from Debian unstable (LP: #1178739). Remaining changes: + - etckeeper.conf, debian/control: default to bzr. + - commit.d/50vcs-commit: Avoid failure in initial commit if etckeeper is + not installed from a tty (like early during installation). + - etckeeper: Ensure that LANG is set, default to UTF8, necessary for bzr + to function properly in non-interactive shells (eg, cron); user's local + LANG will override if set. + - debian/control: Added dependency on hostname. + - README: Update tutorial to use bzr. + - Makefile: Do not call the etckeeper.spec target in clean because it + modifies the spec file instead of cleaning it. + + -- Andres Rodriguez Fri, 10 May 2013 08:30:27 -0700 + etckeeper (1.3) unstable; urgency=low * Fix type -p bashism that crept in via recent patches. Closes: #707319 @@ -332,6 +505,22 @@ -- Joey Hess Sat, 04 May 2013 23:45:25 -0400 +etckeeper (0.64ubuntu1) raring; urgency=low + + * Resynchronise with Debian (bzr change in 0.63 fixes LP: #979223). + Remaining changes: + - etckeeper.conf, debian/control: default to bzr. + - etckeeper.spec: Change version to match Ubuntu version + - commit.d/50vcs-commit: Avoid failure in initial commit if etckeeper is + not installed from a tty (like early during installation). + - debian/control: Added dependency on hostname. + - etckeeper: Ensure that LANG is set, default to UTF8, necessary for bzr + to function properly in non-interactive shells (eg, cron); user's local + LANG will override if set. + - README: Update tutorial to use bzr. + + -- Colin Watson Tue, 08 Jan 2013 10:42:24 +0000 + etckeeper (0.64) unstable; urgency=low * Added support for openSUSE's zypper package manager. @@ -357,6 +546,27 @@ -- Joey Hess Mon, 05 Mar 2012 10:41:46 -0400 +etckeeper (0.61ubuntu2) precise; urgency=low + + * Update tutorial to use bzr. LP: #945453 + + -- Jelmer Vernooij Mon, 26 Mar 2012 16:08:37 +0100 + +etckeeper (0.61ubuntu1) precise; urgency=low + + [Chuck Short] + * Merge from Debian testing. Remaining changes: + - etckeeper.conf, debian/control: default to bzr. + - etckeeper.spec: Change version to match Ubuntu version + - commit.d/50vcs-commit: Avoid failure in initial commit if etckeeper + is not installed from a tty (like early during installation) + - debian/control: Added dependency on hostname. + - etckeeper: Ensure that LANG is set, default to UTF8, necessary for + bzr to function properly in non-interactive shells (eg, cron); user's + local LANG will override if set. + + -- Chuck Short Mon, 06 Feb 2012 07:49:28 -0500 + etckeeper (0.61) unstable; urgency=low * Fix up botched git-rm conffile removal from 0.58. @@ -375,6 +585,20 @@ -- Joey Hess Fri, 06 Jan 2012 19:23:42 -0400 +etckeeper (0.59ubuntu1) precise; urgency=low + + * Merge from Debian Testing. Remaining Ubuntu changes: + - etckeeper.conf, debian/control: default to bzr. + - etckeeper.spec: Change version to match Ubuntu version + - commit.d/50vcs-commit: Avoid failure in initial commit if etckeeper + is not installed from a tty (like early during installation) + - debian/control: Added dependency on hostname. + - etckeeper: Ensure that LANG is set, default to UTF8, necessary for + bzr to function properly in non-interactive shells (eg, cron); user's + local LANG will override if set. + + -- Andrew Starr-Bochicchio Fri, 06 Jan 2012 19:42:39 -0500 + etckeeper (0.59) unstable; urgency=low * Add /etc/cups/subscriptions.conf to default ignores, as the content of @@ -384,6 +608,16 @@ -- Joey Hess Thu, 22 Dec 2011 11:48:50 -0400 +etckeeper (0.58ubuntu1) precise; urgency=low + + * Merge from Debian testing. Remaining Ubuntu changes: + - Merge closes LP: #900662 + - ensure that LANG is set, default to UTF8, necessary for bzr to + function properly in non-interactive shells (eg, cron); user's + local LANG will override if set. (LP: #872553 LP: #791839) + + -- Barry Warsaw Tue, 06 Dec 2011 15:04:51 -0500 + etckeeper (0.58) unstable; urgency=low * Changed to store all permissions of files and directories, even those @@ -412,6 +646,33 @@ -- Joey Hess Fri, 04 Nov 2011 17:03:46 -0400 +etckeeper (0.56ubuntu2.1) oneiric-proposed; urgency=low + + * etckeeper: LP: #872553, #791839 + - ensure that LANG is set, default to UTF8, necessary for bzr to + function properly in non-interactive shells (eg, cron); user's + local LANG will override if set + + -- Dustin Kirkland Wed, 12 Oct 2011 12:18:25 -0500 + +etckeeper (0.56ubuntu2) oneiric; urgency=low + + * Added dependency on hostname (LP: #822613) + + -- Marc Cluet Fri, 19 Aug 2011 11:56:03 +0100 + +etckeeper (0.56ubuntu1) oneiric; urgency=low + + * Merge from debian unstable. (LP: #817074) Remaining changes: + - etckeeper.conf, debian/control: default to bzr. + - etckeeper.spec: Change version to match Ubuntu version + - commit.d/50vcs-commit: Avoid failure in initial commit if etckeeper + is not installed from a tty (like early during installation) + * Dropped change, fixed in Debian: + - Convert from python-central to dh_python2 + + -- Angel Abad Thu, 28 Jul 2011 00:13:53 +0200 + etckeeper (0.56) unstable; urgency=low * Converted to use dh_python2. Closes: #616800 @@ -419,6 +680,22 @@ -- Joey Hess Tue, 12 Jul 2011 14:38:09 -0400 +etckeeper (0.55ubuntu2) oneiric; urgency=low + + * Convert from python-central to dh_python2 + + -- Dmitrijs Ledkovs Thu, 23 Jun 2011 21:58:49 +0000 + +etckeeper (0.55ubuntu1) oneiric; urgency=low + + * Merge from debian unstable. (LP: #800034) Remaining changes: + - etckeeper.conf, debian/control: default to bzr. + - etckeeper.spec: Change version to match Ubuntu version + - commit.d/50vcs-commit: Avoid failure in initial commit if etckeeper + is not installed from a tty (like early during installation) + + -- Adam Gandelman Tue, 21 Jun 2011 17:14:20 +0100 + etckeeper (0.55) unstable; urgency=low * Fix error propigation to yum, which makes AVOID_COMMIT_BEFORE_INSTALL work. @@ -433,6 +710,16 @@ -- Joey Hess Sun, 19 Jun 2011 15:21:20 -0400 +etckeeper (0.54ubuntu1) oneiric; urgency=low + + * Merge from debian unstable. Remaining changes: + - etckeeper.conf, debian/control: default to bzr. + - etckeeper.spec: Change version to match Ubuntu version + - commit.d/50vcs-commit: Avoid failure in initial commit if etckeeper + is not installed from a tty (like early during installation) + + -- Chuck Short Tue, 31 May 2011 08:11:31 +0100 + etckeeper (0.54) unstable; urgency=low * Ignore inssev's FHS violating /etc/init.d/.depend.* files. @@ -444,6 +731,16 @@ -- Joey Hess Mon, 30 May 2011 18:11:40 -0400 +etckeeper (0.53ubuntu1) oneiric; urgency=low + + * Merge from debian unstable. (LP: #782583) Remaining changes: + - etckeeper.conf, debian/control: default to bzr. + - etckeeper.spec: Change version to match Ubuntu version + - commit.d/50vcs-commit: Avoid failure in initial commit if etckeeper + is not installed from a tty (like early during installation) + + -- Angel Abad Sun, 15 May 2011 15:10:40 +0100 + etckeeper (0.53) unstable; urgency=low [ Joey Hess ] @@ -463,6 +760,16 @@ -- Joey Hess Fri, 18 Mar 2011 15:37:54 -0400 +etckeeper (0.52ubuntu1) natty; urgency=low + + * Merge from debian unstable. (LP: #714702) Remaining changes: + - etckeeper.conf, debian/control: default to bzr. + - etckeeper.spec: Change version to match Ubuntu version + - commit.d/50vcs-commit: Avoid failure in initial commit if etckeeper + is not installed from a tty (like early during installation) + + -- Angel Abad Mon, 07 Feb 2011 17:40:13 +0100 + etckeeper (0.52) unstable; urgency=low * Rewrote 50git-rm to avoid using git ls-files, and thus avoid encoding @@ -470,6 +777,16 @@ -- Joey Hess Sun, 06 Feb 2011 00:00:55 -0400 +etckeeper (0.51ubuntu1) natty; urgency=low + + * Merge from debian unstable. (LP: #700987) Remaining changes: + - etckeeper.conf, debian/control: default to bzr. + - etckeeper.spec: Change version to match Ubuntu version + - commit.d/50vcs-commit: Avoid failure in initial commit if etckeeper + is not installed from a tty (like early during installation) + + -- Angel Abad Mon, 10 Jan 2011 16:47:54 +0100 + etckeeper (0.51) unstable; urgency=low * Updated Vietnamese translation of debconf templates. Closes: #601921 @@ -480,6 +797,21 @@ -- Joey Hess Sat, 25 Dec 2010 14:39:57 -0400 +etckeeper (0.50ubuntu2) natty; urgency=low + + * commit.d/50vcs-commit: Avoid failure in initial commit if etckeeper + is not installed from a tty (like early during installation) (LP: #661024) + + -- Thierry Carrez (ttx) Wed, 15 Dec 2010 11:18:50 +0100 + +etckeeper (0.50ubuntu1) natty; urgency=low + + * Merge from Debian unstable (LP: #668842). Remaining changes: + - etckeeper.conf, debian/control: default to bzr. + - etckeeper.spec: Change version to match Ubuntu version + + -- Bhavani Shankar Sat, 30 Oct 2010 21:29:17 +0200 + etckeeper (0.50) unstable; urgency=low * Add Danish translation of debconf templates. Closes: #597768 @@ -493,6 +825,14 @@ -- Joey Hess Wed, 20 Oct 2010 14:06:21 -0400 +etckeeper (0.49ubuntu1) natty; urgency=low + + * Merge from debian unstable. Remaining changes: + - etckeeper.conf, debian/control: default to bzr. + - etckeeper.spec: Change version to match Ubuntu version + + -- Thierry Carrez (ttx) Fri, 15 Oct 2010 14:43:30 +0200 + etckeeper (0.49) unstable; urgency=low * Ensure that PATH contains the directory containing etckeeper, so @@ -507,6 +847,14 @@ -- Joey Hess Mon, 13 Sep 2010 13:10:43 -0400 +etckeeper (0.48ubuntu1) maverick; urgency=low + + * Merge from debian unstable (LP: #607220). Remaining changes: + - etckeeper.conf, debian/control: default to bzr. + - etckeeper.spec: Change version to match Ubuntu version + + -- Bhavani Shankar Mon, 19 Jul 2010 18:09:04 +0530 + etckeeper (0.48) unstable; urgency=low * Fix backwards test for HGUSER. (Mike Rich) @@ -516,6 +864,14 @@ -- Joey Hess Fri, 16 Jul 2010 15:14:05 -0400 +etckeeper (0.47ubuntu1) maverick; urgency=low + + * Merge from debian unstable (LP: #599129). Remaining changes: + - etckeeper.conf, debian/control: default to bzr. + * etckeeper.spec: Change version to match Ubuntu version + + -- Andres Rodriguez Mon, 28 Jun 2010 03:15:50 -0400 + etckeeper (0.47) unstable; urgency=low * Set HOME=~root so that VCS like bzr do not drop root-owned files in @@ -528,6 +884,19 @@ -- Joey Hess Sun, 30 May 2010 16:50:09 -0400 +etckeeper (0.46ubuntu1) maverick; urgency=low + + * Merge from debian unstable. Remaining changes: + - etckeeper.conf, debian/control: default to bzr. + - debian/cron.daily: Avoid cron emails with daily autocommits if VCS=hg + - commit.d/50vcs-commit: Do not use author so that bzr log --line shows + the right name (and hostname) + - etckeeper: Set HOME=~root if VCS=bzr, so that bzr doesn't create + root-owned .bazaar and .bzr.log in home directories when run under sudo + * etckeeper.spec: Change version to match Ubuntu version + + -- Thierry Carrez Fri, 28 May 2010 12:29:14 +0200 + etckeeper (0.46) unstable; urgency=low * Support etckeeper commit --stdin @@ -594,6 +963,29 @@ -- Joey Hess Tue, 26 Jan 2010 16:20:38 -0500 +etckeeper (0.41ubuntu3) lucid; urgency=low + + * etckeeper: Set HOME=~root if VCS=bzr, so that bzr doesn't create root-owned + .bazaar and .bzr.log in home directories when run under sudo (LP: #376388) + + -- Thierry Carrez Tue, 23 Feb 2010 12:05:55 +0100 + +etckeeper (0.41ubuntu2) lucid; urgency=low + + * commit.d/50vcs-commit: Do not use author so that bzr log --line shows the + right name (and hostname), fixes LP: #496533. + + -- Thierry Carrez Mon, 14 Dec 2009 15:04:23 +0100 + +etckeeper (0.41ubuntu1) lucid; urgency=low + + * Merge from debian testing (LP: #489639), remaining changes: + - etckeeper.conf, debian/control: default to bzr. + - debian/cron.daily: Avoid cron emails with daily autocommits if VCS=hg. + * etckeeper.spec: Change version to match Ubuntu version. + + -- Andres Rodriguez Sat, 28 Nov 2009 12:36:40 -0500 + etckeeper (0.41) unstable; urgency=low * Change etckeeper uninit to not remove .gitignore (etc) file @@ -622,6 +1014,14 @@ -- Joey Hess Fri, 31 Jul 2009 13:47:09 -0400 +etckeeper (0.38ubuntu1) karmic; urgency=low + + * Merge from debian unstable, remaining changes: + - etckeeper.conf, debian/control: default to bzr + - debian/cron.daily: Avoid cron emails with daily autocommits if VCS=hg + + -- Thierry Carrez Thu, 23 Jul 2009 17:28:02 +0200 + etckeeper (0.38) unstable; urgency=low * Use hostname if hostname -f fails. Closes: #533295 @@ -630,6 +1030,18 @@ -- Joey Hess Wed, 08 Jul 2009 14:40:58 -0400 +etckeeper (0.37ubuntu1) karmic; urgency=low + + * Merge from debian unstable, remaining changes: + - etckeeper.conf, debian/control: default to bzr + * debian/postinst: Do the initial commit at installation time (LP: #297920) + * commit.d/50vcs-commit: Avoid etckeeper commit failure if 'hostname -f' + fails (LP: #377265) + * debian/cron.daily: Avoid cron emails with daily autocommits if VCS=hg + (LP: #364344) + + -- Thierry Carrez Tue, 16 Jun 2009 11:02:03 +0200 + etckeeper (0.37) unstable; urgency=low * Make postinst check for the configured VCS before trying to run @@ -657,6 +1069,13 @@ -- Joey Hess Wed, 06 May 2009 14:52:30 -0400 +etckeeper (0.34ubuntu1) karmic; urgency=low + + * Merge from debian unstable, remaining changes: + - etckeeper.conf, debian/control: default to bzr + + -- Thierry Carrez Tue, 05 May 2009 16:01:16 +0200 + etckeeper (0.34) unstable; urgency=low * Add support for mktemp if tempfile is not available. @@ -697,6 +1116,21 @@ -- Joey Hess Mon, 16 Feb 2009 15:40:42 -0500 +etckeeper (0.30ubuntu2) jaunty; urgency=low + + * Avoid relying on USER being set, since for the cronjob, it won't be. + Fix backported from 0.31 (LP: #333243) + + -- Thierry Carrez Mon, 23 Feb 2009 11:16:08 +0000 + +etckeeper (0.30ubuntu1) jaunty; urgency=low + + * Merge from debian unstable, remaining changes: + - etckeeper.conf, debian/control: default to bzr + * Introduces daily autocommits (LP: #321409) + + -- Thierry Carrez Mon, 16 Feb 2009 09:49:20 +0000 + etckeeper (0.30) unstable; urgency=low * Add vim .*.sw? files to default ignores. @@ -721,6 +1155,14 @@ -- Joey Hess Fri, 13 Feb 2009 13:43:02 -0500 +etckeeper (0.28ubuntu1) jaunty; urgency=low + + * Merge from debian unstable. Remaining changes: + * etckeeper.conf: Default to bzr + * debian/control: Default to bzr as well (LP: #321809) + + -- Thierry Carrez Fri, 13 Feb 2009 13:58:42 +0000 + etckeeper (0.28) unstable; urgency=low * Support darcs. Thanks to Gian Piero Carrubba. Closes: #510032 @@ -745,6 +1187,12 @@ -- Joey Hess Sun, 25 Jan 2009 13:55:56 -0500 +etckeeper (0.25ubuntu1) jaunty; urgency=low + + * Default to bzr. (LP: #191680) + + -- Jelmer Vernooij Sun, 25 Jan 2009 16:14:46 +0100 + etckeeper (0.25) unstable; urgency=low * Fix filter_unknown calls. Closes: 509888 @@ -1021,3 +1469,4 @@ * First release. -- Joey Hess Sun, 11 Nov 2007 01:11:21 -0500 + diff -Nru etckeeper-1.18.10/debian/control etckeeper-1.18.10/debian/control --- etckeeper-1.18.10/debian/control 2019-01-16 18:51:37.000000000 +0000 +++ etckeeper-1.18.10/debian/control 2019-04-29 14:24:23.000000000 +0100 @@ -3,13 +3,16 @@ Priority: optional Build-Depends: debhelper-compat (= 11), bats, - bzr (>= 1.5~), + brz, + bzr, dh-python, dpkg-dev (>= 1.9.0), fakeroot, git, python, -Maintainer: Antoine Beaupré + python3, +Maintainer: Ubuntu Developers +XSBC-Original-Maintainer: Antoine Beaupré Standards-Version: 4.3.0 Vcs-Git: https://git.joeyh.name/git/etckeeper.git Vcs-Browser: https://git.joeyh.name/index.cgi/etckeeper.git/ @@ -17,13 +20,11 @@ Package: etckeeper Architecture: all -Depends: git (>= 1:1.7) | mercurial | bzr (>= 1.5~) | darcs, - ${misc:Depends}, - ${python:Depends}, +Depends: git (>= 1:1.7) | mercurial | brz | bzr (>= 1.5~) | darcs, ${misc:Depends}, ${python:Depends}, ${python3:Depends} Recommends: cron-daemon Suggests: sudo (>= 1.7.4p4) Conflicts: bzr (<< 1.5~) -Description: store /etc in git, mercurial, bzr or darcs +Description: store /etc in git, mercurial, brz, bzr or darcs The etckeeper program is a tool to let /etc be stored in a git, mercurial, bzr or darcs repository. It hooks into APT to automatically commit changes made to /etc during package upgrades. It tracks file metadata that version diff -Nru etckeeper-1.18.10/debian/patches/0001-Add-breezy-python3-plugin.patch etckeeper-1.18.10/debian/patches/0001-Add-breezy-python3-plugin.patch --- etckeeper-1.18.10/debian/patches/0001-Add-breezy-python3-plugin.patch 1970-01-01 01:00:00.000000000 +0100 +++ etckeeper-1.18.10/debian/patches/0001-Add-breezy-python3-plugin.patch 2019-04-29 14:24:23.000000000 +0100 @@ -0,0 +1,78 @@ +From b5919d7919dda614c3c3c76ba126f45e205494bd Mon Sep 17 00:00:00 2001 +From: Dimitri John Ledkov +Date: Mon, 29 Apr 2019 14:11:09 +0100 +Subject: [PATCH 1/3] Add breezy python3 plugin + +--- + Makefile | 3 +++ + debian/changelog | 6 ++++++ + debian/control | 6 +++--- + etckeeper-brz/__init__.py | 34 ++++++++++++++++++++++++++++++++++ + 4 files changed, 46 insertions(+), 3 deletions(-) + create mode 100644 etckeeper-brz/__init__.py + +Index: etckeeper-1.18.10/Makefile +=================================================================== +--- etckeeper-1.18.10.orig/Makefile ++++ etckeeper-1.18.10/Makefile +@@ -16,11 +16,13 @@ INSTALL=install + INSTALL_EXE=${INSTALL} + INSTALL_DATA=${INSTALL} -m 0644 + PYTHON=python ++PYTHON3=python3 + FAKEROOT := $(shell command -v fakeroot 2> /dev/null) + TESTDIR := $(shell mktemp -u -d) + + build: etckeeper.spec etckeeper.version + -$(PYTHON) ./etckeeper-bzr/__init__.py build || echo "** bzr support not built" ++ -$(PYTHON3) ./etckeeper-brz/__init__.py build || echo "** bzr support not built" + -$(PYTHON) ./etckeeper-dnf/etckeeper.py build || echo "** DNF support not built" + + install: etckeeper.version +@@ -66,6 +68,7 @@ ifeq ($(HIGHLEVEL_PACKAGE_MANAGER),zyppe + $(INSTALL) zypper-etckeeper.py $(DESTDIR)$(prefix)/lib/zypp/plugins/commit/zypper-etckeeper.py + endif + -$(PYTHON) ./etckeeper-bzr/__init__.py install --root=$(DESTDIR) ${PYTHON_INSTALL_OPTS} || echo "** bzr support not installed" ++ -$(PYTHON3) ./etckeeper-brz/__init__.py install --root=$(DESTDIR) ${PYTHON_INSTALL_OPTS} || echo "** brz support not installed" + echo "** installation successful" + + clean: etckeeper.spec etckeeper.version +Index: etckeeper-1.18.10/etckeeper-brz/__init__.py +=================================================================== +--- /dev/null ++++ etckeeper-1.18.10/etckeeper-brz/__init__.py +@@ -0,0 +1,34 @@ ++# ++# Breezy plugin that runs etckeeper pre-commit when necessary ++ ++"""Runs etckeeper pre-commit when necessary.""" ++ ++from breezy.errors import BzrError ++import os ++ ++def etckeeper_startcommit_hook(tree): ++ abspath = getattr(tree, "abspath", None) ++ if abspath is None or not os.path.exists(abspath(".etckeeper")): ++ # Only run the commit hook when this is an etckeeper branch ++ return ++ import subprocess ++ ret = subprocess.call(["etckeeper", "pre-commit", abspath(".")]) ++ if ret != 0: ++ raise BzrError("etckeeper pre-commit failed") ++ ++try: ++ from breezy.hooks import install_lazy_named_hook ++except ImportError: ++ from breezy.mutabletree import MutableTree ++ MutableTree.hooks.install_named_hook('start_commit', ++ etckeeper_startcommit_hook, 'etckeeper') ++else: ++ install_lazy_named_hook( ++ "breezy.mutabletree", "MutableTree.hooks", ++ 'start_commit', etckeeper_startcommit_hook, 'etckeeper') ++ ++if __name__ == "__main__": ++ from distutils.core import setup ++ setup(name="brz-etckeeper", ++ packages=["breezy.plugins.etckeeper"], ++ package_dir={"breezy.plugins.etckeeper":"etckeeper-brz"}) diff -Nru etckeeper-1.18.10/debian/patches/0002-Default-to-UTF8-encoding-for-consistent-ordering.patch etckeeper-1.18.10/debian/patches/0002-Default-to-UTF8-encoding-for-consistent-ordering.patch --- etckeeper-1.18.10/debian/patches/0002-Default-to-UTF8-encoding-for-consistent-ordering.patch 1970-01-01 01:00:00.000000000 +0100 +++ etckeeper-1.18.10/debian/patches/0002-Default-to-UTF8-encoding-for-consistent-ordering.patch 2019-04-29 14:24:23.000000000 +0100 @@ -0,0 +1,39 @@ +From 10d74939aeff32d6638b905ec248ccd6f37fe512 Mon Sep 17 00:00:00 2001 +From: Dimitri John Ledkov +Date: Mon, 29 Apr 2019 14:11:51 +0100 +Subject: [PATCH 2/3] Default to UTF8 encoding, for consistent ordering + +--- + debian/changelog | 1 + + etckeeper | 4 ++++ + pre-commit.d/30store-metadata | 2 +- + 3 files changed, 6 insertions(+), 1 deletion(-) + +Index: etckeeper-1.18.10/etckeeper +=================================================================== +--- etckeeper-1.18.10.orig/etckeeper ++++ etckeeper-1.18.10/etckeeper +@@ -54,6 +54,10 @@ fi + if [ ! -z "$AVOID_SPECIAL_FILE_WARNING" ]; then + export AVOID_SPECIAL_FILE_WARNING + fi ++if [ -z "$LANG" ]; then ++ # Default to UTF8 encoding, if unset ++ export LANG=C.UTF-8 ++fi + + if [ ! -z "$PUSH_REMOTE" ]; then + export PUSH_REMOTE +Index: etckeeper-1.18.10/pre-commit.d/30store-metadata +=================================================================== +--- etckeeper-1.18.10.orig/pre-commit.d/30store-metadata ++++ etckeeper-1.18.10/pre-commit.d/30store-metadata +@@ -2,7 +2,7 @@ + set -e + + # Make sure sort always sorts in same order. +-LANG=C ++LANG=C.UTF-8 + export LANG + + filter_ignore() { diff -Nru etckeeper-1.18.10/debian/patches/series etckeeper-1.18.10/debian/patches/series --- etckeeper-1.18.10/debian/patches/series 1970-01-01 01:00:00.000000000 +0100 +++ etckeeper-1.18.10/debian/patches/series 2019-04-29 14:24:23.000000000 +0100 @@ -0,0 +1,2 @@ +0001-Add-breezy-python3-plugin.patch +0002-Default-to-UTF8-encoding-for-consistent-ordering.patch diff -Nru etckeeper-1.18.10/debian/rules etckeeper-1.18.10/debian/rules --- etckeeper-1.18.10/debian/rules 2019-01-16 18:51:37.000000000 +0000 +++ etckeeper-1.18.10/debian/rules 2019-04-29 14:24:23.000000000 +0100 @@ -3,7 +3,7 @@ export PYTHON_INSTALL_OPTS=--install-layout=deb %: - dh $@ --with python2 + dh $@ --with python2,python3 override_dh_installdocs: dh_installdocs -X.gitignore @@ -11,3 +11,8 @@ override_dh_auto_install: dh_auto_install rm debian/etckeeper/usr/lib/python2.7/dist-packages/bzrlib/plugins/etckeeper/__init__.pyc + +override_dh_python3: + dh_python3 + # python is actually optional, if brz/bzr are installed + sed '/^python:Depends/d;/^python3:Depends/d' -i debian/etckeeper.substvars