[Date Prev][Date Next] [Thread Prev][Thread Next] [Date Index] [Thread Index]

Bug#692652: unblock: xcache/2.0.0-3



Package: release.debian.org
Severity: normal
User: release.debian.org@packages.debian.org
Usertags: unblock

-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA256

Please unblock (just uploaded) package xcache

The upload fixes bug #690409 (wrong handling of conffile move), diff of
packages is attached.

unblock xcache/2.0.0-3

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

- -- System Information:
Debian Release: wheezy/sid
  APT prefers unstable
  APT policy: (500, 'unstable'), (500, 'stable'), (1, 'experimental')
Architecture: amd64 (x86_64)

Kernel: Linux 3.4.11-2.16-desktop (SMP w/2 CPU cores; PREEMPT)
Locale: LANG=cs_CZ.UTF-8, LC_CTYPE=cs_CZ.UTF-8 (charmap=UTF-8)
Shell: /bin/sh linked to /bin/dash

-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.12 (GNU/Linux)

iQIcBAEBCAAGBQJQm3LiAAoJEGo39bHX+xdNfEwP/0a+UrlCvEZMd+XyLJGDWkO+
kYOoI2r/pC7i7dexNJ/ynlfZUsG0OGlJBWibvIG/4MDXNATs1ZJI+JfdjB+0yAhL
Tnhats1Ou2k355b26RjlHLBWVLOBztdfUGuICHTOjPEF3DYo/kjPBr7BSw+Sn2MZ
bst+fmpL8ry25+1ZXHqzJIaGZEjZKW72Dg4nJe9aiTnGfDJUzsdUMBb3YklLHJZW
hoIzERtox5PKzilITE7tokeN3J2LNZ4MlEa2iK75CbMAmzaENNx5Rqlq/Xn3Sqln
DuIMsqtBC68cn/BowUQyuQv9W13AXcKevbB5nzbd44T32fKxHCN6oIYFMzPJNLiu
dh8lZe+j/WS76tYR9/H/URTQfqAAdnvvMoyHocfAZY/+B3ihNw94eOBYtAMXE6sl
3sxKbXTN+O5aWyzucUxyxc7/gDzdURYPYN6kcX61z7gWydnHDXiNFMY7jfyGt4hd
Zfd5+MzIFJclH2tf//Q8wxucKEcoPVvC1/C9GElT8utvyXDcnx25klJ7mr6bMXzF
R/rBr25SeN+ppjn1XguNeIju8Qz3JWPBcwDbIzp+BkYC+k0sLQgm0NdlDyNrxUGc
/rP6KpFiw846zWiWFQeDzZSiFWxIIqLwxXNUWavApcYOvJNLnXCgzB9NIimUNaPh
H4QI/Hou+dBlXTngVyoe
=89gT
-----END PGP SIGNATURE-----
diff -Nru xcache-2.0.0/debian/control xcache-2.0.0/debian/control
--- xcache-2.0.0/debian/control	2012-07-25 09:37:24.000000000 +0200
+++ xcache-2.0.0/debian/control	2012-11-08 09:48:28.000000000 +0100
@@ -11,6 +11,7 @@
 
 Package: php5-xcache
 Architecture: any
+Pre-Depends: dpkg (>= 1.15.7.2)
 Depends: ${shlibs:Depends}, ${misc:Depends}, ${php:Depends}
 Conflicts: php-apc
 Description: Fast, stable PHP opcode cacher
diff -Nru xcache-2.0.0/debian/changelog xcache-2.0.0/debian/changelog
--- xcache-2.0.0/debian/changelog	2012-07-25 09:37:24.000000000 +0200
+++ xcache-2.0.0/debian/changelog	2012-11-08 09:48:28.000000000 +0100
@@ -1,3 +1,10 @@
+xcache (2.0.0-3) unstable; urgency=low
+
+  * Do not include full path to extension in xcache.so.
+  * Properly move configfile on upgrade (Closes: #690409).
+
+ -- Michal Čihař <nijel@debian.org>  Thu, 08 Nov 2012 09:48:20 +0100
+
 xcache (2.0.0-2) unstable; urgency=low
 
   * Cherry pick some fixes from upstream 2.0.1:
diff -Nru xcache-2.0.0/debian/php5-xcache.postinst xcache-2.0.0/debian/php5-xcache.postinst
--- xcache-2.0.0/debian/php5-xcache.postinst	2012-07-25 09:37:24.000000000 +0200
+++ xcache-2.0.0/debian/php5-xcache.postinst	2012-11-08 09:48:28.000000000 +0100
@@ -6,6 +6,9 @@
     php5enmod xcache
 fi
 
+dpkg-maintscript-helper mv_conffile \
+    /etc/php5/conf.d/xcache.ini /etc/php5/mods-available/xcache.ini 2.0.0-2 php5-xcache -- "$@"
+
 #DEBHELPER#
 
 exit 0
diff -Nru xcache-2.0.0/debian/php5-xcache.postrm xcache-2.0.0/debian/php5-xcache.postrm
--- xcache-2.0.0/debian/php5-xcache.postrm	2012-07-25 09:37:24.000000000 +0200
+++ xcache-2.0.0/debian/php5-xcache.postrm	2012-11-08 09:48:28.000000000 +0100
@@ -2,6 +2,9 @@
 
 set -e
 
+dpkg-maintscript-helper mv_conffile \
+    /etc/php5/conf.d/xcache.ini /etc/php5/mods-available/xcache.ini 2.0.0-2 php5-xcache -- "$@"
+
 if [ "$1" = "remove" ]; then
     php5dismod xcache
 fi
diff -Nru xcache-2.0.0/debian/php5-xcache.preinst xcache-2.0.0/debian/php5-xcache.preinst
--- xcache-2.0.0/debian/php5-xcache.preinst	1970-01-01 01:00:00.000000000 +0100
+++ xcache-2.0.0/debian/php5-xcache.preinst	2012-11-08 09:48:28.000000000 +0100
@@ -0,0 +1,11 @@
+#!/bin/sh
+
+set -e
+
+dpkg-maintscript-helper mv_conffile \
+    /etc/php5/conf.d/xcache.ini /etc/php5/mods-available/xcache.ini 2.0.0-2 php5-xcache -- "$@"
+
+#DEBHELPER#
+
+exit 0
+
diff -Nru xcache-2.0.0/debian/xcache.ini xcache-2.0.0/debian/xcache.ini
--- xcache-2.0.0/debian/xcache.ini	2012-07-25 09:37:24.000000000 +0200
+++ xcache-2.0.0/debian/xcache.ini	2012-11-08 09:48:28.000000000 +0100
@@ -2,7 +2,7 @@
 
 [xcache-common]
 ;; install as zend extension (recommended), normally "$extension_dir/xcache.so"
-zend_extension = /usr/lib/php5/20100525/xcache.so
+zend_extension = xcache.so
 
 [xcache.admin]
 xcache.admin.enable_auth = On

Reply to: