Merge lp:~dobey/ubuntu/oneiric/couchdb-glib/fix-824666 into lp:ubuntu/oneiric/couchdb-glib

Proposed by dobey
Status: Merged
Merged at revision: 32
Proposed branch: lp:~dobey/ubuntu/oneiric/couchdb-glib/fix-824666
Merge into: lp:ubuntu/oneiric/couchdb-glib
Diff against target: 26 lines (+7/-1)
2 files modified
debian/changelog (+6/-0)
debian/control (+1/-1)
To merge this branch: bzr merge lp:~dobey/ubuntu/oneiric/couchdb-glib/fix-824666
Reviewer Review Type Date Requested Status
Ubuntu branches Pending
Review via email: mp+71592@code.launchpad.net
To post a comment you must log in.

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-07-22 11:43:24 +0000
3+++ debian/changelog 2011-08-15 17:49:24 +0000
4@@ -1,3 +1,9 @@
5+couchdb-glib (0.7.3-0ubuntu2) oneiric; urgency=low
6+
7+ * Use gir1.2-json-1.0 instead as name changed (LP: #824666)
8+
9+ -- Rodney Dawes <rodney.dawes@ubuntu.com> Mon, 15 Aug 2011 13:33:08 -0400
10+
11 couchdb-glib (0.7.3-0ubuntu1) oneiric; urgency=low
12
13 * New upstream release
14
15=== modified file 'debian/control'
16--- debian/control 2010-12-21 14:14:08 +0000
17+++ debian/control 2011-08-15 17:49:24 +0000
18@@ -15,7 +15,7 @@
19 libdbus-glib-1-dev,
20 gtk-doc-tools,
21 gir1.2-glib-2.0,
22- gir1.2-json-glib-1.0,
23+ gir1.2-json-1.0,
24 libgirepository1.0-dev (>= 0.6.3),
25 gobject-introspection (>= 0.6.5-3)
26 Homepage: https://launchpad.net/couchdb-glib

Subscribers

People subscribed via source and target branches

to all changes: