[SCM] KDE Base Workspace module packaging branch, master, updated. debian/4.11.6-2-3-g57eb22f

Fri Feb 14 11:11:50 UTC 2014

Gitweb-URL: http://git.debian.org/?p=pkg-kde/kde-sc/kde-workspace.git;a=commitdiff;h=02ee303

The following commit has been merged in the master branch:
commit 02ee30370191b8eb562af7fc650fc33d2a5cf7b3
Author: Maximiliano Curia <maxy at debian.org>
Date:   Fri Feb 14 11:52:51 2014 +0100

    Split kde-workspace-krandr, import patches kubuntu_kcm_display_add_kscreen.diff and kubuntu_no_krandr.diff
---
 debian/changelog                                   |  4 ++++
 debian/control                                     |  9 ++++++++
 debian/kde-workspace-bin.install                   |  7 ------
 debian/kde-workspace-randr.install                 |  7 ++++++
 .../patches/kubuntu_kcm_display_add_kscreen.diff   | 18 +++++++++++++++
 debian/patches/kubuntu_no_krandr.diff              | 27 ++++++++++++++++++++++
 debian/patches/series                              |  2 ++
 7 files changed, 67 insertions(+), 7 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 33f3596..85710a9 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,10 @@
 kde-workspace (4:4.11.6-3) UNRELEASED; urgency=medium
 
   * Fix patch: empty_target_kwinglesutils
+  * Import kubuntu's patch: kubuntu_no_krandr.diff
+  * Import kubuntu's patch: kubuntu_kcm_display_add_kscreen.diff
+  * Split kde-workspace-krandr from kde-workspace-bin, in order to let
+    kscreen to take over.
 
  -- Maximiliano Curia <maxy at debian.org>  Thu, 13 Feb 2014 09:58:42 +0100
 
diff --git a/debian/control b/debian/control
index 97a8289..44ef89f 100644
--- a/debian/control
+++ b/debian/control
@@ -160,6 +160,7 @@ Depends: iso-codes,
          kde-runtime (>= 4:4.10.2),
          kde-workspace-data (= ${source:Version}),
          kde-workspace-kgreet-plugins (= ${binary:Version}),
+         kscreen,
          plasma-desktop (= ${binary:Version}) | plasma-netbook (= ${binary:Version}),
          qdbus,
          x11-utils,
@@ -705,3 +706,11 @@ Description: kded daemon to enable/disable touchpad
  ktouchpadenabler is a kded daemon to enable and disable the system's touchpad
  by listening for XF86XK_TouchpadToggle, XF86XK_TouchpadOn, and
  XF86XK_TouchpadOff key events.
+
+Package: kde-workspace-randr
+Architecture: any
+Depends: ${misc:Depends}, ${shlibs:Depends}
+Conflicts: kde-workspace-bin (<< 4:4.11.6-3~)
+Breaks: kde-workspace-bin (<< 4:4.11.6-3~)
+Description: randr tools from kde-workspace
+ Screen resize and rotate tools from KDE Workspace.
diff --git a/debian/kde-workspace-bin.install b/debian/kde-workspace-bin.install
index a51469b..8e76584 100644
--- a/debian/kde-workspace-bin.install
+++ b/debian/kde-workspace-bin.install
@@ -8,8 +8,6 @@ usr/bin/kdostartupconfig4
 usr/bin/kfontinst
 usr/bin/kfontview
 usr/bin/krandom.kss
-usr/bin/krandrstartup
-usr/bin/krandrtray
 usr/bin/krdb
 usr/bin/krunner
 usr/bin/ksmserver
@@ -46,7 +44,6 @@ usr/lib/kde4/kcm_launch.so
 usr/lib/kde4/kcm_powerdevilactivitiesconfig.so
 usr/lib/kde4/kcm_powerdevilglobalconfig.so
 usr/lib/kde4/kcm_powerdevilprofilesconfig.so
-usr/lib/kde4/kcm_randr.so
 usr/lib/kde4/kcm_screensaver.so
 usr/lib/kde4/kcm_smserver.so
 usr/lib/kde4/kcm_solid_actions.so
@@ -58,7 +55,6 @@ usr/lib/kde4/kded_keyboard.so
 usr/lib/kde4/kded_khotkeys.so
 usr/lib/kde4/kded_kwrited.so
 usr/lib/kde4/kded_powerdevil.so
-usr/lib/kde4/kded_randrmonitor.so
 usr/lib/kde4/kded_statusnotifierwatcher.so
 usr/lib/kde4/keyboard_layout_widget.so
 usr/lib/kde4/kfontviewpart.so
@@ -129,7 +125,6 @@ usr/lib/libpowerdevilui.so.4
 usr/lib/libpowerdevilui.so.4.*
 usr/lib/strigi/strigita_font.so
 usr/share/applications/kde4/kfontview.desktop
