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

[ԜаӀtеr Ⅼарсһуnѕkі]

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

[Simon Quigley (tsimonq2)]

FWIW LGTM

review: Approve

diff --git a/debian/README.source b/debian/README.source
new file mode 100644
index 0000000..c550c02
--- /dev/null
+++ b/debian/README.source
@@ -0,0 +1,49 @@
+Branches in the Git packaging repository
+----------------------------------------
+
+Packaging branches must NOT have any debian/patches/* applied. When diff'ing
+packaging and the respective upstream branch, there must NOT be any changes
+outside debian/ subdirectory.
+
+Repository layout is as follows:
+
+* master               - the main packaging branch (upstream source and
+                         debian directory). Typically targets Debian unstable.
+* upstream             - upstream source code for the master branch.
+* <suitename>          - packaging branch targeting Debian <suite_name>
+* upstream-<suitename> - upstream source code for packaging in <suite_name>
+                         branch.
+* pristine-tar         - a branch with pristine-tar deltas for original
+                       - upstream tarballs.
+* debian/<dversion>    - annotated signed tags for package releases to Debian
+                         (based on master and <suitename> branches. ~ is
+                         replaced with -. Tag message should be of the form
+                         '<dversion>/<suitename>'.
+* upstream/<uversion>  - annotated tags for upstream releases which had at least one
+                         debian package release (based on upstream and
+                         upstream-<suitename> branches). ~ is replaced with -.
+
+General rules for patches in debian/patches
+-------------------------------------------
+
+- Patches are managed with `QUILT_PATCHES=debian/patches quilt`.
+* Highly recommended ~/.quiltrc settings are as follows:
+  -------<--------->--------
+  QUILT_NO_DIFF_INDEX=y
+  QUILT_NO_DIFF_TIMESTAMPS=y
+  QUILT_REFRESH_ARGS="-p ab"
+  QUILT_DIFF_OPTS="-p"
+  -------<--------->--------
+* All patches must have valid DEP-3 [1] headers with at least Description and
+  Author/Origin fields.
+* Patches should follow these naming rules:
+  - Each patch should be prefixed with either "debian_" for Debian specific
+    changes, "general_" for distribution agnostic changes or "backport_" for
+    changes backported from future releases.
+  - Patch name should be rather short and meaningfully reflect nature of the
+    changes. "_" should be used as a word separator.
+  - It is recommended to suffix the patch name with either  "_fix" for patches
+    fixing bugs or with '_feature' for patches introducing new features.
+* All patches should have .diff extension.
+
+1. http://dep.debian.net/deps/dep3/
diff --git a/debian/changelog b/debian/changelog
index 6790949..1cd206f 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,14 @@
-konversation (1.6.1-1ubuntu2) UNRELEASED; urgency=medium
+konversation (1.6.2-0ubuntu1) UNRELEASED; urgency=medium
+
+  * New upstream release. 
+  * Changed appdata path to metainfo
+
+ -- Walter Lapchynski <[e-mail]>  Wed, 07 Dec 2016 01:03:03 +0000
+
+konversation (1.6.1-1ubuntu2) yakkety; urgency=medium
+
+  [ Philip Muškovac ]
+  * Konversation breaks/replaces konversation-data << 1.6.1~ 
 
   [ Clive Johnston ]
   * Bumping standards version
@@ -8,7 +18,7 @@ konversation (1.6.1-1ubuntu2) UNRELEASED; urgency=medium
   [ Simon Quigley ]
   * Made the appdata to metainfo transition
 
- -- Clive Johnston <[e-mail]>  Thu, 09 Jun 2016 20:16:14 +0100
+ -- Philip Muškovac <[e-mail]>  Fri, 12 Aug 2016 21:52:18 +0200
 
 konversation (1.6.1-1ubuntu1) yakkety; urgency=low
 
diff --git a/debian/control b/debian/control
index 85f4de8..9edbd36 100644
--- a/debian/control
+++ b/debian/control
@@ -1,49 +1,49 @@
 Source: konversation
 Section: net
 Priority: optional
-Maintainer: Debian/Kubuntu Qt/KDE Team <[e-mail]>
+Maintainer: Ubuntu Developers <[e-mail]>
+XSBC-Original-Maintainer: Debian KDE Extras Team <[e-mail]>
 Uploaders: Modestas Vainius <[e-mail]>, Diane Trout <[e-mail]>
-Build-Depends: cmake (>= 2.6.2),
-               debhelper (>= 9),
-               extra-cmake-modules (>= 1.2.0),
-               kdoctools-dev (>= 5.15.0),
-               kio-dev (>= 5.15.0),
-               libkf5archive-dev (>= 5.15.0),
-               libkf5bookmarks-dev (>= 5.15.0),
-               libkf5config-dev (>= 5.15.0),
-               libkf5configwidgets-dev (>= 5.15.0),
-               libkf5coreaddons-dev (>= 5.15.0),
-               libkf5crash-dev (>= 5.15.0),
-               libkf5dbusaddons-dev (>= 5.15.0),
-               libkf5emoticons-dev (>= 5.15.0),
-               libkf5globalaccel-dev (>= 5.15.0),
-               libkf5i18n-dev (>= 5.15.0),
-               libkf5iconthemes-dev (>= 5.15.0),
-               libkf5idletime-dev (>= 5.15.0),
-               libkf5notifications-dev (>= 5.15.0),
-               libkf5notifyconfig-dev (>= 5.15.0),
-               libkf5parts-dev (>= 5.15.0),
-               libkf5solid-dev (>= 5.15.0),
-               libkf5sonnet-dev (>= 5.15.0),
-               libkf5wallet-dev (>= 5.15.0),
-               libkf5widgetsaddons-dev (>= 5.15.0),
-               libkf5windowsystem-dev (>= 5.15.0),
-               libphonon4qt5-dev (>= 4.6.60),
-               libphonon4qt5experimental-dev (>= 4.6.60),
-               libqca-qt5-2-dev (>= 2.1.0),
-               pkg-kde-tools (>= 0.15.16),
-               qtbase5-dev (>= 5.3.0)
-Standards-Version: 3.9.7
+Build-Depends: debhelper (>= 9), cmake (>= 2.6.2),
+ pkg-kde-tools (>= 0.15.16),
+ extra-cmake-modules (>= 1.2.0),
+ qtbase5-dev (>= 5.3.0),
+ kdoctools-dev (>= 5.15.0),
+ kio-dev (>= 5.15.0),
+ libkf5archive-dev (>= 5.15.0),
+ libkf5bookmarks-dev (>= 5.15.0),
+ libkf5config-dev (>= 5.15.0),
+ libkf5configwidgets-dev (>= 5.15.0),
+ libkf5coreaddons-dev (>= 5.15.0),
+ libkf5crash-dev (>= 5.15.0),
+ libkf5emoticons-dev (>= 5.15.0),
+ libkf5idletime-dev (>= 5.15.0),
+ libkf5i18n-dev (>= 5.15.0),
+ libkf5notifyconfig-dev (>= 5.15.0),
+ libkf5parts-dev (>= 5.15.0),
+ libkf5solid-dev (>= 5.15.0),
+ libkf5sonnet-dev (>= 5.15.0),
+ libkf5wallet-dev (>= 5.15.0),
+ libkf5widgetsaddons-dev (>= 5.15.0),
+ libkf5globalaccel-dev (>= 5.15.0),
+ libkf5dbusaddons-dev (>= 5.15.0),
+ libkf5notifications-dev (>= 5.15.0),
+ libkf5windowsystem-dev (>= 5.15.0),
+ libkf5iconthemes-dev (>= 5.15.0),
+ libphonon4qt5-dev (>= 4.6.60),
+ libphonon4qt5experimental-dev (>= 4.6.60),
+ libqca-qt5-2-dev (>= 2.1.0),
+Standards-Version: 3.9.8
 Homepage: http://konversation.kde.org/
 Vcs-Browser: https://code.launchpad.net/~kubuntu-packagers/kubuntu-packaging/+git/konversation
 Vcs-Git: git://git.launchpad.net/~kubuntu-packagers/kubuntu-packaging/+git/konversation
 
 Package: konversation
 Architecture: any
-Depends: konversation-data (= ${source:Version}),
-         ${misc:Depends},
-         ${shlibs:Depends}
+Depends: ${shlibs:Depends}, ${misc:Depends}, konversation-data (= ${source:Version})
 Provides: irc
+Breaks: konversation-data (<< 1.6.1~)
+Replaces: konversation-data (<< 1.6.1~)
 Description: user friendly Internet Relay Chat (IRC) client for KDE
  Konversation is a client for the Internet Relay Chat (IRC) protocol.
  It is easy to use and well-suited for novice IRC users, but novice