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

José Manuel Santamaría Lema santa-guest at alioth.debian.org
Thu Aug 11 18:23:26 UTC 2011


The following commit has been merged in the master branch:
commit 5725deedb223b21e682ed318142de55a42a853d5
Author: José Manuel Santamaría Lema <panfaust at gmail.com>
Date:   Thu Aug 11 20:22:19 2011 +0200

    Update patches.
---
 debian/changelog                                   |    6 +-
 .../backport_kwin_multihead_improvements.diff      |  276 --------------------
 .../be_better_at_honouring_user_kdm_theming.diff   |    2 +-
 debian/patches/enable_debianabimanager.diff        |    2 +-
 debian/patches/enable_dlrestrcitions.diff          |    4 +-
 debian/patches/fix_target_link_libraries.diff      |    4 +-
 debian/patches/kdm_X_path.diff                     |    2 +-
 debian/patches/kdm_vt_switching_on_kfreebsd.diff   |   10 +-
 debian/patches/kdmrc_defaults.diff                 |   12 +-
 .../ksmserver_fadeeffect_use_sse2_free.diff        |   21 --
 debian/patches/place_global_config_in_etc.diff     |    2 +-
 debian/patches/plasma_netbook_fix_autostart.diff   |    2 +-
 debian/patches/series                              |    2 -
 13 files changed, 25 insertions(+), 320 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 662b970..5ca37e9 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -6,6 +6,10 @@ kdebase-workspace (4:4.7.0-0r0) UNRELEASED; urgency=low
   * Bump kde-sc-dev-latest build dependency to 4:4.7.0.
   * Bump kdelibs5-dev build dependency to 4:4.7.
   * Bump kdepimlibs5-dev build dependency to 4:4.7.
+  * Update patches:
+    - Remove backport_kwin_multihead_improvements.diff, applied usptream.
+    - Remove ksmserver_fadeeffect_use_sse2_free.diff, applied upstream.
+    - Refreshed various patches to make them apply without offsets.
 
  -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Thu, 11 Aug 2011 19:17:29 +0200
 
@@ -86,7 +90,7 @@ kdebase-workspace (4:4.6.3-1) unstable; urgency=low
 
  -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Thu, 26 May 2011 02:41:32 +0300
 
