Merge lp:~micahg/kubuntu-packaging/gwenview-revert-libjpeg62 into lp:~kubuntu-packagers/kubuntu-packaging/gwenview

Proposed by Micah Gersten
Status: Merged
Merged at revision: 21
Proposed branch: lp:~micahg/kubuntu-packaging/gwenview-revert-libjpeg62
Merge into: lp:~kubuntu-packagers/kubuntu-packaging/gwenview
Diff against target: 28 lines (+9/-1)
2 files modified
debian/changelog (+8/-0)
debian/control (+1/-1)
To merge this branch: bzr merge lp:~micahg/kubuntu-packaging/gwenview-revert-libjpeg62
Reviewer Review Type Date Requested Status
Philip Muškovac Approve
Review via email: mp+69939@code.launchpad.net

Description of the change

This merge makes gwenview use the default libjpeg again which will make changing the default next cycle just require a no change rebuild.

To post a comment you must log in.
Revision history for this message
Philip Muškovac (yofel) :
review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== modified file 'debian/changelog'
--- debian/changelog 2011-07-31 14:48:03 +0000
+++ debian/changelog 2011-08-01 01:25:59 +0000
@@ -1,3 +1,11 @@
1gwenview (4:4.7.0-0ubuntu4) UNRELEASED; urgency=low
2
3 * Build depend on libjpeg-dev again now that libjpeg8-dev no longer provides
4 that virtual package
5 - update debian/control
6
7 -- Micah Gersten <micahg@ubuntu.com> Sun, 31 Jul 2011 20:22:28 -0500
8
1gwenview (4:4.7.0-0ubuntu3) oneiric; urgency=low9gwenview (4:4.7.0-0ubuntu3) oneiric; urgency=low
210
3 * Set maintainer field to Kubuntu Developers.11 * Set maintainer field to Kubuntu Developers.
412
=== modified file 'debian/control'
--- debian/control 2011-07-29 08:43:38 +0000
+++ debian/control 2011-08-01 01:25:59 +0000
@@ -6,7 +6,7 @@
6 debhelper (>= 7.0.50~),6 debhelper (>= 7.0.50~),
7 kde-sc-dev-latest (>= 4:4.7.0),7 kde-sc-dev-latest (>= 4:4.7.0),
8 libexiv2-dev,8 libexiv2-dev,
9 libjpeg62-dev,9 libjpeg-dev,
10 libkipi-dev,10 libkipi-dev,
11 libkonq5-dev,11 libkonq5-dev,
12 pkg-kde-tools,12 pkg-kde-tools,

Subscribers

People subscribed via source and target branches