Merge lp:~bulldog98/kubuntu-packaging/marble into lp:~kubuntu-packagers/kubuntu-packaging/marble

Proposed by Jonathan Kolberg
Status: Merged
Merged at revision: 13
Proposed branch: lp:~bulldog98/kubuntu-packaging/marble
Merge into: lp:~kubuntu-packagers/kubuntu-packaging/marble
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:~bulldog98/kubuntu-packaging/marble
Reviewer Review Type Date Requested Status
Kubuntu Packagers Pending
Review via email: mp+73892@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-28 03:20:28 +0000
3+++ debian/changelog 2011-09-02 22:02:23 +0000
4@@ -1,3 +1,9 @@
5+marble (4:4.7.1-0ubuntu1) UNRELEASED; urgency=low
6+
7+ * New upstream release
8+
9+ -- Jonathan Kolberg <bulldog98@kubuntu-de.org> Fri, 02 Sep 2011 23:41:05 +0200
10+
11 marble (4:4.7.0-0ubuntu1) oneiric; urgency=low
12
13 * New upstream release
14
15=== modified file 'debian/control'
16--- debian/control 2011-07-22 21:40:47 +0000
17+++ debian/control 2011-09-02 22:02:23 +0000
18@@ -2,7 +2,7 @@
19 Section: kde
20 Priority: optional
21 Maintainer: Kubuntu Developers <kubuntu-devel@lists.ubuntu.com>
22-Build-Depends: kde-sc-dev-latest (>= 4:4.7.0),
23+Build-Depends: kde-sc-dev-latest (>= 4:4.7.1),
24 cmake,
25 debhelper (>= 7.3.16),
26 pkg-kde-tools (>= 0.12),

Subscribers

People subscribed via source and target branches