-kdebase-workspace (4:4.6.2-2) experimental; urgency=low
+ikdebase-workspace (4:4.6.2-2) experimental; urgency=low
 
   [ Pino Toscano ]
   * Make kdm recommend server-xorg, not xserver-xorg-core. (Closes: #624342)
diff --git a/debian/patches/backport_kwin_multihead_improvements.diff b/debian/patches/backport_kwin_multihead_improvements.diff
deleted file mode 100644
index 96557c7..0000000
--- a/debian/patches/backport_kwin_multihead_improvements.diff
+++ /dev/null
@@ -1,276 +0,0 @@
-From: Alberto Mattea <alberto at mattea.info>
-From: Modestas Vainius <modax at debian.org>
-Subject: Add basic multihead support to kwin
-Origin: backport, commit:299a78772b823d28cf3c48aff696cfb978d0ae7e
-Date: Sun May 8 20:39:27 2011 +0200
-Last-Update: 2011-06-02
-Bug: https://bugs.kde.org/256242
-Applied-Upstream: 4.7
-
-For now there is autostart support on all screens and support for different resolutions on different screens.
-Keyboard shortcuts are still TODO
-REVIEW: 101125
-BUG: 256242
-
---- a/ksmserver/startup.cpp
-+++ b/ksmserver/startup.cpp
-@@ -161,10 +161,6 @@ void KSMServer::launchWM( const QList< Q
-     wmProcess = startApplication( wmStartCommands[ 0 ], QString(), QString(), true );
-     connect( wmProcess, SIGNAL( error( QProcess::ProcessError )), SLOT( wmProcessChange()));
-     connect( wmProcess, SIGNAL( finished( int, QProcess::ExitStatus )), SLOT( wmProcessChange()));
--    // there can be possibly more wm's (because of forking for multihead),
--    // but in such case care only about the process of the first one
--    for (int i = 1; i < wmStartCommands.count(); i++)
--        startApplication( wmStartCommands[i] );
-     QTimer::singleShot( 4000, this, SLOT( autoStart0() ) );
- }
- 
---- a/kwin/geometry.cpp
-+++ b/kwin/geometry.cpp
-@@ -55,6 +55,9 @@ namespace KWin
- // Workspace
- //********************************************
- 
-+extern int screen_number;
-+extern bool is_multihead;
-+
- /*!
-   Resizes the workspace after an XRANDR screen size change
-  */
-@@ -250,56 +253,89 @@ void Workspace::updateClientArea()
- 
-   \sa geometry()
-  */
-+
- QRect Workspace::clientArea( clientAreaOption opt, int screen, int desktop ) const
-     {
-     if( desktop == NETWinInfo::OnAllDesktops || desktop == 0 )
-         desktop = currentDesktop();
-     if( screen == -1 )
-         screen = activeScreen();
--    
--    QRect sarea = (!screenarea.isEmpty() 
--            && screen < screenarea[ desktop ].size()) // screens may be missing during KWin initialization or screen config changes
--        ? screenarea[ desktop ][ screen ]
--        : Kephal::ScreenUtils::screenGeometry( screen );
--    QRect warea = workarea[ desktop ].isNull()
--        ? Kephal::ScreenUtils::desktopGeometry()
--        : workarea[ desktop ];
--    switch (opt)
--        {
--        case MaximizeArea:
--            if (options->xineramaMaximizeEnabled)
--                return sarea;
--            else
--                return warea;
--        case MaximizeFullArea:
--            if (options->xineramaMaximizeEnabled)
--                return Kephal::ScreenUtils::screenGeometry( screen );
--            else
--                return Kephal::ScreenUtils::desktopGeometry();
--        case FullScreenArea:
--            if (options->xineramaFullscreenEnabled)
--                return Kephal::ScreenUtils::screenGeometry( screen );
--            else
--                return Kephal::ScreenUtils::desktopGeometry();
--        case PlacementArea:
--            if (options->xineramaPlacementEnabled)
--                return sarea;
--            else
--                return warea;
--        case MovementArea:
--            if (options->xineramaMovementEnabled)
--                return Kephal::ScreenUtils::screenGeometry( screen );
--            else
--                return Kephal::ScreenUtils::desktopGeometry();
--        case WorkArea:
-+
-+    QRect sarea, warea;
-+
-+    if (is_multihead) {
-+        sarea = (!screenarea.isEmpty()
-+                   && screen < screenarea[ desktop ].size()) // screens may be missing during KWin initialization or screen config changes
-+                  ? screenarea[ desktop ][ screen_number ]
-+                  : Kephal::ScreenUtils::screenGeometry(screen_number);
-+        warea = workarea[ desktop ].isNull()
-+                ? Kephal::ScreenUtils::screenGeometry(screen_number)
-+                : workarea[ desktop ];
-+    } else {
-+        sarea = (!screenarea.isEmpty()
-+                && screen < screenarea[ desktop ].size()) // screens may be missing during KWin initialization or screen config changes
-+                ? screenarea[ desktop ][ screen ]
-+                : Kephal::ScreenUtils::screenGeometry(screen);
-+        warea = workarea[ desktop ].isNull()
-+                ? Kephal::ScreenUtils::desktopGeometry()
-+                : workarea[ desktop ];
-+    }
-+
-+    switch(opt) {
-+    case MaximizeArea:
-+        if (is_multihead)
-+            return sarea;
-+        else if (options->xineramaMaximizeEnabled)
-+            return sarea;
-+        else
-             return warea;
--        case FullArea:
-+    case MaximizeFullArea:
-+        if (is_multihead)
-+            return Kephal::ScreenUtils::screenGeometry(screen_number);
-+        else if (options->xineramaMaximizeEnabled)
-+            return Kephal::ScreenUtils::screenGeometry(screen);
-+        else
-             return Kephal::ScreenUtils::desktopGeometry();
--        case ScreenArea:
--            return Kephal::ScreenUtils::screenGeometry( screen );
--        }
--    abort();
-+    case FullScreenArea:
-+        if (is_multihead)
-+            return Kephal::ScreenUtils::screenGeometry(screen_number);
-+        else if (options->xineramaFullscreenEnabled)
-+            return Kephal::ScreenUtils::screenGeometry(screen);
-+        else
-+            return Kephal::ScreenUtils::desktopGeometry();
-+    case PlacementArea:
-+        if (is_multihead)
-+            return sarea;
-+        else if (options->xineramaPlacementEnabled)
-+            return sarea;
-+        else
-+            return warea;
-+    case MovementArea:
-+        if (is_multihead)
-+            return Kephal::ScreenUtils::screenGeometry(screen_number);
-+        else if (options->xineramaMovementEnabled)
-+            return Kephal::ScreenUtils::screenGeometry(screen);
-+        else
-+            return Kephal::ScreenUtils::desktopGeometry();
-+    case WorkArea:
-+        if (is_multihead)
-+            return sarea;
-+        else
-+            return warea;
-+    case FullArea:
-+        if (is_multihead)
-+            return Kephal::ScreenUtils::screenGeometry(screen_number);
-+        else
-+            return Kephal::ScreenUtils::desktopGeometry();
-+    case ScreenArea:
-+        if (is_multihead)
-+            return Kephal::ScreenUtils::screenGeometry(screen_number);
-+        else
-+            return Kephal::ScreenUtils::screenGeometry(screen);
-     }
-+    abort();
-+}
-+
- 
- QRect Workspace::clientArea( clientAreaOption opt, const QPoint& p, int desktop ) const
-     {
---- a/kwin/main.cpp
-+++ b/kwin/main.cpp
-@@ -74,6 +74,7 @@ Options* options;
- Atoms* atoms;
- 
- int screen_number = -1;
-+bool is_multihead = false;
- 
- bool initting = false;
- 
-@@ -421,58 +422,47 @@ KDE_EXPORT int kdemain( int argc, char *
-     // or command line settings to raster or OpenGL.
-     QApplication::setGraphicsSystem("native");
- 
--    if( !restored )
--        { // We only do the multihead fork if we are not restored by the session
--          // manager, since the session manager will register multiple kwins,
--          // one for each screen...
--        QByteArray multiHead = qgetenv( "KDE_MULTIHEAD" );
--        if( multiHead.toLower() == "true" )
--            {
--            Display* dpy = XOpenDisplay( NULL );
--            if( !dpy )
--                {
--                fprintf( stderr, "%s: FATAL ERROR while trying to open display %s
",
--                    argv[0], XDisplayName( NULL ));
--                exit( 1 );
--                }
--
--            int number_of_screens = ScreenCount( dpy );
--            KWin::screen_number = DefaultScreen( dpy );
--            int pos; // Temporarily needed to reconstruct DISPLAY var if multi-head
--            QByteArray display_name = XDisplayString( dpy );
--            XCloseDisplay( dpy );
--            dpy = 0;
-+    Display* dpy = XOpenDisplay(NULL);
-+    if (!dpy) {
-+        fprintf(stderr, "%s: FATAL ERROR while trying to open display %s
",
-+                argv[0], XDisplayName(NULL));
-+        exit(1);
-+    }
- 
--            if(( pos = display_name.lastIndexOf( '.' )) != -1 )
--                display_name.remove( pos, 10 ); // 10 is enough to be sure we removed ".s"
-+    int number_of_screens = ScreenCount(dpy);
- 
--            QString envir;
--            if( number_of_screens != 1 )
--                {
--                for( int i = 0; i < number_of_screens; i++ )
--                    {
--                    // If execution doesn't pass by here, then kwin
--                    // acts exactly as previously
--                    if( i != KWin::screen_number && fork() == 0 )
--                        {
--                        KWin::screen_number = i;
--                        // Break here because we are the child process, we don't
--                        // want to fork() anymore
--                        break;
--                        }
--                    }
--                // In the next statement, display_name shouldn't contain a screen
--                // number. If it had it, it was removed at the "pos" check
--                envir.sprintf( "DISPLAY=%s.%d", display_name.data(), KWin::screen_number );
--
--                if( putenv( strdup( envir.toAscii() )))
--                    {
--                    fprintf( stderr, "%s: WARNING: unable to set DISPLAY environment variable
", argv[0] );
--                    perror("putenv()");
--                    }
--                }
-+    // multi head
-+    if (number_of_screens != 1) {
-+        KWin::is_multihead = true;
-+        KWin::screen_number = DefaultScreen(dpy);
-+        int pos; // Temporarily needed to reconstruct DISPLAY var if multi-head
-+        QByteArray display_name = XDisplayString(dpy);
-+        XCloseDisplay(dpy);
-+        dpy = 0;
-+
-+        if ((pos = display_name.lastIndexOf('.')) != -1)
-+            display_name.remove(pos, 10);   // 10 is enough to be sure we removed ".s"
-+
-+        QString envir;
-+        for (int i = 0; i < number_of_screens; i++) {
-+            // If execution doesn't pass by here, then kwin
-+            // acts exactly as previously
-+            if (i != KWin::screen_number && fork() == 0) {
-+                KWin::screen_number = i;
-+                // Break here because we are the child process, we don't
-+                // want to fork() anymore
-+                break;
-             }
-         }
-+        // In the next statement, display_name shouldn't contain a screen
-+        // number. If it had it, it was removed at the "pos" check
-+        envir.sprintf("DISPLAY=%s.%d", display_name.data(), KWin::screen_number);
-+
-+        if (putenv(strdup(envir.toAscii()))) {
-+            fprintf(stderr, "%s: WARNING: unable to set DISPLAY environment variable
", argv[0]);
-+            perror("putenv()");
-+        }
-+    }
- 
-     KAboutData aboutData(
-         "kwin",                     // The program name used internally
diff --git a/debian/patches/be_better_at_honouring_user_kdm_theming.diff b/debian/patches/be_better_at_honouring_user_kdm_theming.diff
index c889f15..19ed68f 100644
--- a/debian/patches/be_better_at_honouring_user_kdm_theming.diff
+++ b/debian/patches/be_better_at_honouring_user_kdm_theming.diff
@@ -1,6 +1,6 @@
 --- a/kdm/config.def
 +++ b/kdm/config.def
-@@ -2682,7 +2682,7 @@
+@@ -2683,7 +2683,7 @@ Key: Theme
  Type: string
  Default: ""
  User: greeter
diff --git a/debian/patches/enable_debianabimanager.diff b/debian/patches/enable_debianabimanager.diff
index 0a3b386..aa49e14 100644
--- a/debian/patches/enable_debianabimanager.diff
+++ b/debian/patches/enable_debianabimanager.diff
@@ -9,7 +9,7 @@ For more information about DebianABIManager, refer to
 
 --- a/CMakeLists.txt
 +++ b/CMakeLists.txt
-@@ -241,3 +241,6 @@ install(EXPORT kdeworkspaceLibraryTarget
+@@ -245,3 +245,6 @@ install(EXPORT kdeworkspaceLibraryTarget
          NAMESPACE ${KDE4WORKSPACE_TARGET_PREFIX}
          DESTINATION ${_KDE4WorkspaceConfig_INSTALL_DIR}
          FILE KDE4WorkspaceLibraryTargets.cmake )
diff --git a/debian/patches/enable_dlrestrcitions.diff b/debian/patches/enable_dlrestrcitions.diff
index 1d381aa..0af1183 100644
--- a/debian/patches/enable_dlrestrcitions.diff
+++ b/debian/patches/enable_dlrestrcitions.diff
@@ -2,14 +2,14 @@ From: Modestas Vainius <modax at debian.org>
 Subject: Enable DLRestrictions (REJECT:OTHERSOVERSION) support for all libraries
 Forwarded: not-needed
 Origin: vendor
-Last-Update: 2011-05-25
+Last-Update: 2011-08-11
 
 Enable REJECT:OTHERSOVERSION for these libraries because their ABI is typically
 not stable and structures frequently conflict.
 
 --- a/CMakeLists.txt
 +++ b/CMakeLists.txt
-@@ -244,3 +244,10 @@ install(EXPORT kdeworkspaceLibraryTarget
+@@ -248,3 +248,10 @@ install(EXPORT kdeworkspaceLibraryTarget
  
  # Add support for DebianABIManager
  include(/usr/share/pkg-kde-tools/cmake/DebianABIManager.cmake)
diff --git a/debian/patches/fix_target_link_libraries.diff b/debian/patches/fix_target_link_libraries.diff
index 08c13ac..552d670 100644
--- a/debian/patches/fix_target_link_libraries.diff
+++ b/debian/patches/fix_target_link_libraries.diff
@@ -11,8 +11,8 @@
 --- a/libs/taskmanager/CMakeLists.txt
 +++ b/libs/taskmanager/CMakeLists.txt
 @@ -47,6 +47,7 @@ endif (X11_Xcomposite_FOUND)
- target_link_libraries(taskmanager kephal)
- target_link_libraries(taskmanager kworkspace)
+ 
+ target_link_libraries(taskmanager kephal 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/kdm_X_path.diff b/debian/patches/kdm_X_path.diff
index dde74d2..739f27a 100644
--- a/debian/patches/kdm_X_path.diff
+++ b/debian/patches/kdm_X_path.diff
@@ -1,6 +1,6 @@
 --- a/kdm/backend/dm.c
 +++ b/kdm/backend/dm.c
-@@ -608,7 +608,13 @@ startRemoteLogin(struct display *d)
+@@ -629,7 +629,13 @@ startRemoteLogin(struct display *d)
              exit(1);
          debug("exec %\"[s
", argv);
          (void)execv(argv[0], argv);
diff --git a/debian/patches/kdm_vt_switching_on_kfreebsd.diff b/debian/patches/kdm_vt_switching_on_kfreebsd.diff
index 62c6448..c6a4bf5 100644
--- a/debian/patches/kdm_vt_switching_on_kfreebsd.diff
+++ b/debian/patches/kdm_vt_switching_on_kfreebsd.diff
@@ -2,7 +2,7 @@ From: Modestas Vainius <modax at debian.org>
 Subject: implement VT switching and status detection support in KDM on kFreeBSD
 Forwarded: no
 Bug-Debian: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=586540
-Last-Update: 2011-06-05
+Last-Update: 2011-08-11
 
 This patch implements proper VT switching for KDM on kFreeBSD. It also includes
 detection of the next available VT which should prevent KDM from taking over
@@ -26,7 +26,7 @@ FreeBSD (only kFreeBSD) while it could perfectly do so.
  #endif
  
  static void sigHandler(int n);
-@@ -328,7 +334,12 @@ main(int argc, char **argv)
+@@ -349,7 +355,12 @@ updateNow(void)
  int
  TTYtoVT(const char *tty)
  {
@@ -40,7 +40,7 @@ FreeBSD (only kFreeBSD) while it could perfectly do so.
  }
  
  int
-@@ -1030,9 +1041,15 @@ reapChildren(void)
+@@ -1051,9 +1062,15 @@ reapChildren(void)
                      } else {
                          int con = open("/dev/console", O_RDONLY);
                          if (con >= 0) {
@@ -57,7 +57,7 @@ FreeBSD (only kFreeBSD) while it could perfectly do so.
                                  int vt = 1;
                                  struct display *di;
                                  for (di = displays; di; di = di->next)
-@@ -1045,7 +1062,9 @@ reapChildren(void)
+@@ -1066,7 +1083,9 @@ reapChildren(void)
                                          vt = di->serverVT;
                                  ioctl(con, VT_ACTIVATE, vt);
                              }
@@ -67,7 +67,7 @@ FreeBSD (only kFreeBSD) while it could perfectly do so.
                              close(con);
                          }
                      }
-@@ -1318,16 +1337,41 @@ static int activeVTs;
+@@ -1339,16 +1358,41 @@ static int activeVTs;
  static int
  getBusyVTs(void)
  {
diff --git a/debian/patches/kdmrc_defaults.diff b/debian/patches/kdmrc_defaults.diff
index 1ec4e5e..47b3394 100644
--- a/debian/patches/kdmrc_defaults.diff
+++ b/debian/patches/kdmrc_defaults.diff
@@ -16,7 +16,7 @@
  #endif
  
  #if 0 /*def HASXDMAUTH*/
-@@ -1372,13 +1372,13 @@
+@@ -1373,13 +1373,13 @@ Description:
   This string is subject to word splitting.
   </para><para>
   The default is something reasonable for the system on which &kdm; was built,
@@ -32,7 +32,7 @@
  Comment: &
  Description:
   Additional arguments for the &X-Server;s for local sessions.
-@@ -1932,10 +1932,10 @@
+@@ -1933,10 +1933,10 @@ Description:
  
  Key: SessionsDirs
  Type: list
@@ -45,7 +45,7 @@
  Update: upd_sessionsdirs
  Comment:
   The directories containing session type definitions in .desktop format,
-@@ -2004,7 +2004,7 @@
+@@ -2005,7 +2005,7 @@ Description:
  
  Key: UseSessReg
  Type: bool
@@ -54,7 +54,7 @@
  User: core
  Instance: #*/!
  Comment:
-@@ -2095,9 +2095,9 @@
+@@ -2096,9 +2096,9 @@ Description:
  
  Key: GreetString
  Type: string
@@ -66,7 +66,7 @@
  Comment:
   The headline in the greeter. The following character pairs are replaced:
   - %d -> current display
-@@ -2556,7 +2556,6 @@
+@@ -2557,7 +2557,6 @@ Type: int
  Default: 0
  User: greeter
  Instance: #*/
@@ -74,7 +74,7 @@
  Comment:
   Random seed for forging saved session types, etc. of unknown users.
   This value should be random but constant across the login domain.
-@@ -2653,7 +2652,7 @@
+@@ -2654,7 +2653,7 @@ Key: AllowClose
  Type: bool
  Default: true
  User: greeter
diff --git a/debian/patches/ksmserver_fadeeffect_use_sse2_free.diff b/debian/patches/ksmserver_fadeeffect_use_sse2_free.diff
deleted file mode 100644
index 1674eb9..0000000
--- a/debian/patches/ksmserver_fadeeffect_use_sse2_free.diff
+++ /dev/null
@@ -1,21 +0,0 @@
-From: Modestas Vainius <modax at debian.org>
-Subject: fix ksmserver crash inside ~FaceEffect() on logout
-Forwarded: yes
-Origin: vendor
-Last-Update: 2010-11-27
-Applied-Upstream: 4.7.0, commit:e15382dcfc1550c44bbe2c7c176aba0cdfe052aa
-
-Use _mm_free() for image->data because it was allocated with _mm_alloc() inside
-constructor in the first place. Otherwise this might lead to crash in
-XDestroyImage(). The crash is 100% reproducible on kfreebsd-amd64.
---- a/ksmserver/fadeeffect.cpp
-+++ b/ksmserver/fadeeffect.cpp
-@@ -497,6 +497,8 @@ FadeEffect::FadeEffect(QWidget *parent,
- FadeEffect::~FadeEffect()
- {
-     blender->wait();
-+    _mm_free(image->data);
-+    image->data = NULL;
-     XDestroyImage(image);
-     XFreeGC(QX11Info::display(), gc);
- }
diff --git a/debian/patches/place_global_config_in_etc.diff b/debian/patches/place_global_config_in_etc.diff
index ac8724e..af2f36a 100644
--- a/debian/patches/place_global_config_in_etc.diff
+++ b/debian/patches/place_global_config_in_etc.diff
@@ -107,7 +107,7 @@ least FTBFS, so that we have the chance to inspect.
 -        KConfig(QString::fromLatin1(KDE_CONFDIR "/kdm/kdmrc"), KConfig::SimpleConfig)
 +        KConfig(QString::fromLatin1(KDE_DEBIAN_CONFDIR "/kdm/kdmrc"), KConfig::SimpleConfig)
              .group("X-*-Greeter").readEntry("FaceDir",
-                 KStandardDirs::installPath("data") + "kdm/faces") + '/';
+                 QString(KStandardDirs::installPath("data") + "kdm/faces" + '/'));
  
 --- a/kcontrol/dateandtime/helper.cpp
 +++ b/kcontrol/dateandtime/helper.cpp
diff --git a/debian/patches/plasma_netbook_fix_autostart.diff b/debian/patches/plasma_netbook_fix_autostart.diff
index 046dc3a..8907cf9 100644
--- a/debian/patches/plasma_netbook_fix_autostart.diff
+++ b/debian/patches/plasma_netbook_fix_autostart.diff
@@ -161,7 +161,7 @@ showstopper for this goal.
  #endif // multiple inclusion guard
 --- a/startkde.cmake
 +++ b/startkde.cmake
-@@ -291,6 +291,24 @@ else
+@@ -287,6 +287,24 @@ else
      exit 1
  fi
  
diff --git a/debian/patches/series b/debian/patches/series
index 57eeac4..1829f00 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,4 +1,3 @@
-backport_kwin_multihead_improvements.diff
 kdm_does_not_wreak_havoc.diff
 kdmrc_defaults.diff
 genkdmconf.diff
@@ -11,7 +10,6 @@ use_dejavu_as_default_font.diff
 place_global_config_in_etc.diff
 kdm_xreset_hook_framework.diff
 plasma_netbook_fix_autostart.diff
-ksmserver_fadeeffect_use_sse2_free.diff
 qguiplatformplugin_kde_NULL_check.diff
 fix_target_link_libraries.diff
 enable_debianabimanager.diff

-- 
KDE Base Workspace module packaging



More information about the pkg-kde-commits mailing list