Bug#692652: unblock: xcache/2.0.0-3

[Michal Čihař]

Hi

Dne Tue, 13 Nov 2012 21:59:10 +0100
intrigeri <intrig...@boum.org> napsal(a):

> > The upload fixes bug #690409 (wrong handling of conffile move),
> 
> I think this unblock request should wait until it's clarified on
> #690409 that the absolute extension path is updated or .dpkg-dist
> appears through every supported upgrade path.

I will upload 2.0.0-4 soon with same fix as was used for xdebug, diff
attached.

-- 
        Michal Čihař | http://cihar.com | http://blog.cihar.com

commit 8b83be8abad108f41ac0348b8a16727ba0bb6bdc
Author: Michal Čihař <ni...@debian.org>
Date:   Wed Nov 14 08:55:20 2012 +0100

    Rewrite configuration to correct path to extension on upgrade (Closes: #690409).

diff --git a/debian/changelog b/debian/changelog
index 45a86ba..d266c92 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+xcache (2.0.0-4) unstable; urgency=low
+
+  * Rewrite configuration to correct path to extension on upgrade
+    (Closes: #690409).
+
+ -- Michal Čihař <ni...@debian.org>  Wed, 14 Nov 2012 08:57:03 +0100
+
 xcache (2.0.0-3) unstable; urgency=low
 
   * Do not include full path to extension in xcache.so.
diff --git a/debian/php5-xcache.postinst b/debian/php5-xcache.postinst
index ed10958..a42723f 100755
--- a/debian/php5-xcache.postinst
+++ b/debian/php5-xcache.postinst
@@ -9,6 +9,12 @@ fi
 dpkg-maintscript-helper mv_conffile \
     /etc/php5/conf.d/xcache.ini /etc/php5/mods-available/xcache.ini 2.0.0-2 php5-xcache -- "$@"
 
+# Verify path in ini file is correct
+EXT_DIR=
+if [ -n "$EXT_DIR" ]; then
+    sed -e "s@\(zend_extension=\).*\(xcache.so\)@\1$EXT_DIR/\2@g" -i /etc/php5/mods-available/xcache.ini
+fi
+
 #DEBHELPER#
 
 exit 0
diff --git a/debian/rules b/debian/rules
index d7fdf69..0ad9f73 100755
--- a/debian/rules
+++ b/debian/rules
@@ -24,6 +24,7 @@ build-indep: build-stamp
 build-stamp: 
 	dh build
 	sed "s#@EXTDIR@#`php-config5 --extension-dir`#" debian/xcache.ini.in > debian/xcache.ini
+	sed "s@EXT_DIR=.*@EXT_DIR=`php-config5 --extension-dir`@" -i debian/php5-xcache.postinst
 	touch $@
 
 override_dh_auto_configure:

signature.asc
Description: PGP signature