rev 14546 - in trunk/packages/kdebase-workspace/debian: . patches

Fathi Boudra fabo at alioth.debian.org
Fri May 1 16:40:36 UTC 2009


Author: fabo
Date: 2009-05-01 16:40:35 +0000 (Fri, 01 May 2009)
New Revision: 14546

Modified:
   trunk/packages/kdebase-workspace/debian/changelog
   trunk/packages/kdebase-workspace/debian/control
   trunk/packages/kdebase-workspace/debian/patches/07_kdmrc_defaults.diff
   trunk/packages/kdebase-workspace/debian/patches/08_genkdmconf.diff
   trunk/packages/kdebase-workspace/debian/patches/09_genkdm_make.diff
   trunk/packages/kdebase-workspace/debian/patches/10_kdm_no_custom.diff
   trunk/packages/kdebase-workspace/debian/patches/11_kdm_X_path.diff
   trunk/packages/kdebase-workspace/debian/patches/12_be_better_at_honouring_user_kdm_theming.diff
   trunk/packages/kdebase-workspace/debian/patches/20_use_dejavu_as_default_font.diff
   trunk/packages/kdebase-workspace/debian/patches/21_kdm_doesnt_use_kstandarddirs.diff
   trunk/packages/kdebase-workspace/debian/patches/22_execute_ktrash4.diff
   trunk/packages/kdebase-workspace/debian/patches/23_do_not_depend_on_bindings.diff
   trunk/packages/kdebase-workspace/debian/patches/24_do_not_search_for_libeet.diff
   trunk/packages/kdebase-workspace/debian/patches/25_task.h_forward_decl_netwininfo.diff
   trunk/packages/kdebase-workspace/debian/patches/97_fix_target_link_libraries.diff
Log:
Prepare kdebase-workspace 4.2.3-1
Refresh patches.
Bump Standards-Version from 3.8.0 to 3.8.1 (no changes needed).


Modified: trunk/packages/kdebase-workspace/debian/changelog
===================================================================
--- trunk/packages/kdebase-workspace/debian/changelog	2009-05-01 14:14:03 UTC (rev 14545)
+++ trunk/packages/kdebase-workspace/debian/changelog	2009-05-01 16:40:35 UTC (rev 14546)
@@ -1,13 +1,19 @@
-kdebase-workspace (4:4.2.2-3) UNRELEASED; urgency=low
+kdebase-workspace (4:4.2.3-1) UNRELEASED; urgency=low
 
+  * New upstream release.
+
   +++ Changes by George Kiagiadakis:
 
   * Move the .desktop files of kcm_fonts, kcm_style and kcm_colors
     to the systemsettings package, so that these kcms can actually
     work without kdebase-workspace-bin.
 
- -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Fri, 10 Apr 2009 01:20:51 +0300
+  +++ Changes by Fathi Boudra:
 
+  * Bump Standards-Version from 3.8.0 to 3.8.1 (no changes needed).
+
+ -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Fri, 01 May 2009 18:23:19 +0200
+
 kdebase-workspace (4:4.2.2-2) unstable; urgency=low
 
   +++ Changes by Modestas Vainius:

Modified: trunk/packages/kdebase-workspace/debian/control
===================================================================
--- trunk/packages/kdebase-workspace/debian/control	2009-05-01 14:14:03 UTC (rev 14545)
+++ trunk/packages/kdebase-workspace/debian/control	2009-05-01 16:40:35 UTC (rev 14546)
@@ -15,7 +15,7 @@
  libsmbclient-dev, libxcb1-dev, libxine-dev, libfontconfig-dev, libglu1-mesa-dev,
  libsm-dev, libxcursor-dev, libxft-dev, libxtst-dev, libqt4-opengl-dev, libxinerama-dev,
  libxss-dev, libqedje-dev, libggadget-1.0-dev (>= 0.10.5~), libggadget-qt-1.0-dev (>= 0.10.5~),
-Standards-Version: 3.8.0
+Standards-Version: 3.8.1
 Homepage: http://www.kde.org/
 Vcs-Browser: http://svn.debian.org/wsvn/pkg-kde/trunk/packages/kdebase-workspace
 Vcs-Svn: svn://svn.debian.org/pkg-kde/trunk/packages/kdebase-workspace

Modified: trunk/packages/kdebase-workspace/debian/patches/07_kdmrc_defaults.diff
===================================================================
--- trunk/packages/kdebase-workspace/debian/patches/07_kdmrc_defaults.diff	2009-05-01 14:14:03 UTC (rev 14545)
+++ trunk/packages/kdebase-workspace/debian/patches/07_kdmrc_defaults.diff	2009-05-01 16:40:35 UTC (rev 14546)
@@ -1,6 +1,6 @@
 --- a/kcontrol/kdm/kdm-dlg.cpp
 +++ b/kcontrol/kdm/kdm-dlg.cpp
-@@ -281,7 +281,7 @@
+@@ -281,7 +281,7 @@ void KDMDialogWidget::load()
  
  	// Read the greeting string
  	greetstr_lined->setText( configGrp.readEntry( "GreetString",
@@ -9,7 +9,7 @@
  
  	// Regular logo or clock
  	QString logoArea = configGrp.readEntry( "LogoArea", "Logo" );
-@@ -309,7 +309,7 @@
+@@ -309,7 +309,7 @@ void KDMDialogWidget::load()
  
  void KDMDialogWidget::defaults()
  {
@@ -36,7 +36,7 @@
  #endif
  
  #if 0 /*def HASXDMAUTH*/
-@@ -1355,13 +1355,13 @@
+@@ -1355,13 +1355,13 @@ Description:
   This string is subject to word splitting.
   </para><para>
   The default is something reasonable for the system on which &kdm; was built,
@@ -52,7 +52,7 @@
  Comment: &
  Description:
   Additional arguments for the &X-Server;s for local sessions.
-@@ -1930,10 +1930,10 @@
+@@ -1930,10 +1930,10 @@ Description:
  
  Key: SessionsDirs
  Type: list
@@ -65,7 +65,7 @@
  Update: upd_sessionsdirs
  Comment:
   The directories containing session type definitions in .desktop format,
-@@ -2002,7 +2002,7 @@
+@@ -2002,7 +2002,7 @@ Description:
  
  Key: UseSessReg
  Type: bool
@@ -74,7 +74,7 @@
  User: core
  Instance: #*/!
  Comment:
-@@ -2093,9 +2093,9 @@
+@@ -2093,9 +2093,9 @@ Description:
  
  Key: GreetString
  Type: string
@@ -86,7 +86,7 @@
  Comment:
   The headline in the greeter. The following character pairs are replaced:
   - %d -> current display
-@@ -2530,7 +2530,6 @@
+@@ -2530,7 +2530,6 @@ Type: int
  Default: 0
  User: greeter
  Instance: #*/
@@ -94,7 +94,7 @@
  Comment:
   Random seed for forging saved session types, etc. of unknown users.
   This value should be random but constant across the login domain.
-@@ -2627,7 +2626,7 @@
+@@ -2627,7 +2626,7 @@ Key: AllowClose
  Type: bool
  Default: true
  User: greeter

Modified: trunk/packages/kdebase-workspace/debian/patches/08_genkdmconf.diff
===================================================================
--- trunk/packages/kdebase-workspace/debian/patches/08_genkdmconf.diff	2009-05-01 14:14:03 UTC (rev 14545)
+++ trunk/packages/kdebase-workspace/debian/patches/08_genkdmconf.diff	2009-05-01 16:40:35 UTC (rev 14546)
@@ -1,6 +1,6 @@
 --- a/kdm/kfrontend/genkdmconf.c
 +++ b/kdm/kfrontend/genkdmconf.c
-@@ -532,7 +532,7 @@
+@@ -532,7 +532,7 @@ static const char def_xaccess[] =
  "# right hand sides can match.\n"
  "#\n"
  "\n"
@@ -9,7 +9,7 @@
  "\n"
  "#\n"
  "# To hardwire a specific terminal to a specific host, you can\n"
-@@ -550,7 +550,7 @@
+@@ -550,7 +550,7 @@ static const char def_xaccess[] =
  "# so this may not work in all environments.\n"
  "#\n"
  "\n"
@@ -18,7 +18,7 @@
  "\n"
  "#\n"
  "# If you would prefer to configure the set of hosts each terminal sees,\n"
-@@ -586,35 +586,25 @@
+@@ -586,35 +586,25 @@ static const char def_startup[] =
  "#! /bin/sh\n"
  "# Xstartup - run as root before session starts\n"
  "\n"
@@ -72,7 +72,7 @@
  
  static const char def_reset[] =
  "#! /bin/sh\n"
-@@ -630,12 +620,13 @@
+@@ -630,12 +620,13 @@ static const char def_reset[] =
  "#devname=`echo $DISPLAY | cut -c1-8`\n"
  "#exec sessreg -d -l xdm/$devname -h \"`echo $DISPLAY | cut -d: -f1`\""
  #else
@@ -91,7 +91,7 @@
  
  static const char def_session1[] =
  "#! /bin/sh\n"
-@@ -667,6 +658,7 @@
+@@ -667,6 +658,7 @@ static const char def_session1[] =
  "    [ -f $zhome/.zprofile ] && . $zhome/.zprofile\n"
  "    [ -f $zdir/zlogin ] && . $zdir/zlogin\n"
  "    [ -f $zhome/.zlogin ] && . $zhome/.zlogin\n"
@@ -99,7 +99,7 @@
  "    ;;\n"
  "  */csh|*/tcsh)\n"
  "    # [t]cshrc is always sourced automatically.\n"
-@@ -683,28 +675,8 @@
+@@ -683,28 +675,8 @@ static const char def_session2[] =
  "    [ -f $HOME/.profile ] && . $HOME/.profile\n"
  "    ;;\n"
  "esac\n"
@@ -130,7 +130,7 @@
  
  static const char def_background[] =
  "[Desktop0]\n"
-@@ -1068,29 +1040,6 @@
+@@ -1068,29 +1040,6 @@ getInitTab( void )
  
  	if (maxTTY)
  		return;

Modified: trunk/packages/kdebase-workspace/debian/patches/09_genkdm_make.diff
===================================================================
--- trunk/packages/kdebase-workspace/debian/patches/09_genkdm_make.diff	2009-05-01 14:14:03 UTC (rev 14545)
+++ trunk/packages/kdebase-workspace/debian/patches/09_genkdm_make.diff	2009-05-01 16:40:35 UTC (rev 14546)
@@ -4,7 +4,7 @@
 
 --- a/kdm/kfrontend/CMakeLists.txt
 +++ b/kdm/kfrontend/CMakeLists.txt
-@@ -109,5 +109,5 @@
+@@ -109,5 +109,5 @@ build_confci()
  
  ## use 'GENKDMCONF_FLAGS=... make install' to add flags to the config generation (try genkdmconf -h)
  install(CODE "

Modified: trunk/packages/kdebase-workspace/debian/patches/10_kdm_no_custom.diff
===================================================================
--- trunk/packages/kdebase-workspace/debian/patches/10_kdm_no_custom.diff	2009-05-01 14:14:03 UTC (rev 14545)
+++ trunk/packages/kdebase-workspace/debian/patches/10_kdm_no_custom.diff	2009-05-01 16:40:35 UTC (rev 14546)
@@ -1,6 +1,6 @@
 --- a/kdm/kfrontend/kgreeter.cpp
 +++ b/kdm/kfrontend/kgreeter.cpp
-@@ -416,7 +416,6 @@
+@@ -416,7 +416,6 @@ void
  KGreeter::putSession( const QString &type, const QString &name, bool hid, const char *exe )
  {
  	int prio = exe ? (!strcmp( exe, "default" ) ? 0 :
@@ -8,7 +8,7 @@
  	                  !strcmp( exe, "failsafe" ) ? 3 : 2) : 2;
  	for (int i = 0; i < sessionTypes.size(); i++)
  		if (sessionTypes[i].type == type) {
-@@ -445,7 +444,6 @@
+@@ -445,7 +444,6 @@ KGreeter::insertSessions()
  				            dsk.readEntry( "Exec" ).toLatin1() );
  			}
  	putSession( "default", i18nc("@item:inlistbox session type", "Default"), false, "default" );

Modified: trunk/packages/kdebase-workspace/debian/patches/11_kdm_X_path.diff
===================================================================
--- trunk/packages/kdebase-workspace/debian/patches/11_kdm_X_path.diff	2009-05-01 14:14:03 UTC (rev 14545)
+++ trunk/packages/kdebase-workspace/debian/patches/11_kdm_X_path.diff	2009-05-01 16:40:35 UTC (rev 14546)
@@ -1,6 +1,6 @@
 --- a/kdm/backend/dm.c
 +++ b/kdm/backend/dm.c
-@@ -39,6 +39,7 @@
+@@ -39,6 +39,7 @@ from the copyright holder.
  #include "dm_error.h"
  
  #include <stdio.h>
@@ -8,7 +8,7 @@
  #include <string.h>
  #include <unistd.h>
  #include <stdarg.h>
-@@ -588,6 +589,16 @@
+@@ -588,6 +589,16 @@ startRemoteLogin( struct display *d )
  		debug( "exec %\"[s\n", argv );
  		(void)execv( argv[0], argv );
  		logError( "X server %\"s cannot be executed\n", argv[0] );
@@ -27,7 +27,7 @@
  		logError( "Forking X server for remote login failed: %m" );
 --- a/kdm/backend/server.c
 +++ b/kdm/backend/server.c
-@@ -41,6 +41,7 @@
+@@ -41,6 +41,7 @@ from the copyright holder.
  #include <X11/Xlib.h>
  
  #include <stdio.h>
@@ -35,7 +35,7 @@
  #include <signal.h>
  
  
-@@ -92,6 +93,16 @@
+@@ -92,6 +93,16 @@ startServerOnce( void )
  		 */
  		(void)Signal( SIGUSR1, SIG_IGN );
  		(void)execv( argv[0], argv );

Modified: trunk/packages/kdebase-workspace/debian/patches/12_be_better_at_honouring_user_kdm_theming.diff
===================================================================
--- trunk/packages/kdebase-workspace/debian/patches/12_be_better_at_honouring_user_kdm_theming.diff	2009-05-01 14:14:03 UTC (rev 14545)
+++ trunk/packages/kdebase-workspace/debian/patches/12_be_better_at_honouring_user_kdm_theming.diff	2009-05-01 16:40:35 UTC (rev 14546)
@@ -1,6 +1,6 @@
 --- a/kdm/config.def
 +++ b/kdm/config.def
-@@ -2656,7 +2656,7 @@
+@@ -2656,7 +2656,7 @@ Key: Theme
  Type: string
  Default: ""
  User: greeter

Modified: trunk/packages/kdebase-workspace/debian/patches/20_use_dejavu_as_default_font.diff
===================================================================
--- trunk/packages/kdebase-workspace/debian/patches/20_use_dejavu_as_default_font.diff	2009-05-01 14:14:03 UTC (rev 14545)
+++ trunk/packages/kdebase-workspace/debian/patches/20_use_dejavu_as_default_font.diff	2009-05-01 16:40:35 UTC (rev 14546)
@@ -1,6 +1,6 @@
 --- a/kcontrol/fonts/fonts.cpp
 +++ b/kcontrol/fonts/fonts.cpp
-@@ -513,12 +513,12 @@
+@@ -513,12 +513,12 @@ KFonts::KFonts(QWidget *parent, const QV
  
    // NOTE: keep in sync with kdelibs/kdeui/kernel/kglobalsettings.cpp
  

Modified: trunk/packages/kdebase-workspace/debian/patches/21_kdm_doesnt_use_kstandarddirs.diff
===================================================================
--- trunk/packages/kdebase-workspace/debian/patches/21_kdm_doesnt_use_kstandarddirs.diff	2009-05-01 14:14:03 UTC (rev 14545)
+++ trunk/packages/kdebase-workspace/debian/patches/21_kdm_doesnt_use_kstandarddirs.diff	2009-05-01 16:40:35 UTC (rev 14546)
@@ -16,7 +16,7 @@
  
 --- a/kcontrol/kdm/background.cpp
 +++ b/kcontrol/kdm/background.cpp
-@@ -43,9 +43,9 @@
+@@ -43,9 +43,9 @@ KBackground::KBackground( QWidget *paren
  		" If it is disabled, you have to look after the background yourself."
  		" This is done by running some program (possibly xsetroot) in the script"
  		" specified in the Setup= option in kdmrc (usually Xsetup).") );
@@ -31,7 +31,7 @@
  	connect( m_background, SIGNAL(changed( bool )), SIGNAL(changed()) );
 --- a/kcontrol/kdm/main.cpp
 +++ b/kcontrol/kdm/main.cpp
-@@ -186,8 +186,8 @@
+@@ -186,8 +186,8 @@ KDModule::KDModule( QWidget *parent, con
  	for (tgmapci = tgmap.constBegin(); tgmapci != tgmap.constEnd(); ++tgmapci)
  		kWarning() << "user(s) '" << tgmapci.value().join( "," )
  		<< "' have unknown GID " << tgmapci.key() << endl;
@@ -55,7 +55,7 @@
  #ifdef _AIX
 --- a/kdm/kfrontend/kdmctl.c
 +++ b/kdm/kfrontend/kdmctl.c
-@@ -150,7 +150,7 @@
+@@ -150,7 +150,7 @@ main( int argc, char **argv )
  {
  	char *dpy = getenv( "DISPLAY" );
  	const char *ctl = getenv( "DM_CONTROL" );
@@ -66,7 +66,7 @@
  
 --- a/kdm/kfrontend/genkdmconf.c
 +++ b/kdm/kfrontend/genkdmconf.c
-@@ -2768,6 +2768,7 @@
+@@ -2768,6 +2768,7 @@ fprintfLineWrap( FILE *f, const char *ms
  
  
  static const char *oldkdes[] = {
@@ -74,7 +74,7 @@
  	KDE_CONFDIR,
  	"/opt/kde4/share/config",
  	"/usr/local/kde4/share/config",
-@@ -2776,6 +2777,7 @@
+@@ -2776,6 +2777,7 @@ static const char *oldkdes[] = {
  	"/usr/local/kde/share/config",
  	"/usr/local/share/config",
  	"/usr/share/config",
@@ -82,7 +82,7 @@
  
  	"/opt/kde3/share/config",
  	"/usr/local/kde3/share/config",
-@@ -2819,7 +2821,7 @@
+@@ -2819,7 +2821,7 @@ int main( int argc, char **argv )
  "    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"

Modified: trunk/packages/kdebase-workspace/debian/patches/22_execute_ktrash4.diff
===================================================================
--- trunk/packages/kdebase-workspace/debian/patches/22_execute_ktrash4.diff	2009-05-01 14:14:03 UTC (rev 14545)
+++ trunk/packages/kdebase-workspace/debian/patches/22_execute_ktrash4.diff	2009-05-01 16:40:35 UTC (rev 14546)
@@ -1,7 +1,7 @@
 We renamed ktrash to ktrash4. See bug #494427.
 --- a/plasma/applets/trash/trash.cpp
 +++ b/plasma/applets/trash/trash.cpp
-@@ -215,7 +215,7 @@
+@@ -215,7 +215,7 @@ void Trash::slotEmpty()
          m_emptyProcess = new KProcess(this);
          connect(m_emptyProcess, SIGNAL(finished(int,QProcess::ExitStatus)),
                  this, SLOT(emptyFinished(int,QProcess::ExitStatus)));

Modified: trunk/packages/kdebase-workspace/debian/patches/23_do_not_depend_on_bindings.diff
===================================================================
--- trunk/packages/kdebase-workspace/debian/patches/23_do_not_depend_on_bindings.diff	2009-05-01 14:14:03 UTC (rev 14545)
+++ trunk/packages/kdebase-workspace/debian/patches/23_do_not_depend_on_bindings.diff	2009-05-01 16:40:35 UTC (rev 14546)
@@ -1,6 +1,6 @@
 --- a/CMakeLists.txt
 +++ b/CMakeLists.txt
-@@ -59,9 +59,9 @@
+@@ -59,9 +59,9 @@ endif(PYQT4_FOUND AND PYQT4_VERSION STRL
  
  macro_optional_find_package(PyKDE4)
  set(PythonSupport_FOUND FALSE)

Modified: trunk/packages/kdebase-workspace/debian/patches/24_do_not_search_for_libeet.diff
===================================================================
--- trunk/packages/kdebase-workspace/debian/patches/24_do_not_search_for_libeet.diff	2009-05-01 14:14:03 UTC (rev 14545)
+++ trunk/packages/kdebase-workspace/debian/patches/24_do_not_search_for_libeet.diff	2009-05-01 16:40:35 UTC (rev 14546)
@@ -1,7 +1,5 @@
-Index: kdebase-workspace/cmake/modules/FindQEdje.cmake
-===================================================================
---- kdebase-workspace.orig/cmake/modules/FindQEdje.cmake	2009-01-03 18:14:55.000000000 +0200
-+++ kdebase-workspace/cmake/modules/FindQEdje.cmake	2009-01-03 18:16:04.000000000 +0200
+--- a/cmake/modules/FindQEdje.cmake
++++ b/cmake/modules/FindQEdje.cmake
 @@ -14,7 +14,7 @@
  # in the FIND_PATH() and FIND_LIBRARY() calls
  if( NOT WIN32 )
@@ -11,7 +9,7 @@
  endif( NOT WIN32 )
  
  # use this just to create a nice message at FindPackageHandleStandardArgs
-@@ -27,10 +27,6 @@
+@@ -27,10 +27,6 @@ if (PC_QEdje_FOUND)
      HINTS
      ${PC_QEdje_INCLUDE_DIRS}
    )
@@ -22,7 +20,7 @@
  
    FIND_LIBRARY(QEDJE_QEdje_LIBRARY NAMES qedje
      PATHS
-@@ -40,20 +36,16 @@
+@@ -40,20 +36,16 @@ if (PC_QEdje_FOUND)
      PATHS
      ${PC_QEdje_LIBRARY_DIRS}
    )

Modified: trunk/packages/kdebase-workspace/debian/patches/25_task.h_forward_decl_netwininfo.diff
===================================================================
--- trunk/packages/kdebase-workspace/debian/patches/25_task.h_forward_decl_netwininfo.diff	2009-05-01 14:14:03 UTC (rev 14545)
+++ trunk/packages/kdebase-workspace/debian/patches/25_task.h_forward_decl_netwininfo.diff	2009-05-01 16:40:35 UTC (rev 14546)
@@ -1,11 +1,9 @@
 Use forward declaration for NETWinInfo class
 instead of including KDE/NETWinInfo header,
 which in turn includes much X stuff
-Index: kdebase-workspace/libs/taskmanager/task.h
-===================================================================
---- kdebase-workspace.orig/libs/taskmanager/task.h	2009-01-03 15:21:25.000000000 +0200
-+++ kdebase-workspace/libs/taskmanager/task.h	2009-02-07 19:14:08.000000000 +0200
-@@ -34,11 +34,12 @@
+--- a/libs/taskmanager/task.h
++++ b/libs/taskmanager/task.h
+@@ -34,11 +34,12 @@ CONNECTION WITH THE SOFTWARE OR THE USE 
  // KDE
  #include <KDE/KSharedPtr>
  #include <KDE/KWindowSystem>
@@ -19,11 +17,9 @@
  namespace TaskManager
  {
  
-Index: kdebase-workspace/libs/taskmanager/task.cpp
-===================================================================
---- kdebase-workspace.orig/libs/taskmanager/task.cpp	2009-02-07 19:14:30.000000000 +0200
-+++ kdebase-workspace/libs/taskmanager/task.cpp	2009-02-07 19:15:05.000000000 +0200
-@@ -40,6 +40,7 @@
+--- a/libs/taskmanager/task.cpp
++++ b/libs/taskmanager/task.cpp
+@@ -40,6 +40,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE 
  #include <KDebug>
  #include <KIconLoader>
  #include <KLocale>
@@ -31,11 +27,9 @@
  
  #include "taskmanager.h"
  
-Index: kdebase-workspace/libs/taskmanager/taskmanager.cpp
-===================================================================
---- kdebase-workspace.orig/libs/taskmanager/taskmanager.cpp	2009-02-07 19:15:18.000000000 +0200
-+++ kdebase-workspace/libs/taskmanager/taskmanager.cpp	2009-02-07 19:15:32.000000000 +0200
-@@ -35,6 +35,7 @@
+--- a/libs/taskmanager/taskmanager.cpp
++++ b/libs/taskmanager/taskmanager.cpp
+@@ -35,6 +35,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE 
  #include <KDebug>
  #include <KGlobal>
  #include <KLocale>

Modified: trunk/packages/kdebase-workspace/debian/patches/97_fix_target_link_libraries.diff
===================================================================
--- trunk/packages/kdebase-workspace/debian/patches/97_fix_target_link_libraries.diff	2009-05-01 14:14:03 UTC (rev 14545)
+++ trunk/packages/kdebase-workspace/debian/patches/97_fix_target_link_libraries.diff	2009-05-01 16:40:35 UTC (rev 14546)
@@ -1,6 +1,6 @@
 --- a/libs/kworkspace/CMakeLists.txt
 +++ b/libs/kworkspace/CMakeLists.txt
-@@ -18,6 +18,7 @@
+@@ -18,6 +18,7 @@ qt4_add_dbus_interface( kworkspace_LIB_S
  kde4_add_library(kworkspace SHARED ${kworkspace_LIB_SRCS})
  
  target_link_libraries(kworkspace  ${KDE4_KDEUI_LIBS} ${X11_LIBRARIES} )
@@ -10,7 +10,7 @@
  install(TARGETS kworkspace EXPORT kdeworkspaceLibraryTargets ${INSTALL_TARGETS_DEFAULT_ARGS} )
 --- a/libs/taskmanager/CMakeLists.txt
 +++ b/libs/taskmanager/CMakeLists.txt
-@@ -37,6 +37,7 @@
+@@ -37,6 +37,7 @@ endif (X11_Xcomposite_FOUND)
  
  target_link_libraries(taskmanager kephal)
  




More information about the pkg-kde-commits mailing list