Merge lp:~l3on/ubuntu/oneiric/qwt/fix-921430 into lp:ubuntu/oneiric/qwt

Proposed by Leo Iannacone on 2012-05-26
Status: Rejected
Rejected by: Martin Pitt on 2012-05-30
Proposed branch: lp:~l3on/ubuntu/oneiric/qwt/fix-921430
Merge into: lp:ubuntu/oneiric/qwt
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:~l3on/ubuntu/oneiric/qwt/fix-921430
Reviewer Review Type Date Requested Status
Didier Roche Approve on 2012-05-30
Ubuntu branches 2012-05-26 Pending
Review via email: mp+107534@code.launchpad.net

Description of the Change

Imported patch from debian to fix the typo in
debian/control.Replaces: added the missing debian revision.
(LP: #921430, Closes: #631816)

To post a comment you must log in.
12. By Leo Iannacone on 2012-05-26

Fix typo in debian/changelog

Didier Roche (didrocks) wrote :

the change looks good to me. Thanks!

review: Approve
Didier Roche (didrocks) wrote :

FYI, the right branch to push it is the oneiric-proposed one. Sponsoring and pushing there.

Unmerged revisions

12. By Leo Iannacone on 2012-05-26

Fix typo in debian/changelog

11. By Leo Iannacone on 2012-05-26

Imported patch from debian to fix fix the typo in debian/control.Replaces: added the missing debian revision. (LP: #921430, Closes: #631816)

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-20 16:49:50 +0000
3+++ debian/changelog 2012-05-26 22:11:18 +0000
4@@ -1,3 +1,11 @@
5+qwt (6.0.0-1ubuntu1.11.10.1) oneiric-proposed; urgency=low
6+
7+ * Imported patch from debian to fix the typo in
8+ debian/control.Replaces: added the missing debian revision.
9+ (LP: #921430, Closes: #631816)
10+
11+ -- Leo Iannacone <l3on@ubuntu.com> Sat, 26 May 2012 23:32:19 +0200
12+
13 qwt (6.0.0-1ubuntu1) oneiric; urgency=low
14
15 * Update libqwt-dev.install path for multiarch (LP: #829437)
16
17=== modified file 'debian/control'
18--- debian/control 2011-08-20 16:49:50 +0000
19+++ debian/control 2012-05-26 22:11:18 +0000
20@@ -14,7 +14,7 @@
21 Depends: ${shlibs:Depends}, ${misc:Depends},
22 libqwt6 (= ${binary:Version}), libqt4-dev
23 Breaks: libqwt5-qt4-dev (<< 6.0.0-1)
24-Replaces: libqwt5-qt4-dev (<< 6.0.0-)
25+Replaces: libqwt5-qt4-dev (<< 6.0.0-1)
26 Description: Qt widgets library for technical applications (development)
27 The Qwt library contains Qt GUI Components and utility classes which
28 are primarily useful for programs with a technical background. Most of

Subscribers

People subscribed via source and target branches

to all changes: