Simon Quigley has proposed merging ~tsimonq2/kubuntu-packaging/+git/kubuntu-konversation:kubuntu_yakkety_archive into ~kubuntu-packagers/kubuntu-packaging/+git/konversation:kubuntu_unstable.
Requested reviews: Kubuntu Packagers (kubuntu-packagers) For more details, see: https://code.launchpad.net/~tsimonq2/kubuntu-packaging/+git/kubuntu-konversation/+merge/301698 This updates the Vcs-* fields to Kubuntu's Git repository. -- Your team Kubuntu Packagers is requested to review the proposed merge of ~tsimonq2/kubuntu-packaging/+git/kubuntu-konversation:kubuntu_yakkety_archive into ~kubuntu-packagers/kubuntu-packaging/+git/konversation:kubuntu_unstable.
diff --git a/debian/TODO.Debian b/debian/TODO.Debian new file mode 100644 index 0000000..4f94dd3 --- /dev/null +++ b/debian/TODO.Debian @@ -0,0 +1 @@ +* New manual file. diff --git a/debian/changelog b/debian/changelog index e0fc22f..c0f32c1 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,4 @@ +<<<<<<< debian/changelog konversation (1.6-0ubuntu2) UNRELEASED; urgency=medium * Bumping standards version @@ -5,6 +6,67 @@ konversation (1.6-0ubuntu2) UNRELEASED; urgency=medium * Adding missing files to install file -- Clive Johnston <[email protected]> Thu, 09 Jun 2016 20:16:14 +0100 +======= +konversation (1.6.1-1ubuntu1) yakkety; 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. + + -- Artur Rona <[email protected]> Sun, 24 Jul 2016 16:14:10 +0200 + +konversation (1.6.1-1) unstable; urgency=medium + + * Team upload. + * New upstream release. + * Stop passing -DCMAKE_USE_RELATIVE_PATHS=ON, since this option is no more + used in newer CMake versions. + * Use the right dh addon: + - switch from kde to kf5 dh addon + - bump the pkg-kde-tools build dependency to >= 0.15.16 + * Update the build dependencies: + - bump the minimum version for all the existing frameworks packages from + 5.2.0 to 5.15.0 + - add libkf5crash-dev + * Update install files. + * Link in as-needed mode. + * Pass --fail-missing to dh_install, so no uninstalled files are missed. + + -- Pino Toscano <[email protected]> Fri, 22 Jul 2016 07:17:16 +0200 + +konversation (1.6-3) unstable; urgency=medium + + * Team upload. + * Drop menu file and its pixmaps, since konversation already provides a + .desktop file. + * Bump Standards-Version to 3.9.8, no changes required. + * Remove konversation-dbg in favour of the -dbgsym packages. + * Update Vcs-* fields. + + -- Pino Toscano <[email protected]> Tue, 07 Jun 2016 12:17:04 +0200 + +konversation (1.6-2) unstable; urgency=medium + + * Add have-qca2-needs-to-be-defined.patch + Andy Irving noticed an ordering problem that prevented + Konversation from detecting it had QCA available. + (Closes: #798036) + + -- Diane Trout <[email protected]> Wed, 16 Sep 2015 22:21:23 -0700 + +konversation (1.6-1) unstable; urgency=medium + + * Update watch file. + * Update Diane Trout's email address + * Remove cve-2014-8483.patch, applied upstream. + * New upstream release. + * Update Build-Depends to KF5 packages. + * Update install files for new Plasma5 locations. + * Upstream is no longer providing a TODO file, remove it from docs. + * Refresh debian_channel.diff and debian_dbug_autoreplace.diff patches + + -- Diane Trout <[email protected]> Fri, 28 Aug 2015 11:10:40 -0700 +>>>>>>> debian/changelog konversation (1.6-0ubuntu1) vivid; urgency=medium diff --git a/debian/control b/debian/control index 64a08b2..3d6f708 100644 --- a/debian/control +++ b/debian/control @@ -2,9 +2,10 @@ Source: konversation Section: net Priority: optional Maintainer: Debian/Kubuntu Qt/KDE Team <[email protected]> -Uploaders: Modestas Vainius <[email protected]>, Diane Trout <[email protected]> +Uploaders: Modestas Vainius <[email protected]>, Diane Trout <[email protected]> Build-Depends: cmake (>= 2.6.2), debhelper (>= 9), +<<<<<<< debian/control extra-cmake-modules, kio-dev, libkf5archive-dev, @@ -29,6 +30,40 @@ Standards-Version: 3.9.7 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 +======= + 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.8 +Homepage: http://konversation.kde.org/ +Vcs-Git: https://git.launchpad.net/~kubuntu-packagers/kubuntu-packaging/+git/konversation +Vcs-Browser: https://git.launchpad.net/~kubuntu-packagers/kubuntu-packaging/+git/konversation +>>>>>>> debian/control Package: konversation Architecture: any @@ -64,14 +99,3 @@ Description: data files for Konversation Konversation is a client for the Internet Relay Chat (IRC) protocol. This package contains data files for Konversation. It is probably of no use if `konversation' package is not installed. - -Package: konversation-dbg -Section: debug -Architecture: any -Priority: extra -Depends: konversation (= ${binary:Version}), ${misc:Depends} -Recommends: kdelibs5-dbg -Description: debugging symbols for Konversation - Konversation is a client for the Internet Relay Chat (IRC) protocol. This - package contains the debugging symbols associated with konversation. They - will automatically be used by gdb for debugging konversation-related issues. diff --git a/debian/konversation-data.install b/debian/konversation-data.install index 3c2f2ed..88ca517 100644 --- a/debian/konversation-data.install +++ b/debian/konversation-data.install @@ -1,5 +1,8 @@ usr/share/doc/HTML/* usr/share/icons/hicolor/* -usr/share/k*/* +usr/share/kconf_update/konversation* +usr/share/knotifications5/konversation.notifyrc +usr/share/konversation/* +usr/share/kxmlgui5/konversation/konversationui.rc usr/share/locale/* usr/share/appdata/* diff --git a/debian/konversation.install b/debian/konversation.install index 36f4fa4..077f59f 100644 --- a/debian/konversation.install +++ b/debian/konversation.install @@ -1,2 +1,6 @@ usr/bin/konversation +usr/share/appdata/org.kde.konversation.appdata.xml usr/share/applications/org.kde.konversation.desktop +usr/share/kservices5/konvirc.protocol +usr/share/kservices5/konvirc6.protocol +usr/share/kservices5/konvircs.protocol diff --git a/debian/patches/debian_channel.diff b/debian/patches/debian_channel.diff new file mode 100644 index 0000000..36e418f --- /dev/null +++ b/debian/patches/debian_channel.diff @@ -0,0 +1,32 @@ +From: Modestas Vainius <[email protected]> +Subject: [PATCH] debian/debian_channel + +Connect to Debian IRC server and join both #debian and +#debian-kde channels by default. + +Signed-off-by: Modestas Vainius <[email protected]> + +--- + src/config/preferences.cpp | 10 ++++++---- + 1 files changed, 6 insertions(+), 4 deletions(-) + +--- a/src/config/preferences.cpp ++++ b/src/config/preferences.cpp +@@ -64,12 +64,14 @@ + Konversation::ServerGroupSettingsPtr serverGroup(new Konversation::ServerGroupSettings); + serverGroup->setName(QStringLiteral("freenode")); + Konversation::ServerSettings server; +- server.setHost(QStringLiteral("chat.freenode.net")); +- server.setPort(8001); ++ server.setHost(QStringLiteral("irc.debian.org")); ++ server.setPort(7000); + serverGroup->addServer(server); + serverGroup->setIdentityId(mIdentity->id()); + Konversation::ChannelSettings channel; +- channel.setName(QStringLiteral("#konversation")); ++ channel.setName(QStringLiteral("#debian")); ++ serverGroup->addChannel(channel); ++ channel.setName(QStringLiteral("#debian-kde")); + serverGroup->addChannel(channel); + serverGroup->setExpanded(false); + mServerGroupHash.insert(0, serverGroup); diff --git a/debian/patches/debian_dbug_autoreplace.diff b/debian/patches/debian_dbug_autoreplace.diff new file mode 100644 index 0000000..410a79e --- /dev/null +++ b/debian/patches/debian_dbug_autoreplace.diff @@ -0,0 +1,22 @@ +From: Modestas Vainius <[email protected]> +Subject: [PATCH] debian/dbug_autoreplace + +Add a default autoreplace which replaces dbug:bugnumber with +the respective Debian BTS URL. + +Signed-off-by: Modestas Vainius <[email protected]> + +--- + src/config/preferences.cpp | 1 + + 1 files changed, 1 insertions(+), 0 deletions(-) + +--- a/src/config/preferences.cpp ++++ b/src/config/preferences.cpp +@@ -122,6 +122,7 @@ + QList<QStringList> defaultList; + defaultList.append(QStringList() << QStringLiteral("1") << QStringLiteral("o") << QStringLiteral("\\[\\[([^\\s]+)\\]\\]") << QStringLiteral("http://en.wikipedia.org/wiki/Special:Search?go=Go&search=%1";)); + defaultList.append(QStringList() << QStringLiteral("1") << QStringLiteral("o") << QStringLiteral("(BUG:|bug:)([0-9]+)") << QStringLiteral("https://bugs.kde.org/show_bug.cgi?id=%2";)); ++ defaultList.append(QStringList() << QStringLiteral("1") << QStringLiteral("o") << QStringLiteral("([Dd][Bb][Uu][Gg]:)(\\w+)") << QStringLiteral("https://bugs.debian.org/%2";)); + return defaultList; + } + diff --git a/debian/patches/have-qca2-needs-to-be-defined.patch b/debian/patches/have-qca2-needs-to-be-defined.patch new file mode 100644 index 0000000..6cbde62 --- /dev/null +++ b/debian/patches/have-qca2-needs-to-be-defined.patch @@ -0,0 +1,25 @@ +Author: Andy Irving <[email protected]> +Description: HAVE_QCA2 needs to be set before the configuration file + is created. Andy Irving proposed the fix in the Debian bug, + I (Diane Trout) showed it to Eike Hien, checked that it worked, + and pushed it upstream. +Bug-Debian: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=798036 +Reviewed-by: Diane Trout <[email protected]> +Reviewed-by: Eike Hein <[email protected]> +Applied-Upstream: http://commits.kde.org/konversation/edeedffafb282730fa99a53634a3ea6f8ba6a00a +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -52,11 +52,11 @@ + check_include_file("byteswap.h" HAVE_BYTESWAP_H) + check_include_file("sys/endian.h" HAVE_SYS_ENDIAN_H) + ++set(HAVE_QCA2 ${Qca-qt5_FOUND}) ++ + configure_file(config-konversation.h.cmake ${CMAKE_CURRENT_BINARY_DIR}/config-konversation.h ) + include_directories(${CMAKE_CURRENT_BINARY_DIR}) + +-set(HAVE_QCA2 ${Qca-qt5_FOUND}) +- + add_definitions( + -DQT_USE_QSTRINGBUILDER + -DQT_NO_CAST_TO_ASCII diff --git a/debian/patches/series b/debian/patches/series index 20fae27..71cbd76 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -1 +1,4 @@ +have-qca2-needs-to-be-defined.patch +#debian_dbug_autoreplace.diff +#debian_channel.diff kubuntu_default-channels.diff diff --git a/debian/rules b/debian/rules index baa1b48..5f4b3b6 100755 --- a/debian/rules +++ b/debian/rules @@ -1,13 +1,16 @@ #!/usr/bin/make -f -include /usr/share/pkg-kde-tools/qt-kde-team/3/debian-qt-kde.mk +export DEB_LDFLAGS_MAINT_APPEND := -Wl,--as-needed override_dh_install: - $(overridden_command) + dh_install --fail-missing # Install scripts README (and rename) if [ -d debian/konversation ]; then \ cp -a data/scripts/README debian/konversation/usr/share/doc/konversation/README.scripts; \ fi override_dh_strip: - $(overridden_command) --dbg-package=konversation-dbg + dh_strip --dbgsym-migration='konversation-dbg (<< 1.6-3~)' + +%: + dh $@ --with kf5 --parallel diff --git a/debian/watch b/debian/watch index a24ca33..0830ffe 100644 --- a/debian/watch +++ b/debian/watch @@ -1,4 +1,4 @@ version=3 opts=uversionmangle=s/-/~/ \ -ftp://ftp.kde.org/pub/kde/stable/konversation/([\d.]+)/src/konversation-(.*).(?:zip|tgz|tbz|txz|(?:tar\.(?:gz|bz2|xz))) +http://download.kde.org/stable/konversation/([\d.]+)/src/konversation-(.*).(?:zip|tgz|tbz|txz|(?:tar\.(?:gz|bz2|xz)))
-- kubuntu-devel mailing list [email protected] Modify settings or unsubscribe at: https://lists.ubuntu.com/mailman/listinfo/kubuntu-devel
