diff -Nru konversation-1.5/debian/changelog konversation-1.5/debian/changelog
--- konversation-1.5/debian/changelog	2014-02-12 12:06:47.000000000 +0000
+++ konversation-1.5/debian/changelog	2014-03-09 12:19:10.000000000 +0000
@@ -1,3 +1,25 @@
+konversation (1.5-1ubuntu1) trusty; urgency=low
+
+  * Merge from Debian unstable.  Remaining changes:
+    - debian/patches/{series, kubuntu_01_default_channels.diff}:
+      + Don't use debian_channel.diff, we got own default channels.
+    - debian/rules:
+      + Export translation domain.
+
+ -- Artur Rona <ari-tczew@ubuntu.com>  Sun, 09 Mar 2014 13:19:08 +0100
+
+konversation (1.5-1) unstable; urgency=medium
+
+  * New upstream release
+  * Make watch file robust to different compression extensions
+  * Add myself to Uploaders
+  * Refresh debian_channel.diff
+  * Bump Standards-Version to 3.9.5: no changes needed.
+  * Update to debhelper compat 9, to add hardening flags.
+  * Update Vcs-Git and Vcs-Browser to canonical hostnames.
+
+ -- Diane Trout <diane@ghic.org>  Sat, 22 Feb 2014 17:19:34 -0800
+
 konversation (1.5-0ubuntu1) trusty; urgency=medium
 
   * New upstream release
diff -Nru konversation-1.5/debian/compat konversation-1.5/debian/compat
--- konversation-1.5/debian/compat	2014-02-12 12:00:52.000000000 +0000
+++ konversation-1.5/debian/compat	2014-02-23 01:15:47.000000000 +0000
@@ -1 +1 @@
-7
+9
diff -Nru konversation-1.5/debian/control konversation-1.5/debian/control
--- konversation-1.5/debian/control	2014-02-12 12:06:12.000000000 +0000
+++ konversation-1.5/debian/control	2014-03-09 12:17:41.000000000 +0000
@@ -3,16 +3,16 @@
 Priority: optional
 Maintainer: Kubuntu Developers <kubuntu-devel@lists.ubuntu.com>
 XSBC-Original-Maintainer: Debian KDE Extras Team <pkg-kde-extras@lists.alioth.debian.org>
-Uploaders: Modestas Vainius <modax@debian.org>
-Build-Depends: debhelper (>= 7.3.16), cmake (>= 2.6.2), pkg-kde-tools (>= 0.5),
+Uploaders: Modestas Vainius <modax@debian.org>, Diane Trout <diane@ghic.org>
+Build-Depends: debhelper (>= 9), cmake (>= 2.6.2), pkg-kde-tools (>= 0.5),
  libqt4-dev (>= 4:4.7), kdelibs5-dev (>= 4:4.4.3), kdepimlibs5-dev (>= 4:4.4.3),
  libqca2-dev
-Standards-Version: 3.9.2
+Standards-Version: 3.9.5
 Homepage: http://konversation.kde.org/
 Vcs-Bzr: lp:~kubuntu-packagers/kubuntu-packaging/konversation
 Vcs-Browser: http://bazaar.launchpad.net/~kubuntu-packagers/kubuntu-packaging/konversation
-XS-Debian-Vcs-Git: git://git.debian.org/git/pkg-kde/kde-extras/konversation.git
-XS-Debian-Vcs-Browser: http://git.debian.org/?p=pkg-kde/kde-extras/konversation.git;a=summary
+XS-Debian-Vcs-Git: git://anonscm.debian.org/pkg-kde/kde-extras/konversation.git
+XS-Debian-Vcs-Browser: http://anonscm.debian.org/gitweb/?p=pkg-kde/kde-extras/konversation.git
 
 Package: konversation
 Architecture: any
diff -Nru konversation-1.5/debian/patches/debian_channel.diff konversation-1.5/debian/patches/debian_channel.diff
--- konversation-1.5/debian/patches/debian_channel.diff	2014-02-12 12:00:52.000000000 +0000
+++ konversation-1.5/debian/patches/debian_channel.diff	2014-02-22 18:28:08.000000000 +0000
@@ -12,11 +12,11 @@
 
 --- a/src/config/preferences.cpp
 +++ b/src/config/preferences.cpp
-@@ -61,14 +61,16 @@ Preferences::Preferences()
+@@ -61,14 +61,16 @@
      mIdentity->setNicknameList(nickList);
  
      Konversation::ServerGroupSettingsPtr serverGroup(new Konversation::ServerGroupSettings);
--    serverGroup->setName("Freenode");
+-    serverGroup->setName("freenode");
 +    serverGroup->setName("Debian IRC");
      Konversation::ServerSettings server;
 -    server.setHost("chat.freenode.net");
diff -Nru konversation-1.5/debian/rules konversation-1.5/debian/rules
--- konversation-1.5/debian/rules	2014-02-12 12:00:52.000000000 +0000
+++ konversation-1.5/debian/rules	2014-03-09 11:04:01.000000000 +0000
@@ -15,4 +15,4 @@
 	fi
 
 %:
-	dh --with kde --parallel --dbg-package=konversation-dbg $@
+	dh  $@ --with kde --parallel --dbg-package=konversation-dbg
diff -Nru konversation-1.5/debian/watch konversation-1.5/debian/watch
--- konversation-1.5/debian/watch	2014-02-12 12:01:45.000000000 +0000
+++ konversation-1.5/debian/watch	2014-02-22 18:28:08.000000000 +0000
@@ -1,4 +1,4 @@
 version=3
 
 opts=uversionmangle=s/-/~/ \
-ftp://ftp.kde.org/pub/kde/stable/konversation/(?:[\w.-]+)/src/ konversation-(.*).tar.xz
+ftp://ftp.kde.org/pub/kde/stable/konversation/([\d.]+)/src/konversation-(.*).(?:zip|tgz|tbz|txz|(?:tar\.(?:gz|bz2|xz)))