Debian

Available patches from Ubuntu

To see Ubuntu differences wrt. to Debian, write down a grep-dctrl query identifying the packages you're interested in:
grep-dctrl -n -sPackage Sources.Debian
(e.g. -FPackage linux-ntfs or linux-ntfs)

Modified packages are listed below:

Debian ( Changelog | PTS | Bugs ) Ubuntu ( Changelog | txt | LP | Bugs ) | Diff from Ubuntu

Source: konversation

konversation (1.7.5-3ubuntu2) focal; urgency=medium * No-change rebuild for libgcc-s1 package name change. -- Matthias Klose <doko@ubuntu.com> Wed, 25 Mar 2020 19:06:06 +0100 konversation (1.7.5-3ubuntu1) focal; urgency=medium * Merge from Debian unstable. Remaining changes: - Use python3 for the scripts (no changes necessary), use python3 as the shebang. - debian/patches: Retain kubuntu_default_channels.diff in place of debian equivalent. - debian/patches: don't adopt debian_debug_autoreplace.diff - Keep Kubuntu VCS fields. - wrap-and-sort -- Rik Mills <rikmills@kde.org> Wed, 13 Nov 2019 10:10:07 +0000

Modifications :
  1. Download patch debian/patches/debian_dbug_autoreplace.diff

    --- 1.7.5-3/debian/patches/debian_dbug_autoreplace.diff 2016-01-17 18:49:41.000000000 +0000 +++ 1.7.5-3ubuntu2/debian/patches/debian_dbug_autoreplace.diff 1970-01-01 00:00:00.000000000 +0000 @@ -1,22 +0,0 @@ -From: Modestas Vainius <modestas@vainius.eu> -Subject: [PATCH] debian/dbug_autoreplace - -Add a default autoreplace which replaces dbug:bugnumber with -the respective Debian BTS URL. - -Signed-off-by: Modestas Vainius <modestas@vainius.eu> - ---- - 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; - } -
  2. Download patch debian/patches/python3-shebang.diff

    --- 1.7.5-3/debian/patches/python3-shebang.diff 1970-01-01 00:00:00.000000000 +0000 +++ 1.7.5-3ubuntu2/debian/patches/python3-shebang.diff 2019-11-13 10:10:07.000000000 +0000 @@ -0,0 +1,40 @@ +--- a/data/scripts/bug ++++ b/data/scripts/bug +@@ -1,4 +1,4 @@ +-#!/usr/bin/env python ++#!/usr/bin/python3 + # -*- coding: utf-8 -*- + # + # This program is free software; you can redistribute it and/or +--- a/data/scripts/cmd ++++ b/data/scripts/cmd +@@ -1,4 +1,4 @@ +-#!/usr/bin/env python ++#!/usr/bin/python3 + # -*- coding: utf-8 -*- + # + # This program is free software; you can redistribute it and/or +--- a/data/scripts/media ++++ b/data/scripts/media +@@ -1,4 +1,4 @@ +-#!/usr/bin/env python ++#!/usr/bin/python3 + # -*- coding: utf-8 -*- + # + # This program is free software; you can redistribute it and/or +--- a/data/scripts/sysinfo ++++ b/data/scripts/sysinfo +@@ -1,4 +1,4 @@ +-#!/usr/bin/env python ++#!/usr/bin/python3 + # -*- coding: utf-8 -*- + # + # This program is free software; you can redistribute it and/or +--- a/data/scripting_support/python/konversation/dbus.py ++++ b/data/scripting_support/python/konversation/dbus.py +@@ -1,4 +1,4 @@ +-#!/usr/bin/env python ++#!/usr/bin/python3 + # -*- coding: utf-8 -*- + # + # This program is free software; you can redistribute it and/or
  3. Download patch debian/control

    --- 1.7.5-3/debian/control 2019-11-11 18:38:41.000000000 +0000 +++ 1.7.5-3ubuntu2/debian/control 2019-11-13 10:10:07.000000000 +0000 @@ -3,45 +3,48 @@ Section: net Priority: optional Maintainer: Debian KDE Extras Team <pkg-kde-extras@lists.alioth.debian.org> Uploaders: Modestas Vainius <modax@debian.org>, Diane Trout <diane@debian.org> -Build-Depends: debhelper-compat (= 12), cmake (>= 2.6.2), - pkg-kde-tools (>= 0.15.16), - extra-cmake-modules (>= 1.2.0), - gettext, - qtbase5-dev (>= 5.5.0), - libkf5archive-dev (>= 5.25.0), - libkf5bookmarks-dev (>= 5.25.0), - libkf5config-dev (>= 5.25.0), - libkf5configwidgets-dev (>= 5.25.0), - libkf5coreaddons-dev (>= 5.25.0), - libkf5crash-dev (>= 5.25.0), - libkf5doctools-dev (>= 5.25.0), - libkf5emoticons-dev (>= 5.25.0), - libkf5idletime-dev (>= 5.25.0), - libkf5i18n-dev (>= 5.25.0), - libkf5kio-dev (>= 5.25.0), - libkf5notifyconfig-dev (>= 5.25.0), - libkf5parts-dev (>= 5.25.0), - libkf5solid-dev (>= 5.25.0), - libkf5wallet-dev (>= 5.25.0), - libkf5widgetsaddons-dev (>= 5.25.0), - libkf5globalaccel-dev (>= 5.25.0), - libkf5dbusaddons-dev (>= 5.25.0), - libkf5notifications-dev (>= 5.25.0), - libkf5windowsystem-dev (>= 5.25.0), - libkf5iconthemes-dev (>= 5.25.0), - libphonon4qt5-dev (>= 4.6.60), - libphonon4qt5experimental-dev (>= 4.6.60), - libqca-qt5-2-dev (>= 2.1.0), - dh-python, - python3, +Build-Depends: cmake (>= 2.6.2), + debhelper-compat (= 12), + dh-python, + extra-cmake-modules (>= 1.2.0), + gettext, + libkf5archive-dev (>= 5.25.0), + libkf5bookmarks-dev (>= 5.25.0), + libkf5config-dev (>= 5.25.0), + libkf5configwidgets-dev (>= 5.25.0), + libkf5coreaddons-dev (>= 5.25.0), + libkf5crash-dev (>= 5.25.0), + libkf5dbusaddons-dev (>= 5.25.0), + libkf5doctools-dev (>= 5.25.0), + libkf5emoticons-dev (>= 5.25.0), + libkf5globalaccel-dev (>= 5.25.0), + libkf5i18n-dev (>= 5.25.0), + libkf5iconthemes-dev (>= 5.25.0), + libkf5idletime-dev (>= 5.25.0), + libkf5kio-dev (>= 5.25.0), + libkf5notifications-dev (>= 5.25.0), + libkf5notifyconfig-dev (>= 5.25.0), + libkf5parts-dev (>= 5.25.0), + libkf5solid-dev (>= 5.25.0), + libkf5wallet-dev (>= 5.25.0), + libkf5widgetsaddons-dev (>= 5.25.0), + libkf5windowsystem-dev (>= 5.25.0), + libphonon4qt5-dev (>= 4.6.60), + libphonon4qt5experimental-dev (>= 4.6.60), + libqca-qt5-2-dev (>= 2.1.0), + pkg-kde-tools (>= 0.15.16), + python3, + qtbase5-dev (>= 5.5.0) Standards-Version: 4.4.1 Homepage: https://konversation.kde.org/ -Vcs-Git: https://salsa.debian.org/qt-kde-team/extras/konversation.git -Vcs-Browser: https://salsa.debian.org/qt-kde-team/extras/konversation +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: ${shlibs:Depends}, ${misc:Depends}, konversation-data (= ${source:Version}) +Depends: konversation-data (= ${source:Version}), + ${misc:Depends}, + ${shlibs:Depends} Provides: irc Description: user friendly Internet Relay Chat (IRC) client for KDE Konversation is a client for the Internet Relay Chat (IRC) protocol. @@ -63,8 +66,8 @@ Description: user friendly Internet Rela Package: konversation-data Architecture: all -Depends: ${misc:Depends}, ${perl:Depends}, ${python3:Depends}, -Recommends: konversation (>= ${source:Version}), +Depends: ${misc:Depends}, ${perl:Depends}, ${python3:Depends} +Recommends: konversation (>= ${source:Version}) 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
  4. Download patch debian/patches/series

    --- 1.7.5-3/debian/patches/series 2019-10-10 04:37:35.000000000 +0000 +++ 1.7.5-3ubuntu2/debian/patches/series 2019-11-13 10:10:07.000000000 +0000 @@ -1,3 +1,3 @@ upstream_Fix-build-with-Qt-5.13.patch -debian_dbug_autoreplace.diff -debian_channel.diff +kubuntu_default-channels.diff +python3-shebang.diff
  5. Download patch debian/patches/kubuntu_default-channels.diff

    --- 1.7.5-3/debian/patches/kubuntu_default-channels.diff 1970-01-01 00:00:00.000000000 +0000 +++ 1.7.5-3ubuntu2/debian/patches/kubuntu_default-channels.diff 2019-11-13 10:10:07.000000000 +0000 @@ -0,0 +1,13 @@ +Index: konversation/src/config/preferences.cpp +=================================================================== +--- konversation.orig/src/config/preferences.cpp ++++ konversation/src/config/preferences.cpp +@@ -69,7 +69,7 @@ Preferences::Preferences() + serverGroup->addServer(server); + serverGroup->setIdentityId(mIdentity->id()); + Konversation::ChannelSettings channel; +- channel.setName(QStringLiteral("#konversation")); ++ channel.setName(QStringLiteral("#kubuntu")); + serverGroup->addChannel(channel); + serverGroup->setExpanded(false); + mServerGroupHash.insert(0, serverGroup);
  6. Download patch debian/patches/debian_channel.diff

    --- 1.7.5-3/debian/patches/debian_channel.diff 2016-01-17 18:49:41.000000000 +0000 +++ 1.7.5-3ubuntu2/debian/patches/debian_channel.diff 1970-01-01 00:00:00.000000000 +0000 @@ -1,32 +0,0 @@ -From: Modestas Vainius <modestas@vainius.eu> -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 <modestas@vainius.eu> - ---- - 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);
  1. konversation