--- etckeeper-1.18.2.orig/Makefile +++ etckeeper-1.18.2/Makefile @@ -7,7 +7,8 @@ prefix=/usr bindir=${prefix}/bin etcdir=/etc -mandir=${prefix}/share/man +sharedir=${prefix}/share +mandir=${sharedir}/man vardir=/var CP=cp -R INSTALL=install @@ -27,8 +28,8 @@ $(INSTALL_EXE) etckeeper $(DESTDIR)$(bindir)/etckeeper mkdir -p $(DESTDIR)$(mandir)/man8 $(INSTALL_DATA) etckeeper.8 $(DESTDIR)$(mandir)/man8/etckeeper.8 - mkdir -p $(DESTDIR)$(etcdir)/bash_completion.d - $(INSTALL_DATA) bash_completion $(DESTDIR)$(etcdir)/bash_completion.d/etckeeper + mkdir -p $(DESTDIR)$(sharedir)/bash-completion/completions + $(INSTALL_DATA) bash_completion $(DESTDIR)$(sharedir)/bash-completion/completions/etckeeper ifeq ($(HIGHLEVEL_PACKAGE_MANAGER),apt) mkdir -p $(DESTDIR)$(etcdir)/apt/apt.conf.d $(INSTALL_DATA) apt.conf $(DESTDIR)$(etcdir)/apt/apt.conf.d/05etckeeper @@ -59,11 +60,11 @@ rm -rf build etckeeper.spec: - sed -i~ "s/Version:.*/Version: $$(perl -e '$$_=<>;print m/\((.*?)\)/';m/\((.*?)(-.*)?\)/;print $$1;';print m/\((.*?)\)/';m/\((.*?)(-.*)?\)/;print $$1;' Mon, 08 Feb 2016 17:21:33 -0800 + +etckeeper (1.18.2-1) unstable; urgency=medium + + * Prepare upload to Debian unstable + * Fix Makefile version patterns to ignore non-native version number + * Fix lintian warnings: + * remove .pyc files on build + * install bash completions in standard location + * ignore missing debian/config file, we ask only on purge on purpose + * ignore full path for /usr/bin/etckeeper, we use it to stash it for + later + * Update to standards 3.9.6, no change + * Remove obsolete XS-Python-Version field + * Run debconf-updatepo, outdating a bunch of translations + + -- Antoine Beaupré Thu, 14 Jan 2016 15:20:40 -0500 + etckeeper (1.18.2) unstable; urgency=medium * Use getent utility instead of perl. (Elan Ruusamäe) @@ -8,6 +41,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) @@ -45,6 +103,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 @@ -84,6 +171,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. @@ -100,6 +202,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 @@ -138,12 +261,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 @@ -179,6 +333,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. @@ -204,6 +374,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. @@ -222,6 +413,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 @@ -231,6 +436,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 @@ -259,6 +474,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 @@ -266,6 +508,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. @@ -280,6 +538,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. @@ -291,6 +559,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 ] @@ -310,6 +588,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 @@ -317,6 +605,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 @@ -327,6 +625,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 @@ -340,6 +653,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 @@ -354,6 +675,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) @@ -363,6 +692,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 @@ -375,6 +712,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 @@ -441,6 +791,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 @@ -469,6 +842,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 @@ -477,6 +858,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 @@ -504,6 +897,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. @@ -544,6 +944,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. @@ -568,6 +983,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 @@ -592,6 +1015,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 @@ -868,3 +1297,4 @@ * First release. -- Joey Hess Sun, 11 Nov 2007 01:11:21 -0500 + --- etckeeper-1.18.2.orig/debian/changelog.d +++ etckeeper-1.18.2/debian/changelog.d @@ -0,0 +1,886 @@ +etckeeper (1.18.2-1) unstable; urgency=medium + + * Prepare upload to Debian unstable + * Fix Makefile version patterns to ignore non-native version number + * Fix lintian warnings: + * remove .pyc files on build + * install bash completions in standard location + * ignore missing debian/config file, we ask only on purge on purpose + * ignore full path for /usr/bin/etckeeper, we use it to stash it for + later + * Update to standards 3.9.6, no change + * Remove obsolete XS-Python-Version field + * Run debconf-updatepo, outdating a bunch of translations + + -- Antoine Beaupré Thu, 14 Jan 2016 15:20:40 -0500 + +etckeeper (1.18.2) unstable; urgency=medium + + * Use getent utility instead of perl. (Elan Ruusamäe) + * Initial FreeBSD support with pkgng plugin. (William Johansson) + * Fix README.md symlink in package (Sebastian Schmidt, Antoine Beaupré, + closes: #791566) + * Fix typo of GIT_COMMITTER_EMAIL. + + -- Joey Hess Tue, 04 Aug 2015 10:13:08 -0400 + +etckeeper (1.18.1) unstable; urgency=medium + + * Add myself as maintainer (Closes: #768516) + * Keeping the package native as I do not intend to diverge from + upstream. + * Update git URL in control file. + + -- Antoine Beaupré Sat, 21 Mar 2015 18:30:07 -0400 + +etckeeper (1.18) unstable; urgency=medium + + * Send yum pre-commit output to /dev/null + Thanks, Andrew Colin Kissa + * Set LANG=C internally when doing some operations that have + been reported to fail in other locales. + + -- Joey Hess Sat, 14 Mar 2015 13:24:07 -0400 + +etckeeper (1.17) unstable; urgency=medium + + * Fix name of DNF plugin. + * Add --version + Thanks Andreas Wansner. + * New website, http://etckeeper.branchable.com/ + * Add build-depends on dh-python. + + -- Joey Hess Mon, 22 Dec 2014 16:42:26 -0400 + +etckeeper (1.16) unstable; urgency=medium + + * Added support for Fedora's DNF highlevel package manager. + Thanks, Peter Listiak and Petr Spacek. + * Add architecture info to dpkg list-installed. Closes: #768145 + * Orphaned the Debian package. + + -- Joey Hess Fri, 07 Nov 2014 21:30:50 -0400 + +etckeeper (1.15) unstable; urgency=medium + + * Recommend cron-daemon, rather than cron, as etckeeper only needs + cron.daily functionality. Closes: #762721 + + -- Joey Hess Thu, 16 Oct 2014 12:21:48 -0400 + +etckeeper (1.14) unstable; urgency=medium + + * Handle failure to commit in post-install, pre-install by showing a + warning, rather than propigating the error to apt. + This avoids breaking the apt run when eg, git is misconfigured and + cannot commit. + pre-install already did this when it was able to use debconf to display a + message, but now debconf is not used, and it always behaves this way. + Closes: #760011 + + -- Joey Hess Thu, 04 Sep 2014 15:47:32 -0400 + +etckeeper (1.13) unstable; urgency=medium + + * Ignore check-mk-agent-logwatch's FHS violating + /etc/check_mk/logwatch.state. Closes: #753903 + * Only allow [-a-z_] in etckeeper commands to avoid any possible directory + traversal etc issues. + * update-ignore, uninit: Fix parsing of ignore files containing '\' + + -- Joey Hess Sat, 09 Aug 2014 13:05:55 -0400 + +etckeeper (1.12) unstable; urgency=medium + + * Portability fixes. Thanks, Harald Dunkel. + * Add support for pushing to multiple remote repositories. + Thanks, Rouben. + * Fix handling of git ignores like dir/* + Thanks, Pim van den Berg + + -- Joey Hess Fri, 13 Jun 2014 12:03:06 -0400 + +etckeeper (1.11) unstable; urgency=low + + * Fix too broad matching of .gitignored files. + Closes: #732339 + + -- Joey Hess Tue, 17 Dec 2013 22:24:29 -0400 + +etckeeper (1.10) unstable; urgency=low + + * Remove lvm/backup from default ignores, because lvm + documentation recommends backing that up, for use by + vgcfgrestore. + * Fix exporting of some git variables. Closes: #728583 + + -- Joey Hess Sun, 03 Nov 2013 12:14:02 -0400 + +etckeeper (1.9) unstable; urgency=low + + * Fix git update-ignore syntax. Closes: #721873 + + -- Joey Hess Wed, 04 Sep 2013 21:43:42 -0400 + +etckeeper (1.8) unstable; urgency=low + + * Avoid listing .gitignored files in .etckeeper file. Closes: #607665 + Thanks, Zdenek Crha + + -- Joey Hess Wed, 04 Sep 2013 09:31:37 -0400 + +etckeeper (1.7) unstable; urgency=low + + * Fix hilarious typo hardcoding my name. Closes: #718425 + + -- Joey Hess Wed, 31 Jul 2013 11:33:45 -0400 + +etckeeper (1.6) unstable; urgency=low + + * Guard git config calls. Closes: #717957 + + -- Joey Hess Sat, 27 Jul 2013 12:24:30 -0400 + +etckeeper (1.5) unstable; urgency=low + + * Quote user and group names, in case one contains a space. + * Added support for the pacman package manager. + (Thanks, Tiago Stürmer Daitx) + * Use user.name and user.email from the .gitconfig file belonging to the + user who sued or sudoed to root, in preference to making up values for + that user. + * cron.daily: Fix typo in stale lockfile handling code. + Closes: #717908 + + -- Joey Hess Fri, 26 Jul 2013 11:03:48 -0400 + +etckeeper (1.4) unstable; urgency=low + + * Deal with unix^wlinux portability nonsense. + + -- Joey Hess Mon, 17 Jun 2013 12:00:59 -0400 + +etckeeper (1.3) unstable; urgency=low + + * Fix type -p bashism that crept in via recent patches. Closes: #707319 + + -- Joey Hess Wed, 08 May 2013 22:36:30 -0400 + +etckeeper (1.2) unstable; urgency=low + + * Call type -p in a more compatable way. + * When a file is owned by a uid or a gid with no corresponding user or + group, put a numeric chown into .etckeeper. Previously, a broken + chown was outputted. + + -- Joey Hess Wed, 08 May 2013 11:51:51 -0400 + +etckeeper (1.1) unstable; urgency=low + + * Fix warning when PUSH_REMOTE is not set. Closes: #706917 + + -- Joey Hess Mon, 06 May 2013 09:49:24 -0400 + +etckeeper (1.0) unstable; urgency=low + + [ Joey Hess ] + * Unset GIT_DIR and GIT_WORK_TREE. Closes: #689101 + * PUSH_REMOTE can be set to automatically push to a remote on commit. + Thanks, L. Alberto Giménez + * Ignore fake-hwclock.data. Closes: #701491 + + [ Jelmer Vernooij ] + * Auto-detect the VCS setting if there already is a repository in + /etc. + + -- Joey Hess Sat, 04 May 2013 23:45:25 -0400 + +etckeeper (0.64) unstable; urgency=low + + * Added support for openSUSE's zypper package manager. + Thanks, Catalin Iacob + * Add Brazilian Portuguese debconf translation. + Closes: #685771 Thanks, Adriano Rafael Gomes + + -- Joey Hess Sat, 25 Aug 2012 11:53:08 -0400 + +etckeeper (0.63) unstable; urgency=low + + * bzr: Improve detection of unclean repos, to work when there are shelved + changes. + * uninit: Now preserves parts of the gitignore and similar files that + are outside the managed by etckeeper block. Closes: #673996 + Thanks, David De La Harpe Golden (Squared Financial) + + -- Joey Hess Sat, 02 Jun 2012 18:22:37 -0400 + +etckeeper (0.62) unstable; urgency=low + + * Autocommit git staged files. Closes: #662614 + + -- Joey Hess Mon, 05 Mar 2012 10:41:46 -0400 + +etckeeper (0.61) unstable; urgency=low + + * Fix up botched git-rm conffile removal from 0.58. + The file could be in any of three states; absent, present, or .dpkg-dist. + Finish fully removing it. Closes: #655836 + + -- Joey Hess Sat, 14 Jan 2012 12:42:50 -0400 + +etckeeper (0.60) unstable; urgency=low + + * Updated Dutch translation of debconf templates. Closes: #654244 + * Support -h and --help. Closes: #654188 + * Fix typo in bugfix for #651168. + * Improve yum hook to avoid running if etckeeper was just removed. + Thanks, Mykola Marzhan + + -- Joey Hess Fri, 06 Jan 2012 19:23:42 -0400 + +etckeeper (0.59) unstable; urgency=low + + * Add /etc/cups/subscriptions.conf to default ignores, as the content of + this file does not normally contain configuration and it changes + frequently. Closes: #651168 + * Shell quoting fix. Thanks, Daniel Hahler + + -- Joey Hess Thu, 22 Dec 2011 11:48:50 -0400 + +etckeeper (0.58) unstable; urgency=low + + * Changed to store all permissions of files and directories, even those + with standard permissions of 644 and 755. This is unfortunately necessary + in order to support etckeeper init on a checkout that was made with a + nonstandard umask, in which case the files that were expected to be + 644 and 755, won't be. Closes: #649701 + Thanks to Дмитрий Матросов for reporting the bug and developing + a fixup script (attached to the bug) which could be used if you've + already encountered this problem. + * Bugfix for filenames containing single quotes. + * Use git add -A, which automatically removes deleted files, + and avoids a separate call to git add -u. + Thanks to Miklos Vajna, whose patch in 2008 was deferred + because -A was then too new, and languished in a branch until found today. + * Optimised metadata storage. + * cron.daily: Don't stop committing when a stale packagelist.pre-install + file exists. + Thanks to gulikoza for noticing this bug. + + -- Joey Hess Fri, 25 Nov 2011 20:03:36 -0400 + +etckeeper (0.57) unstable; urgency=low + + * Use find -path instead of less portable find -wholename. + + -- Joey Hess Fri, 04 Nov 2011 17:03:46 -0400 + +etckeeper (0.56) unstable; urgency=low + + * Converted to use dh_python2. Closes: #616800 + * Handle files with % in their names. + + -- Joey Hess Tue, 12 Jul 2011 14:38:09 -0400 + +etckeeper (0.55) unstable; urgency=low + + * Fix error propigation to yum, which makes AVOID_COMMIT_BEFORE_INSTALL work. + Closes: https://bugzilla.redhat.com/show_bug.cgi?id=709487 + Thanks, Thomas Moschny + * Avoid being noisy in post-install after automatic yum updates. + (Tuomo Soini) + * Ignore FHS violating prelink.cache and openvpn-status.log. + * Ignore *.LOCK files, as used by selinux policies. + * Add AVOID_SPECIAL_FILE_WARNING to config file, and set it in cron + job to avoid daily noise. (gulikoza) + + -- Joey Hess Sun, 19 Jun 2011 15:21:20 -0400 + +etckeeper (0.54) unstable; urgency=low + + * Ignore inssev's FHS violating /etc/init.d/.depend.* files. + Closes: #619407 See #619409 + * Use hg pre-commit hook, rather than its precommit hook, + as the latter is run after the files staged for commit are + determined and so .etckeeper cannot be staged as part of the current + commit. Closes: #621827 + + -- Joey Hess Mon, 30 May 2011 18:11:40 -0400 + +etckeeper (0.53) unstable; urgency=low + + [ Joey Hess ] + * Install bzr hook lazily, clean up some compatibility code. (Jelmer Vernooij) + + [ Josh Triplett ] + * Only set environment variables for commit authorship (EMAIL, + GIT_AUTHOR_NAME, GIT_AUTHOR_EMAIL, GIT_COMMITTER_EMAIL) if they don't + already exist. + + [ Joey Hess ] + * Add .pyc and .pyo files to ignore. + * Add lvm/backup and lvm/cache to ignore. Closes: #462355 + * Avoid warning about special or hard linked files that are ignored + by hg. Thanks Sjoerd Mullender for patch. + Closes: https://bugzilla.redhat.com/show_bug.cgi?id=688991 + + -- Joey Hess Fri, 18 Mar 2011 15:37:54 -0400 + +etckeeper (0.52) unstable; urgency=low + + * Rewrote 50git-rm to avoid using git ls-files, and thus avoid encoding + problems with filenames. + + -- Joey Hess Sun, 06 Feb 2011 00:00:55 -0400 + +etckeeper (0.51) unstable; urgency=low + + * Updated Vietnamese translation of debconf templates. Closes: #601921 + * Improve rpm version change detection. + * Move etckeeper out of sbin, to avoid needing to work around broken + root PATH settings in eg, crontab. Closes: #602438 + * Added Polish translation of debconf templates. Closes: #607563 + + -- Joey Hess Sat, 25 Dec 2010 14:39:57 -0400 + +etckeeper (0.50) unstable; urgency=low + + * Add Danish translation of debconf templates. Closes: #597768 + * Ignore /etc/.initctl. Closes: #598121 + * Do not warn about special files or hardlinks if they are ignored by + git. Fixes #549354 for git, but not for other VCSs. + * Set GIT_COMMITTER_EMAIL to root@$hostname to avoid git prompting + the user to configure it in .gitconfig. Closes: #599749 + * Deal with strange systems that include the domain name in the hostname, + by stripping it. Closes: #600026 + + -- Joey Hess Wed, 20 Oct 2010 14:06:21 -0400 + +etckeeper (0.49) unstable; urgency=low + + * Ensure that PATH contains the directory containing etckeeper, so + that hook scripts that re-exec etckeeper are guaranteed to find it. + * Ignore -m switch to etckeeper commit, in case someone tries to use + it with that option common to several VCS. Closes: #592050 + * Remove HOME setting in etckeeper. sudo now defaults to setting HOME + itself as of version 1.7.4p4, so it is not necessary for etckeeper + to work around its behavior anymore. (sudo also allows disabling that + for those who enjoy using guns around feet.) Closes: #583899 + * Fix file quoting problem in processing .etckeeper file in init. + + -- Joey Hess Mon, 13 Sep 2010 13:10:43 -0400 + +etckeeper (0.48) unstable; urgency=low + + * Fix backwards test for HGUSER. (Mike Rich) + Closes: #589242 + * 'etckeeper vcs' can be used to run arbitrary VCS subcommands + in the etckeeper environment. (Thanks, Stefan Tomanek) + + -- Joey Hess Fri, 16 Jul 2010 15:14:05 -0400 + +etckeeper (0.47) unstable; urgency=low + + * Set HOME=~root so that VCS like bzr do not drop root-owned files in + user home directory when sudo etckeeper is run. Closes: #583581 + * hg: Set HGUSER (if not already set) to avoid warning message when + committing. Closes: #533298 + * Both git and bzr default to showing the author of a commit, + and not the committer. So, set the author to the user running sudo + for both. The committer will then be root. + + -- Joey Hess Sun, 30 May 2010 16:50:09 -0400 + +etckeeper (0.46) unstable; urgency=low + + * Support etckeeper commit --stdin + * Fix bug where after a large upgrade, etckeeper's automatic commit message + was so long it exceeded command line length limits. Closes: #581678 + + -- Joey Hess Sun, 16 May 2010 19:10:57 -0400 + +etckeeper (0.45) unstable; urgency=low + + * Revert darcs to using --logfile again, necessary for multiline commit + messages. Closes: #577915 + * Fix logic error in darcs user code. Closes: #577918 + + -- Joey Hess Thu, 15 Apr 2010 11:50:22 -0400 + +etckeeper (0.44) unstable; urgency=low + + * Add example to README of how to automatically push changes to a backup + repository. + * Add fuse lock file to ignore list. + * Changed darcs to specify --author instead of noting the committing + user inside the commit log. + * Add -a to DARCS_COMMIT_OPTIONS so commits are noninteractive by default, + but users who want darcs prompting can disable it. + * Use darcs record -m to specify commit message, instead of using a logfile. + * Closes: #519228 + * Update depends for git-core to git transition. Closes: #577732 + * Avoid using hostname -f, since on Solaris that sets the hostname to -f. + Yay, Unix portability! (Instead, use dnsdomainname if available, and + otherwise, fall back to the unqualified hostname.) + * Other portability fixes for non-GNU tools and OS X. Thanks, Neil Mayhew. + + -- Joey Hess Wed, 14 Apr 2010 15:43:14 -0400 + +etckeeper (0.43) unstable; urgency=low + + * Fix cleanup of /var/cache/etckeeper/packagelist.pre-install after + an upgrade where no conffiles are changed. + * Prevent cron job autocommit from happening if pre-install file + is present, to avoid committing state in the middle of an apt run. + Closes: #567538 + * Add /etc/webmin/webmin/oscache to ignore list. Closes: #567255 + * Check owner of tty to determine who has su'd to root when committing, + based on a patch by Jakov Sosic. + * Add apparmor.d/cache/ to default ignores. + * Record real committer username in the darcs log, so that the man page + can say that for every VCS the username is recorded. + + -- Joey Hess Thu, 18 Feb 2010 14:01:45 -0500 + +etckeeper (0.42) unstable; urgency=low + + * Deal with removal of the cache directory. Closes: #559418 + * Add ucf backups to ignore list. (See #462355) + * Add webmin fsdump status files to ignore list. Closes: #567000 + * Add *.old to ignore list (See #462355) + * Add *.elc to ignore list (See #491401) + * Add ntp.conf.dhcp and X11/xdm/authdir/authfiles/* to ignore list. + Closes: #491401 + * Fix handling of "#*#" ignores for git and hg. + * Add runit and daemontools supervise files to ignore list. + Closes: #529253 + + -- Joey Hess Tue, 26 Jan 2010 16:20:38 -0500 + +etckeeper (0.41) unstable; urgency=low + + * Change etckeeper uninit to not remove .gitignore (etc) file + if it lacks the "managed by etckeeper" comment. Closes: #545137 + * Fix hgrc setup code to not warn if the hgrc already contains + a call to etckeeper. (Thanks, Jakov Sosic) + * Updated Czech debconf translation from Miroslav Kure. Closes: #546411 + + -- Joey Hess Sat, 26 Sep 2009 15:58:15 -0400 + +etckeeper (0.40) unstable; urgency=low + + * Add Spanish debconf translation. Closes: #539589 + * Updated Italian debconf translation. Closes: #540516 + * Avoid infinite loop when displaying message about failure + to commit changes in /etc. Closes: #540596 + + -- Joey Hess Sat, 08 Aug 2009 21:21:27 -0400 + +etckeeper (0.39) unstable; urgency=low + + * Document ETCKEEPER_CONF_DIR in man page. + * Typo. Closes: #536799 + * bzr: Set author to root when committing via sudo. Committer + will be the sudo user, as it is in git. + + -- Joey Hess Fri, 31 Jul 2009 13:47:09 -0400 + +etckeeper (0.38) unstable; urgency=low + + * Use hostname if hostname -f fails. Closes: #533295 + * Automatically commit on initial install, so users can + begin relying on etckeeper right away. Closes: #533290 + + -- Joey Hess Wed, 08 Jul 2009 14:40:58 -0400 + +etckeeper (0.37) unstable; urgency=low + + * Make postinst check for the configured VCS before trying to run + etckeeper init. Closes: #530497 + * Update French debconf translation. Closes: #530795 + * Fix typo in cruft file. Closes: #530819 + * Update Portuguese debconf translation. Closes: #528109 + * Update German debconf translation. Closes: #532346 + + -- Joey Hess Mon, 08 Jun 2009 13:24:13 -0400 + +etckeeper (0.36) unstable; urgency=low + + * Add cruft ignore file. Closes: #522513 + * Update Japanese debconf translation. Closes: #527921 + * Update Swedish debconf translation. Closes: #528575 + * Update Russian debconf translation. Closes: #528798 + + -- Joey Hess Sat, 16 May 2009 18:22:49 -0400 + +etckeeper (0.35) unstable; urgency=low + + * Make etckeeper uninit -f disable the prompt. + * Uninit on purge, guarded by a debconf prompt. Closes: #527218 + + -- Joey Hess Wed, 06 May 2009 14:52:30 -0400 + +etckeeper (0.34) unstable; urgency=low + + * Add support for mktemp if tempfile is not available. + * Fix uninit prompt to accept 'y' as well as 'yes'. Closes: #517911 + * README: Typo. Closes: #517914 + + -- Joey Hess Mon, 02 Mar 2009 17:01:09 -0500 + +etckeeper (0.33) unstable; urgency=low + + * Add support for yum. Thanks, Jimmy Tang. + + -- Joey Hess Wed, 25 Feb 2009 14:38:12 -0500 + +etckeeper (0.32) unstable; urgency=low + + * Add uninit subcommand, which cleans up all etckeeper and VCS droppings + in /etc. This is useful if you want to switch to a different VCS and + don't have any history to preserve. (Preserving history and converting + is of course possible, but significantly harder.) + * Run etckeeper init on initial install. Closes: #505772 + (The idea being that if someone doesn't want to use git, they can + immediatly uninit to easily reverse this.) + * Document how to change the VCS used by etckeeper, without preserving + any history. Preserving history left as an exersise for the reader. + Closes: #515237 + * Implement list-installed for rpm. + * Added a spec file contributed by Jimmy Tang. + + -- Joey Hess Tue, 24 Feb 2009 23:01:55 -0500 + +etckeeper (0.31) unstable; urgency=low + + * Avoid relying on USER being set, won't be for cron job. + Closes: #515602 + * Add .sw? to ignores. vim uses that if editing an + unspecified file name. Closes: #515628 + + -- Joey Hess Mon, 16 Feb 2009 15:40:42 -0500 + +etckeeper (0.30) unstable; urgency=low + + * Add vim .*.sw? files to default ignores. + * Also add emacs #*# autosave files to default ignores. + * And DEADJOE files, for good measure. + * etckeeper update-ignore will automatically update the VCS ignore + file, only touching the part inside a "# managed by etckeeper" + comment block. (You may want to add such a comment block to your existing + .gitignore, or delete the file and regenerate it.) + * Run etckeeper update-ignore on upgrade. + * Fix handling of -d in recursive calls to etckeeper + + -- Joey Hess Sat, 14 Feb 2009 01:21:22 -0500 + +etckeeper (0.29) unstable; urgency=low + + * Add a daily cron job to autocommit changes to /etc. Closes: #515100 + The cron job is enabled by default but can be disabled + via etckeeper.conf. + (Thanks to Thierry Carrez) + * Fix executable bits on two darcs support scripts. + + -- Joey Hess Fri, 13 Feb 2009 13:43:02 -0500 + +etckeeper (0.28) unstable; urgency=low + + * Support darcs. Thanks to Gian Piero Carrubba. Closes: #510032 + + -- Joey Hess Thu, 12 Feb 2009 17:13:23 -0500 + +etckeeper (0.27) unstable; urgency=low + + * Use SUDO_USER as the committer if set. Closes: #498739 + (Thierry Carrez) + * bzr: Avoid use of etckeeper pre-commit on Trees not on the + filesystem. (Jelmer Vernooij) + + -- Joey Hess Sun, 01 Feb 2009 17:20:11 -0500 + +etckeeper (0.26) unstable; urgency=low + + * Add Japanese debconf translation. Closes: #512869 + * Prevent git from removing a directory when the last file in it + has been removed, but the directory is left existing and empty, + by touching a flag file before calling git rm. Closes: 513006 + + -- Joey Hess Sun, 25 Jan 2009 13:55:56 -0500 + +etckeeper (0.25) unstable; urgency=low + + * Fix filter_unknown calls. Closes: 509888 + + -- Joey Hess Wed, 31 Dec 2008 13:01:31 -0500 + +etckeeper (0.24) unstable; urgency=low + + * Make .etckeeper test that files actually exist + before acting on them. Closes: #509888 + + -- Joey Hess Mon, 29 Dec 2008 15:37:25 -0500 + +etckeeper (0.23) unstable; urgency=low + + * Fix hook scripts to use new etckeeper path. Closes: #509742 + + -- Joey Hess Thu, 25 Dec 2008 16:25:25 -0500 + +etckeeper (0.22) unstable; urgency=low + + * Move etckeeper to sbin, and man page to section 8, since only an admin + can really use etckeeper. Closes: #509152 + * Mention README file from man page. + * Build using python-central. For some reason bzr does not pick up on + plugins built using python-support. + + -- Joey Hess Tue, 23 Dec 2008 18:51:14 -0500 + +etckeeper (0.21) unstable; urgency=low + + * Swedish debconf translation from Martin Ågren. Closes: #492063 + * Make etckeeper init -d set up commit hooks that call etckeeper -d. + (Note that if you've relied on it setting up such commit hooks for a repo + outside of /etc already, it created broken ones that need to be fixed to use + -d.) + Thanks, Wolfgang Karall. + + -- Joey Hess Thu, 11 Sep 2008 16:41:16 -0400 + +etckeeper (0.20) unstable; urgency=low + + [ Jelmer Vernooij ] + * Use new Bazaar API. + * Pass --quiet to bzr add to avoid new files from being printed twice. + * Don't consider warnings from bzr plugins when checking if tree was + modified. + + -- Joey Hess Mon, 07 Jul 2008 12:04:30 -0400 + +etckeeper (0.19) unstable; urgency=low + + * Patch from Miklos Vajna to fix one more git- command that crept in. + + -- Joey Hess Sat, 05 Jul 2008 08:34:22 -0400 + +etckeeper (0.18) unstable; urgency=low + + * Allow AVOID_COMMIT_BEFORE_INSTALL to be set to zero to disable. + * Don't allow LC_COLLATE to reorder the .etckeeper file. Closes: #489057 + + -- Joey Hess Thu, 03 Jul 2008 00:47:40 -0400 + +etckeeper (0.17) unstable; urgency=low + + * Fix backwards test for AVOID_COMMIT_BEFORE_INSTALL. Closes: #486922 + + -- Joey Hess Wed, 18 Jun 2008 20:36:52 -0400 + +etckeeper (0.16) unstable; urgency=low + + [ Joey Hess] + * Add a AVOID_COMMIT_BEFORE_INSTALL option in the config file to make it + easy to configure etckeeper to abort an installation if there are + uncommitted changes in /etc. Closes: #478754 + + -- Joey Hess Mon, 16 Jun 2008 19:21:16 -0400 + +etckeeper (0.15) unstable; urgency=low + + [ Daniel Hahler ] + * bzr: Set nickname for tree in init.d/40vcs-init. + * Add script to add new files during "commit" for bzr (commit.d/30bzr-add). + Closes: #477321 + * Fix handling of files with spaces, by setting IFS to "newline" in + commit.d/40git-rm. + + [ Jelmer Vernooij ] + * Support for the new bzr pre-commit hook. This requires bzr version 1.4. + Closes: #473069 + * Remove pointless commit.d/40bzr-rm script. + + [ Joey Hess ] + * debhelper v7; rules file minimisation + + -- Joey Hess Sat, 03 May 2008 15:08:12 -0400 + +etckeeper (0.14.2) unstable; urgency=low + + * Handle nonzero exit status when building package list diff. + + -- Joey Hess Thu, 17 Apr 2008 13:00:29 -0400 + +etckeeper (0.14.1) unstable; urgency=low + + * Fix typo in bzr-precommit script. Closes: #473069 + This is an interim fix -- full bzr precommit support has been implemented, + but the bzr that supports it is not yet released. + * Fix handling of files with spaces, by setting IFS to NL. + + -- Joey Hess Wed, 16 Apr 2008 19:16:52 -0400 + +etckeeper (0.14) unstable; urgency=low + + * When deleting the .metadata, only $VCS rm it if using git. hg write + locks the repo when the pre-commit hook is running, so it would lock. + + -- Joey Hess Sat, 29 Mar 2008 13:43:20 -0400 + +etckeeper (0.13) unstable; urgency=low + + * Drop the debconf prompt before committing in pre-install. + Closes: #470577, #462161, #471157, #462161 + * Stop using metastore, instead add shell commands to .etckeeper + to handle permissions. Patch by Scott Bronson. The main advantages + of this approach are: + - .etckeeper uses less disk space than .metadata. + - Git diff includes changes to the commands in the file, which is more + transparent than a change to the binary .metadata file, and does not + produce conflicts during merging. + - Revision control directories such as .hg are filtered out. + Closes: #471371 + Note that repositories still including .metadata files will be + automatically transitioned, and the file removed. Also, etckeeper init + on a historical version of a repository that still contains .metadata + will use it, if metastore is installed. + * Keep track of what packages change state during an installation, + and include that in the commit message at the end. Closes: #459384 + + -- Joey Hess Tue, 25 Mar 2008 20:53:23 -0400 + +etckeeper (0.12) unstable; urgency=low + + * Use git ls-files instead of git status. Depend on new enough git for this. + * Add support for bzr, thanks to Mark A. Hershberger. Closes: #470515 + (Note that bzr does not support etckeeper's pre-commit hook.) + + -- Joey Hess Tue, 11 Mar 2008 15:06:29 -0400 + +etckeeper (0.11) unstable; urgency=low + + * Add lvm cache dir to default ignores. (#462355) + * Updated German translation. Closes: #463153 + * Some initial rpm support. Patch from Евгений Терешков. + * Add apt hooks for rpm based systems. + * Add nologin to default ignores. + + -- Joey Hess Mon, 11 Feb 2008 00:43:19 -0500 + +etckeeper (0.10) unstable; urgency=low + + * Convert the directory parameter of etckeeper into "-d directory". + * Pass other patameters on from etckeeper to the .d scripts. + * Stop using run-parts for various reasons. + * Split out a commit.d that contains committing code that's used by + both the pre-install.d and post-install.d scripts. + * Split out an unclean.d that tests if the WC contains uncommitted + changes. + * Don't commit in post-install.d if there are no uncommitted changes. + * German debconf translation. Closes: #460940, #458751 + * Use git status instead of git-status (missed this one before). + + -- Joey Hess Tue, 15 Jan 2008 14:35:29 -0500 + +etckeeper (0.9) unstable; urgency=low + + * Separate debconf use from the main flow of the script so the commit + stage can use editors etc. Closes: #459547 + * Remove the hint about setting -e to get interactive commits, since + I don't want to encourage users to do that. (For one thing, it's unlikely + to work if a graphical package manager is used..) + + -- Joey Hess Mon, 07 Jan 2008 13:46:22 -0500 + +etckeeper (0.8) unstable; urgency=low + + * Typo fixes from Miklos Vajna + * Add backwards compatability code to handle post-apt action. Closes: #459441 + + -- Joey Hess Sun, 06 Jan 2008 12:54:51 -0500 + +etckeeper (0.7) unstable; urgency=low + + [ Joey Hess ] + * Added configuration options for highlevel and lowlevel package managers + in etckeeper.conf. + * Only install apt hooks if apt is used. + * Only add backup conffile exclusion to gitignore if dpkg is used. + * Rename pre/post-apt.d to pre/post-install.d to allow the same directories + to be used for other package managers. + * Use the name of the highlevel package manager in commit messages. + * Add gnarly conffile renaming code. + * Support mercurial as an alternative to git. Original patch by Mathieu + Clabaut, significantly changed. + + [ Miklos Vajna ] + * Add support for frugalware's pacman-g2 package manager. + * Stop using git-foo commands. + + [ Christian Perrier ] + * Debconf templates and debian/control reviewed by the debian-l10n-english + team as part of the Smith review project. Closes: #454774 + * [Debconf translation updates] + * Galician. Closes: #455790 + * Finnish. Closes: #455967 + * Italian. Closes: #456509 + * Portuguese. Closes: #456543 + * French. Closes: #456920 + * Vietnamese. Closes: #457307 + * Czech. Closes: #457678 + * Dutch. Closes: #457806 + * Basque. Closes: #457830 + * Russian. Closes: #457871 + + [ Joey Hess ] + * Commit removed files in the pre-install hook to git, as was already done + for hg. Avoided changing the debconf template so bubulle doesn't murder + me; the current wording is just vague enough to still work with the + current behavior. + + -- Joey Hess Fri, 04 Jan 2008 18:46:49 -0500 + +etckeeper (0.6) unstable; urgency=low + + * Depend on a fairly recent git-core. Closes: #453063 + + -- Joey Hess Sun, 02 Dec 2007 15:46:12 -0500 + +etckeeper (0.5) unstable; urgency=low + + * Typo. Closes: #452926 + + -- Joey Hess Mon, 26 Nov 2007 03:16:14 -0500 + +etckeeper (0.4) unstable; urgency=low + + * Portuguese translation from Américo Monteiro. Closes: #451798 + * Pass --quiet to git-rm calls. + + -- Joey Hess Tue, 20 Nov 2007 01:04:32 -0500 + +etckeeper (0.3) unstable; urgency=low + + * Patch from Remi Vanicat adding an etckeeper.conf file and + a GIT_COMMIT_OPTIONS configuration setting. Closes: #451167 + * Add network/run and adjtime to default gitignore. Closes: #451347 + * Patch from Rémi Vanicat adding bash completion. Closes: #451302 + * Remove redundant dependency on debconf. Closes: #451378 + + -- Joey Hess Thu, 15 Nov 2007 12:21:02 -0500 + +etckeeper (0.2) unstable; urgency=low + + * Add .pwd.lock to default ignores, this file is created by programs + that call getspent(). + * Add tests for /etc/.git not yet existing and avoid doing bad things. + Closes: #451185 + * If /etc/.git doesn't exist, display a suggestion to run etckeeper-init. + + -- Joey Hess Tue, 13 Nov 2007 19:09:11 -0500 + +etckeeper (0.1) unstable; urgency=low + + * First release. + + -- Joey Hess Sun, 11 Nov 2007 01:11:21 -0500 --- etckeeper-1.18.2.orig/debian/control +++ etckeeper-1.18.2/debian/control @@ -2,16 +2,16 @@ Section: admin Priority: optional Build-Depends: debhelper (>= 7), dpkg-dev (>= 1.9.0), bzr (>= 1.5~), python, dh-python -Maintainer: Antoine Beaupré -Standards-Version: 3.9.4 -XS-Python-Version: all +Maintainer: Ubuntu Developers +XSBC-Original-Maintainer: Antoine Beaupré +Standards-Version: 3.9.6 Vcs-Git: git://etckeeper.branchable.com/ Homepage: http://etckeeper.branchable.com/ Package: etckeeper Architecture: all Section: admin -Depends: git (>= 1:1.7) | mercurial | bzr (>= 1.5~) | darcs, ${misc:Depends} +Depends: git (>= 1:1.7) | mercurial | bzr (>= 1.5~) | darcs, hostname, ${misc:Depends}, ${python:Depends} Recommends: cron-daemon Suggests: sudo (>= 1.7.4p4) Conflicts: bzr (<< 1.5~) --- etckeeper-1.18.2.orig/debian/lintian-overrides +++ etckeeper-1.18.2/debian/lintian-overrides @@ -0,0 +1,4 @@ +# we ask only on purge, on purpose +etckeeper: no-debconf-config +# we deliberately access the full path to stash it for purging +etckeeper: command-with-path-in-maintainer-script prerm:28 /usr/bin/etckeeper --- etckeeper-1.18.2.orig/debian/po/cs.po +++ etckeeper-1.18.2/debian/po/cs.po @@ -7,44 +7,24 @@ msgstr "" "Project-Id-Version: etckeeper\n" "Report-Msgid-Bugs-To: etckeeper@packages.debian.org\n" -"POT-Creation-Date: 2009-05-06 14:41-0400\n" +"POT-Creation-Date: 2016-01-14 15:43-0500\n" "PO-Revision-Date: 2009-09-13 09:09+0200\n" "Last-Translator: Miroslav Kure \n" "Language-Team: Czech \n" +"Language: cs\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -#. Type: error -#. Description -#: ../templates:2001 -msgid "Commit failed" -msgstr "Zápis selhal" - -#. Type: error -#. Description -#: ../templates:2001 -msgid "An attempt to commit /etc changes to ${VCS} failed." -msgstr "Pokus o zapsání změn v /etc do ${VCS} selhal." - -#. Type: error -#. Description -#: ../templates:2001 -msgid "" -"You may manually resolve the issues with the uncommitted changes before " -"continuing." -msgstr "" -"Před pokračováním byste měli ručně vyřešit problémy s nezapsanými změnami." - #. Type: boolean #. Description -#: ../templates:3001 +#: ../templates:2001 msgid "Remove etckeeper ${VCS} repository and associated files?" msgstr "Odstranit ${VCS} repositář etckeeperu a přidružené soubory?" #. Type: boolean #. Description -#: ../templates:3001 +#: ../templates:2001 msgid "" "Etckeeper is being purged from the system, and was used to store /etc in a " "${VCS} repository. If you choose to remove the repository, this will DESTROY " @@ -54,6 +34,18 @@ "repositáři, avšak nyní je ze systému odstraňován. Pokud povolíte odstranění " "repositáře, ZNIČÍTE tím veškerou historii, kterou etckeeper uchovával." +#~ msgid "Commit failed" +#~ msgstr "Zápis selhal" + +#~ msgid "An attempt to commit /etc changes to ${VCS} failed." +#~ msgstr "Pokus o zapsání změn v /etc do ${VCS} selhal." + +#~ msgid "" +#~ "You may manually resolve the issues with the uncommitted changes before " +#~ "continuing." +#~ msgstr "" +#~ "Před pokračováním byste měli ručně vyřešit problémy s nezapsanými změnami." + #~ msgid "Commit changed files in /etc to ${VCS}?" #~ msgstr "Zapsat změněné soubory v /etc do ${VCS}?" --- etckeeper-1.18.2.orig/debian/po/da.po +++ etckeeper-1.18.2/debian/po/da.po @@ -7,51 +7,44 @@ msgstr "" "Project-Id-Version: etckeeper\n" "Report-Msgid-Bugs-To: etckeeper@packages.debian.org\n" -"POT-Creation-Date: 2009-05-06 14:41-0400\n" +"POT-Creation-Date: 2016-01-14 15:43-0500\n" "PO-Revision-Date: 2010-09-22 17:30+01:00\n" "Last-Translator: Joe Hansen \n" "Language-Team: Danish \n" +"Language: \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -#. Type: error -#. Description -#: ../templates:2001 -msgid "Commit failed" -msgstr "Indsendelse (commit) mislykkedes" - -#. Type: error -#. Description -#: ../templates:2001 -msgid "An attempt to commit /etc changes to ${VCS} failed." -msgstr "Et fors??g p?? at indsende (commit) /etc-??ndringer til ${VCS} mislykkedes." - -#. Type: error -#. Description -#: ../templates:2001 -msgid "" -"You may manually resolve the issues with the uncommitted changes before " -"continuing." -msgstr "" -"Du skal manuelt l??se problemstillingerne med de ikke indsendte (uncommitted) " -"??ndringer, f??r du forts??tter." - #. Type: boolean #. Description -#: ../templates:3001 +#: ../templates:2001 msgid "Remove etckeeper ${VCS} repository and associated files?" msgstr "Fjern etckeeper ${VCS}-arkiv og associerede filer?" #. Type: boolean #. Description -#: ../templates:3001 +#: ../templates:2001 msgid "" "Etckeeper is being purged from the system, and was used to store /etc in a " "${VCS} repository. If you choose to remove the repository, this will DESTROY " "all history etckeeper has recorded for /etc." msgstr "" "Etckeeper afinstalleres fra systemet, og blev brugt til at gemme /etc i et " -"${VCS}-arkiv. Hvis du v??lger at fjerne arkivet, vil dette ??DEL??GGE al historik " -"som etckeeper har optaget for /etc." +"${VCS}-arkiv. Hvis du v??lger at fjerne arkivet, vil dette ??DEL??GGE al " +"historik som etckeeper har optaget for /etc." + +#~ msgid "Commit failed" +#~ msgstr "Indsendelse (commit) mislykkedes" +#~ msgid "An attempt to commit /etc changes to ${VCS} failed." +#~ msgstr "" +#~ "Et fors??g p?? at indsende (commit) /etc-??ndringer til ${VCS} " +#~ "mislykkedes." + +#~ msgid "" +#~ "You may manually resolve the issues with the uncommitted changes before " +#~ "continuing." +#~ msgstr "" +#~ "Du skal manuelt l??se problemstillingerne med de ikke indsendte " +#~ "(uncommitted) ??ndringer, f??r du forts??tter." --- etckeeper-1.18.2.orig/debian/po/de.po +++ etckeeper-1.18.2/debian/po/de.po @@ -6,46 +6,24 @@ msgstr "" "Project-Id-Version: etckeeper 0.10\n" "Report-Msgid-Bugs-To: etckeeper@packages.debian.org\n" -"POT-Creation-Date: 2009-05-06 14:41-0400\n" +"POT-Creation-Date: 2016-01-14 15:43-0500\n" "PO-Revision-Date: 2009-06-08 19:05+0200\n" "Last-Translator: Helge Kreutzmann \n" "Language-Team: de \n" +"Language: \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=ISO-8859-15\n" "Content-Transfer-Encoding: 8bit\n" -#. Type: error -#. Description -#: ../templates:2001 -msgid "Commit failed" -msgstr "bergabe (commit) fehlgeschlagen" - -#. Type: error -#. Description -#: ../templates:2001 -msgid "An attempt to commit /etc changes to ${VCS} failed." -msgstr "" -"Ein Versuch, die nderungen an /etc an ${VCS} zu bergeben, schlug fehl." - -#. Type: error -#. Description -#: ../templates:2001 -msgid "" -"You may manually resolve the issues with the uncommitted changes before " -"continuing." -msgstr "" -"Sie knnen das Problem mit den nicht-bergebenen nderungen manuell beheben, " -"bevor Sie fortfahren." - #. Type: boolean #. Description -#: ../templates:3001 +#: ../templates:2001 msgid "Remove etckeeper ${VCS} repository and associated files?" msgstr "Das ${VCS}-Depot von Etckeeper und die zugehrigen Dateien entfernen?" #. Type: boolean #. Description -#: ../templates:3001 +#: ../templates:2001 msgid "" "Etckeeper is being purged from the system, and was used to store /etc in a " "${VCS} repository. If you choose to remove the repository, this will DESTROY " @@ -56,6 +34,20 @@ "zu entfernen, wird dies den Verlauf, den Etckeeper fr /etc aufgezeichnet " "hat, ZERSTREN." +#~ msgid "Commit failed" +#~ msgstr "bergabe (commit) fehlgeschlagen" + +#~ msgid "An attempt to commit /etc changes to ${VCS} failed." +#~ msgstr "" +#~ "Ein Versuch, die nderungen an /etc an ${VCS} zu bergeben, schlug fehl." + +#~ msgid "" +#~ "You may manually resolve the issues with the uncommitted changes before " +#~ "continuing." +#~ msgstr "" +#~ "Sie knnen das Problem mit den nicht-bergebenen nderungen manuell " +#~ "beheben, bevor Sie fortfahren." + #~ msgid "Commit changed files in /etc to ${VCS}?" #~ msgstr "Genderte Dateien in /etc an ${VCS} bergeben?" --- etckeeper-1.18.2.orig/debian/po/es.po +++ etckeeper-1.18.2/debian/po/es.po @@ -33,53 +33,45 @@ msgstr "" "Project-Id-Version: etckeeper 0.38\n" "Report-Msgid-Bugs-To: etckeeper@packages.debian.org\n" -"POT-Creation-Date: 2009-05-06 14:41-0400\n" +"POT-Creation-Date: 2016-01-14 15:43-0500\n" "PO-Revision-Date: 2009-07-11 16:07+0200\n" "Last-Translator: Fernando González de Requena \n" "Language-Team: Spanish \n" +"Language: es\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "X-Generator: KBabel 1.11.4\n" -#. Type: error -#. Description -#: ../templates:2001 -msgid "Commit failed" -msgstr "El envío de los cambios ha fallado" - -#. Type: error -#. Description -#: ../templates:2001 -msgid "An attempt to commit /etc changes to ${VCS} failed." -msgstr "Ha fallado un intento de enviar los cambios en «/etc» a ${VCS}." - -#. Type: error -#. Description -#: ../templates:2001 -msgid "" -"You may manually resolve the issues with the uncommitted changes before " -"continuing." -msgstr "" -"Puede resolver manualmente los problemas con los cambios que no se han enviado " -"antes de continuar." - #. Type: boolean #. Description -#: ../templates:3001 +#: ../templates:2001 msgid "Remove etckeeper ${VCS} repository and associated files?" -msgstr "¿Desea eliminar el repositorio ${VCS} de etckeeper y los ficheros asociados?" +msgstr "" +"¿Desea eliminar el repositorio ${VCS} de etckeeper y los ficheros asociados?" #. Type: boolean #. Description -#: ../templates:3001 +#: ../templates:2001 msgid "" "Etckeeper is being purged from the system, and was used to store /etc in a " "${VCS} repository. If you choose to remove the repository, this will DESTROY " "all history etckeeper has recorded for /etc." msgstr "" "Se está eliminando completamente etckeeper de su sistema. Etckeeper se ha " -"utilizado para almacenar el directorio «/etc» en un repositorio ${VCS}. Si elige " -"eliminar el repositorio, se DESTRUIRÁ todo el historial que etckeeper ha " -"guardado para «/etc»." - +"utilizado para almacenar el directorio «/etc» en un repositorio ${VCS}. Si " +"elige eliminar el repositorio, se DESTRUIRÁ todo el historial que etckeeper " +"ha guardado para «/etc»." + +#~ msgid "Commit failed" +#~ msgstr "El envío de los cambios ha fallado" + +#~ msgid "An attempt to commit /etc changes to ${VCS} failed." +#~ msgstr "Ha fallado un intento de enviar los cambios en «/etc» a ${VCS}." + +#~ msgid "" +#~ "You may manually resolve the issues with the uncommitted changes before " +#~ "continuing." +#~ msgstr "" +#~ "Puede resolver manualmente los problemas con los cambios que no se han " +#~ "enviado antes de continuar." --- etckeeper-1.18.2.orig/debian/po/eu.po +++ etckeeper-1.18.2/debian/po/eu.po @@ -9,52 +9,44 @@ msgstr "" "Project-Id-Version: etckeeper-eu\n" "Report-Msgid-Bugs-To: etckeeper@packages.debian.org\n" -"POT-Creation-Date: 2009-05-06 14:41-0400\n" +"POT-Creation-Date: 2016-01-14 15:43-0500\n" "PO-Revision-Date: 2007-12-17 12:47+0100\n" "Last-Translator: Aitor Ibañez \n" "Language-Team: Euskara \n" +"Language: \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "X-Generator: KBabel 1.11.4\n" -#. Type: error -#. Description -#: ../templates:2001 -msgid "Commit failed" -msgstr "Onarpenak failatu du" - -#. Type: error -#. Description -#: ../templates:2001 -msgid "An attempt to commit /etc changes to ${VCS} failed." -msgstr "/etc-ko aldaketak ${VCS}-en onartzearen saiakerak huts egin du." - -#. Type: error -#. Description -#: ../templates:2001 -msgid "" -"You may manually resolve the issues with the uncommitted changes before " -"continuing." -msgstr "" -"Aurrera jarraitu baino lehen, eskuz erresolbitu beharko ditu onartu gabeko " -"aldaketak." - #. Type: boolean #. Description -#: ../templates:3001 +#: ../templates:2001 msgid "Remove etckeeper ${VCS} repository and associated files?" msgstr "" #. Type: boolean #. Description -#: ../templates:3001 +#: ../templates:2001 msgid "" "Etckeeper is being purged from the system, and was used to store /etc in a " "${VCS} repository. If you choose to remove the repository, this will DESTROY " "all history etckeeper has recorded for /etc." msgstr "" +#~ msgid "Commit failed" +#~ msgstr "Onarpenak failatu du" + +#~ msgid "An attempt to commit /etc changes to ${VCS} failed." +#~ msgstr "/etc-ko aldaketak ${VCS}-en onartzearen saiakerak huts egin du." + +#~ msgid "" +#~ "You may manually resolve the issues with the uncommitted changes before " +#~ "continuing." +#~ msgstr "" +#~ "Aurrera jarraitu baino lehen, eskuz erresolbitu beharko ditu onartu " +#~ "gabeko aldaketak." + #~ msgid "Commit changed files in /etc to ${VCS}?" #~ msgstr "Aldaturiko fitxategiak ${VCS}-en onartu?" --- etckeeper-1.18.2.orig/debian/po/fi.po +++ etckeeper-1.18.2/debian/po/fi.po @@ -2,52 +2,45 @@ msgstr "" "Project-Id-Version: etckeeper 0.3\n" "Report-Msgid-Bugs-To: etckeeper@packages.debian.org\n" -"POT-Creation-Date: 2009-05-06 14:41-0400\n" +"POT-Creation-Date: 2016-01-14 15:43-0500\n" "PO-Revision-Date: 2007-12-12 19:54+0200\n" "Last-Translator: Esko Arajärvi \n" "Language-Team: Finnish \n" +"Language: fi\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "X-Poedit-Language: Finnish\n" "X-Poedit-Country: Finland\n" -#. Type: error -#. Description -#: ../templates:2001 -msgid "Commit failed" -msgstr "Tallettaminen epäonnistui" - -#. Type: error -#. Description -#: ../templates:2001 -msgid "An attempt to commit /etc changes to ${VCS} failed." -msgstr "Yritys tallettaa /etc:n muutokset ${VCS}-varastoon epäonnistui." - -#. Type: error -#. Description -#: ../templates:2001 -msgid "" -"You may manually resolve the issues with the uncommitted changes before " -"continuing." -msgstr "" -"Voit selvittää tallettamattomien muutosten ongelmat käsin ennen jatkamista." - #. Type: boolean #. Description -#: ../templates:3001 +#: ../templates:2001 msgid "Remove etckeeper ${VCS} repository and associated files?" msgstr "" #. Type: boolean #. Description -#: ../templates:3001 +#: ../templates:2001 msgid "" "Etckeeper is being purged from the system, and was used to store /etc in a " "${VCS} repository. If you choose to remove the repository, this will DESTROY " "all history etckeeper has recorded for /etc." msgstr "" +#~ msgid "Commit failed" +#~ msgstr "Tallettaminen epäonnistui" + +#~ msgid "An attempt to commit /etc changes to ${VCS} failed." +#~ msgstr "Yritys tallettaa /etc:n muutokset ${VCS}-varastoon epäonnistui." + +#~ msgid "" +#~ "You may manually resolve the issues with the uncommitted changes before " +#~ "continuing." +#~ msgstr "" +#~ "Voit selvittää tallettamattomien muutosten ongelmat käsin ennen " +#~ "jatkamista." + #~ msgid "Commit changed files in /etc to ${VCS}?" #~ msgstr "Talletetaanko hakemiston /etc muutetut tiedostot ${VCS}in?" --- etckeeper-1.18.2.orig/debian/po/fr.po +++ etckeeper-1.18.2/debian/po/fr.po @@ -9,10 +9,11 @@ msgstr "" "Project-Id-Version: etckeeper\n" "Report-Msgid-Bugs-To: etckeeper@packages.debian.org\n" -"POT-Creation-Date: 2009-05-06 14:41-0400\n" +"POT-Creation-Date: 2016-01-14 15:43-0500\n" "PO-Revision-Date: 2009-05-17 11:42+0200\n" "Last-Translator: Bruno Travouillon \n" "Language-Team: French \n" +"Language: fr\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" @@ -20,33 +21,9 @@ "X-Poedit-Country: FRANCE\n" "X-Generator: KBabel 1.11.4\n" -#. Type: error -#. Description -#: ../templates:2001 -msgid "Commit failed" -msgstr "Échec de la synchronisation" - -#. Type: error -#. Description -#: ../templates:2001 -msgid "An attempt to commit /etc changes to ${VCS} failed." -msgstr "" -"La tentative d'enregistrement (« commit ») des modifications de /etc vers " -"${VCS} a échoué." - -#. Type: error -#. Description -#: ../templates:2001 -msgid "" -"You may manually resolve the issues with the uncommitted changes before " -"continuing." -msgstr "" -"Avant de poursuivre, vous devriez résoudre vous-même les problèmes liés aux " -"changements non sauvegardés." - #. Type: boolean #. Description -#: ../templates:3001 +#: ../templates:2001 msgid "Remove etckeeper ${VCS} repository and associated files?" msgstr "" "Faut-il supprimer le référentiel ${VCS} d'etckeeper et les fichiers " @@ -54,7 +31,7 @@ #. Type: boolean #. Description -#: ../templates:3001 +#: ../templates:2001 msgid "" "Etckeeper is being purged from the system, and was used to store /etc in a " "${VCS} repository. If you choose to remove the repository, this will DESTROY " @@ -63,3 +40,18 @@ "Etckeeper est purgé du système, et était utilisé pour stocker /etc dans un " "référentiel ${VCS}. Si vous choisissez de supprimer ce référentiel, cela va " "DÉTRUIRE tout l'historique qu'etckeeper a enregistré pour /etc." + +#~ msgid "Commit failed" +#~ msgstr "Échec de la synchronisation" + +#~ msgid "An attempt to commit /etc changes to ${VCS} failed." +#~ msgstr "" +#~ "La tentative d'enregistrement (« commit ») des modifications de /etc vers " +#~ "${VCS} a échoué." + +#~ msgid "" +#~ "You may manually resolve the issues with the uncommitted changes before " +#~ "continuing." +#~ msgstr "" +#~ "Avant de poursuivre, vous devriez résoudre vous-même les problèmes liés " +#~ "aux changements non sauvegardés." --- etckeeper-1.18.2.orig/debian/po/gl.po +++ etckeeper-1.18.2/debian/po/gl.po @@ -6,49 +6,41 @@ msgstr "" "Project-Id-Version: etckeeper\n" "Report-Msgid-Bugs-To: etckeeper@packages.debian.org\n" -"POT-Creation-Date: 2009-05-06 14:41-0400\n" +"POT-Creation-Date: 2016-01-14 15:43-0500\n" "PO-Revision-Date: 2007-12-11 20:52+0000\n" "Last-Translator: Jacobo Tarrio \n" "Language-Team: Galician \n" +"Language: gl\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -#. Type: error -#. Description -#: ../templates:2001 -msgid "Commit failed" -msgstr "O gardado fallou" - -#. Type: error -#. Description -#: ../templates:2001 -msgid "An attempt to commit /etc changes to ${VCS} failed." -msgstr "Fallou unha tentativa de gardar en ${VCS} os cambios de /etc." - -#. Type: error -#. Description -#: ../templates:2001 -msgid "" -"You may manually resolve the issues with the uncommitted changes before " -"continuing." -msgstr "configurar apt para que instale paquetes adicionais do CD.<" - #. Type: boolean #. Description -#: ../templates:3001 +#: ../templates:2001 msgid "Remove etckeeper ${VCS} repository and associated files?" msgstr "" #. Type: boolean #. Description -#: ../templates:3001 +#: ../templates:2001 msgid "" "Etckeeper is being purged from the system, and was used to store /etc in a " "${VCS} repository. If you choose to remove the repository, this will DESTROY " "all history etckeeper has recorded for /etc." msgstr "" +#~ msgid "Commit failed" +#~ msgstr "O gardado fallou" + +#~ msgid "An attempt to commit /etc changes to ${VCS} failed." +#~ msgstr "Fallou unha tentativa de gardar en ${VCS} os cambios de /etc." + +#~ msgid "" +#~ "You may manually resolve the issues with the uncommitted changes before " +#~ "continuing." +#~ msgstr "configurar apt para que instale paquetes adicionais do CD.<" + #~ msgid "Commit changed files in /etc to ${VCS}?" #~ msgstr "¿Gardar en ${VCS} os ficheiros modificados de /etc?" --- etckeeper-1.18.2.orig/debian/po/it.po +++ etckeeper-1.18.2/debian/po/it.po @@ -7,45 +7,24 @@ msgstr "" "Project-Id-Version: etckeeper 0.36 debconf templates\n" "Report-Msgid-Bugs-To: etckeeper@packages.debian.org\n" -"POT-Creation-Date: 2009-05-06 14:41-0400\n" +"POT-Creation-Date: 2016-01-14 15:43-0500\n" "PO-Revision-Date: 2009-08-08 15:32+0200\n" "Last-Translator: Luca Monducci \n" "Language-Team: Italian \n" +"Language: it\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -#. Type: error -#. Description -#: ../templates:2001 -msgid "Commit failed" -msgstr "Commit fallito" - -#. Type: error -#. Description -#: ../templates:2001 -msgid "An attempt to commit /etc changes to ${VCS} failed." -msgstr "Il tentativo di commit delle modifiche in /etc a ${VCS} è fallito." - -#. Type: error -#. Description -#: ../templates:2001 -msgid "" -"You may manually resolve the issues with the uncommitted changes before " -"continuing." -msgstr "" -"Potrebbe essere necessario risolvere manualmente i problemi con le modifiche " -"delle quali non è stato fatto il commit prima di continuare." - #. Type: boolean #. Description -#: ../templates:3001 +#: ../templates:2001 msgid "Remove etckeeper ${VCS} repository and associated files?" msgstr "Eliminare il repository ${VCS} di etckeeper e i file associati?" #. Type: boolean #. Description -#: ../templates:3001 +#: ../templates:2001 msgid "" "Etckeeper is being purged from the system, and was used to store /etc in a " "${VCS} repository. If you choose to remove the repository, this will DESTROY " @@ -55,3 +34,16 @@ "per memorizzare il contenuto di /etc in un repository ${VCS}. Nel caso si " "scelga di eliminare il repository, si DISTRUGGE tutta la storia di /etc " "registrata da etckeeper." + +#~ msgid "Commit failed" +#~ msgstr "Commit fallito" + +#~ msgid "An attempt to commit /etc changes to ${VCS} failed." +#~ msgstr "Il tentativo di commit delle modifiche in /etc a ${VCS} è fallito." + +#~ msgid "" +#~ "You may manually resolve the issues with the uncommitted changes before " +#~ "continuing." +#~ msgstr "" +#~ "Potrebbe essere necessario risolvere manualmente i problemi con le " +#~ "modifiche delle quali non è stato fatto il commit prima di continuare." --- etckeeper-1.18.2.orig/debian/po/ja.po +++ etckeeper-1.18.2/debian/po/ja.po @@ -6,51 +6,42 @@ msgstr "" "Project-Id-Version: etckeeper 0.35\n" "Report-Msgid-Bugs-To: etckeeper@packages.debian.org\n" -"POT-Creation-Date: 2009-05-06 14:41-0400\n" +"POT-Creation-Date: 2016-01-14 15:43-0500\n" "PO-Revision-Date: 2009-05-09 19:26+0900\n" "Last-Translator: Hideki Yamane (Debian-JP) \n" "Language-Team: Japanese \n" +"Language: ja\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -#. Type: error -#. Description -#: ../templates:2001 -msgid "Commit failed" -msgstr "コミットに失敗しました" - -#. Type: error -#. Description -#: ../templates:2001 -msgid "An attempt to commit /etc changes to ${VCS} failed." -msgstr "/etc の変更を ${VCS} にコミットしようとしましたが失敗しました。" - -#. Type: error -#. Description -#: ../templates:2001 -msgid "" -"You may manually resolve the issues with the uncommitted changes before " -"continuing." -msgstr "" -"続ける前に、この問題とコミットされていない変更について、手動で解決する必要が" -"あるでしょう。" - #. Type: boolean #. Description -#: ../templates:3001 +#: ../templates:2001 msgid "Remove etckeeper ${VCS} repository and associated files?" msgstr "etckeeper の$ {VCS} リポジトリおよび関連ファイルを削除しますか?" #. Type: boolean #. Description -#: ../templates:3001 +#: ../templates:2001 msgid "" "Etckeeper is being purged from the system, and was used to store /etc in a " "${VCS} repository. If you choose to remove the repository, this will DESTROY " "all history etckeeper has recorded for /etc." msgstr "" "Etckeeper はシステムから完全に削除されようとしており、/etc の保存には ${VCS} " -"リポジトリを利用していました。リポジトリを削除すると、/etc について etckeeper " -"が記録してた全ての履歴は「破壊」されます。" +"リポジトリを利用していました。リポジトリを削除すると、/etc について " +"etckeeper が記録してた全ての履歴は「破壊」されます。" + +#~ msgid "Commit failed" +#~ msgstr "コミットに失敗しました" + +#~ msgid "An attempt to commit /etc changes to ${VCS} failed." +#~ msgstr "/etc の変更を ${VCS} にコミットしようとしましたが失敗しました。" +#~ msgid "" +#~ "You may manually resolve the issues with the uncommitted changes before " +#~ "continuing." +#~ msgstr "" +#~ "続ける前に、この問題とコミットされていない変更について、手動で解決する必要" +#~ "があるでしょう。" --- etckeeper-1.18.2.orig/debian/po/nl.po +++ etckeeper-1.18.2/debian/po/nl.po @@ -8,7 +8,7 @@ msgstr "" "Project-Id-Version: etckeeper 0.59\n" "Report-Msgid-Bugs-To: etckeeper@packages.debian.org\n" -"POT-Creation-Date: 2009-05-06 14:41-0400\n" +"POT-Creation-Date: 2016-01-14 15:43-0500\n" "PO-Revision-Date: 2012-01-02 15:54+0100\n" "Last-Translator: Jeroen Schot \n" "Language-Team: Debian l10n Dutch \n" @@ -17,39 +17,16 @@ "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -#. Type: error -#. Description -#: ../templates:2001 -msgid "Commit failed" -msgstr "Vastleggen mislukt" - -#. Type: error -#. Description -#: ../templates:2001 -msgid "An attempt to commit /etc changes to ${VCS} failed." -msgstr "" -"De poging om de aanpassingen in /etc vast te leggen in ${VCS} is mislukt." - -#. Type: error -#. Description -#: ../templates:2001 -msgid "" -"You may manually resolve the issues with the uncommitted changes before " -"continuing." -msgstr "" -"U kunt de problemen met de niet-vastgelegde aanpassingen handmatig oplossen " -"alvorens verder te gaan." - #. Type: boolean #. Description -#: ../templates:3001 +#: ../templates:2001 msgid "Remove etckeeper ${VCS} repository and associated files?" msgstr "" "De ${VCS}-opslagruimte van etckeeper en gerelateerde bestanden verwijderen?" #. Type: boolean #. Description -#: ../templates:3001 +#: ../templates:2001 msgid "" "Etckeeper is being purged from the system, and was used to store /etc in a " "${VCS} repository. If you choose to remove the repository, this will DESTROY " @@ -59,3 +36,17 @@ "een ${VCS}-opslagruimte te bewaren. Als u ervoor kiest om de opslagruimte te " "verwijderen zal alle geschiedenis van /etc die etckeeper heeft bijgehouden " "worden VERNIETIGD." + +#~ msgid "Commit failed" +#~ msgstr "Vastleggen mislukt" + +#~ msgid "An attempt to commit /etc changes to ${VCS} failed." +#~ msgstr "" +#~ "De poging om de aanpassingen in /etc vast te leggen in ${VCS} is mislukt." + +#~ msgid "" +#~ "You may manually resolve the issues with the uncommitted changes before " +#~ "continuing." +#~ msgstr "" +#~ "U kunt de problemen met de niet-vastgelegde aanpassingen handmatig " +#~ "oplossen alvorens verder te gaan." --- etckeeper-1.18.2.orig/debian/po/pl.po +++ etckeeper-1.18.2/debian/po/pl.po @@ -7,41 +7,43 @@ msgstr "" "Project-Id-Version: etckeeper 0.50\n" "Report-Msgid-Bugs-To: etckeeper@packages.debian.org\n" -"POT-Creation-Date: 2009-05-06 14:41-0400\n" +"POT-Creation-Date: 2016-01-14 15:43-0500\n" "PO-Revision-Date: 2010-12-19 20:07+0100\n" "Last-Translator: Artur R. Czechowski \n" "Language-Team: Polish \n" +"Language: pl\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=utf-8\n" "Content-Transfer-Encoding: 8bit\n" -#. Type: error -#. Description -#: ../templates:2001 -msgid "Commit failed" -msgstr "Błąd zapisu." - -#. Type: error -#. Description -#: ../templates:2001 -msgid "An attempt to commit /etc changes to ${VCS} failed." -msgstr "Nieudana próba zapisania zmian przy użyciu ${VCS}" - -#. Type: error -#. Description -#: ../templates:2001 -msgid "You may manually resolve the issues with the uncommitted changes before continuing." -msgstr "Przed kontynuacją możesz ręcznie rozwiązać problemy z niezapisanymi zmianami." - #. Type: boolean #. Description -#: ../templates:3001 +#: ../templates:2001 msgid "Remove etckeeper ${VCS} repository and associated files?" msgstr "Usunąć repozytorium etckeeper ${VCS} i powiązane pliki?" #. Type: boolean #. Description -#: ../templates:3001 -msgid "Etckeeper is being purged from the system, and was used to store /etc in a ${VCS} repository. If you choose to remove the repository, this will DESTROY all history etckeeper has recorded for /etc." -msgstr "Etckeeper jest usuwany z systemu, ale był używany do przechowywania zawartości katalogu /etc w repozytorium ${VCS}. Jeśli wybierzesz usunięcie repozytorium, historia zmian zapisana dla katalogu /etc zostanie BEZPOWROTNIE USUNIĘTA." - +#: ../templates:2001 +msgid "" +"Etckeeper is being purged from the system, and was used to store /etc in a " +"${VCS} repository. If you choose to remove the repository, this will DESTROY " +"all history etckeeper has recorded for /etc." +msgstr "" +"Etckeeper jest usuwany z systemu, ale był używany do przechowywania " +"zawartości katalogu /etc w repozytorium ${VCS}. Jeśli wybierzesz usunięcie " +"repozytorium, historia zmian zapisana dla katalogu /etc zostanie " +"BEZPOWROTNIE USUNIĘTA." + +#~ msgid "Commit failed" +#~ msgstr "Błąd zapisu." + +#~ msgid "An attempt to commit /etc changes to ${VCS} failed." +#~ msgstr "Nieudana próba zapisania zmian przy użyciu ${VCS}" + +#~ msgid "" +#~ "You may manually resolve the issues with the uncommitted changes before " +#~ "continuing." +#~ msgstr "" +#~ "Przed kontynuacją możesz ręcznie rozwiązać problemy z niezapisanymi " +#~ "zmianami." --- etckeeper-1.18.2.orig/debian/po/pt.po +++ etckeeper-1.18.2/debian/po/pt.po @@ -7,52 +7,43 @@ msgstr "" "Project-Id-Version: etckeeper 0.35\n" "Report-Msgid-Bugs-To: etckeeper@packages.debian.org\n" -"POT-Creation-Date: 2009-05-06 14:41-0400\n" +"POT-Creation-Date: 2016-01-14 15:43-0500\n" "PO-Revision-Date: 2009-05-10 22:10+0100\n" "Last-Translator: Américo Monteiro \n" "Language-Team: Portuguese \n" +"Language: pt\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "X-Generator: KBabel 1.11.4\n" -#. Type: error -#. Description -#: ../templates:2001 -msgid "Commit failed" -msgstr "Submissão falhou" - -#. Type: error -#. Description -#: ../templates:2001 -msgid "An attempt to commit /etc changes to ${VCS} failed." -msgstr "A tentativa de submeter as alterações de /etc ao ${VCS} falhou." - -#. Type: error -#. Description -#: ../templates:2001 -msgid "" -"You may manually resolve the issues with the uncommitted changes before " -"continuing." -msgstr "" -"Você pode resolver manualmente as situações com as alterações não submetidas " -"antes de continuar. " - #. Type: boolean #. Description -#: ../templates:3001 +#: ../templates:2001 msgid "Remove etckeeper ${VCS} repository and associated files?" msgstr "Remover o repositório ${VCS} do etckeeper e os ficheiros associados?" #. Type: boolean #. Description -#: ../templates:3001 +#: ../templates:2001 msgid "" "Etckeeper is being purged from the system, and was used to store /etc in a " "${VCS} repository. If you choose to remove the repository, this will DESTROY " "all history etckeeper has recorded for /etc." msgstr "" -"O etckeeper está a ser purgado do sistema, e foi usado para guardar o /etc num " -"repositório ${VCS}. Se escolher remover o repositório, isto irá DESTRUIR todo " -"o histórico que o etckeeper guardou de /etc." - +"O etckeeper está a ser purgado do sistema, e foi usado para guardar o /etc " +"num repositório ${VCS}. Se escolher remover o repositório, isto irá DESTRUIR " +"todo o histórico que o etckeeper guardou de /etc." + +#~ msgid "Commit failed" +#~ msgstr "Submissão falhou" + +#~ msgid "An attempt to commit /etc changes to ${VCS} failed." +#~ msgstr "A tentativa de submeter as alterações de /etc ao ${VCS} falhou." + +#~ msgid "" +#~ "You may manually resolve the issues with the uncommitted changes before " +#~ "continuing." +#~ msgstr "" +#~ "Você pode resolver manualmente as situações com as alterações não " +#~ "submetidas antes de continuar. " --- etckeeper-1.18.2.orig/debian/po/pt_BR.po +++ etckeeper-1.18.2/debian/po/pt_BR.po @@ -7,7 +7,7 @@ msgstr "" "Project-Id-Version: etckeeper 0.63\n" "Report-Msgid-Bugs-To: etckeeper@packages.debian.org\n" -"POT-Creation-Date: 2009-05-06 14:41-0400\n" +"POT-Creation-Date: 2016-01-14 15:43-0500\n" "PO-Revision-Date: 2012-08-21 11:15-0300\n" "Last-Translator: Adriano Rafael Gomes \n" "Language-Team: Brazilian Portuguese \n" "Language-Team: Russian \n" +"Language: ru\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "X-Generator: KBabel 1.11.4\n" -"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n" - -#. Type: error -#. Description -#: ../templates:2001 -msgid "Commit failed" -msgstr "Фиксация завершилась неудачно" - -#. Type: error -#. Description -#: ../templates:2001 -msgid "An attempt to commit /etc changes to ${VCS} failed." -msgstr "Попытка зафиксировать изменения /etc в ${VCS} завершилась неудачно." - -#. Type: error -#. Description -#: ../templates:2001 -msgid "" -"You may manually resolve the issues with the uncommitted changes before " -"continuing." -msgstr "" -"Перед тем как продолжить вы можете вручную исправить положение " -"с незафиксированными изменениями." +"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n" +"%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n" #. Type: boolean #. Description -#: ../templates:3001 +#: ../templates:2001 msgid "Remove etckeeper ${VCS} repository and associated files?" msgstr "Удалить репозиторий etckeeper ${VCS} и связанные с ним файлы?" #. Type: boolean #. Description -#: ../templates:3001 +#: ../templates:2001 msgid "" "Etckeeper is being purged from the system, and was used to store /etc in a " "${VCS} repository. If you choose to remove the repository, this will DESTROY " "all history etckeeper has recorded for /etc." msgstr "" -"Etckeeper вычищается из системы, но использовался для хранения каталога " -"/etc в репозитории ${VCS}. Если вы выберете удаление репозитория, то " -"это УНИЧТОЖИТ всю историю, которую etckeeper вёл для /etc." - +"Etckeeper вычищается из системы, но использовался для хранения каталога /etc " +"в репозитории ${VCS}. Если вы выберете удаление репозитория, то это " +"УНИЧТОЖИТ всю историю, которую etckeeper вёл для /etc." + +#~ msgid "Commit failed" +#~ msgstr "Фиксация завершилась неудачно" + +#~ msgid "An attempt to commit /etc changes to ${VCS} failed." +#~ msgstr "Попытка зафиксировать изменения /etc в ${VCS} завершилась неудачно." + +#~ msgid "" +#~ "You may manually resolve the issues with the uncommitted changes before " +#~ "continuing." +#~ msgstr "" +#~ "Перед тем как продолжить вы можете вручную исправить положение с " +#~ "незафиксированными изменениями." --- etckeeper-1.18.2.orig/debian/po/sv.po +++ etckeeper-1.18.2/debian/po/sv.po @@ -8,47 +8,26 @@ msgstr "" "Project-Id-Version: etckeeper_0.20_sv\n" "Report-Msgid-Bugs-To: etckeeper@packages.debian.org\n" -"POT-Creation-Date: 2009-05-06 14:41-0400\n" +"POT-Creation-Date: 2016-01-14 15:43-0500\n" "PO-Revision-Date: 2009-05-12 20:08+0100\n" "Last-Translator: Martin Bagge \n" "Language-Team: Swedish \n" +"Language: sv\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "X-Generator: KBabel 1.11.4\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" -#. Type: error -#. Description -#: ../templates:2001 -msgid "Commit failed" -msgstr "Verkställning misslyckades" - -#. Type: error -#. Description -#: ../templates:2001 -msgid "An attempt to commit /etc changes to ${VCS} failed." -msgstr "Ett försök att verkställa ändringar i /etc i ${VCS} misslyckades." - -#. Type: error -#. Description -#: ../templates:2001 -msgid "" -"You may manually resolve the issues with the uncommitted changes before " -"continuing." -msgstr "" -"Du kan lösa problemen med de overkställda ändringarna manuellt innan du " -"fortsätter." - #. Type: boolean #. Description -#: ../templates:3001 +#: ../templates:2001 msgid "Remove etckeeper ${VCS} repository and associated files?" msgstr "Ska ${VCS}-förrådet för etckeeper och alla tillhörande filer tas bort?" #. Type: boolean #. Description -#: ../templates:3001 +#: ../templates:2001 msgid "" "Etckeeper is being purged from the system, and was used to store /etc in a " "${VCS} repository. If you choose to remove the repository, this will DESTROY " @@ -57,3 +36,16 @@ "Etckeeper håller på att tas bort från systemet, användningsområdet för " "etckeeper är att spara /etc i ett ${VCS}-förråd. Om du väljer att ta bort " "förrådet kommer all historik för /etc att raderas." + +#~ msgid "Commit failed" +#~ msgstr "Verkställning misslyckades" + +#~ msgid "An attempt to commit /etc changes to ${VCS} failed." +#~ msgstr "Ett försök att verkställa ändringar i /etc i ${VCS} misslyckades." + +#~ msgid "" +#~ "You may manually resolve the issues with the uncommitted changes before " +#~ "continuing." +#~ msgstr "" +#~ "Du kan lösa problemen med de overkställda ändringarna manuellt innan du " +#~ "fortsätter." --- etckeeper-1.18.2.orig/debian/po/templates.pot +++ etckeeper-1.18.2/debian/po/templates.pot @@ -6,45 +6,26 @@ #, fuzzy msgid "" msgstr "" -"Project-Id-Version: PACKAGE VERSION\n" +"Project-Id-Version: etckeeper\n" "Report-Msgid-Bugs-To: etckeeper@packages.debian.org\n" -"POT-Creation-Date: 2009-05-06 14:41-0400\n" +"POT-Creation-Date: 2016-01-14 15:43-0500\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" +"Language: \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=CHARSET\n" "Content-Transfer-Encoding: 8bit\n" -#. Type: error -#. Description -#: ../templates:2001 -msgid "Commit failed" -msgstr "" - -#. Type: error -#. Description -#: ../templates:2001 -msgid "An attempt to commit /etc changes to ${VCS} failed." -msgstr "" - -#. Type: error -#. Description -#: ../templates:2001 -msgid "" -"You may manually resolve the issues with the uncommitted changes before " -"continuing." -msgstr "" - #. Type: boolean #. Description -#: ../templates:3001 +#: ../templates:2001 msgid "Remove etckeeper ${VCS} repository and associated files?" msgstr "" #. Type: boolean #. Description -#: ../templates:3001 +#: ../templates:2001 msgid "" "Etckeeper is being purged from the system, and was used to store /etc in a " "${VCS} repository. If you choose to remove the repository, this will DESTROY " --- etckeeper-1.18.2.orig/debian/po/vi.po +++ etckeeper-1.18.2/debian/po/vi.po @@ -6,49 +6,45 @@ msgstr "" "Project-Id-Version: etckeeper 0.50\n" "Report-Msgid-Bugs-To: etckeeper@packages.debian.org\n" -"POT-Creation-Date: 2009-05-06 14:41-0400\n" +"POT-Creation-Date: 2016-01-14 15:43-0500\n" "PO-Revision-Date: 2010-10-31 13:59+1030\n" "Last-Translator: Clytie Siddall \n" "Language-Team: Vietnamese \n" +"Language: vi\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=1; plural=0;\n" "X-Generator: LocFactoryEditor 1.8\n" -#: ../templates:2001 -#. Type: error -#. Description -msgid "Commit failed" -msgstr "Lỗi ghi chép" - -#: ../templates:2001 -#. Type: error -#. Description -#| msgid "An attempt to commit /etc changes to git failed." -msgid "An attempt to commit /etc changes to ${VCS} failed." -msgstr "Gặp lỗi khi thử ghi chép vào ${VCS} các thay đổi trong « /etc »." - -#: ../templates:2001 -#. Type: error -#. Description -msgid "" -"You may manually resolve the issues with the uncommitted changes before " -"continuing." -msgstr "" -"Bạn cũng có thể tự giải quyết vấn đề về các thay đổi chưa ghi chép, trước khi tiếp tục." - -#: ../templates:3001 #. Type: boolean #. Description +#: ../templates:2001 msgid "Remove etckeeper ${VCS} repository and associated files?" msgstr "Gỡ bỏ kho lưu ${VCS} etckeeper và các tập tin tương ứng ?" -#: ../templates:3001 #. Type: boolean #. Description +#: ../templates:2001 msgid "" "Etckeeper is being purged from the system, and was used to store /etc in a " "${VCS} repository. If you choose to remove the repository, this will DESTROY " "all history etckeeper has recorded for /etc." -msgstr "Gói etckeeper đang bị tẩy khỏi hệ thống: nó từng được sử dụng để lưu trữ « /etc » vào một kho ${VCS}. Sự chọn gỡ bỏ kho lưu này thì HỦY toàn bộ lịch sử được etckeeper giữ đối với « /etc »." +msgstr "" +"Gói etckeeper đang bị tẩy khỏi hệ thống: nó từng được sử dụng để lưu trữ « /" +"etc » vào một kho ${VCS}. Sự chọn gỡ bỏ kho lưu này thì HỦY toàn bộ lịch sử " +"được etckeeper giữ đối với « /etc »." + +#~ msgid "Commit failed" +#~ msgstr "Lỗi ghi chép" + +#~| msgid "An attempt to commit /etc changes to git failed." +#~ msgid "An attempt to commit /etc changes to ${VCS} failed." +#~ msgstr "Gặp lỗi khi thử ghi chép vào ${VCS} các thay đổi trong « /etc »." + +#~ msgid "" +#~ "You may manually resolve the issues with the uncommitted changes before " +#~ "continuing." +#~ msgstr "" +#~ "Bạn cũng có thể tự giải quyết vấn đề về các thay đổi chưa ghi chép, trước " +#~ "khi tiếp tục." --- etckeeper-1.18.2.orig/etckeeper +++ etckeeper-1.18.2/etckeeper @@ -54,6 +54,10 @@ 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=en_US.UTF-8 +fi if [ ! -z "$PUSH_REMOTE" ]; then export PUSH_REMOTE