Merge lp:~dobey/ubuntu/natty/libubuntuone/fix-lost-change into lp:ubuntu/natty/libubuntuone

Proposed by dobey
Status: Merged
Merged at revision: 80
Proposed branch: lp:~dobey/ubuntu/natty/libubuntuone/fix-lost-change
Merge into: lp:ubuntu/natty/libubuntuone
Diff against target: 36 lines (+9/-2)
2 files modified
debian/changelog (+7/-0)
debian/control (+2/-2)
To merge this branch: bzr merge lp:~dobey/ubuntu/natty/libubuntuone/fix-lost-change
Reviewer Review Type Date Requested Status
Daniel Holbach (community) Approve
Ubuntu branches Pending
Review via email: mp+46616@code.launchpad.net
To post a comment you must log in.
Revision history for this message
Daniel Holbach (dholbach) wrote :

Good work!

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 2011-01-14 22:43:21 +0000
3+++ debian/changelog 2011-01-18 15:11:10 +0000
4@@ -1,3 +1,10 @@
5+libubuntuone (0.3.9-0ubuntu2) natty; urgency=low
6+
7+ * debian/control:
8+ - Bring back lost change of libwebkit-dev to libwebkitgtk-dev
9+
10+ -- Rodney Dawes <rodney.dawes@ubuntu.com> Tue, 18 Jan 2011 10:03:09 -0500
11+
12 libubuntuone (0.3.9-0ubuntu1) natty; urgency=low
13
14 * New upstream release.
15
16=== modified file 'debian/control'
17--- debian/control 2011-01-14 22:43:21 +0000
18+++ debian/control 2011-01-18 15:11:10 +0000
19@@ -8,7 +8,7 @@
20 Build-Depends: debhelper (>= 7.0.17),
21 cdbs,
22 python-support,
23- libwebkit-dev,
24+ libwebkitgtk-dev,
25 libglib2.0-dev,
26 libebook1.2-dev,
27 gnome-doc-utils,
28@@ -85,7 +85,7 @@
29 Package: libubuntuone-dev
30 Section: libdevel
31 Depends: libubuntuone-1.0-1 (= ${binary:Version}),
32- libwebkit-dev,
33+ libwebkitgtk-dev,
34 ${misc:Depends}
35 Architecture: any
36 Description: Ubuntu One widget library

Subscribers

People subscribed via source and target branches

to all changes: