kubuntu-packaging

Merge ~gsilvapt/kubuntu-packaging/+git/peruse:kubuntu_unstable into ~kubuntu-packagers/kubuntu-packaging/+git/peruse:kubuntu_unstable

  1. Git
  2. lp:~gsilvapt/kubuntu-packaging/+git/peruse
  3. kubuntu_unstable
  4. Merge into kubuntu_unstable
Proposed by Gustavo Silva on 2017-06-18
Status: Merged
Merged at revision: 5f9e7db210163dd259a9ca37386174586d0b3706
Proposed branch: ~gsilvapt/kubuntu-packaging/+git/peruse:kubuntu_unstable
Merge into: ~kubuntu-packagers/kubuntu-packaging/+git/peruse:kubuntu_unstable
Diff against target: 60 lines (+4/-16)
4 files modified
debian/changelog (+0/-12)
debian/control (+1/-1)
debian/rules (+1/-1)
debian/upstream/metadata (+2/-2)
Reviewer Review Type Date Requested Status
Kubuntu Packagers 2017-06-18 Pending
Review via email: mp+325893@code.launchpad.net

Description of the Change

Changed files as proposed in https://bugs.launchpad.net/ubuntu/+bug/1663675/comments/4

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
1diff --git a/debian/changelog b/debian/changelog
2index cb116a6..dabd33a 100644
3--- a/debian/changelog
4+++ b/debian/changelog
5@@ -1,18 +1,6 @@
6 peruse (1.2-0ubuntu1) UNRELEASED; urgency=medium
7
8 [ Clive Johnston ]
9- * New upstream release (1.1)
10- * Adding lintian override
11- * Add new build dep on qml-module-org-kde-newstuff
12- * Add catch all in copyright and merged under same licence
13- * Add build deps on git and zlib1g-dev
14- * Add runtime dep on newstuff
15- * Adding more lintian overrides as Lintian loves to complain
16-
17- [ Rik Mills ]
18- * New upstream release (1.2)
19-
20- [ Clive Johnston ]
21 * Initial release (LP: #1663675)
22
23 -- Clive Johnston <clivejo@kubuntu.org> Mon, 31 Oct 2016 20:44:02 +0000
24diff --git a/debian/control b/debian/control
25index bdb8a17..d404eaa 100644
26--- a/debian/control
27+++ b/debian/control
28@@ -1,7 +1,7 @@
29 Source: peruse
30 Section: kde
31 Priority: optional
32-Maintainer: Debian KDE Extras Team <pkg-kde-extras@lists.alioth.debian.org>
33+Maintainer: Kubuntu Developers <kubuntu-devel@lists.ubuntu.com>
34 Uploaders: Mark Purcell <msp@debian.org>, Kai Wasserbäch <curan@debian.org>
35 Build-Depends: baloo-kf5-dev (>= 5.1.0),
36 cmake (>= 2.8.12),
37diff --git a/debian/rules b/debian/rules
38index 5639079..6175ed0 100755
39--- a/debian/rules
40+++ b/debian/rules
41@@ -3,4 +3,4 @@
42 include /usr/share/pkg-kde-tools/qt-kde-team/3/debian-qt-kde.mk
43
44 %:
45- dh $@ --parallel --with kf5
46+ dh $@ --with kf5
47diff --git a/debian/upstream/metadata b/debian/upstream/metadata
48index a22d886..591b86e 100644
49--- a/debian/upstream/metadata
50+++ b/debian/upstream/metadata
51@@ -1,8 +1,8 @@
52 Name: peruse
53-Changelog: https://quickgit.kde.org/?p=peruse.git&a=log
54+Changelog: https://cgit.kde.org/peruse.git/log
55 Contact: admin@leinir.dk
56 Donation: https://www.kde.org/community/donations/index.php
57-Repository: https://anongit.kde.org/peruse.git
58+Repository: https://cgit.kde.org/peruse.git
59 Repository-Browse: https://quickgit.kde.org/?p=peruse.git
60 Security-Contact: security@kde.org
61

Subscribers

People subscribed via source and target branches