Rik Mills has proposed merging ~acheron/kubuntu-packaging/+git/konsole:kubuntu_unstable into ~kubuntu-packagers/kubuntu-packaging/+git/konsole:kubuntu_unstable.
Requested reviews: Kubuntu Packagers (kubuntu-packagers) For more details, see: https://code.launchpad.net/~acheron/kubuntu-packaging/+git/konsole/+merge/297380 https://quickgit.kde.org/?p=konsole.git&a=commitdiff&h=27dec8d02f705c77eef45a2533bed203eec9454f Requires update of debian-T-addition.diff patch -- Your team Kubuntu Packagers is requested to review the proposed merge of ~acheron/kubuntu-packaging/+git/konsole:kubuntu_unstable into ~kubuntu-packagers/kubuntu-packaging/+git/konsole:kubuntu_unstable.
diff --git a/debian/changelog b/debian/changelog index c18e5cb..fb5cd01 100644 --- a/debian/changelog +++ b/debian/changelog @@ -13,6 +13,10 @@ konsole (4:16.04.1-0ubuntu1) UNRELEASED; urgency=medium [ Clive Johnston ] * Adding lintian override for package-must-activate-ldconfig-trigger + [ Rik Mills ] + * Update debian-T-addition patch, adapting to upstream changes + porting away from kdelibs4support + -- Scarlett Clark <[email protected]> Tue, 10 May 2016 12:49:36 -0700 konsole (4:15.12.3-0ubuntu1) xenial; urgency=medium diff --git a/debian/patches/debian-T-addition.diff b/debian/patches/debian-T-addition.diff index 99ddeb4..1f15402 100644 --- a/debian/patches/debian-T-addition.diff +++ b/debian/patches/debian-T-addition.diff @@ -1,12 +1,12 @@ -Index: konsole/src/main.cpp -=================================================================== ---- konsole.orig/src/main.cpp 2015-05-27 18:02:19.804651972 +0200 -+++ konsole/src/main.cpp 2015-05-27 18:02:19.800652134 +0200 -@@ -197,6 +197,7 @@ - " (for use with -p)")); - options.add("p <property=value>", - ki18nc("@info:shell", "Change the value of a profile property.")); -+ options.add("T <value>", ki18n("Debian policy compatibility, not used")); - options.add("!e <cmd>", - ki18nc("@info:shell", "Command to execute. This option will catch all following" - " arguments, so use it as the last option.")); +--- a/src/main.cpp ++++ b/src/main.cpp +@@ -282,6 +282,9 @@ + parser.addOption(QCommandLineOption(QStringList() << "p", + i18nc("@info:shell", "Change the value of a profile property."), + QStringLiteral("property=value"))); ++ parser.addOption(QCommandLineOption(QStringList() << "T", ++ i18nc("@info:shell", "Debian policy compatibility, not used."), ++ QStringLiteral("value"))); + parser.addOption(QCommandLineOption(QStringList() << "e", + i18nc("@info:shell", "Command to execute. This option will catch all following" + " arguments, so use it as the last option."),
-- kubuntu-devel mailing list [email protected] Modify settings or unsubscribe at: https://lists.ubuntu.com/mailman/listinfo/kubuntu-devel
