php-memcache upload to stable-proposed-updates
Dear Release Team,
I would like to make an upload [1] to stable in order to fix bug in
php-memcache package (and include maintainer change too).
The full patch between this new package version and the version
3.0.4-4 currently in Squeeze is attached.
[1] http://mentors.debian.net/debian/pool/main/p/php-memcache/php-memcache_3.0.4-4~squeeze1.dsc
diff --git a/debian/changelog b/debian/changelog
index c6f2225..ed3079a 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+php-memcache (3.0.4-4~squeeze1) stable; urgency=low
+
+ * Fix cache delete bug, when deleting objects from memcached
+ 1.4.4+ (Closes: #620258)
+ * Maintainer change (See #620029)
+
+ -- Sergey B Kirpichev <skirpichev@gmail.com> Tue, 24 Jan 2012 13:01:06 +0400
+
php-memcache (3.0.4-4) unstable; urgency=low
* add memcached to suggests (Closes: #583109)
diff --git a/debian/control b/debian/control
index 3ef8cc0..7058a54 100644
--- a/debian/control
+++ b/debian/control
@@ -1,7 +1,7 @@
Source: php-memcache
Section: php
Priority: optional
-Maintainer: Ivan Borzenkov <ivan1986@list.ru>
+Maintainer: Sergey B Kirpichev <skirpichev@gmail.com>
Build-Depends: debhelper (>= 7), php5-dev(>= 5.3.1), cdbs, zlib1g-dev
Standards-Version: 3.8.4
Homepage: http://pecl.php.net/package/memcache
diff --git a/debian/patches/delete_items.patch b/debian/patches/delete_items.patch
new file mode 100644
index 0000000..4423112
--- /dev/null
+++ b/debian/patches/delete_items.patch
@@ -0,0 +1,24 @@
+Description: Fix cache delete bug.
+Origin: upstream, http://svn.php.net/viewvc/pecl/memcache/tags/RELEASE_3_0_5/memcache.c?r1=296729&r2=300434
+Bug-Debian: http://bugs.debian.org/620258
+
+--- a/memcache.c 2009-02-22 19:01:43.000000000 +0300
++++ b/memcache.c 2012-01-23 21:31:17.000000000 +0400
+@@ -642,7 +642,7 @@
+ }
+
+ if (deleted) {
+- pool->protocol->delete(request, request->key, request->key_len, value);
++ pool->protocol->delete(request, request->key, request->key_len, exptime);
+ }
+ else {
+ pool->protocol->mutate(request, *key, request->key, request->key_len, invert ? -value : value, defval, defval_used, exptime);
+@@ -676,7 +676,7 @@
+ }
+
+ if (deleted) {
+- pool->protocol->delete(request, request->key, request->key_len, value);
++ pool->protocol->delete(request, request->key, request->key_len, exptime);
+ }
+ else {
+ pool->protocol->mutate(request, keys, request->key, request->key_len, invert ? -value : value, defval, defval_used, exptime);
Reply to: