Merge ~wxl/kubuntu-packaging/+git/konversation:kubuntu_unstable into ~kubuntu-packagers/kubuntu-packaging/+git/konversation:kubuntu_unstable

Proposed by Walter Lapchynski on 2016-12-07
Status: Merged
Merged at revision: f61c6d53a0742e2fcc659f421bed7166925eea74
Proposed branch: ~wxl/kubuntu-packaging/+git/konversation:kubuntu_unstable
Merge into: ~kubuntu-packagers/kubuntu-packaging/+git/konversation:kubuntu_unstable
Diff against target: 173 lines (+96/-37)
3 files modified
debian/README.source (+49/-0)
debian/changelog (+12/-2)
debian/control (+35/-35)
Reviewer Review Type Date Requested Status
Simon Quigley 2016-12-07 Approve on 2016-12-07
Review via email: mp+312618@code.launchpad.net

Description of the change

Try #3!

New upstream version 1.6.2.

Note it was necessary to update the location of org.kde.konversation.appdata.xml.

I also proposed a sync with the current Ubuntu version in yakkety:
https://code.launchpad.net/~wxl/kubuntu-packaging/+git/konversation/+merge/312604

These together should allow us to eliminate crashing when editing servers:
https://cgit.kde.org/konversation.git/commit/?h=1.6&id=4fa92f7e55dea6354a7dbeae1ddf62c4357912e2

To post a comment you must log in.
Simon Quigley (tsimonq2) wrote :

