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

George Kiagiadakis gkiagia-guest at alioth.debian.org
Mon Feb 8 23:49:35 UTC 2010 

Author: gkiagia-guest
Date: 2010-02-08 23:49:35 +0000 (Mon, 08 Feb 2010)
New Revision: 16834

Removed:
   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/27_geolocation_gpsd_2.90_compat.diff
   trunk/packages/kdebase-workspace/debian/patches/90_work_with_hal_0.5.14_svn_r1062504.diff
Modified:
   trunk/packages/kdebase-workspace/debian/changelog
   trunk/packages/kdebase-workspace/debian/control
   trunk/packages/kdebase-workspace/debian/patches/06_kdm_does_not_wreak_havoc.diff
   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/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/23_do_not_depend_on_bindings.diff
   trunk/packages/kdebase-workspace/debian/patches/series
Log:
Initial work on kdebase-workspace 4.4.0


Modified: trunk/packages/kdebase-workspace/debian/changelog
===================================================================
--- trunk/packages/kdebase-workspace/debian/changelog	2010-02-08 16:22:26 UTC (rev 16833)
+++ trunk/packages/kdebase-workspace/debian/changelog	2010-02-08 23:49:35 UTC (rev 16834)
@@ -1,5 +1,7 @@
-kdebase-workspace (4:4.3.4-5) UNRELEASED; urgency=low
+kdebase-workspace (4:4.4.0-0r1) UNRELEASED; urgency=low
 
