Merge lp:~nobuto/ubuntu/vivid/etckeeper/restore-exec-permission into lp:ubuntu/vivid/etckeeper

[Nobuto Murata]

This branch fixes a regression at 1.11ubuntu1/utopic-proposed.

====
tags: 1.11ubuntu1
<snip>
branch nick: utopic-proposed
timestamp: Wed 2014-06-04 10:27:24 +0200
message:
  * 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.
diff:
=== modified file 'commit.d/50vcs-commit' (properties changed: +x to -x)

[Sebastien Bacher (seb128)]

Thanks, uploaded to vivid, https://launchpad.net/ubuntu/+source/etckeeper/1.15ubuntu2

review: Approve

=== modified file 'commit.d/50vcs-commit' (properties changed: -x to +x)
=== modified file 'debian/changelog'
--- debian/changelog	2014-10-27 10:35:02 +0000
+++ debian/changelog	2015-02-14 10:01:25 +0000
@@ -1,3 +1,10 @@
+etckeeper (1.15ubuntu2) UNRELEASED; 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 <[e-mail]>  Sat, 14 Feb 2015 18:55:13 +0900
+
 etckeeper (1.15ubuntu1) vivid; urgency=low
 
   * Merge from Debian unstable.  Remaining changes: