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

Proposed by Walter Lapchynski on 2016-12-06
Status: Needs review
Proposed branch: ~wxl/kubuntu-packaging/+git/konversation:kubuntu_yakkety_archive
Merge into: ~kubuntu-packagers/kubuntu-packaging/+git/konversation:kubuntu_yakkety_archive
Diff against target: 157 lines (+89/-34)
3 files modified
debian/README.source (+49/-0)
debian/changelog (+6/-0)
debian/control (+34/-34)
Reviewer Review Type Date Requested Status
Kubuntu Packagers 2016-12-06 Pending
Review via email: mp+312604@code.launchpad.net

Description of the change

sync yakkety to 1.6.1-1ubuntu2 version

This is in preparation for upping the version to 1.6.2 and pulling an SRU in yakkety, mostly due to:
https://cgit.kde.org/konversation.git/commit/?h=1.6&id=4fa92f7e55dea6354a7dbeae1ddf62c4357912e2

To post a comment you must log in.

Unmerged commits

58e0346... by Walter Lapchynski on 2016-12-06

sync yakkety to 1.6.1-1ubuntu2 version

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 2e3643d..5756edd 100644
58--- a/debian/changelog
59+++ b/debian/changelog
60@@ -1,3 +1,9 @@
61+konversation (1.6.1-1ubuntu2) yakkety; urgency=medium
62+
63+ * Konversation breaks/replaces konversation-data << 1.6.1~
64+
65+ -- Philip Muškovac <yofel@kubuntu.org> Fri, 12 Aug 2016 21:52:18 +0200
66+
67 konversation (1.6.1-1ubuntu1) yakkety; urgency=low
68
69 * Merge from Debian unstable. Remaining changes:
70diff --git a/debian/control b/debian/control
71index b83b218..e95194a 100644
72--- a/debian/control
73+++ b/debian/control
74@@ -1,38 +1,38 @@
75 Source: konversation
76 Section: net
77 Priority: optional
78-Maintainer: Debian/Kubuntu Qt/KDE Team <debian-qt-kde@lists.debian.org>
79+Maintainer: Ubuntu Developers <ubuntu-devel-discuss@lists.ubuntu.com>
80+XSBC-Original-Maintainer: Debian KDE Extras Team <pkg-kde-extras@lists.alioth.debian.org>
81 Uploaders: Modestas Vainius <modax@debian.org>, Diane Trout <diane@debian.org>
82-Build-Depends: cmake (>= 2.6.2),
83- debhelper (>= 9),
84- extra-cmake-modules (>= 1.2.0),
85- kdoctools-dev (>= 5.15.0),
86- kio-dev (>= 5.15.0),
87- libkf5archive-dev (>= 5.15.0),
88- libkf5bookmarks-dev (>= 5.15.0),
89- libkf5config-dev (>= 5.15.0),
90- libkf5configwidgets-dev (>= 5.15.0),
91- libkf5coreaddons-dev (>= 5.15.0),
92- libkf5crash-dev (>= 5.15.0),
93- libkf5dbusaddons-dev (>= 5.15.0),
94- libkf5emoticons-dev (>= 5.15.0),
95- libkf5globalaccel-dev (>= 5.15.0),
96- libkf5i18n-dev (>= 5.15.0),
97- libkf5iconthemes-dev (>= 5.15.0),
98- libkf5idletime-dev (>= 5.15.0),
99- libkf5notifications-dev (>= 5.15.0),
100- libkf5notifyconfig-dev (>= 5.15.0),
101- libkf5parts-dev (>= 5.15.0),
102- libkf5solid-dev (>= 5.15.0),
103- libkf5sonnet-dev (>= 5.15.0),
104- libkf5wallet-dev (>= 5.15.0),
105- libkf5widgetsaddons-dev (>= 5.15.0),
106- libkf5windowsystem-dev (>= 5.15.0),
107- libphonon4qt5-dev (>= 4.6.60),
108- libphonon4qt5experimental-dev (>= 4.6.60),
109- libqca-qt5-2-dev (>= 2.1.0),
110- pkg-kde-tools (>= 0.15.16),
111- qtbase5-dev (>= 5.3.0)
112+Build-Depends: debhelper (>= 9), cmake (>= 2.6.2),
113+ pkg-kde-tools (>= 0.15.16),
114+ extra-cmake-modules (>= 1.2.0),
115+ qtbase5-dev (>= 5.3.0),
116+ kdoctools-dev (>= 5.15.0),
117+ kio-dev (>= 5.15.0),
118+ libkf5archive-dev (>= 5.15.0),
119+ libkf5bookmarks-dev (>= 5.15.0),
120+ libkf5config-dev (>= 5.15.0),
121+ libkf5configwidgets-dev (>= 5.15.0),
122+ libkf5coreaddons-dev (>= 5.15.0),
123+ libkf5crash-dev (>= 5.15.0),
124+ libkf5emoticons-dev (>= 5.15.0),
125+ libkf5idletime-dev (>= 5.15.0),
126+ libkf5i18n-dev (>= 5.15.0),
127+ libkf5notifyconfig-dev (>= 5.15.0),
128+ libkf5parts-dev (>= 5.15.0),
129+ libkf5solid-dev (>= 5.15.0),
130+ libkf5sonnet-dev (>= 5.15.0),
131+ libkf5wallet-dev (>= 5.15.0),
132+ libkf5widgetsaddons-dev (>= 5.15.0),
133+ libkf5globalaccel-dev (>= 5.15.0),
134+ libkf5dbusaddons-dev (>= 5.15.0),
135+ libkf5notifications-dev (>= 5.15.0),
136+ libkf5windowsystem-dev (>= 5.15.0),
137+ libkf5iconthemes-dev (>= 5.15.0),
138+ libphonon4qt5-dev (>= 4.6.60),
139+ libphonon4qt5experimental-dev (>= 4.6.60),
140+ libqca-qt5-2-dev (>= 2.1.0),
141 Standards-Version: 3.9.8
142 Homepage: http://konversation.kde.org/
143 Vcs-Git: https://anonscm.debian.org/git/pkg-kde/kde-extras/konversation.git
144@@ -40,10 +40,10 @@ Vcs-Browser: https://anonscm.debian.org/cgit/pkg-kde/kde-extras/konversation.git
145
146 Package: konversation
147 Architecture: any
148-Depends: konversation-data (= ${source:Version}),
149- ${misc:Depends},
150- ${shlibs:Depends}
151+Depends: ${shlibs:Depends}, ${misc:Depends}, konversation-data (= ${source:Version})
152 Provides: irc
153+Breaks: konversation-data (<< 1.6.1~)
154+Replaces: konversation-data (<< 1.6.1~)
155 Description: user friendly Internet Relay Chat (IRC) client for KDE
156 Konversation is a client for the Internet Relay Chat (IRC) protocol.
157 It is easy to use and well-suited for novice IRC users, but novice

Subscribers

People subscribed via source and target branches