FWIW LGTM

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1diff --git a/debian/README.source b/debian/README.source
2new file mode 100644
3index 0000000..c550c02
4--- /dev/null
5+++ b/debian/README.source
6@@ -0,0 +1,49 @@
7+Branches in the Git packaging repository
8+----------------------------------------
9+
10+Packaging branches must NOT have any debian/patches/* applied. When diff'ing
11+packaging and the respective upstream branch, there must NOT be any changes
12+outside debian/ subdirectory.
13+
14+Repository layout is as follows:
15+
16+* master - the main packaging branch (upstream source and
17+ debian directory). Typically targets Debian unstable.
18+* upstream - upstream source code for the master branch.
19+* <suitename> - packaging branch targeting Debian <suite_name>
20+* upstream-<suitename> - upstream source code for packaging in <suite_name>
21+ branch.
22+* pristine-tar - a branch with pristine-tar deltas for original
23+ - upstream tarballs.
24+* debian/<dversion> - annotated signed tags for package releases to Debian
25+ (based on master and <suitename> branches. ~ is
26+ replaced with -. Tag message should be of the form
27+ '<dversion>/<suitename>'.
28+* upstream/<uversion> - annotated tags for upstream releases which had at least one
29+ debian package release (based on upstream and
30+ upstream-<suitename> branches). ~ is replaced with -.
31+
32+General rules for patches in debian/patches
33+-------------------------------------------
34+
35+- Patches are managed with `QUILT_PATCHES=debian/patches quilt`.
36+* Highly recommended ~/.quiltrc settings are as follows:
37+ -------<--------->--------
38+ QUILT_NO_DIFF_INDEX=y
39+ QUILT_NO_DIFF_TIMESTAMPS=y
40+ QUILT_REFRESH_ARGS="-p ab"
41+ QUILT_DIFF_OPTS="-p"
42+ -------<--------->--------
43+* All patches must have valid DEP-3 [1] headers with at least Description and
44+ Author/Origin fields.
45+* Patches should follow these naming rules:
46+ - Each patch should be prefixed with either "debian_" for Debian specific
47+ changes, "general_" for distribution agnostic changes or "backport_" for
48+ changes backported from future releases.
49+ - Patch name should be rather short and meaningfully reflect nature of the
50+ changes. "_" should be used as a word separator.
51+ - It is recommended to suffix the patch name with either "_fix" for patches
52+ fixing bugs or with '_feature' for patches introducing new features.
53+* All patches should have .diff extension.
54+
55+1. http://dep.debian.net/deps/dep3/
56diff --git a/debian/changelog b/debian/changelog
57index 6790949..1cd206f 100644
58--- a/debian/changelog
59+++ b/debian/changelog
60@@ -1,4 +1,14 @@
61-konversation (1.6.1-1ubuntu2) UNRELEASED; urgency=medium
62+konversation (1.6.2-0ubuntu1) UNRELEASED; urgency=medium
63+
64+ * New upstream release.
65+ * Changed appdata path to metainfo
66+
67+ -- Walter Lapchynski <wxl@ubuntu.com> Wed, 07 Dec 2016 01:03:03 +0000
68+
69+konversation (1.6.1-1ubuntu2) yakkety; urgency=medium
70+
71+ [ Philip Muškovac ]
72+ * Konversation breaks/replaces konversation-data << 1.6.1~
73
74 [ Clive Johnston ]
75 * Bumping standards version
76@@ -8,7 +18,7 @@ konversation (1.6.1-1ubuntu2) UNRELEASED; urgency=medium
77 [ Simon Quigley ]
78 * Made the appdata to metainfo transition
79
80- -- Clive Johnston <clivejo@kubuntu.org> Thu, 09 Jun 2016 20:16:14 +0100
81+ -- Philip Muškovac <yofel@kubuntu.org> Fri, 12 Aug 2016 21:52:18 +0200
82
83 konversation (1.6.1-1ubuntu1) yakkety; urgency=low
84
85diff --git a/debian/control b/debian/control
86index 85f4de8..9edbd36 100644
87--- a/debian/control
88+++ b/debian/control
89@@ -1,49 +1,49 @@
90 Source: konversation
91 Section: net
92 Priority: optional
93-Maintainer: Debian/Kubuntu Qt/KDE Team <debian-qt-kde@lists.debian.org>
94+Maintainer: Ubuntu Developers <ubuntu-devel-discuss@lists.ubuntu.com>
95+XSBC-Original-Maintainer: Debian KDE Extras Team <pkg-kde-extras@lists.alioth.debian.org>
96 Uploaders: Modestas Vainius <modax@debian.org>, Diane Trout <diane@debian.org>
97-Build-Depends: cmake (>= 2.6.2),
98- debhelper (>= 9),
99- extra-cmake-modules (>= 1.2.0),
100- kdoctools-dev (>= 5.15.0),
101- kio-dev (>= 5.15.0),
102- libkf5archive-dev (>= 5.15.0),
103- libkf5bookmarks-dev (>= 5.15.0),
104- libkf5config-dev (>= 5.15.0),
105- libkf5configwidgets-dev (>= 5.15.0),
106- libkf5coreaddons-dev (>= 5.15.0),
107- libkf5crash-dev (>= 5.15.0),
108- libkf5dbusaddons-dev (>= 5.15.0),
109- libkf5emoticons-dev (>= 5.15.0),
110- libkf5globalaccel-dev (>= 5.15.0),
111- libkf5i18n-dev (>= 5.15.0),
112- libkf5iconthemes-dev (>= 5.15.0),
113- libkf5idletime-dev (>= 5.15.0),
114- libkf5notifications-dev (>= 5.15.0),
115- libkf5notifyconfig-dev (>= 5.15.0),
116- libkf5parts-dev (>= 5.15.0),
117- libkf5solid-dev (>= 5.15.0),
118- libkf5sonnet-dev (>= 5.15.0),
119- libkf5wallet-dev (>= 5.15.0),
120- libkf5widgetsaddons-dev (>= 5.15.0),
121- libkf5windowsystem-dev (>= 5.15.0),
122- libphonon4qt5-dev (>= 4.6.60),
123- libphonon4qt5experimental-dev (>= 4.6.60),
124- libqca-qt5-2-dev (>= 2.1.0),
125- pkg-kde-tools (>= 0.15.16),
126- qtbase5-dev (>= 5.3.0)
127-Standards-Version: 3.9.7
128+Build-Depends: debhelper (>= 9), cmake (>= 2.6.2),
129+ pkg-kde-tools (>= 0.15.16),
130+ extra-cmake-modules (>= 1.2.0),
131+ qtbase5-dev (>= 5.3.0),
132+ kdoctools-dev (>= 5.15.0),
133+ kio-dev (>= 5.15.0),
134+ libkf5archive-dev (>= 5.15.0),
135+ libkf5bookmarks-dev (>= 5.15.0),
136+ libkf5config-dev (>= 5.15.0),
137+ libkf5configwidgets-dev (>= 5.15.0),
138+ libkf5coreaddons-dev (>= 5.15.0),
139+ libkf5crash-dev (>= 5.15.0),
140+ libkf5emoticons-dev (>= 5.15.0),
141+ libkf5idletime-dev (>= 5.15.0),
142+ libkf5i18n-dev (>= 5.15.0),
143+ libkf5notifyconfig-dev (>= 5.15.0),
144+ libkf5parts-dev (>= 5.15.0),
145+ libkf5solid-dev (>= 5.15.0),
146+ libkf5sonnet-dev (>= 5.15.0),
147+ libkf5wallet-dev (>= 5.15.0),
148+ libkf5widgetsaddons-dev (>= 5.15.0),
149+ libkf5globalaccel-dev (>= 5.15.0),
150+ libkf5dbusaddons-dev (>= 5.15.0),
151+ libkf5notifications-dev (>= 5.15.0),
152+ libkf5windowsystem-dev (>= 5.15.0),
153+ libkf5iconthemes-dev (>= 5.15.0),
154+ libphonon4qt5-dev (>= 4.6.60),
155+ libphonon4qt5experimental-dev (>= 4.6.60),
156+ libqca-qt5-2-dev (>= 2.1.0),
157+Standards-Version: 3.9.8
158 Homepage: http://konversation.kde.org/
159 Vcs-Browser: https://code.launchpad.net/~kubuntu-packagers/kubuntu-packaging/+git/konversation
160 Vcs-Git: git://git.launchpad.net/~kubuntu-packagers/kubuntu-packaging/+git/konversation
161
162 Package: konversation
163 Architecture: any
164-Depends: konversation-data (= ${source:Version}),
165- ${misc:Depends},
166- ${shlibs:Depends}
167+Depends: ${shlibs:Depends}, ${misc:Depends}, konversation-data (= ${source:Version})
168 Provides: irc
169+Breaks: konversation-data (<< 1.6.1~)
170+Replaces: konversation-data (<< 1.6.1~)
171 Description: user friendly Internet Relay Chat (IRC) client for KDE
172 Konversation is a client for the Internet Relay Chat (IRC) protocol.
173 It is easy to use and well-suited for novice IRC users, but novice

Subscribers

People subscribed via source and target branches