Merge lp:~jtaylor/ubuntu/oneiric/libindicate/apply-patches into lp:ubuntu/oneiric/libindicate

Proposed by Julian Taylor
Status: Merged
Merge reported by: Chris Halse Rogers
Merged at revision: not available
Proposed branch: lp:~jtaylor/ubuntu/oneiric/libindicate/apply-patches
Merge into: lp:ubuntu/oneiric/libindicate
Diff against target: 25 lines (+7/-0)
2 files modified
debian/changelog (+6/-0)
debian/rules (+1/-0)
To merge this branch: bzr merge lp:~jtaylor/ubuntu/oneiric/libindicate/apply-patches
Reviewer Review Type Date Requested Status
Ubuntu branches Pending
Review via email: mp+73179@code.launchpad.net

Description of the change

apply patches was seemingly accidentally dropped in 0.5.90-0ubuntu1
causes bug 834602 and rdep build failure bug 835760, reintroduces bug 690668

To post a comment you must log in.
Revision history for this message
Chris Halse Rogers (raof) wrote :

This is actually against the wrong branch - we use lp:~ubuntu-desktop/libindicate/ubuntu. I've gone ahead and merged those changes onto the appropriate branch.

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 2011-08-25 11:58:58 +0000
3+++ debian/changelog 2011-08-28 15:56:24 +0000
4@@ -1,3 +1,9 @@
5+libindicate (0.5.91-0ubuntu3) oneiric; urgency=low
6+
7+ * debian/rules: apply patches again (LP: #834602)
8+
9+ -- Julian Taylor <jtaylor.debian@googlemail.com> Sun, 28 Aug 2011 17:49:37 +0200
10+
11 libindicate (0.5.91-0ubuntu2) oneiric; urgency=low
12
13 * debian/rules: Call dh_cli* helpers so we get correct dependencies and
14
15=== modified file 'debian/rules'
16--- debian/rules 2011-08-25 11:58:58 +0000
17+++ debian/rules 2011-08-28 15:56:24 +0000
18@@ -12,6 +12,7 @@
19 DEB_BUILDDIR = build
20 DEB_MAKE_FLAVORS = gtk2 gtk3
21
22+include /usr/share/cdbs/1/rules/simple-patchsys.mk
23 include /usr/share/cdbs/1/rules/autoreconf.mk
24 include /usr/share/cdbs/1/rules/debhelper.mk
25 include /usr/share/cdbs/1/class/gnome.mk

Subscribers

People subscribed via source and target branches

to all changes: