Merge lp:~yolanda.robla/ubuntu/saucy/etckeeper/debian_merge into lp:ubuntu/saucy/etckeeper

[Yolanda Robla]

Merging last Debian version (LP: #1200508)

[Martin Pitt (pitti)]

Thanks! Uploaded.

review: Approve

Unmerged revisions

47. By Yolanda Robla on 2013-07-16

* 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.
* Deal with unix^wlinux portability nonsense.

=== modified file 'debian/changelog'
--- debian/changelog	2013-05-10 08:30:27 +0000
+++ debian/changelog	2013-07-16 13:19:25 +0000
@@ -1,3 +1,24 @@
+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 <[e-mail]>  Fri, 12 Jul 2013 09:28:51 +0200
+
+etckeeper (1.4) unstable; urgency=low
+
+  * Deal with unix^wlinux portability nonsense.
+
+ -- Joey Hess <[e-mail]>  Mon, 17 Jun 2013 12:00:59 -0400
+
 etckeeper (1.3ubuntu1) saucy; urgency=low
 
   * Merge from Debian unstable (LP: #1178739).  Remaining changes:

=== modified file 'debian/control'
--- debian/control	2013-01-08 10:39:55 +0000
+++ debian/control	2013-07-16 13:19:25 +0000
@@ -4,7 +4,7 @@
 Build-Depends: debhelper (>= 7), dpkg-dev (>= 1.9.0), bzr (>= 1.5~), python
 Maintainer: Ubuntu Developers <[e-mail]>
 XSBC-Original-Maintainer: Joey Hess <[e-mail]>
-Standards-Version: 3.9.3
+Standards-Version: 3.9.4
 XS-Python-Version: all
 Vcs-Git: git://git.kitenet.net/etckeeper
 Homepage: http://kitenet.net/~joey/code/etckeeper/

=== modified file 'etckeeper.spec'
--- etckeeper.spec	2013-05-10 08:30:27 +0000
+++ etckeeper.spec	2013-07-16 13:19:25 +0000
@@ -1,5 +1,5 @@
 Name: etckeeper
-Version: 1.3
+Version: 1.4
 Release: 4%{?dist}
 Summary: store /etc in git, mercurial, bzr or darcs
 

=== modified file 'uninit.d/50vcs-uninit'
--- uninit.d/50vcs-uninit	2013-05-08 22:36:30 +0000
+++ uninit.d/50vcs-uninit	2013-07-16 13:19:25 +0000
@@ -21,9 +21,9 @@
 	exit 0
 else
 	realfile="$file"
-	if which tempfile >/dev/null 2>&1; then
+	if which tempfile >/dev/null 2>&1 || type -p tempfile >/dev/null 2>&1; then
 		tempfile="tempfile"
-	elif which mktemp >/dev/null 2>&1; then
+	elif which mktemp >/dev/null 2>&1 || type -p mktemp >/dev/null 2>&1; then
 		tempfile="mktemp"
 	else
 		echo "etckeeper warning: can't find tempfile or mktemp" >&2

=== modified file 'update-ignore.d/01update-ignore'
--- update-ignore.d/01update-ignore	2013-05-08 22:36:30 +0000
+++ update-ignore.d/01update-ignore	2013-07-16 13:19:25 +0000
@@ -171,9 +171,9 @@
 		fi
 	fi
 	realfile="$file"
-	if which tempfile >/dev/null 2>&1; then
+	if which tempfile >/dev/null 2>&1 || type -p tempfile >/dev/null 2>&1; then
 		tempfile="tempfile"
-	elif which mktemp >/dev/null 2>&1; then
+	elif which mktemp >/dev/null 2>&1 || type -p mktemp >/dev/null 2>&1; then
 		tempfile="mktemp"
 	else
 		echo "etckeeper warning: can't find tempfile or mktemp" >&2