Merge lp:~yolanda.robla/ubuntu/trusty/memcached/add_distribution into lp:ubuntu/trusty/memcached

[Yolanda Robla]

Added distribution: https://blueprints.launchpad.net/ubuntu/+spec/servercloud-s-server-app-banner-updates

[Barry Warsaw (barry)]

This patch looks pretty good.

I noticed you used append_stat instead of APPEND_STAT (in memcached.c). It appears this is necessary because APPEND_STAT is a macro that only accepts 3 arguments (memcached.h).

I removed the extra newline from d/rules.

Some of the quilt patches had to be refreshed in order to remove fuzz.

I double checked that the change doesn't break memcached documented protocol:

https://github.com/memcached/memcached/blob/master/doc/protocol.txt

and it seems to be okay, but I'm not an expert.

I tested it on a live trusty system by:

% telnet localhost 11211
Trying 127.0.0.1...
Connected to localhost.
Escape character is '^]'.
version
VERSION 1.4.14 (Ubuntu)
quit
Connection closed by foreign host.

So it looks good to me and I'll sponsor the package with these changes. Thanks!

review: Approve

Unmerged revisions

36. By Yolanda Robla on 2013-11-14

* debian/control: added lsb-release, dh-autoreconf to build depends
* debian/rules: run autoreconf
* debian/patches/fix-distribution.patch: added patch to show distribution on version

35. By Ubuntu <email address hidden> on 2013-11-14

* debian/control: added lsb-release, dh-autoreconf to build depends
* debian/rules: run autoreconf
* debian/patches/fix-distribution.patch: added patch to show distribution on version

=== modified file 'debian/changelog'
--- debian/changelog	2013-08-30 00:36:52 +0000
+++ debian/changelog	2013-11-14 12:04:29 +0000
@@ -1,3 +1,11 @@
+memcached (1.4.14-0ubuntu5) UNRELEASED; urgency=low
+
+  * debian/control: added lsb-release, dh-autoreconf to build depends
+  * debian/rules: run autoreconf
+  * debian/patches/fix-distribution.patch: added patch to show distribution on version
+
+ -- Yolanda Robla <[e-mail]>  Wed, 13 Nov 2013 13:50:59 +0100
+
 memcached (1.4.14-0ubuntu4) saucy; urgency=low
 
   * Move dh_quilt_apply into configure step so that config.{sub,guess}
 
=== modified file 'debian/control'
--- debian/control	2013-05-23 13:36:11 +0000
+++ debian/control	2013-11-14 12:04:29 +0000
@@ -4,7 +4,7 @@
 Maintainer: Ubuntu Developers <[e-mail]>
 XSBC-Original-Maintainer: David Martínez Moreno <[e-mail]>
 Build-Depends: debhelper (>= 6), libevent-dev, quilt (>= 0.46-7), libsasl2-dev,
- dpkg-dev (>= 1.15.7)
+ dpkg-dev (>= 1.15.7), dh-autoreconf, lsb-release
 Homepage: http://www.danga.com/memcached/
 Standards-Version: 3.8.4
 XS-Testsuite: autopkgtest
 
=== added file 'debian/patches/fix-distribution.patch'
--- debian/patches/fix-distribution.patch	1970-01-01 00:00:00 +0000
+++ debian/patches/fix-distribution.patch	2013-11-14 12:04:29 +0000
@@ -0,0 +1,37 @@
+--- a/configure.ac
++++ b/configure.ac
+@@ -554,4 +554,13 @@
+ fi
+ 
+ AC_CONFIG_FILES(Makefile doc/Makefile)
++
++# define distribution
++if test -x /usr/bin/lsb_release && lsb_release -si; then
++       MEMCACHED_DISTRIBUTION=" ($(lsb_release -si))"
++else
++       MEMCACHED_DISTRIBUTION=""
++fi
++AC_DEFINE_UNQUOTED(MEMCACHED_DISTRIBUTION, "$MEMCACHED_DISTRIBUTION", Memcached distribution)
++
+ AC_OUTPUT
+--- a/memcached.c
++++ b/memcached.c
+@@ -2536,7 +2536,8 @@
+     APPEND_STAT("pid", "%lu", (long)pid);
+     APPEND_STAT("uptime", "%u", now);
+     APPEND_STAT("time", "%ld", now + (long)process_started);
+-    APPEND_STAT("version", "%s", VERSION);
++    append_stat("version", add_stats, c, "%s%s", VERSION,
++                MEMCACHED_DISTRIBUTION);
+     APPEND_STAT("libevent", "%s", event_get_version());
+     APPEND_STAT("pointer_size", "%d", (int)(8 * sizeof(void *)));
+ 
+@@ -3325,7 +3326,7 @@
+ 
+     } else if (ntokens == 2 && (strcmp(tokens[COMMAND_TOKEN].value, "version") == 0)) {
+ 
+-        out_string(c, "VERSION " VERSION);
++        out_string(c, "VERSION " VERSION MEMCACHED_DISTRIBUTION);
+ 
+     } else if (ntokens == 2 && (strcmp(tokens[COMMAND_TOKEN].value, "quit") == 0)) {
+ 
 
=== modified file 'debian/patches/series'
--- debian/patches/series	2013-08-13 13:52:58 +0000
+++ debian/patches/series	2013-11-14 12:04:29 +0000
@@ -4,3 +4,4 @@
 04_add_init_retry.patch
 start-memcached-fix-hash.patch
 config-updates.diff
+fix-distribution.patch
 
=== modified file 'debian/rules'
--- debian/rules	2013-08-29 19:08:53 +0000
+++ debian/rules	2013-11-14 12:04:29 +0000
@@ -6,6 +6,8 @@
 # Uncomment this to turn on verbose mode.
 #export DH_VERBOSE=1
 
+%:
+	dh $@  --with autoreconf
 
 # These are used for cross-compiling and for saving the configure script
 # from having to guess our platform (since we know it already)
@@ -25,6 +27,7 @@
 	INSTALL_PROGRAM += -s
 endif
 
+
 get-orig-source:
 	uscan --verbose --force-download --rename --repack --destdir=..