[SCM] konsole packaging branch, master, updated. debian/4.10.5-1
Pino Toscano
pino at alioth.debian.org
Sat Jul 13 12:57:19 UTC 2013
Gitweb-URL: http://git.debian.org/?p=pkg-kde/kde-sc/konsole.git;a=commitdiff;h=ce856ee
The following commit has been merged in the master branch:
commit ce856ee0487cfab9e6ae853d144d8f224039609b
Author: Sune Vuorela <sune at vuorela.dk>
Date: Wed Apr 3 20:20:32 2013 +0000
Do 4.10.2
Refresh patches
Remove upstream and/or unneeded patches
Update install file
Update uploaders
---
debian/changelog | 13 ++++---
debian/control | 2 +-
debian/konsole.install | 12 +++++--
debian/patches/avoid-chdir-home.patch | 26 --------------
debian/patches/avoid-lineSpacing.diff | 13 -------
debian/patches/debian-T-addition.diff | 20 ++++++-----
debian/patches/drawText-alignBottom.diff | 37 --------------------
debian/patches/one_profile_per_window.diff | 25 -------------
debian/patches/series | 5 ---
...lookup-executable-PATH-when-absolute-path.patch | 30 ----------------
10 files changed, 29 insertions(+), 154 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index ac7ae77..d6449d1 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,12 +1,15 @@
-konsole (4:4.8.4-4) UNRELEASED; urgency=low
+konsole (4:4.10.2-1) experimental; urgency=low
* Team upload.
- [ Maximiliano Curia ]
- * Add avoid-chdir-home.patch, reverts the chdir $HOME fallback.
- (Closes: #586030)
+ [ Sune Vuorela ]
+ * New upstream release
+ - Fixes homedir fallback. (Closes: #586030)
+ - Refresh patches
+ - Drop patches found at upstream
+ * Update uploaders
- -- Maximiliano Curia <maxy at debian.org> Wed, 20 Feb 2013 16:00:49 +0100
+ -- Sune Vuorela <sune at debian.org> Wed, 03 Apr 2013 18:25:01 +0000
konsole (4:4.8.4-3) unstable; urgency=low
diff --git a/debian/control b/debian/control
index 2daa69c..b838d9a 100644
--- a/debian/control
+++ b/debian/control
@@ -2,7 +2,7 @@ Source: konsole
Section: kde
Priority: optional
Maintainer: Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>
-Uploaders: José Manuel Santamaría Lema <panfaust at gmail.com>,
+Uploaders: Sune Vuorela <sune at debian.org>
Eshat Cakar <info at eshat.de>,
Modestas Vainius <modax at debian.org>
Build-Depends: kde-sc-dev-latest (>= 4:4.8.4),
diff --git a/debian/konsole.install b/debian/konsole.install
index f0313c8..878c487 100644
--- a/debian/konsole.install
+++ b/debian/konsole.install
@@ -7,16 +7,22 @@ usr/share/applications/kde4/konsole.desktop
usr/share/doc/kde/HTML/en/konsole/common
usr/share/doc/kde/HTML/en/konsole/index.cache.bz2
usr/share/doc/kde/HTML/en/konsole/index.docbook
-usr/share/kde4/apps/konsole/BlackOnLightYellow.schema
+usr/share/kde4/apps/kconf_update/konsole-2.10.0-remove-menuindex-from-profiles.sh
+usr/share/kde4/apps/kconf_update/konsole-2.9.0-colorscheme-bold-key.sh
+usr/share/kde4/apps/kconf_update/konsole-2.9.0-global-options.sh
+usr/share/kde4/apps/kconf_update/konsole.upd
+usr/share/kde4/apps/konsole/BlackOnLightYellow.colorscheme
usr/share/kde4/apps/konsole/BlackOnRandomLight.colorscheme
-usr/share/kde4/apps/konsole/BlackOnWhite.schema
+usr/share/kde4/apps/konsole/BlackOnWhite.colorscheme
+usr/share/kde4/apps/konsole/BlueOnBlack.colorscheme
usr/share/kde4/apps/konsole/DarkPastels.colorscheme
usr/share/kde4/apps/konsole/GreenOnBlack.colorscheme
usr/share/kde4/apps/konsole/Linux.colorscheme
usr/share/kde4/apps/konsole/README.KeyTab
+usr/share/kde4/apps/konsole/RedOnBlack.colorscheme
usr/share/kde4/apps/konsole/Shell.profile
usr/share/kde4/apps/konsole/Solarized.colorscheme
-usr/share/kde4/apps/konsole/WhiteOnBlack.schema
+usr/share/kde4/apps/konsole/WhiteOnBlack.colorscheme
usr/share/kde4/apps/konsole/default.keytab
usr/share/kde4/apps/konsole/konsole.notifyrc
usr/share/kde4/apps/konsole/konsoleui.rc
diff --git a/debian/patches/avoid-chdir-home.patch b/debian/patches/avoid-chdir-home.patch
deleted file mode 100644
index cd75093..0000000
--- a/debian/patches/avoid-chdir-home.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-Author: Jekyll Wu <adaptee at gmail.com>
-Date: Wed Oct 3 16:45:55 2012 +0800
-
- Remove the hack of resetting working directory to $HOME
-
- That hack is added due to the the "single process" model used by konsole.
- However, That hack seems to make the thing more confusing as reflected in bug
- 302903
-
- So here is a known issue: if you set konsole as the terminal emulator
- used in pcmanfm, pressing F4 twice in different folder will open two
- konsole window in the same folder.
-
-Index: konsole/src/Session.cpp
-===================================================================
---- konsole.orig/src/Session.cpp 2013-02-20 16:05:22.075301582 +0100
-+++ konsole/src/Session.cpp 2013-02-20 16:07:14.862690867 +0100
-@@ -470,7 +470,7 @@
- if (!_initialWorkingDir.isEmpty())
- _shellProcess->setInitialWorkingDirectory(_initialWorkingDir);
- else
-- _shellProcess->setInitialWorkingDirectory(QDir::homePath());
-+ _shellProcess->setInitialWorkingDirectory(QDir::currentPath());
-
- _shellProcess->setFlowControlEnabled(_flowControl);
- _shellProcess->setEraseChar(_emulation->eraseChar());
diff --git a/debian/patches/avoid-lineSpacing.diff b/debian/patches/avoid-lineSpacing.diff
deleted file mode 100644
index b4fd6d4..0000000
--- a/debian/patches/avoid-lineSpacing.diff
+++ /dev/null
@@ -1,13 +0,0 @@
-Index: konsole/src/TerminalDisplay.h
-===================================================================
---- konsole.orig/src/TerminalDisplay.h 2013-02-18 12:11:02.117782190 +0100
-+++ konsole/src/TerminalDisplay.h 2013-02-18 12:14:25.000000000 +0100
-@@ -405,7 +405,7 @@
- if (_bidiEnabled) {
- setLineSpacing(0);
- } else {
-- setLineSpacing(2);
-+ setLineSpacing(0);
- }
- #endif
- }
diff --git a/debian/patches/debian-T-addition.diff b/debian/patches/debian-T-addition.diff
index 8088ea7..f9cd802 100644
--- a/debian/patches/debian-T-addition.diff
+++ b/debian/patches/debian-T-addition.diff
@@ -1,10 +1,12 @@
---- a/src/main.cpp
-+++ b/src/main.cpp
-@@ -122,6 +122,7 @@ void fillCommandLineOptions(KCmdLineOpti
- // TODO - Document this option more clearly
- options.add("p <property=value>",ki18n("Change the value of a profile property."));
- options.add("list-profile-properties", ki18n("List all the profile properties names and their type (for use with -p)"));
+Index: konsole/src/main.cpp
+===================================================================
+--- konsole.orig/src/main.cpp 2013-04-03 19:44:13.305306792 +0000
++++ konsole/src/main.cpp 2013-04-03 19:44:13.301306811 +0000
+@@ -184,6 +184,7 @@
+ " (for use with -p)"));
+ options.add("p <property=value>",
+ ki18n("Change the value of a profile property."));
+ options.add("T <value>", ki18n("Debian policy compatibility, not used"));
- options.add("!e <cmd>",ki18n("Command to execute"));
- options.add("+[args]",ki18n("Arguments passed to command"));
- options.add("", ki18n("Use --nofork to run in the foreground (helpful with the -e option)."));
+ options.add("!e <cmd>",
+ ki18n("Command to execute. This option will catch all following"
+ " arguments, so use it as the last option."));
diff --git a/debian/patches/drawText-alignBottom.diff b/debian/patches/drawText-alignBottom.diff
deleted file mode 100644
index e6d1904..0000000
--- a/debian/patches/drawText-alignBottom.diff
+++ /dev/null
@@ -1,37 +0,0 @@
-Index: konsole/src/TerminalDisplay.cpp
-===================================================================
---- konsole.orig/src/TerminalDisplay.cpp 2013-02-18 12:18:34.531454381 +0100
-+++ konsole/src/TerminalDisplay.cpp 2013-02-18 12:20:46.362113452 +0100
-@@ -707,6 +707,13 @@
- }
- else
- {
-+ // Avoid fonts vertical displacement.
-+
-+ // See bug 280896 for more info
-+ int flags = 0;
-+#if QT_VERSION >= 0x040800
-+ flags |= Qt::AlignBottom;
-+#endif
- // Force using LTR as the document layout for the terminal area, because
- // there is no use cases for RTL emulator and RTL terminal application.
- //
-@@ -721,16 +728,11 @@
- //
- // This was discussed in: http://lists.kde.org/?t=120552223600002&r=1&w=2
- if (_bidiEnabled) {
-- painter.drawText(rect, 0, text);
-+ painter.drawText(rect, flags, text);
- }
- else
- {
-- // See bug 280896 for more info
--#if QT_VERSION >= 0x040800
-- painter.drawText(rect, Qt::AlignBottom, LTR_OVERRIDE_CHAR + text);
--#else
-- painter.drawText(rect, 0, LTR_OVERRIDE_CHAR + text);
--#endif
-+ painter.drawText(rect, flags, LTR_OVERRIDE_CHAR + text);
- }
- }
- }
diff --git a/debian/patches/one_profile_per_window.diff b/debian/patches/one_profile_per_window.diff
deleted file mode 100644
index 65b8562..0000000
--- a/debian/patches/one_profile_per_window.diff
+++ /dev/null
@@ -1,25 +0,0 @@
-Author: José Manuel Santamaría Lema <panfaust at gmail.com>
-Description: This patch reverts the following upstream commit:
- https://projects.kde.org/projects/kde/kde-baseapps/konsole/repository/revisions/6167fc97
- This patch MUST be removed for 4.9.x since the lost functionality would be
- available as a new "Clone Tab" action.
---- a/src/MainWindow.cpp
-+++ b/src/MainWindow.cpp
-@@ -397,14 +397,12 @@ void MainWindow::openUrls(const QList<KUrl>& urls)
-
- void MainWindow::newTab()
- {
-- Profile::Ptr defaultProfile = SessionManager::instance()->defaultProfile();
-- emit newSessionRequest(defaultProfile , activeSessionDir() , _viewManager);
-+ emit newSessionRequest( _defaultProfile , activeSessionDir() , _viewManager);
- }
-
- void MainWindow::newWindow()
- {
-- Profile::Ptr defaultProfile = SessionManager::instance()->defaultProfile();
-- emit newWindowRequest(defaultProfile , activeSessionDir());
-+ emit newWindowRequest( _defaultProfile , activeSessionDir() );
- }
-
- bool MainWindow::queryClose()
-
diff --git a/debian/patches/series b/debian/patches/series
index 7303330..bccb940 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,6 +1 @@
-one_profile_per_window.diff
debian-T-addition.diff
-upstream_No-need-to-lookup-executable-PATH-when-absolute-path.patch
-avoid-lineSpacing.diff
-drawText-alignBottom.diff
-avoid-chdir-home.patch
diff --git a/debian/patches/upstream_No-need-to-lookup-executable-PATH-when-absolute-path.patch b/debian/patches/upstream_No-need-to-lookup-executable-PATH-when-absolute-path.patch
deleted file mode 100644
index 4d2d53c..0000000
--- a/debian/patches/upstream_No-need-to-lookup-executable-PATH-when-absolute-path.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-From e48cee6cca742a5bdb3daf6fa0b7c76073217faa Mon Sep 17 00:00:00 2001
-From: Jekyll Wu <adaptee at gmail.com>
-Date: Thu, 1 Nov 2012 11:57:42 +0800
-Subject: [PATCH] No need to lookup executable PATH when absolute path is
- given (cherry picked from commit
- d12aead588ec09359633eb9de5f9ac2b2a7e1e06)
-
----
- src/Session.cpp | 5 +++++
- 1 file changed, 5 insertions(+)
-
-diff --git a/src/Session.cpp b/src/Session.cpp
-index 732858d..cf325b0 100644
---- a/src/Session.cpp
-+++ b/src/Session.cpp
-@@ -369,6 +369,11 @@ QString Session::checkProgram(const QString& program)
- if (exec.isEmpty())
- return QString();
-
-+ QFileInfo info(exec);
-+ if (info.isAbsolute() && info.exists() && info.isExecutable()) {
-+ return exec;
-+ }
-+
- exec = KRun::binaryName(exec, false);
- exec = KShell::tildeExpand(exec);
- QString pexec = KStandardDirs::findExe(exec);
---
-1.7.10.4
-
--
konsole packaging
More information about the pkg-kde-commits
mailing list