Fix hook scripts to use new etckeeper path. Closes: #509742

diff --git a/apt.conf b/apt.conf
index b2e0f9b3a3dd2fa2e7fbe601b5d4d706e615a9f6..bd6afc58a4e6e1da4454ae972390b2df4194b10e 100644 (file)
--- a/apt.conf
+++ b/apt.conf
@@ -1,5 +1,5 @@
-DPkg::Pre-Install-Pkgs { "if [ -x /usr/bin/etckeeper ]; then etckeeper pre-install; fi"; };
-DPkg::Post-Invoke      { "if [ -x /usr/bin/etckeeper ]; then etckeeper post-install; fi"; };
+DPkg::Pre-Install-Pkgs { "if [ -x /usr/sbin/etckeeper ]; then etckeeper pre-install; fi"; };
+DPkg::Post-Invoke      { "if [ -x /usr/sbin/etckeeper ]; then etckeeper post-install; fi"; };
 
-RPM::Pre-Install-Pkgs { "if [ -x /usr/bin/etckeeper ]; then etckeeper pre-install; fi"; };
-RPM::Post-Invoke      { "if [ -x /usr/bin/etckeeper ]; then etckeeper post-install; fi"; };
+RPM::Pre-Install-Pkgs { "if [ -x /usr/sbin/etckeeper ]; then etckeeper pre-install; fi"; };
+RPM::Post-Invoke      { "if [ -x /usr/sbin/etckeeper ]; then etckeeper post-install; fi"; };

diff --git a/debian/changelog b/debian/changelog
index 60c5ad41fa7ca8e7fa280183b7269311f28f0a33..07bcc17a1b0633cc35b139b22f9fe7d00da2e1a0 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+etckeeper (0.23) UNRELEASED; urgency=low
+
+  * Fix hook scripts to use new etckeeper path. Closes: #509742
+
+ -- Joey Hess <joeyh@debian.org>  Thu, 25 Dec 2008 16:24:42 -0500
+
 etckeeper (0.22) unstable; urgency=low
 
   * Move etckeeper to sbin, and man page to section 8, since only an admin

diff --git a/pacman-g2.hook b/pacman-g2.hook
index ac2e099816b739b2e9dbd44c550c3fb2dd93708d..bd93d7345ed5f6005e1b5ef59cde7f448ea8f2be 100644 (file)
--- a/pacman-g2.hook
+++ b/pacman-g2.hook
@@ -1,13 +1,13 @@
 #!/bin/sh
 
 pre_sysupgrade() {
-       if [ -x /usr/bin/etckeeper ]; then
+       if [ -x /usr/sbin/etckeeper ]; then
                etckeeper pre-install
        fi
 }
 
 post_sysupgrade() {
-       if [ -x /usr/bin/etckeeper ]; then
+       if [ -x /usr/sbin/etckeeper ]; then
                etckeeper post-install
        fi
 }