+  * New upstream release.
+
   [ Kai Wasserbäch ]
   * debian/control: Remove libxxf86misc-dev from Build-Depends.
     (Closes: #559691)
@@ -8,8 +10,25 @@
   * debian/control: slightly improve package descriptions a bit.
     - ... including spelling of "WebKit" and "Mac OS X". (Closes: #567164)
 
- -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Thu, 28 Jan 2010 17:45:13 +0100
+  [ George Kiagiadakis ]
+  * Refresh patches.
+  * Drop patches that have been included upstream:
+    - 24_do_not_search_for_libeet.diff
+    - 25_task.h_forward_decl_netwininfo.diff
+    - 27_geolocation_gpsd_2.90_compat.diff
+    - 90_work_with_hal_0.5.14_svn_r1062504.diff
+  * Bump kdelibs5-dev build dependency to >= 4:4.4.0.
+  * Bump libggadgets-1.0-dev and libggadgets-qt-1.0-dev build
+    dependencies to >= 0.11.0.
+  * Drop build dependencies to libutempter-dev and libknotificationitem1-dev
+    as they are no longer needed.
+  * Disable building polkit-kde and thus drop build dependencies to
+    libpolkit-qt-dev, libpolkit-dbus-dev and libpolkit-grant-dev.
+  * Drop libnepomukquery4 and libnepomukqueryclient4 packages
+    (code moved to kdelibs in libnepomukquery4).
 
+ -- George Kiagiadakis <gkiagiad at csd.uoc.gr>  Tue, 09 Feb 2010 00:57:25 +0200
+
 kdebase-workspace (4:4.3.4-4) unstable; urgency=low
 
   * Backport r1069849 in order to fix crash with hal 0.5.14 (yet another

Modified: trunk/packages/kdebase-workspace/debian/control
===================================================================
--- trunk/packages/kdebase-workspace/debian/control	2010-02-08 16:22:26 UTC (rev 16833)
+++ trunk/packages/kdebase-workspace/debian/control	2010-02-08 23:49:35 UTC (rev 16834)
@@ -4,7 +4,7 @@
 Maintainer: Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>
 Uploaders: Sune Vuorela <debian at pusling.com>, Fathi Boudra <fabo at debian.org>, Armin Berres <armin+debian at space-based.de>, Modestas Vainius <modax at debian.org>, George Kiagiadakis <gkiagiad at csd.uoc.gr>
 Build-Depends: cdbs (>= 0.4.51), debhelper (>= 7), quilt, pkg-kde-tools (>= 0.4.2),
- kdelibs5-dev (>= 4:4.3.4), kdepimlibs5-dev (>= 4:4.3.4), libboost-dev,
+ kdelibs5-dev (>= 4:4.4.0), kdepimlibs5-dev (>= 4:4.3.4), libboost-dev,
  python-support (>= 0.6), python-dev,
  libbluetooth-dev [!kfreebsd-i386 !kfreebsd-amd64 !hurd-i386],
  libck-connector-dev, libdbus-1-dev,
@@ -19,9 +19,8 @@
  libxrandr-dev, libxrender-dev, libxi-dev,
  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 (>= 0.4.0), libggadget-1.0-dev (>= 0.10.5~), libggadget-qt-1.0-dev (>= 0.10.5~),
- libpolkit-qt-dev, libpolkit-dbus-dev, libpolkit-grant-dev, libakonadi-dev (>= 1.1.95), libknotificationitem-1-dev,
- libgps-dev (>= 2.90), libutempter-dev
+ libxss-dev, libqedje-dev (>= 0.4.0), libggadget-1.0-dev (>= 0.11.0), libggadget-qt-1.0-dev (>= 0.11.0),
+ libakonadi-dev (>= 1.1.95), libgps-dev (>= 2.90)
 Standards-Version: 3.8.3
 Homepage: http://www.kde.org/
 Vcs-Browser: http://svn.debian.org/wsvn/pkg-kde/trunk/packages/kdebase-workspace/#_trunk_packages_kdebase-workspace_
@@ -92,8 +91,6 @@
  libksgrd4 (= ${binary:Version}),
  libkworkspace4 (= ${binary:Version}),
  liblsofui4 (= ${binary:Version}),
- libnepomukquery4 (= ${binary:Version}),
- libnepomukqueryclient4 (= ${binary:Version}),
  libplasma-applet-system-monitor4 (= ${binary:Version}),
  libplasmaclock4 (= ${binary:Version}),
  libplasma-geolocation-interface4 (= ${binary:Version}),
@@ -413,28 +410,6 @@
  .
  This package is part of the KDE 4 base workspace module.
 
-Package: libnepomukquery4
-Section: libs
-Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}
-Replaces: kdebase-workspace-libs4+5
-Conflicts: kdebase-workspace-libs4+5 (<< 4:4.2.90)
-Description: library for the Nepomuk search
- This package contains libraries needed for the Nepomuk query search.
- .
- This package is part of the KDE 4 base workspace module.
-
-Package: libnepomukqueryclient4
-Section: libs
-Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}
-Replaces: kdebase-workspace-libs4+5
-Conflicts: kdebase-workspace-libs4+5 (<< 4:4.2.90)
-Description: library for the Nepomuk client search
- This package contains libraries needed for the Nepomuk client search.
- .
- This package is part of the KDE 4 base workspace module.
-
 Package: libplasma-applet-system-monitor4
 Section: libs
 Architecture: any

Modified: trunk/packages/kdebase-workspace/debian/patches/06_kdm_does_not_wreak_havoc.diff
===================================================================
--- trunk/packages/kdebase-workspace/debian/patches/06_kdm_does_not_wreak_havoc.diff	2010-02-08 16:22:26 UTC (rev 16833)
+++ trunk/packages/kdebase-workspace/debian/patches/06_kdm_does_not_wreak_havoc.diff	2010-02-08 23:49:35 UTC (rev 16834)
@@ -1,6 +1,6 @@
 --- a/kdm/kfrontend/genkdmconf.c
 +++ b/kdm/kfrontend/genkdmconf.c
-@@ -2998,9 +2998,11 @@ int main( int argc, char **argv )
+@@ -3044,9 +3044,11 @@
  				memcmp( oldkde + olen - sizeof(SHR_CONF) + 1,
  						SHR_CONF, sizeof(SHR_CONF) ))
  			{

Modified: trunk/packages/kdebase-workspace/debian/patches/07_kdmrc_defaults.diff
===================================================================
--- trunk/packages/kdebase-workspace/debian/patches/07_kdmrc_defaults.diff	2010-02-08 16:22:26 UTC (rev 16833)
+++ trunk/packages/kdebase-workspace/debian/patches/07_kdmrc_defaults.diff	2010-02-08 23:49:35 UTC (rev 16834)
@@ -16,7 +16,7 @@
  #endif
  
  #if 0 /*def HASXDMAUTH*/
-@@ -1355,13 +1355,13 @@ Description:
+@@ -1353,13 +1353,13 @@
   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.
-@@ -1930,10 +1930,10 @@ Description:
+@@ -1928,10 +1928,10 @@
  
  Key: SessionsDirs
  Type: list
@@ -45,7 +45,7 @@
  Update: upd_sessionsdirs
  Comment:
   The directories containing session type definitions in .desktop format,
-@@ -2002,7 +2002,7 @@ Description:
+@@ -2000,7 +2000,7 @@
  
  Key: UseSessReg
  Type: bool
@@ -54,7 +54,7 @@
  User: core
  Instance: #*/!
  Comment:
-@@ -2093,9 +2093,9 @@ Description:
+@@ -2091,9 +2091,9 @@
  
  Key: GreetString
  Type: string
@@ -66,7 +66,7 @@
  Comment:
   The headline in the greeter. The following character pairs are replaced:
   - %d -> current display
-@@ -2530,7 +2530,6 @@ Type: int
+@@ -2550,7 +2550,6 @@
  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.
-@@ -2627,7 +2626,7 @@ Key: AllowClose
+@@ -2647,7 +2646,7 @@
  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	2010-02-08 16:22:26 UTC (rev 16833)
+++ trunk/packages/kdebase-workspace/debian/patches/08_genkdmconf.diff	2010-02-08 23:49:35 UTC (rev 16834)
@@ -1,6 +1,6 @@
 --- a/kdm/kfrontend/genkdmconf.c
 +++ b/kdm/kfrontend/genkdmconf.c
-@@ -532,7 +532,7 @@ static const char def_xaccess[] =
+@@ -586,7 +586,7 @@
  "# 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 @@ static const char def_xaccess[] =
+@@ -604,7 +604,7 @@
  "# 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 @@ static const char def_startup[] =
+@@ -640,35 +640,25 @@
  "#! /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 @@ static const char def_reset[] =
+@@ -684,12 +674,13 @@
  "#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 @@ static const char def_session1[] =
+@@ -721,6 +712,7 @@
  "    [ -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 @@ static const char def_session2[] =
+@@ -737,28 +729,8 @@
  "    [ -f $HOME/.profile ] && . $HOME/.profile\n"
  "    ;;\n"
  "esac\n"
@@ -130,7 +130,7 @@
  
  static const char def_background[] =
  "[Desktop0]\n"
-@@ -1068,29 +1040,6 @@ getInitTab( void )
+@@ -1107,29 +1079,6 @@
  
  	if (maxTTY)
  		return;

Modified: trunk/packages/kdebase-workspace/debian/patches/09_genkdm_make.diff
===================================================================
--- trunk/packages/kdebase-workspace/debian/patches/09_genkdm_make.diff	2010-02-08 16:22:26 UTC (rev 16833)
+++ trunk/packages/kdebase-workspace/debian/patches/09_genkdm_make.diff	2010-02-08 23:49:35 UTC (rev 16834)
@@ -4,7 +4,7 @@
 
 --- a/kdm/kfrontend/CMakeLists.txt
 +++ b/kdm/kfrontend/CMakeLists.txt
-@@ -110,5 +110,5 @@ build_confci()
+@@ -114,5 +114,5 @@
  
  ## use 'GENKDMCONF_FLAGS=... make install' to add flags to the config generation (try genkdmconf -h)
  install(CODE "

Modified: trunk/packages/kdebase-workspace/debian/patches/11_kdm_X_path.diff
===================================================================
--- trunk/packages/kdebase-workspace/debian/patches/11_kdm_X_path.diff	2010-02-08 16:22:26 UTC (rev 16833)
+++ trunk/packages/kdebase-workspace/debian/patches/11_kdm_X_path.diff	2010-02-08 23:49:35 UTC (rev 16834)
@@ -1,6 +1,6 @@
 --- a/kdm/backend/dm.c
 +++ b/kdm/backend/dm.c
-@@ -39,6 +39,7 @@ from the copyright holder.
+@@ -39,6 +39,7 @@
  #include "dm_error.h"
  
  #include <stdio.h>
@@ -8,7 +8,7 @@
  #include <string.h>
  #include <unistd.h>
  #include <stdarg.h>
-@@ -588,6 +589,16 @@ startRemoteLogin( struct display *d )
+@@ -611,6 +612,16 @@
  		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 @@ from the copyright holder.
+@@ -41,6 +41,7 @@
  #include <X11/Xlib.h>
  
  #include <stdio.h>
@@ -35,7 +35,7 @@
  #include <signal.h>
  
  
-@@ -92,6 +93,16 @@ startServerOnce( void )
+@@ -92,6 +93,16 @@
  		 */
  		(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	2010-02-08 16:22:26 UTC (rev 16833)
+++ trunk/packages/kdebase-workspace/debian/patches/12_be_better_at_honouring_user_kdm_theming.diff	2010-02-08 23:49:35 UTC (rev 16834)
@@ -1,6 +1,6 @@
 --- a/kdm/config.def
 +++ b/kdm/config.def
-@@ -2656,7 +2656,7 @@ Key: Theme
+@@ -2676,7 +2676,7 @@
  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	2010-02-08 16:22:26 UTC (rev 16833)
+++ trunk/packages/kdebase-workspace/debian/patches/20_use_dejavu_as_default_font.diff	2010-02-08 23:49:35 UTC (rev 16834)
@@ -1,20 +1,20 @@
 --- a/kcontrol/fonts/fonts.cpp
 +++ b/kcontrol/fonts/fonts.cpp
-@@ -512,12 +512,12 @@
+@@ -511,12 +511,12 @@
  
    // NOTE: keep in sync with kdelibs/kdeui/kernel/kglobalsettings.cpp
  
--  QFont f0("Sans Serif", 10);
--  QFont f1("Monospace", 10);
--  QFont f2("Sans Serif", 8);
--  QFont f3("Sans Serif", 9, QFont::Bold);
--  QFont f4("Sans Serif", 10);
+-  QFont f0("Sans Serif", 9); // general/menu/desktop
+-  QFont f1("Monospace", 9);
+-  QFont f2("Sans Serif", 8); // toolbar
+-  QFont f3("Sans Serif", 8); // window title
+-  QFont f4("Sans Serif", 9); // taskbar
 -  QFont f5("Sans Serif", 8); // smallestReadableFont
-+  QFont f0("DejaVu Sans", 9);
++  QFont f0("DejaVu Sans", 9); // general/menu/desktop
 +  QFont f1("DejaVu Sans Mono", 9);
-+  QFont f2("DejaVu Sans", 8);
-+  QFont f3("DejaVu Sans", 9, QFont::Bold);
-+  QFont f4("DejaVu Sans", 9);
++  QFont f2("DejaVu Sans", 8); // toolbar
++  QFont f3("DejaVu Sans", 9, QFont::Bold); // window title
++  QFont f4("DejaVu Sans", 9); // taskbar
 +  QFont f5("DejaVu Sans", 8); // smallestReadableFont
  
    defaultFontList << f0 << f1 << f5 << f2 << f0 << f3 << f4 << f0;

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	2010-02-08 16:22:26 UTC (rev 16833)
+++ trunk/packages/kdebase-workspace/debian/patches/21_kdm_doesnt_use_kstandarddirs.diff	2010-02-08 23:49:35 UTC (rev 16834)
@@ -16,7 +16,7 @@
  
 --- a/kcontrol/kdm/background.cpp
 +++ b/kcontrol/kdm/background.cpp
-@@ -43,9 +43,9 @@
+@@ -42,9 +42,9 @@
  		" 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).") );
@@ -66,7 +66,7 @@
  
 --- a/kdm/kfrontend/genkdmconf.c
 +++ b/kdm/kfrontend/genkdmconf.c
-@@ -2768,6 +2768,7 @@
+@@ -2814,6 +2814,7 @@
  
  
  static const char *oldkdes[] = {
@@ -74,7 +74,7 @@
  	KDE_CONFDIR,
  	"/opt/kde4/share/config",
  	"/usr/local/kde4/share/config",
-@@ -2776,6 +2777,7 @@
+@@ -2822,6 +2823,7 @@
  	"/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 @@
+@@ -2865,7 +2867,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"

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	2010-02-08 16:22:26 UTC (rev 16833)
+++ trunk/packages/kdebase-workspace/debian/patches/23_do_not_depend_on_bindings.diff	2010-02-08 23:49:35 UTC (rev 16834)
@@ -1,6 +1,6 @@
 --- a/CMakeLists.txt
 +++ b/CMakeLists.txt
-@@ -60,9 +60,9 @@
+@@ -61,9 +61,9 @@
  
  macro_optional_find_package(PyKDE4)
  set(PythonSupport_FOUND FALSE)

Modified: trunk/packages/kdebase-workspace/debian/patches/series
===================================================================
--- trunk/packages/kdebase-workspace/debian/patches/series	2010-02-08 16:22:26 UTC (rev 16833)
+++ trunk/packages/kdebase-workspace/debian/patches/series	2010-02-08 23:49:35 UTC (rev 16834)
@@ -9,9 +9,5 @@
 20_use_dejavu_as_default_font.diff
 21_kdm_doesnt_use_kstandarddirs.diff
 23_do_not_depend_on_bindings.diff
-24_do_not_search_for_libeet.diff
-25_task.h_forward_decl_netwininfo.diff
 26_run_kaboom_when_starting_kde.diff
-27_geolocation_gpsd_2.90_compat.diff
 97_fix_target_link_libraries.diff
-90_work_with_hal_0.5.14_svn_r1062504.diff

More information about the pkg-kde-commits mailing list