[SCM] KDE Base Workspace module packaging branch, master, updated. debian/4.4.5-5-42-g7d8e9d2
José Manuel Santamaría Lema
santa-guest at alioth.debian.org
Mon Dec 20 13:02:24 UTC 2010
The following commit has been merged in the master branch:
commit 7d8e9d2b362eae56afa54272050a8cbbfb5dc705
Author: José Manuel Santamaría Lema <panfaust at gmail.com>
Date: Mon Dec 20 14:02:47 2010 +0100
Update patches.
---
debian/changelog | 20 +
debian/patches/02_kdm_double_servertimeout.diff | 11 -
debian/patches/06_kdm_does_not_wreak_havoc.diff | 8 +-
debian/patches/07_kdmrc_defaults.diff | 16 +-
debian/patches/08_genkdmconf.diff | 18 +-
debian/patches/09_genkdm_make.diff | 8 +-
debian/patches/10_kdm_no_custom.diff | 10 +-
...12_be_better_at_honouring_user_kdm_theming.diff | 8 +-
debian/patches/21_place_global_config_in_etc.diff | 50 ++-
.../28_backport_bug156475_dualhead_support.diff | 20 -
...29_backport_fix_krandr_support_in_startkde.diff | 391 --------------------
.../33_qguiplatformplugin_kde_NULL_check.diff | 8 +-
debian/patches/97_fix_target_link_libraries.diff | 18 +-
debian/patches/99_solid_network_use_ntrack.diff | 276 --------------
debian/patches/series | 6 -
15 files changed, 110 insertions(+), 758 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index 893aa1f..a7bfed3 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -60,6 +60,26 @@ kdebase-workspace (4:4.5.86-0r1) UNRELEASED; urgency=low
configuration file from /usr/share to /etc.
* Update lintian overrides.
+ [ José Manuel Santamaría Lema ]
+ * Refreshed patches:
+ - 06_kdm_does_not_wreak_havoc.diff
+ - 07_kdmrc_defaults.diff
+ - 08_genkdmconf.diff
+ - 09_genkdm_make.diff
+ - 10_kdm_no_custom.diff
+ - 12_be_better_at_honouring_user_kdm_theming.diff
+ - 21_place_global_config_in_etc.diff
+ - 33_qguiplatformplugin_kde_NULL_check.diff
+ - 97_fix_target_link_libraries.diff
+ * Dropped patches:
+ - 02_kdm_double_servertimeout.diff - applied upstream
+ - 28_backport_bug156475_dualhead_support.diff - applied upstream
+ - 29_backport_fix_krandr_support_in_startkde.diff - applied upstream
+ - 99_solid_network_use_ntrack.diff - applied upstream
+ * TODO:
+ - 30_plasma_netbook_fix_autostart.diff - check if the issue still exists
+ - 31_kdm_vt_switching_on_kfreebsd.diff - should be refreshed/reworked
+
-- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org> Sat, 31 Jul 2010 16:41:50 +0300
kdebase-workspace (4:4.4.5-5) unstable; urgency=medium
diff --git a/debian/patches/02_kdm_double_servertimeout.diff b/debian/patches/02_kdm_double_servertimeout.diff
deleted file mode 100644
index c2802d7..0000000
--- a/debian/patches/02_kdm_double_servertimeout.diff
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/kdm/config.def
-+++ b/kdm/config.def
-@@ -1332,7 +1332,7 @@
-
- Key: ServerTimeout
- Type: int
--Default: 15
-+Default: 30
- User: core
- Instance: #:*/
- Comment:
diff --git a/debian/patches/06_kdm_does_not_wreak_havoc.diff b/debian/patches/06_kdm_does_not_wreak_havoc.diff
index 622944f..797c066 100644
--- a/debian/patches/06_kdm_does_not_wreak_havoc.diff
+++ b/debian/patches/06_kdm_does_not_wreak_havoc.diff
@@ -1,6 +1,8 @@
---- a/kdm/kfrontend/genkdmconf.c
-+++ b/kdm/kfrontend/genkdmconf.c
-@@ -3136,9 +3136,11 @@
+Index: kdebase-workspace/kdm/kfrontend/genkdmconf.c
+===================================================================
+--- kdebase-workspace.orig/kdm/kfrontend/genkdmconf.c 2010-12-18 20:44:22.682071103 +0100
++++ kdebase-workspace/kdm/kfrontend/genkdmconf.c 2010-12-18 20:44:27.662318969 +0100
+@@ -3141,9 +3141,11 @@
memcmp(oldkde + olen - sizeof(SHR_CONF) + 1,
SHR_CONF, sizeof(SHR_CONF)))
{
diff --git a/debian/patches/07_kdmrc_defaults.diff b/debian/patches/07_kdmrc_defaults.diff
index 08b8435..bca0f37 100644
--- a/debian/patches/07_kdmrc_defaults.diff
+++ b/debian/patches/07_kdmrc_defaults.diff
@@ -1,5 +1,7 @@
---- a/kdm/config.def
-+++ b/kdm/config.def
+Index: kdebase-workspace/kdm/config.def
+===================================================================
+--- kdebase-workspace.orig/kdm/config.def 2010-12-18 20:44:08.786127265 +0100
++++ kdebase-workspace/kdm/config.def 2010-12-18 20:45:45.790819514 +0100
@@ -49,11 +49,11 @@
#endif
@@ -32,7 +34,7 @@
Comment: &
Description:
Additional arguments for the &X-Server;s for local sessions.
-@@ -1953,10 +1953,10 @@
+@@ -1929,10 +1929,10 @@
Key: SessionsDirs
Type: list
@@ -45,7 +47,7 @@
Update: upd_sessionsdirs
Comment:
The directories containing session type definitions in .desktop format,
-@@ -2025,7 +2025,7 @@
+@@ -2001,7 +2001,7 @@
Key: UseSessReg
Type: bool
@@ -54,7 +56,7 @@
User: core
Instance: #*/!
Comment:
-@@ -2116,9 +2116,9 @@
+@@ -2092,9 +2092,9 @@
Key: GreetString
Type: string
@@ -66,7 +68,7 @@
Comment:
The headline in the greeter. The following character pairs are replaced:
- %d -> current display
-@@ -2577,7 +2577,6 @@
+@@ -2553,7 +2553,6 @@
Default: 0
User: greeter
Instance: #*/
@@ -74,7 +76,7 @@
Comment:
Random seed for forging saved session types, etc. of unknown users.
This value should be random but constant across the login domain.
-@@ -2674,7 +2673,7 @@
+@@ -2650,7 +2649,7 @@
Type: bool
Default: true
User: greeter
diff --git a/debian/patches/08_genkdmconf.diff b/debian/patches/08_genkdmconf.diff
index 65aeb08..5ad8545 100644
--- a/debian/patches/08_genkdmconf.diff
+++ b/debian/patches/08_genkdmconf.diff
@@ -1,5 +1,7 @@
---- a/kdm/kfrontend/genkdmconf.c
-+++ b/kdm/kfrontend/genkdmconf.c
+Index: kdebase-workspace/kdm/kfrontend/genkdmconf.c
+===================================================================
+--- kdebase-workspace.orig/kdm/kfrontend/genkdmconf.c 2010-12-18 20:44:27.000000000 +0100
++++ kdebase-workspace/kdm/kfrontend/genkdmconf.c 2010-12-18 20:56:31.274321200 +0100
@@ -613,7 +613,7 @@
"# right hand sides can match.\n"
"#\n"
@@ -54,14 +56,18 @@
" ;;\n"
" */csh|*/tcsh)\n"
" # [t]cshrc is always sourced automatically.\n"
-@@ -738,28 +741,8 @@
- " [ -f $HOME/.profile ] && . $HOME/.profile\n"
+@@ -739,32 +742,8 @@
" ;;\n"
"esac\n"
--"\n"
+ "\n"
-"[ -f /etc/xprofile ] && . /etc/xprofile\n"
-"[ -f $HOME/.xprofile ] && . $HOME/.xprofile\n"
-"\n"
+-"for i in /etc/X11/Xresources/*; do\n"
+-" [ -f $i ] && xrdb -merge $i\n"
+-"done\n"
+-"[ -f $HOME/.Xresources ] && xrdb -merge $HOME/.Xresources\n"
+-"\n"
-"case $session in\n"
-" \"\")\n"
-" exec xmessage -center -buttons OK:0 -default OK \"Sorry, $DESKTOP_SESSION is no valid session.\"\n"
@@ -85,7 +91,7 @@
static const char def_background[] =
"[Desktop0]\n"
-@@ -1110,29 +1093,6 @@
+@@ -1115,29 +1094,6 @@
if (maxTTY)
return;
diff --git a/debian/patches/09_genkdm_make.diff b/debian/patches/09_genkdm_make.diff
index af68c54..8331088 100644
--- a/debian/patches/09_genkdm_make.diff
+++ b/debian/patches/09_genkdm_make.diff
@@ -2,9 +2,11 @@ As we use DEB_CONFIG_INSTALL_DIR ?= /usr/share/kde4/config
and we want kdm configuration files in /etc/kde4/kdm,
Let's hardcode it.
---- a/kdm/kfrontend/CMakeLists.txt
-+++ b/kdm/kfrontend/CMakeLists.txt
-@@ -114,5 +114,5 @@
+Index: kdebase-workspace/kdm/kfrontend/CMakeLists.txt
+===================================================================
+--- kdebase-workspace.orig/kdm/kfrontend/CMakeLists.txt 2010-10-27 21:55:03.000000000 +0200
++++ kdebase-workspace/kdm/kfrontend/CMakeLists.txt 2010-12-18 21:00:13.950319340 +0100
+@@ -112,5 +112,5 @@
# use 'GENKDMCONF_FLAGS=... make install' to add flags to the config generation (try genkdmconf -h)
install(CODE "
diff --git a/debian/patches/10_kdm_no_custom.diff b/debian/patches/10_kdm_no_custom.diff
index 0306262..52e2165 100644
--- a/debian/patches/10_kdm_no_custom.diff
+++ b/debian/patches/10_kdm_no_custom.diff
@@ -1,6 +1,8 @@
---- a/kdm/kfrontend/kgreeter.cpp
-+++ b/kdm/kfrontend/kgreeter.cpp
-@@ -450,7 +450,6 @@
+Index: kdebase-workspace/kdm/kfrontend/kgreeter.cpp
+===================================================================
+--- kdebase-workspace.orig/kdm/kfrontend/kgreeter.cpp 2010-08-05 18:55:46.000000000 +0200
++++ kdebase-workspace/kdm/kfrontend/kgreeter.cpp 2010-12-18 21:00:27.122127452 +0100
+@@ -451,7 +451,6 @@
KGreeter::putSession(const QString &type, const QString &name, bool hid, const char *exe)
{
int prio = exe ? (!strcmp(exe, "default") ? 0 :
@@ -8,7 +10,7 @@
!strcmp(exe, "failsafe") ? 3 : 2) : 2;
for (int i = 0; i < sessionTypes.size(); i++)
if (sessionTypes[i].type == type) {
-@@ -479,7 +478,6 @@
+@@ -480,7 +479,6 @@
dsk.readEntry("Exec").toLatin1());
}
putSession("default", i18nc("@item:inlistbox session type", "Default"), false, "default");
diff --git a/debian/patches/12_be_better_at_honouring_user_kdm_theming.diff b/debian/patches/12_be_better_at_honouring_user_kdm_theming.diff
index 1a9c5a4..46edf93 100644
--- a/debian/patches/12_be_better_at_honouring_user_kdm_theming.diff
+++ b/debian/patches/12_be_better_at_honouring_user_kdm_theming.diff
@@ -1,6 +1,8 @@
---- a/kdm/config.def
-+++ b/kdm/config.def
-@@ -2703,7 +2703,7 @@
+Index: kdebase-workspace/kdm/config.def
+===================================================================
+--- kdebase-workspace.orig/kdm/config.def 2010-12-18 20:45:45.790819514 +0100
++++ kdebase-workspace/kdm/config.def 2010-12-18 21:00:40.918568853 +0100
+@@ -2679,7 +2679,7 @@
Type: string
Default: ""
User: greeter
diff --git a/debian/patches/21_place_global_config_in_etc.diff b/debian/patches/21_place_global_config_in_etc.diff
index 586855f..5a48c78 100644
--- a/debian/patches/21_place_global_config_in_etc.diff
+++ b/debian/patches/21_place_global_config_in_etc.diff
@@ -5,8 +5,10 @@ we can detect possible new uses of KDE_CONFDIR in upstream code that might
have trouble if we apply this patch. With the renamed define, it will at
least FTBFS, so that we have the chance to inspect.
---- a/config-workspace.h.cmake
-+++ b/config-workspace.h.cmake
+Index: kdebase-workspace/config-workspace.h.cmake
+===================================================================
+--- kdebase-workspace.orig/config-workspace.h.cmake 2009-03-27 15:46:42.000000000 +0100
++++ kdebase-workspace/config-workspace.h.cmake 2010-12-18 22:10:20.366072714 +0100
@@ -121,7 +121,7 @@
#define KDE_BINDIR "${BIN_INSTALL_DIR}"
@@ -16,8 +18,10 @@ least FTBFS, so that we have the chance to inspect.
/* KDE's static data directory */
#define KDE_DATADIR "${DATA_INSTALL_DIR}"
---- a/kcontrol/kdm/main.cpp
-+++ b/kcontrol/kdm/main.cpp
+Index: kdebase-workspace/kdm/kcm/main.cpp
+===================================================================
+--- kdebase-workspace.orig/kdm/kcm/main.cpp 2010-10-27 21:55:02.000000000 +0200
++++ kdebase-workspace/kdm/kcm/main.cpp 2010-12-18 22:10:20.366072714 +0100
@@ -282,7 +282,7 @@
QString tempConfigName = pTempConfigFile->fileName();
@@ -36,8 +40,10 @@ least FTBFS, so that we have the chance to inspect.
KConfig systemBackgroundConfig(systemBackgroundConfigName);
KSharedConfigPtr pTempConfig = KSharedConfig::openConfig(tempBackgroundConfigName);
---- a/kdm/config.def
-+++ b/kdm/config.def
+Index: kdebase-workspace/kdm/config.def
+===================================================================
+--- kdebase-workspace.orig/kdm/config.def 2010-12-18 22:10:16.866820187 +0100
++++ kdebase-workspace/kdm/config.def 2010-12-18 22:10:20.370070760 +0100
@@ -29,7 +29,7 @@
#define RCVERMAJOR 2
#define RCVERMINOR 4
@@ -47,9 +53,11 @@ least FTBFS, so that we have the chance to inspect.
#define KDMDATA KDE_DATADIR "/kdm"
#include <sys/param.h> /* for #define BSD */
---- a/kdm/kfrontend/kdmctl.c
-+++ b/kdm/kfrontend/kdmctl.c
-@@ -150,7 +150,7 @@
+Index: kdebase-workspace/kdm/kfrontend/kdmctl.c
+===================================================================
+--- kdebase-workspace.orig/kdm/kfrontend/kdmctl.c 2010-11-19 11:51:19.000000000 +0100
++++ kdebase-workspace/kdm/kfrontend/kdmctl.c 2010-12-18 22:10:20.370070760 +0100
+@@ -148,7 +148,7 @@
{
char *dpy = getenv("DISPLAY");
const char *ctl = getenv("DM_CONTROL");
@@ -58,9 +66,11 @@ least FTBFS, so that we have the chance to inspect.
char *ptr;
int fd;
---- a/kdm/kfrontend/genkdmconf.c
-+++ b/kdm/kfrontend/genkdmconf.c
-@@ -2917,7 +2917,7 @@
+Index: kdebase-workspace/kdm/kfrontend/genkdmconf.c
+===================================================================
+--- kdebase-workspace.orig/kdm/kfrontend/genkdmconf.c 2010-12-18 22:10:12.634569938 +0100
++++ kdebase-workspace/kdm/kfrontend/genkdmconf.c 2010-12-18 22:10:20.370070760 +0100
+@@ -2918,7 +2918,7 @@
static const char * const oldkdes[] = {
@@ -69,7 +79,7 @@ least FTBFS, so that we have the chance to inspect.
"/opt/kde4/share/config",
"/usr/local/kde4/share/config",
-@@ -2925,6 +2925,7 @@
+@@ -2926,6 +2926,7 @@
"/usr/local/kde/share/config",
"/usr/local/share/config",
"/usr/share/config",
@@ -77,7 +87,7 @@ least FTBFS, so that we have the chance to inspect.
"/opt/kde3/share/config",
"/usr/local/kde3/share/config",
-@@ -2968,7 +2969,7 @@
+@@ -2969,7 +2970,7 @@
" Note that you possibly need to use --no-old-kde to make this take effect.\n"
" --old-kde /path/to/old/kde-config-dir\n"
" Where to look for the kdmrc of a previously installed kdm.\n"
@@ -86,8 +96,10 @@ least FTBFS, so that we have the chance to inspect.
" {/usr,/usr/local,{/opt,/usr/local}/{kde4,kde,kde3}}/share/config.\n"
" --no-old\n"
" Do not look at older xdm/kdm configurations, just create default config.\n"
---- a/kcontrol/kdm/helper.cpp
-+++ b/kcontrol/kdm/helper.cpp
+Index: kdebase-workspace/kdm/kcm/helper.cpp
+===================================================================
+--- kdebase-workspace.orig/kdm/kcm/helper.cpp 2010-10-27 21:55:02.000000000 +0200
++++ kdebase-workspace/kdm/kcm/helper.cpp 2010-12-18 22:10:20.370070760 +0100
@@ -131,9 +131,9 @@
QString tempConfigName = args.value("tempkdmrcfile").toString();
QString tempBackgroundConfigName = args.value("tempbackgroundrcfile").toString();
@@ -109,8 +121,10 @@ least FTBFS, so that we have the chance to inspect.
.group("X-*-Greeter").readEntry("FaceDir",
KStandardDirs::installPath("data") + "kdm/faces") + '/';
---- a/kcontrol/dateandtime/helper.cpp
-+++ b/kcontrol/dateandtime/helper.cpp
+Index: kdebase-workspace/kcontrol/dateandtime/helper.cpp
+===================================================================
+--- kdebase-workspace.orig/kcontrol/dateandtime/helper.cpp 2010-09-01 15:36:50.000000000 +0200
++++ kdebase-workspace/kcontrol/dateandtime/helper.cpp 2010-12-18 22:10:20.370070760 +0100
@@ -54,7 +54,7 @@
int ret = 0;
diff --git a/debian/patches/28_backport_bug156475_dualhead_support.diff b/debian/patches/28_backport_bug156475_dualhead_support.diff
deleted file mode 100644
index cbf6569..0000000
--- a/debian/patches/28_backport_bug156475_dualhead_support.diff
+++ /dev/null
@@ -1,20 +0,0 @@
-From: Aaron J. Seigo <aseigo at kde.org>
-Subject: attempt to fix dual head support
-Origin: backport http://websvn.kde.org/?view=rev&revision=1182543
-Bug: https://bugs.kde.org/show_bug.cgi?id=156475
-Applied-Upstream: 4.5.3
-
-convert the number first to a string, otherwise it doesn't append anything.
-noticed by Oliver oin the BR
-
---- a/plasma/desktop/shell/main.cpp
-+++ b/plasma/desktop/shell/main.cpp
-@@ -91,7 +91,7 @@ KDE_EXPORT int kdemain(int argc, char **
-
- QByteArray appName = "plasma-desktop";
- if (associatedScreen > 0) {
-- appName.append("-screen-").append(associatedScreen);
-+ appName.append("-screen-").append(QByteArray::number(associatedScreen));
- }
-
- KAboutData aboutData(appName, 0, ki18n("Plasma Workspace"),
diff --git a/debian/patches/29_backport_fix_krandr_support_in_startkde.diff b/debian/patches/29_backport_fix_krandr_support_in_startkde.diff
deleted file mode 100644
index 0bb3342..0000000
--- a/debian/patches/29_backport_fix_krandr_support_in_startkde.diff
+++ /dev/null
@@ -1,391 +0,0 @@
-From: Lubos Lunak <l.lunak at kde.org>
-From: Timo Boettcher <debian at timoboettcher.name>
-From: Modestas Vainius <modax at debian.org>
-Subject: Add back support for changing RandR settings on KDE startup
-Bug: https://bugs.kde.org/show_bug.cgi?id=183143
-Bug-Debian: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=596473
-Origin: backport http://websvn.kde.org/?view=rev&revision=1170315
-Last-Update: 2010-10-17
-Applied-Upstream: 4.6
-
-KDE 3.5 used to have this feature. Actually, old code was still present in this
-version of KDE 4 but it was severily broken and has never worked with modern
-RandR 1.2 or higher. This patch attempts to address this problem. It's not very
-intrusive hence it would be a shame not to include it.
-
-Since Debian is pushing xorg.conf'less X now, so restoring non-Xorg-default
-RandR settings on startup becomes essential for users who have to deal with
-pretty frequent problems like:
-
-1) monitor reports incorrect or no EDID data to Xorg;
-2) users just want lower/higher resolution than default selected by Xorg;
-2) users have more complex setup like 2 monitors or monitor + TV.
-
-Original author of the patch is upstream developer Lubos Lunak. Thanks to Timo
-Boettcher for adapting (slight differences in startkde) and testing the patch
-on Debian's KDE 4.4. The patch also contains minor refactoring by me which aims
-to minimize the startkde diff.
---- a/kcontrol/randr/legacyrandrconfig.cpp
-+++ b/kcontrol/randr/legacyrandrconfig.cpp
-@@ -92,7 +92,11 @@ void LegacyRandRConfig::save()
- m_oldApply = applyOnStartup->isChecked();
- m_oldSyncTrayApp = syncTrayApp->isChecked();
- KConfig config("krandrrc");
-- m_display->saveDisplay(config, m_oldApply, m_oldSyncTrayApp);
-+ m_display->saveDisplay(config, m_oldSyncTrayApp);
-+ if(m_oldApply)
-+ m_display->saveStartup(config);
-+ else
-+ m_display->disableStartup(config);
-
- setChanged();
- }
---- a/kcontrol/randr/legacyrandrscreen.cpp
-+++ b/kcontrol/randr/legacyrandrscreen.cpp
-@@ -388,6 +388,28 @@ void LegacyRandRScreen::save(KConfig& co
- group.writeEntry("reflectY", (bool)(rotation() & RandR::ReflectMask) == RandR::ReflectY);
- }
-
-+QStringList LegacyRandRScreen::startupCommands() const
-+{
-+ QString command = QString("xrandr -s %1x%2 -r %3 ").arg( currentPixelSize().width(),
-+ currentPixelSize().height(), refreshRateIndexToHz(size(), refreshRate()));
-+ switch( rotation()) {
-+ case RR_Rotate_90:
-+ command += " -o 1 ";
-+ break;
-+ case RR_Rotate_180:
-+ command += " -o 2 ";
-+ break;
-+ case RR_Rotate_270:
-+ command += " -o 3 ";
-+ break;
-+ }
-+ if((rotation() & RandR::ReflectMask) == RandR::ReflectX)
-+ command += " -x ";
-+ if((bool)(rotation() & RandR::ReflectMask) == RandR::ReflectY)
-+ command += " -y ";
-+ return QStringList() << command;
-+}
-+
- int LegacyRandRScreen::pixelCount( int index ) const
- {
- QSize sz = pixelSize(index);
---- a/kcontrol/randr/legacyrandrscreen.h
-+++ b/kcontrol/randr/legacyrandrscreen.h
-@@ -130,6 +130,7 @@ public:
- */
- void load(KConfig& config);
- void save(KConfig& config) const;
-+ QStringList startupCommands() const;
-
- private:
- XRRScreenConfiguration* m_config;
---- a/kcontrol/randr/randrconfigbase.ui
-+++ b/kcontrol/randr/randrconfigbase.ui
-@@ -44,6 +44,13 @@
- </property>
- </widget>
- </item>
-+ <item>
-+ <widget class="QPushButton" name="saveAsDefaultButton">
-+ <property name="text">
-+ <string>Save as Default</string>
-+ </property>
-+ </widget>
-+ </item>
- </layout>
- </widget>
- <widget class="QGraphicsView" name="screenView"/>
---- a/kcontrol/randr/randrconfig.cpp
-+++ b/kcontrol/randr/randrconfig.cpp
-@@ -31,6 +31,8 @@
- #include <kglobalsettings.h>
- #include <kmessagebox.h>
- #include <kprocess.h>
-+#include <kshell.h>
-+#include <qmenu.h>
-
- RandRConfig::RandRConfig(QWidget *parent, RandRDisplay *display)
- : QWidget(parent), Ui::RandRConfigBase()
-@@ -54,6 +56,12 @@ RandRConfig::RandRConfig(QWidget *parent
- identifyTimer.setSingleShot( true );
- compressUpdateViewTimer.setSingleShot( true );
-
-+ connect( saveAsDefaultButton, SIGNAL( clicked()), SLOT( saveStartup()));
-+ QMenu* saveMenu = new QMenu(saveAsDefaultButton);
-+ saveMenu->addAction(i18n("Save as Default"),this, SLOT(saveStartup()));
-+ saveMenu->addAction(i18n("Reset"),this, SLOT(disableStartup()));
-+ saveAsDefaultButton->setMenu(saveMenu);
-+
- // create the container for the settings widget
- QHBoxLayout *layout = new QHBoxLayout(outputList);
- layout->setSpacing(0);
-@@ -214,6 +222,25 @@ void RandRConfig::update()
- emit changed(false);
- }
-
-+void RandRConfig::saveStartup()
-+{
-+ if (!m_display->isValid())
-+ return;
-+ KConfig config("krandrrc");
-+ m_display->saveStartup(config);
-+ KMessageBox::information( window(), i18n( "Configuration has been set as the desktop default." ));
-+}
-+
-+void RandRConfig::disableStartup()
-+{
-+ if (!m_display->isValid())
-+ return;
-+ KConfig config("krandrrc");
-+ m_display->disableStartup(config);
-+ KMessageBox::information( window(), i18n( "Default desktop setup has been reset." ));
-+}
-+
-+
- bool RandRConfig::eventFilter(QObject *obj, QEvent *event)
- {
- if ( obj == screenView && event->type() == QEvent::Resize ) {
---- a/kcontrol/randr/randrconfig.h
-+++ b/kcontrol/randr/randrconfig.h
-@@ -57,6 +57,8 @@ protected slots:
- void slotAdjustOutput(OutputGraphicsItem *o);
- void identifyOutputs();
- void clearIndicators();
-+ void saveStartup();
-+ void disableStartup();
-
- signals:
- void changed(bool change);
---- a/kcontrol/randr/randrdisplay.cpp
-+++ b/kcontrol/randr/randrdisplay.cpp
-@@ -290,10 +290,9 @@ bool RandRDisplay::syncTrayApp(KConfig&
- return config.group("Display").readEntry("SyncTrayApp", false);
- }
-
--void RandRDisplay::saveDisplay(KConfig& config, bool applyOnStartup, bool syncTrayApp)
-+void RandRDisplay::saveDisplay(KConfig& config, bool syncTrayApp)
- {
- KConfigGroup group = config.group("Display");
-- group.writeEntry("ApplyOnStartup", applyOnStartup);
- group.writeEntry("SyncTrayApp", syncTrayApp);
-
- #ifdef HAS_RANDR_1_2
-@@ -310,6 +309,36 @@ void RandRDisplay::saveDisplay(KConfig&
- }
- }
-
-+// to be used during desktop startup, make all screens provide the shell commands
-+// (using xrandr cli tool), save them here and a script will perform these commands
-+// early during desktop startup
-+void RandRDisplay::saveStartup(KConfig& config)
-+{
-+ KConfigGroup group = config.group("Display");
-+ group.writeEntry("ApplyOnStartup", true);
-+ QStringList commands;
-+#ifdef HAS_RANDR_1_2
-+ if (RandR::has_1_2)
-+ {
-+ foreach(RandRScreen *s, m_screens)
-+ commands += s->startupCommands();
-+ }
-+ else
-+#endif
-+ {
-+ foreach(LegacyRandRScreen *s, m_legacyScreens)
-+ commands += s->startupCommands();
-+ }
-+ group.writeEntry( "StartupCommands", commands.join( "\n" ));
-+}
-+
-+void RandRDisplay::disableStartup(KConfig& config)
-+{
-+ KConfigGroup group = config.group("Display");
-+ group.writeEntry("ApplyOnStartup", false);
-+ group.deleteEntry( "StartupCommands" );
-+}
-+
- void RandRDisplay::applyProposed(bool confirm)
- {
-
---- a/kcontrol/randr/randrdisplay.h
-+++ b/kcontrol/randr/randrdisplay.h
-@@ -63,7 +63,9 @@ public:
- * @retuns true if the settings should be applied on KDE startup.
- */
- bool loadDisplay(KConfig& config, bool loadScreens = true);
-- void saveDisplay(KConfig& config, bool applyOnStartup, bool syncTrayApp);
-+ void saveDisplay(KConfig& config, bool syncTrayApp);
-+ void saveStartup(KConfig& config);
-+ void disableStartup(KConfig& config);
-
- static bool applyOnStartup(KConfig& config);
- static bool syncTrayApp(KConfig& config);
---- a/kcontrol/randr/randroutput.cpp
-+++ b/kcontrol/randr/randroutput.cpp
-@@ -24,6 +24,7 @@
-
- #include <KConfig>
- #include <KConfigGroup>
-+#include <KShell>
- #include <QX11Info>
- #include <QAction>
-
-@@ -424,6 +425,36 @@ void RandROutput::save(KConfig &config)
- cg.writeEntry("RefreshRate", (double)m_crtc->refreshRate());
- }
-
-+QStringList RandROutput::startupCommands() const
-+{
-+ if (!m_connected)
-+ return QStringList();
-+ if (m_crtc->id() == None)
-+ return QStringList();
-+ QString command = QString( "xrandr --output \"%1\"" ).arg( KShell::quoteArg( m_name ));
-+ // if the outputs are unified, do not save size and rotation
-+ // this allow us to set back the size and rotation being used
-+ // when the outputs are not unified.
-+ if (!m_screen->outputsUnified() || m_screen->connectedCount() <=1)
-+ {
-+ command += QString( " --pos %1x%2 --mode %3x%4" ).arg( m_crtc->rect().x())
-+ .arg( m_crtc->rect().y()).arg( m_crtc->rect().width()).arg( m_crtc->rect().height());
-+ switch( m_crtc->rotation()) {
-+ case RandR::Rotate90:
-+ command += " --rotate right";
-+ break;
-+ case RandR::Rotate180:
-+ command += " --rotate inverted";
-+ break;
-+ case RandR::Rotate270:
-+ command += " --rotate left";
-+ break;
-+ }
-+ }
-+ command += QString(" --refresh %1").arg( m_crtc->refreshRate());
-+ return QStringList() << command;
-+}
-+
- void RandROutput::proposeRefreshRate(float rate)
- {
- if (!m_crtc->isValid())
---- a/kcontrol/randr/randroutput.h
-+++ b/kcontrol/randr/randroutput.h
-@@ -118,6 +118,7 @@ public:
-
- void load(KConfig &config);
- void save(KConfig &config);
-+ QStringList startupCommands() const;
-
- public slots:
- void slotChangeSize(QAction *action);
---- a/kcontrol/randr/randrscreen.cpp
-+++ b/kcontrol/randr/randrscreen.cpp
-@@ -424,6 +424,17 @@ void RandRScreen::save()
- save(cfg);
- }
-
-+QStringList RandRScreen::startupCommands() const
-+{
-+ QStringList commands;
-+ foreach(RandROutput *output, m_outputs)
-+ {
-+ if (output->isConnected())
-+ commands += output->startupCommands();
-+ }
-+ return commands;
-+}
-+
- void RandRScreen::load()
- {
- KConfig cfg("krandrrc");
---- a/kcontrol/randr/randrscreen.h
-+++ b/kcontrol/randr/randrscreen.h
-@@ -84,6 +84,7 @@ public:
-
- void load(KConfig &config);
- void save(KConfig &config);
-+ QStringList startupCommands() const;
-
- public slots:
- void slotUnifyOutputs(bool unify);
---- a/startkde.cmake
-+++ b/startkde.cmake
-@@ -91,11 +91,12 @@ kcminputrc Mouse cursorTheme 'Oxygen_Bla
- kcminputrc Mouse cursorSize ''
- ksplashrc KSplash Theme Default
- ksplashrc KSplash Engine KSplashX
--kcmrandrrc Display ApplyOnStartup false
--kcmrandrrc [Screen0]
--kcmrandrrc [Screen1]
--kcmrandrrc [Screen2]
--kcmrandrrc [Screen3]
-+krandrrc Display ApplyOnStartup false
-+krandrrc Display StartupCommands ''
-+krandrrc [Screen0]
-+krandrrc [Screen1]
-+krandrrc [Screen2]
-+krandrrc [Screen3]
- kcmfonts General forceFontDPI 0
- kdeglobals Locale Language '' # trigger requesting languages from KLocale
- EOF
-@@ -125,20 +126,20 @@ if test -n "$kcminputrc_mouse_cursorthem
- fi
- fi
-
--if test "$kcmrandrrc_display_applyonstartup" = "true"; then
-+krandr_backwards_compatibility() {
- # 4 screens is hopefully enough
- for scrn in 0 1 2 3; do
- args=
-- width="\$kcmrandrrc_screen${scrn}_width" ; eval "width=$width"
-- height="\$kcmrandrrc_screen${scrn}_height" ; eval "height=$height"
-+ width="\$krandrrc_screen${scrn}_width" ; eval "width=$width"
-+ height="\$krandrrc_screen${scrn}_height" ; eval "height=$height"
- if test -n "${width}" -a -n "${height}"; then
- args="$args -s ${width}x${height}"
- fi
-- refresh="\$kcmrandrrc_screen${scrn}_refresh" ; eval "refresh=$refresh"
-+ refresh="\$krandrrc_screen${scrn}_refresh" ; eval "refresh=$refresh"
- if test -n "${refresh}"; then
- args="$args -r ${refresh}"
- fi
-- rotation="\$kcmrandrrc_screen${scrn}_rotation" ; eval "rotation=$rotation"
-+ rotation="\$krandrrc_screen${scrn}_rotation" ; eval "rotation=$rotation"
- if test -n "${rotation}"; then
- case "${rotation}" in
- 0)
-@@ -155,11 +156,11 @@ if test "$kcmrandrrc_display_applyonstar
- ;;
- esac
- fi
-- reflectx="\$kcmrandrrc_screen${scrn}_reflectx" ; eval "reflectx=$reflectx"
-+ reflectx="\$krandrrc_screen${scrn}_reflectx" ; eval "reflectx=$reflectx"
- if test "${refrectx}" = "true"; then
- args="$args -x"
- fi
-- reflecty="\$kcmrandrrc_screen${scrn}_reflecty" ; eval "reflecty=$reflecty"
-+ reflecty="\$krandrrc_screen${scrn}_reflecty" ; eval "reflecty=$reflecty"
- if test "${refrecty}" = "true"; then
- args="$args -y"
- fi
-@@ -167,6 +168,19 @@ if test "$kcmrandrrc_display_applyonstar
- xrandr $args
- fi
- done
-+}
-+
-+if test "$krandrrc_display_applyonstartup" = "true"; then
-+ if test -n "$krandrrc_display_startupcommands"; then
-+ # new way of simply storing the commands
-+ echo "$krandrrc_display_startupcommands" | \
-+ while read command; do
-+ eval "$command"
-+ done
-+ else
-+ # backwards compatibility
-+ krandr_backwards_compatibility
-+ fi
- fi
-
- if test "$kcmfonts_general_forcefontdpi" -eq 120; then
diff --git a/debian/patches/33_qguiplatformplugin_kde_NULL_check.diff b/debian/patches/33_qguiplatformplugin_kde_NULL_check.diff
index 78b03e4..fbf46f3 100644
--- a/debian/patches/33_qguiplatformplugin_kde_NULL_check.diff
+++ b/debian/patches/33_qguiplatformplugin_kde_NULL_check.diff
@@ -4,9 +4,11 @@ Author: "Dr. David Alan Gilbert" <debian at treblig.org>
Signed-By: Didier Raboud <didier at raboud.com>
Bugs-Debian: #603480
Last-Update: 2010-11-28
---- a/qguiplatformplugin_kde/qguiplatformplugin_kde.cpp
-+++ b/qguiplatformplugin_kde/qguiplatformplugin_kde.cpp
-@@ -246,7 +246,9 @@
+Index: kdebase-workspace/qguiplatformplugin_kde/qguiplatformplugin_kde.cpp
+===================================================================
+--- kdebase-workspace.orig/qguiplatformplugin_kde/qguiplatformplugin_kde.cpp 2010-06-01 20:10:52.000000000 +0200
++++ kdebase-workspace/qguiplatformplugin_kde/qguiplatformplugin_kde.cpp 2010-12-18 22:31:42.726096651 +0100
+@@ -247,7 +247,9 @@
kdefd->setConfirmOverwrite(qfd->confirmOverwrite());
kdefd->setSelection(qfd->selectedFiles().value(0));
}
diff --git a/debian/patches/97_fix_target_link_libraries.diff b/debian/patches/97_fix_target_link_libraries.diff
index 7056547..5141c30 100644
--- a/debian/patches/97_fix_target_link_libraries.diff
+++ b/debian/patches/97_fix_target_link_libraries.diff
@@ -1,6 +1,8 @@
---- a/libs/kworkspace/CMakeLists.txt
-+++ b/libs/kworkspace/CMakeLists.txt
-@@ -79,6 +79,7 @@
+Index: kdebase-workspace/libs/kworkspace/CMakeLists.txt
+===================================================================
+--- kdebase-workspace.orig/libs/kworkspace/CMakeLists.txt 2010-11-05 11:47:18.000000000 +0100
++++ kdebase-workspace/libs/kworkspace/CMakeLists.txt 2010-12-18 22:36:55.306819074 +0100
+@@ -65,6 +65,7 @@
kde4_add_library(kworkspace ${LIB_MODE} ${kworkspace_LIB_SRCS})
target_link_libraries(kworkspace ${KDE4_KDEUI_LIBS} ${X11_LIBRARIES} ${KDE4_PLASMA_LIBS} )
@@ -8,11 +10,13 @@
set_target_properties(kworkspace PROPERTIES VERSION ${GENERIC_LIB_VERSION} SOVERSION ${GENERIC_LIB_SOVERSION} )
install(TARGETS kworkspace EXPORT kdeworkspaceLibraryTargets ${INSTALL_TARGETS_DEFAULT_ARGS} )
---- a/libs/taskmanager/CMakeLists.txt
-+++ b/libs/taskmanager/CMakeLists.txt
-@@ -44,6 +44,7 @@
-
+Index: kdebase-workspace/libs/taskmanager/CMakeLists.txt
+===================================================================
+--- kdebase-workspace.orig/libs/taskmanager/CMakeLists.txt 2010-11-11 15:40:48.000000000 +0100
++++ kdebase-workspace/libs/taskmanager/CMakeLists.txt 2010-12-18 22:36:55.306819074 +0100
+@@ -47,6 +47,7 @@
target_link_libraries(taskmanager kephal)
+ target_link_libraries(taskmanager kworkspace)
+target_link_libraries(taskmanager LINK_INTERFACE_LIBRARIES ${QT_QTGUI_LIBRARY} )
set_target_properties(taskmanager PROPERTIES VERSION ${GENERIC_LIB_VERSION} SOVERSION ${GENERIC_LIB_SOVERSION} )
diff --git a/debian/patches/99_solid_network_use_ntrack.diff b/debian/patches/99_solid_network_use_ntrack.diff
deleted file mode 100644
index a6d87c4..0000000
--- a/debian/patches/99_solid_network_use_ntrack.diff
+++ /dev/null
@@ -1,276 +0,0 @@
-From: Sune Vuorela <sune at debian.org>
-Subject: Use ntrack in solidnetwork
-Origin: vendor
-Forwarded: yes
-Last-Update: 2010-10-18
-Applied-Upstream: 4.6 http://websvn.kde.org/?view=revision&revision=1180766
-
-By default, solidnetworkstatus trusts networkmanager too much. NetworkManager reports offline, if
-all devices managed by NM is offline. But there might be devices that aren't managed by NM.
-
-This patch adds the ntrack library to give a additional set of data points for wether or not
-the status is online.
-
-If one datapoint reports offline and another datapoint reports online, then solidnetworkstatus
-reports online as status.
-
-Patch forwarded, hopefully it will soon be applied
---- /dev/null
-+++ b/solid/networking/kded/ntracknetworkstate.cpp
-@@ -0,0 +1,73 @@
-+/*
-+ Copyright (c) 2010 Sune Vuorela <sune at debian.org>
-+
-+ Permission is hereby granted, free of charge, to any person
-+ obtaining a copy of this software and associated documentation
-+ files (the "Software"), to deal in the Software without
-+ restriction, including without limitation the rights to use,
-+ copy, modify, merge, publish, distribute, sublicense, and/or sell
-+ copies of the Software, and to permit persons to whom the
-+ Software is furnished to do so, subject to the following
-+ conditions:
-+
-+ The above copyright notice and this permission notice shall be
-+ included in all copies or substantial portions of the Software.
-+
-+ THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-+ EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES
-+ OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-+ NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
-+ HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
-+ WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
-+ FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
-+ OTHER DEALINGS IN THE SOFTWARE.
-+
-+*/
-+
-+#include "ntracknetworkstate.h"
-+
-+#include "networkstatus.h"
-+
-+#include <Solid/Networking>
-+
-+#include <KDebug>
-+
-+Solid::Networking::Status ntrackstate2solidstatus(QNTrackState state)
-+{
-+ kDebug( 1222 ) << "ntrackstate2solidstatus changed status: " << state;
-+ switch(state) {
-+ case NTRACK_STATE_UNKNOWN:
-+ case NTRACK_STATE_UNSET: {
-+ return Solid::Networking::Unknown;
-+ }
-+ case NTRACK_STATE_ONLINE: {
-+ return Solid::Networking::Connected;
-+ }
-+ case NTRACK_STATE_BLOCKED:
-+ case NTRACK_STATE_OFFLINE: {
-+ return Solid::Networking::Unconnected;
-+ }
-+ }
-+ //FAILSAFE
-+ return Solid::Networking::Unknown;
-+}
-+
-+NtrackNetworkState::NtrackNetworkState( NetworkStatusModule* statusmodule ) : QObject(statusmodule),m_statusmodule(statusmodule)
-+{
-+ m_statusmodule->registerNetwork("ntrack", ntrackstate2solidstatus(QNtrack::instance()->networkState()),"ntrack backend");
-+ connect(QNtrack::instance(),SIGNAL(stateChanged(QNTrackState,QNTrackState)),this,SLOT(ntrackStateChangedSlot(QNTrackState,QNTrackState)));
-+}
-+
-+NtrackNetworkState::~NtrackNetworkState()
-+{
-+}
-+
-+
-+
-+void NtrackNetworkState::ntrackStateChangedSlot(QNTrackState /*oldstate*/ , QNTrackState newstate )
-+{
-+ kDebug( 1222 ) << "ntrack changed status: " << newstate;
-+ m_statusmodule->setNetworkStatus("ntrack",ntrackstate2solidstatus(newstate));
-+}
-+
-+
---- a/solid/networking/kded/CMakeLists.txt
-+++ b/solid/networking/kded/CMakeLists.txt
-@@ -6,6 +6,20 @@
- # MESSAGE(STATUS "Adding in-process NetworkManager service-wart to kded module")
- #endif(NETWORKMANAGER_FOUND)
-
-+find_package(QNtrack)
-+
-+if(QNTRACK_FOUND)
-+ MESSAGE(STATUS "Found QNtrack, will use it as a additional data point for KDED network status module")
-+ set(kded_networkstatus_PART_SRCS ${kded_networkstatus_PART_SRCS} ntracknetworkstate.cpp)
-+ add_definitions(-DHAVE_QNTRACK)
-+ include_directories(${QNTRACK_INCLUDE_DIR})
-+else(QNTRACK_FOUND)
-+ MESSAGE(STATUS "QNtrack not found. Consider installing it for more data points to network status module. See https://launchpad.net/ntrack")
-+endif(QNTRACK_FOUND)
-+
-+macro_log_feature(QNTRACK_FOUND "QNtrack" "Network status tracking library" "http://launchpad.net/ntrack" FALSE "" "Needed to provide more data points for KDED Networkstatus module")
-+
-+
- qt4_add_dbus_adaptor(kded_networkstatus_PART_SRCS ../org.kde.Solid.Networking.Service.xml
- networkstatus.h NetworkStatusModule)
-
-@@ -17,7 +31,10 @@
-
- kde4_add_plugin(kded_networkstatus ${kded_networkstatus_PART_SRCS})
-
--target_link_libraries(kded_networkstatus ${KDE4_KIO_LIBS} solidcontrol)
-+target_link_libraries(kded_networkstatus ${KDE4_KIO_LIBS} solidcontrol )
-+if(QNTRACK_FOUND)
-+ target_link_libraries(kded_networkstatus ${QNTRACK_LIBRARIES})
-+endif(QNTRACK_FOUND)
-
- install(TARGETS kded_networkstatus DESTINATION ${PLUGIN_INSTALL_DIR})
-
---- /dev/null
-+++ b/solid/networking/kded/ntracknetworkstate.h
-@@ -0,0 +1,51 @@
-+/*
-+ Copyright (c) 2010 Sune Vuorela <sune at debian.org>
-+
-+ Permission is hereby granted, free of charge, to any person
-+ obtaining a copy of this software and associated documentation
-+ files (the "Software"), to deal in the Software without
-+ restriction, including without limitation the rights to use,
-+ copy, modify, merge, publish, distribute, sublicense, and/or sell
-+ copies of the Software, and to permit persons to whom the
-+ Software is furnished to do so, subject to the following
-+ conditions:
-+
-+ The above copyright notice and this permission notice shall be
-+ included in all copies or substantial portions of the Software.
-+
-+ THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-+ EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES
-+ OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-+ NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
-+ HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
-+ WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
-+ FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
-+ OTHER DEALINGS IN THE SOFTWARE.
-+
-+*/
-+
-+#ifndef NTRACKNETWORKSTATE_H
-+#define NTRACKNETWORKSTATE_H
-+#ifdef HAVE_QNTRACK
-+
-+#include <QObject>
-+#include <QNtrack.h>
-+
-+class NetworkStatusModule;
-+
-+class NtrackNetworkState : public QObject {
-+ Q_OBJECT
-+ public:
-+ NtrackNetworkState(NetworkStatusModule* statusmodule /*also parent in object hierachy*/);
-+ virtual ~NtrackNetworkState();
-+private Q_SLOTS:
-+ /**
-+ * A slot to register the new state as reported by the ntrack part of things
-+ */
-+ void ntrackStateChangedSlot(QNTrackState, QNTrackState newstate);
-+ private:
-+ NetworkStatusModule* m_statusmodule;
-+};
-+
-+#endif // HAVE_QNTRACK
-+#endif // NTRACKNETWORKSTATE_H
---- a/solid/networking/kded/networkstatus.cpp
-+++ b/solid/networking/kded/networkstatus.cpp
-@@ -33,6 +33,7 @@
- #include "serviceadaptor.h"
-
- #include <kpluginfactory.h>
-+#include "ntracknetworkstate.h"
-
- K_PLUGIN_FACTORY(NetworkStatusFactory,
- registerPlugin<NetworkStatusModule>();
-@@ -68,6 +69,10 @@
- new ClientAdaptor( this );
- new ServiceAdaptor( this );
-
-+#ifdef HAVE_QNTRACK
-+ new NtrackNetworkState( this );
-+#endif
-+
- init();
- }
-
---- /dev/null
-+++ b/cmake/modules/FindQNtrack.cmake
-@@ -0,0 +1,70 @@
-+# - Try to find the QNtrack library
-+# Once done this will define
-+#
-+# QNTRACK_FOUND - system has the CK Connector
-+# QNTRACK_INCLUDE_DIR - the CK Connector include directory
-+# QNTRACK_LIBRARIES - the libraries needed to use CK Connector
-+
-+# Copyright (C) 2010 Sune Vuorela <sune at debian.org>
-+# modeled after FindCkConnector.cmake:
-+# Copyright (c) 2008, Kevin Kofler, <kevin.kofler at chello.at>
-+# modeled after FindLibArt.cmake:
-+# Copyright (c) 2006, Alexander Neundorf, <neundorf at kde.org>
-+#
-+# Redistribution and use is allowed according to the terms of the BSD license.
-+# For details see the accompanying COPYING-CMAKE-SCRIPTS file.
-+
-+
-+if(QNTRACK_INCLUDE_DIR AND QNTRACK_LIBRARIES)
-+
-+ # in cache already
-+ SET(QNTRACK_FOUND TRUE)
-+
-+else (QNTRACK_INCLUDE_DIR AND QNTRACK_LIBRARIES)
-+
-+ IF (NOT WIN32)
-+ FIND_PACKAGE(PkgConfig)
-+ IF (PKG_CONFIG_FOUND)
-+ # use pkg-config to get the directories and then use these values
-+ # in the FIND_PATH() and FIND_LIBRARY() calls
-+ pkg_check_modules(_QNTRACK_PC QUIET libntrack-qt4 )
-+ ENDIF (PKG_CONFIG_FOUND)
-+ ENDIF (NOT WIN32)
-+
-+ FIND_PATH(QNTRACK_QT_INCLUDE_DIR QNtrack.h
-+ ${_QNTRACK_PC_INCLUDE_DIRS}
-+ )
-+ #Hide from cmake user interfaces
-+ SET(QNTRACK_QT_INCLUDE_DIR ${QNTRACK_QT_INCLUDE_DIR} CACHE INTERNAL "" FORCE)
-+
-+ FIND_PATH(NTRACK_INCLUDE_DIR ntrackmonitor.h
-+ ${_QNTRACK_PC_INCLUDE_DIRS}
-+ )
-+ #Hide from cmake user interfaces
-+ SET(NTRACK_INCLUDE_DIR ${NTRACK_INCLUDE_DIR} CACHE INTERNAL "" FORCE)
-+
-+ FIND_LIBRARY(QNTRACK_LIBRARIES NAMES ntrack-qt4
-+ PATHS
-+ ${_QNTRACK_PC_LIBDIR}
-+ )
-+
-+
-+ if (QNTRACK_QT_INCLUDE_DIR AND NTRACK_INCLUDE_DIR AND QNTRACK_LIBRARIES)
-+ set(QNTRACK_FOUND TRUE)
-+ set(QNTRACK_INCLUDE_DIR ${QNTRACK_QT_INCLUDE_DIR} ${NTRACK_INCLUDE_DIR})
-+ endif (QNTRACK_QT_INCLUDE_DIR AND NTRACK_INCLUDE_DIR AND QNTRACK_LIBRARIES)
-+
-+
-+ if (QNTRACK_FOUND)
-+ if (NOT QNtrack_FIND_QUIETLY)
-+ message(STATUS "Found QNtrack: ${QNTRACK_LIBRARIES}")
-+ endif (NOT QNtrack_FIND_QUIETLY)
-+ else (QNTRACK_FOUND)
-+ if (QNtrack_FIND_REQUIRED)
-+ message(FATAL_ERROR "Could NOT find QNtrack")
-+ endif (QNtrack_FIND_REQUIRED)
-+ endif (QNTRACK_FOUND)
-+
-+ MARK_AS_ADVANCED(QNTRACK_INCLUDE_DIR QNTRACK_LIBRARIES)
-+
-+endif (QNTRACK_INCLUDE_DIR AND QNTRACK_LIBRARIES)
diff --git a/debian/patches/series b/debian/patches/series
index 8d4f631..faf18ca 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,4 +1,3 @@
-02_kdm_double_servertimeout.diff
06_kdm_does_not_wreak_havoc.diff
07_kdmrc_defaults.diff
08_genkdmconf.diff
@@ -11,11 +10,6 @@
21_place_global_config_in_etc.diff
22_kdm_xreset_hook_framework.diff
26_run_kaboom_when_starting_kde.diff
-28_backport_bug156475_dualhead_support.diff
-29_backport_fix_krandr_support_in_startkde.diff
-30_plasma_netbook_fix_autostart.diff
-31_kdm_vt_switching_on_kfreebsd.diff
32_ksmserver_fadeeffect_use_sse2_free.diff
33_qguiplatformplugin_kde_NULL_check.diff
97_fix_target_link_libraries.diff
-99_solid_network_use_ntrack.diff
--
KDE Base Workspace module packaging
More information about the pkg-kde-commits
mailing list