-usr/share/applications/kde4/krandrtray.desktop
 usr/share/autostart/krunner.desktop
 usr/share/kde4/apps/kcmsolidactions/solid-action-template.desktop
 usr/share/kde4/apps/konqsidebartng/virtual_folders/services/fonts.desktop
@@ -156,7 +151,6 @@ usr/share/kde4/services/kded/keyboard.desktop
 usr/share/kde4/services/kded/khotkeys.desktop
 usr/share/kde4/services/kded/kwrited.desktop
 usr/share/kde4/services/kded/powerdevil.desktop
-usr/share/kde4/services/kded/randrmonitor.desktop
 usr/share/kde4/services/kded/statusnotifierwatcher.desktop
 usr/share/kde4/services/keys.desktop
 usr/share/kde4/services/kfontviewpart.desktop
@@ -199,7 +193,6 @@ usr/share/kde4/services/powerdevilkeyboardbrightnesscontrolaction.desktop
 usr/share/kde4/services/powerdevilprofilesconfig.desktop
 usr/share/kde4/services/powerdevilrunscriptaction.desktop
 usr/share/kde4/services/powerdevilsuspendsessionaction.desktop
-usr/share/kde4/services/randr.desktop
 usr/share/kde4/services/recentdocuments.desktop
 usr/share/kde4/services/screensaver.desktop
 usr/share/kde4/services/settings-power-management.desktop
diff --git a/debian/kde-workspace-randr.install b/debian/kde-workspace-randr.install
new file mode 100644
index 0000000..a2fb002
--- /dev/null
+++ b/debian/kde-workspace-randr.install
@@ -0,0 +1,7 @@
+usr/bin/krandrstartup
+usr/bin/krandrtray
+usr/lib/kde4/kcm_randr.so
+usr/lib/kde4/kded_randrmonitor.so
+usr/share/applications/kde4/krandrtray.desktop
+usr/share/kde4/services/kded/randrmonitor.desktop
+usr/share/kde4/services/randr.desktop
diff --git a/debian/patches/kubuntu_kcm_display_add_kscreen.diff b/debian/patches/kubuntu_kcm_display_add_kscreen.diff
new file mode 100644
index 0000000..4d630cd
--- /dev/null
+++ b/debian/patches/kubuntu_kcm_display_add_kscreen.diff
@@ -0,0 +1,18 @@
+Description: Kubuntu does not ship the randr kcm by default
+ Kubuntu ships the KScreen KCM by default
+Author: Harald Sitter <apachelogger at ubuntu.com>
+Bug-Ubuntu: https://bugs.launchpad.net/ubuntu/+source/kde-runtime/+bug/1251140
+Forwarded: not-needed
+Index: kde-workspace-4.11.4/kcontrol/hardware/display/display.cpp
+===================================================================
+--- kde-workspace-4.11.4.orig/kcontrol/hardware/display/display.cpp	2013-06-28 19:10:44.135426884 +0200
++++ kde-workspace-4.11.4/kcontrol/hardware/display/display.cpp	2014-01-02 12:30:24.762427129 +0100
+@@ -41,7 +41,7 @@
+ {
+   m_tabs = new QTabWidget( this );
+ 
+-  addTab( "randr", i18n( "Size && Orientation" ) );
++  addTab( "kcm_kscreen", i18n( "Size && Orientation" ) );
+   addTab( "nvidiadisplay", i18n( "Graphics Adaptor" ) );
+   addTab( "nvidia3d", i18n( "3D Options" ) );
+   addTab( "kgamma", i18n( "Monitor Gamma" ) );
diff --git a/debian/patches/kubuntu_no_krandr.diff b/debian/patches/kubuntu_no_krandr.diff
new file mode 100644
index 0000000..5a61379
--- /dev/null
+++ b/debian/patches/kubuntu_no_krandr.diff
@@ -0,0 +1,27 @@
+Index: kde-workspace/startkde.cmake
+===================================================================
+--- kde-workspace.orig/startkde.cmake	2014-02-14 11:53:21.926042620 +0100
++++ kde-workspace/startkde.cmake	2014-02-14 11:53:21.922042540 +0100
+@@ -70,12 +70,6 @@
+ kcminputrc Mouse cursorSize ''
+ ksplashrc KSplash Theme Default
+ ksplashrc KSplash Engine KSplashX
+-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
+@@ -105,7 +99,8 @@
+     fi
+ fi
+ 
+-. krandrstartup
++# disabled due to move to kscreen - jriddell 2013-03
++# . krandrstartup
+ 
+ if test "$kcmfonts_general_forcefontdpi" -ne 0; then
+     xrdb -quiet -merge -nocpp <<EOF
diff --git a/debian/patches/series b/debian/patches/series
index 4171a0d..adfe8d3 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -21,3 +21,5 @@ hurd.diff
 add_kdefakes_for_strlcpy_and_strlcat.diff
 krunner_iceweasel_bookmarks.patch
 empty_target_kwinglesutils
+kubuntu_kcm_display_add_kscreen.diff
+kubuntu_no_krandr.diff

-- 
KDE Base Workspace module packaging

