diff -Nru etckeeper-0.48/debian/changelog etckeeper-0.48ubuntu1/debian/changelog --- etckeeper-0.48/debian/changelog 2010-07-17 00:54:56.000000000 +0530 +++ etckeeper-0.48ubuntu1/debian/changelog 2010-07-19 18:10:54.000000000 +0530 @@ -1,3 +1,11 @@ +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) @@ -7,6 +15,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 @@ -19,6 +35,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 @@ -85,6 +114,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 @@ -113,6 +165,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 @@ -121,6 +181,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 @@ -148,6 +220,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. @@ -188,6 +267,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. @@ -212,6 +306,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 @@ -236,6 +338,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 + diff -Nru etckeeper-0.48/debian/control etckeeper-0.48ubuntu1/debian/control --- etckeeper-0.48/debian/control 2010-07-17 00:57:56.000000000 +0530 +++ etckeeper-0.48ubuntu1/debian/control 2010-07-19 18:06:45.000000000 +0530 @@ -2,7 +2,8 @@ Section: admin Priority: optional Build-Depends: debhelper (>= 7), dpkg-dev (>= 1.9.0), bzr (>= 1.4~), python-central -Maintainer: Joey Hess +Maintainer: Ubuntu Developers +XSBC-Original-Maintainer: Joey Hess Standards-Version: 3.9.0 XS-Python-Version: all Vcs-Git: git://git.kitenet.net/etckeeper @@ -11,7 +12,7 @@ Package: etckeeper Architecture: all Section: admin -Depends: git-core (>= 1:1.5.4) | git (>= 1:1.7) | mercurial | bzr (>= 1.4~) | darcs, ${misc:Depends} +Depends: bzr (>= 1.4~) | git-core (>= 1:1.5.4) | git (>= 1:1.7) | mercurial | darcs, ${misc:Depends} Recommends: cron Conflicts: bzr (<< 1.4~) XB-Python-Version: ${python:Versions} diff -Nru etckeeper-0.48/etckeeper.conf etckeeper-0.48ubuntu1/etckeeper.conf --- etckeeper-0.48/etckeeper.conf 2010-03-13 03:44:22.000000000 +0530 +++ etckeeper-0.48ubuntu1/etckeeper.conf 2010-07-17 04:43:16.000000000 +0530 @@ -1,7 +1,7 @@ # The VCS to use. #VCS="hg" -VCS="git" -#VCS="bzr" +#VCS="git" +VCS="bzr" #VCS="darcs" # Options passed to git commit when run by etckeeper. diff -Nru etckeeper-0.48/etckeeper.spec etckeeper-0.48ubuntu1/etckeeper.spec --- etckeeper-0.48/etckeeper.spec 2010-07-17 00:58:04.000000000 +0530 +++ etckeeper-0.48ubuntu1/etckeeper.spec 2010-07-19 18:11:14.000000000 +0530 @@ -1,5 +1,5 @@ Name: etckeeper -Version: 0.48 +Version: 0.48ubuntu1 Release: 4%{?dist} Summary: store /etc in git, mercurial, bzr or darcs