Merge lp:~dannf/ubuntu/saucy/memcached/lp1218114.2 into lp:ubuntu/saucy/memcached

Proposed by dann frazier
Status: Merged
Merged at revision: 34
Proposed branch: lp:~dannf/ubuntu/saucy/memcached/lp1218114.2
Merge into: lp:ubuntu/saucy/memcached
Diff against target: 34 lines (+8/-1)
2 files modified
debian/changelog (+7/-0)
debian/rules (+1/-1)
To merge this branch: bzr merge lp:~dannf/ubuntu/saucy/memcached/lp1218114.2
Reviewer Review Type Date Requested Status
Mathieu Trudel-Lapierre Approve
Review via email: mp+182993@code.launchpad.net
To post a comment you must log in.
Revision history for this message
Mathieu Trudel-Lapierre (cyphermox) wrote :

Looks fine to me; let's merge / release this.

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'debian/changelog'
2--- debian/changelog 2013-08-13 13:52:58 +0000
3+++ debian/changelog 2013-08-29 19:15:25 +0000
4@@ -1,3 +1,10 @@
5+memcached (1.4.14-0ubuntu4) UNRELEASED; urgency=low
6+
7+ * Move dh_quilt_apply into configure step so that config.{sub,guess}
8+ patches get applied before running configure. (LP: #1218114)
9+
10+ -- dann frazier <dann.frazier@canonical.com> Thu, 29 Aug 2013 12:54:20 -0600
11+
12 memcached (1.4.14-0ubuntu3) saucy; urgency=low
13
14 * Update config.{guess,sub} for Aarch64.
15
16=== modified file 'debian/rules'
17--- debian/rules 2012-05-28 15:21:53 +0000
18+++ debian/rules 2013-08-29 19:15:25 +0000
19@@ -29,6 +29,7 @@
20 uscan --verbose --force-download --rename --repack --destdir=..
21
22 config.status: configure
23+ dh_quilt_patch
24 dh_testdir
25 CFLAGS="$(CFLAGS)" CPPFLAGS="$(CPPFLAGS)" LDFLAGS="$(LDFLAGS)" ./configure --host=$(DEB_HOST_GNU_TYPE) \
26 --build=$(DEB_BUILD_GNU_TYPE) \
27@@ -40,7 +41,6 @@
28 build: build-stamp
29
30 build-stamp: config.status
31- dh_quilt_patch
32 dh_testdir
33
34 $(MAKE)

Subscribers

People subscribed via source and target branches

to all changes: