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

Modestas Vainius modax at alioth.debian.org
Sat Mar 20 21:36:08 UTC 2010 

Author: modax
Date: 2010-03-20 21:36:07 +0000 (Sat, 20 Mar 2010)
New Revision: 17473

Removed:
   trunk/packages/kdebase-workspace/debian/patches/00_fix_ftfbs_with_gpsd_2.92.diff
Modified:
   trunk/packages/kdebase-workspace/debian/changelog
   trunk/packages/kdebase-workspace/debian/kdebase-workspace-data.install
   trunk/packages/kdebase-workspace/debian/ksysguard.install
   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/12_be_better_at_honouring_user_kdm_theming.diff
   trunk/packages/kdebase-workspace/debian/patches/13_kdm_override_docs.diff
   trunk/packages/kdebase-workspace/debian/patches/21_kdm_doesnt_use_kstandarddirs.diff
   trunk/packages/kdebase-workspace/debian/patches/22_kdm_xreset_hook_framework.diff
   trunk/packages/kdebase-workspace/debian/patches/series
   trunk/packages/kdebase-workspace/debian/plasma-widgets-workspace.install
Log:
New snapshot

Modified: trunk/packages/kdebase-workspace/debian/changelog
===================================================================
--- trunk/packages/kdebase-workspace/debian/changelog	2010-03-20 14:44:16 UTC (rev 17472)
+++ trunk/packages/kdebase-workspace/debian/changelog	2010-03-20 21:36:07 UTC (rev 17473)
@@ -1,4 +1,4 @@
-kdebase-workspace (4:4.4.1-0rc4) UNRELEASED; urgency=low
+kdebase-workspace (4:4.4.1+svn1105476-0rc1) UNRELEASED; urgency=low
 
   * New upstream release:
     - fixes crash in Solid's HAL power handling. (Closes: #561724)
@@ -85,10 +85,10 @@
   * Add cmake to Build-Depends.
   * Add kde-sc-dev-latest (>= 4:4.4.1) to Build-Depends.
   * Unversion conflicts with kdebase-workspace-libs4+5.
-  * Add patch 00_fix_ftfbs_with_gpsd_2.92.diff to fix geolocation dataengine
-    build against gpsd 2.92.
   * Pass --noscripts to dh_installinit for kdm because otherwise it is not
     possible to avoid kdm stopping in kdm.init (either on upgrade or remove).
+  * Adapt 08_genkdmconf.diff patch to upstream changes: drop sessreg from
+    scripts as kdm has it built-in.
 
   [ Christian Perrier ]
   * Debconf translations:

Modified: trunk/packages/kdebase-workspace/debian/kdebase-workspace-data.install
===================================================================
--- trunk/packages/kdebase-workspace/debian/kdebase-workspace-data.install	2010-03-20 14:44:16 UTC (rev 17472)
+++ trunk/packages/kdebase-workspace/debian/kdebase-workspace-data.install	2010-03-20 21:36:07 UTC (rev 17473)
@@ -1,9 +1,5 @@
-etc/dbus-1/system.d/org.kde.fontinst.conf
-etc/dbus-1/system.d/org.kde.kcontrol.kcmclock.conf
 usr/share/dbus-1/services/org.kde.fontinst.service
 usr/share/dbus-1/services/org.kde.krunner.service
-usr/share/dbus-1/system-services/org.kde.fontinst.service
-usr/share/dbus-1/system-services/org.kde.kcontrol.kcmclock.service
 usr/share/doc/kde4/HTML/en/kcontrol/autostart/common
 usr/share/doc/kde4/HTML/en/kcontrol/autostart/index.cache.bz2
 usr/share/doc/kde4/HTML/en/kcontrol/autostart/index.docbook
@@ -93,11 +89,11 @@
 usr/share/doc/kde4/HTML/en/kxkb/common
 usr/share/doc/kde4/HTML/en/kxkb/index.cache.bz2
 usr/share/doc/kde4/HTML/en/kxkb/index.docbook
-usr/share/doc/kde4/HTML/en/plasma/common
-usr/share/doc/kde4/HTML/en/plasma/favorite-widgets.png
-usr/share/doc/kde4/HTML/en/plasma/index.cache.bz2
-usr/share/doc/kde4/HTML/en/plasma/index.docbook
-usr/share/doc/kde4/HTML/en/plasma/taskbar-settings.png
+usr/share/doc/kde4/HTML/en/plasma-desktop/common
+usr/share/doc/kde4/HTML/en/plasma-desktop/favorite-widgets.png
+usr/share/doc/kde4/HTML/en/plasma-desktop/index.cache.bz2
+usr/share/doc/kde4/HTML/en/plasma-desktop/index.docbook
+usr/share/doc/kde4/HTML/en/plasma-desktop/taskbar-settings.png
 usr/share/icons/hicolor/128x128/apps/ksplash.png
 usr/share/icons/hicolor/16x16/apps/kmenuedit.png
 usr/share/icons/hicolor/16x16/apps/ksplash.png

Modified: trunk/packages/kdebase-workspace/debian/ksysguard.install
===================================================================
--- trunk/packages/kdebase-workspace/debian/ksysguard.install	2010-03-20 14:44:16 UTC (rev 17472)
+++ trunk/packages/kdebase-workspace/debian/ksysguard.install	2010-03-20 21:36:07 UTC (rev 17473)
@@ -1,9 +1,7 @@
-etc/dbus-1/system.d/org.kde.ksysguard.processlisthelper.conf
 usr/bin/ksysguard
 usr/lib/kde4/libexec/ksysguardprocesslist_helper
 usr/lib/libkdeinit4_ksysguard.so
 usr/share/applications/kde4/ksysguard.desktop
-usr/share/dbus-1/system-services/org.kde.ksysguard.processlisthelper.service
 usr/share/doc/kde4/HTML/en/ksysguard/common
 usr/share/doc/kde4/HTML/en/ksysguard/index.cache.bz2
 usr/share/doc/kde4/HTML/en/ksysguard/index.docbook

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-03-20 14:44:16 UTC (rev 17472)
+++ trunk/packages/kdebase-workspace/debian/patches/06_kdm_does_not_wreak_havoc.diff	2010-03-20 21:36:07 UTC (rev 17473)
@@ -1,6 +1,6 @@
 --- a/kdm/kfrontend/genkdmconf.c
 +++ b/kdm/kfrontend/genkdmconf.c
-@@ -3044,9 +3044,11 @@
+@@ -3018,9 +3018,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-03-20 14:44:16 UTC (rev 17472)
+++ trunk/packages/kdebase-workspace/debian/patches/07_kdmrc_defaults.diff	2010-03-20 21:36:07 UTC (rev 17473)
@@ -1,6 +1,6 @@
 --- a/kdm/config.def
 +++ b/kdm/config.def
-@@ -47,11 +47,11 @@
+@@ -49,11 +49,11 @@
  #endif
  
  #if defined(BSD) || defined(__linux__)
@@ -16,7 +16,7 @@
  #endif
  
  #if 0 /*def HASXDMAUTH*/
-@@ -1353,13 +1353,13 @@
+@@ -1355,13 +1355,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.
-@@ -1928,10 +1928,10 @@
+@@ -1930,10 +1930,10 @@
  
  Key: SessionsDirs
  Type: list
@@ -45,7 +45,7 @@
  Update: upd_sessionsdirs
  Comment:
   The directories containing session type definitions in .desktop format,
-@@ -2000,7 +2000,7 @@
+@@ -2002,7 +2002,7 @@
  
  Key: UseSessReg
  Type: bool
@@ -54,7 +54,7 @@
  User: core
  Instance: #*/!
  Comment:
-@@ -2091,9 +2091,9 @@
+@@ -2093,9 +2093,9 @@
  
  Key: GreetString
  Type: string
@@ -66,7 +66,7 @@
  Comment:
   The headline in the greeter. The following character pairs are replaced:
   - %d -> current display
-@@ -2550,7 +2550,6 @@
+@@ -2552,7 +2552,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.
-@@ -2647,7 +2646,7 @@
+@@ -2649,7 +2648,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-03-20 14:44:16 UTC (rev 17472)
+++ trunk/packages/kdebase-workspace/debian/patches/08_genkdmconf.diff	2010-03-20 21:36:07 UTC (rev 17473)
@@ -18,7 +18,7 @@
  "\n"
  "#\n"
  "# If you would prefer to configure the set of hosts each terminal sees,\n"
-@@ -640,35 +640,25 @@
+@@ -640,16 +640,18 @@
  "#! /bin/sh\n"
  "# Xstartup - run as root before session starts\n"
  "\n"
@@ -32,26 +32,7 @@
 -"#chown $USER /dev/console\n"
 +"PATH=\"$PATH:/usr/bin/X11\"\n"
  "\n"
--#ifdef _AIX
--"# We create a pseudodevice for finger.  (host:0 becomes xdm/host_0)\n"
--"# Without it, finger errors out with \"Cannot stat /dev/host:0\".\n"
--"#\n"
--"#devname=`echo $DISPLAY | cut -c1-8`\n"
--"#if [ ! -d /dev/xdm ]; then\n"
--"#  mkdir /dev/xdm\n"
--"#  chmod 755 /dev/xdm\n"
--"#fi\n"
--"#touch /dev/xdm/$devname\n"
--"#chmod 644 /dev/xdm/$devname\n"
--"#exec sessreg -a -l xdm/$devname -h \"`echo $DISPLAY | cut -d: -f1`\""
--#else
--"#exec sessreg -a -l $DISPLAY -h \"`echo $DISPLAY | cut -d: -f1`\""
--# ifdef BSD
--" -x " KDMCONF "/Xservers"
--# endif
--#endif /* _AIX */
--" $USER\n"
--"\n# NOTE: The session is aborted if the last command returns non-zero.\n";
+-"# XDM configurations typically have sessreg here. KDM has it built-in.\n"
 +"if [ -e /etc/nologin ]; then\n"
 +"  # always display the nologin message, if possible\n"
 +"  if [ -s /etc/nologin ] && which xmessage > /dev/null 2>&1; then\n"
@@ -62,36 +43,10 @@
 +"    exit 1\n"
 +"  fi\n"
 +"fi\n"
-+"\n"
-+"if grep -qs '^use-sessreg' /etc/kde4/kdm/kdm.options && \\\n"
-+"   which sessreg > /dev/null 2>&1; then\n"
-+"      exec sessreg -a -l \"$DISPLAY\" -u /var/run/utmp \\\n"
-+"                   -h \"`echo $DISPLAY | cut -d: -f1`\" \"$USER\"\n"
-+"      # NOTREACHED\n"
-+"fi\n";
+ "\n"
+ "# NOTE: The session is aborted if the last command returns non-zero.\n";
  
- static const char def_reset[] =
- "#! /bin/sh\n"
-@@ -684,12 +674,13 @@
- "#devname=`echo $DISPLAY | cut -c1-8`\n"
- "#exec sessreg -d -l xdm/$devname -h \"`echo $DISPLAY | cut -d: -f1`\""
- #else
--"#exec sessreg -d -l $DISPLAY -h \"`echo $DISPLAY | cut -d: -f1`\""
--# ifdef BSD
--" -x " KDMCONF "/Xservers"
--# endif
-+"if grep -qs '^use-sessreg' /etc/kde4/kdm/kdm.options && \\\n"
-+"   which sessreg > /dev/null 2>&1; then\n"
-+"      exec sessreg -d -l \"$DISPLAY\" -u /var/run/utmp \\\n"
-+"                   -h \"`echo $DISPLAY | cut -d: -f1`\" \"$USER\"\n"
-+"      # NOTREACHED\n"
-+"fi\n";
- #endif /* _AIX */
--" $USER\n";
- 
- static const char def_session1[] =
- "#! /bin/sh\n"
-@@ -721,6 +712,7 @@
+@@ -695,6 +697,7 @@
  "    [ -f $zhome/.zprofile ] && . $zhome/.zprofile\n"
  "    [ -f $zdir/zlogin ] && . $zdir/zlogin\n"
  "    [ -f $zhome/.zlogin ] && . $zhome/.zlogin\n"
@@ -99,7 +54,7 @@
  "    ;;\n"
  "  */csh|*/tcsh)\n"
  "    # [t]cshrc is always sourced automatically.\n"
-@@ -737,28 +729,8 @@
+@@ -711,28 +714,8 @@
  "    [ -f $HOME/.profile ] && . $HOME/.profile\n"
  "    ;;\n"
  "esac\n"
@@ -130,7 +85,7 @@
  
  static const char def_background[] =
  "[Desktop0]\n"
-@@ -1107,29 +1079,6 @@
+@@ -1081,29 +1064,6 @@
  
  	if (maxTTY)
  		return;

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-03-20 14:44:16 UTC (rev 17472)
+++ trunk/packages/kdebase-workspace/debian/patches/12_be_better_at_honouring_user_kdm_theming.diff	2010-03-20 21:36:07 UTC (rev 17473)
@@ -1,6 +1,6 @@
 --- a/kdm/config.def
 +++ b/kdm/config.def
-@@ -2676,7 +2676,7 @@
+@@ -2678,7 +2678,7 @@
  Type: string
  Default: ""
  User: greeter

Modified: trunk/packages/kdebase-workspace/debian/patches/13_kdm_override_docs.diff
===================================================================
--- trunk/packages/kdebase-workspace/debian/patches/13_kdm_override_docs.diff	2010-03-20 14:44:16 UTC (rev 17472)
+++ trunk/packages/kdebase-workspace/debian/patches/13_kdm_override_docs.diff	2010-03-20 21:36:07 UTC (rev 17473)
@@ -1,6 +1,6 @@
 --- a/kdm/config.def
 +++ b/kdm/config.def
-@@ -87,6 +87,12 @@
+@@ -89,6 +89,12 @@
  <kdmrc>
   &kdm; master configuration file
   _

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-03-20 14:44:16 UTC (rev 17472)
+++ trunk/packages/kdebase-workspace/debian/patches/21_kdm_doesnt_use_kstandarddirs.diff	2010-03-20 21:36:07 UTC (rev 17473)
@@ -52,7 +52,7 @@
 +#define KDMCONF KDM_CONFDIR "/kdm"
  #define KDMDATA KDE_DATADIR "/kdm"
  
- #ifdef _AIX
+ #include <sys/param.h> /* for #define BSD */
 --- a/kdm/kfrontend/kdmctl.c
 +++ b/kdm/kfrontend/kdmctl.c
 @@ -150,7 +150,7 @@
@@ -66,7 +66,7 @@
  
 --- a/kdm/kfrontend/genkdmconf.c
 +++ b/kdm/kfrontend/genkdmconf.c
-@@ -2814,6 +2814,7 @@
+@@ -2799,6 +2799,7 @@
  
  
  static const char *oldkdes[] = {
@@ -74,7 +74,7 @@
  	KDE_CONFDIR,
  	"/opt/kde4/share/config",
  	"/usr/local/kde4/share/config",
-@@ -2822,6 +2823,7 @@
+@@ -2807,6 +2808,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",
-@@ -2865,7 +2867,7 @@
+@@ -2850,7 +2852,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/22_kdm_xreset_hook_framework.diff
===================================================================
--- trunk/packages/kdebase-workspace/debian/patches/22_kdm_xreset_hook_framework.diff	2010-03-20 14:44:16 UTC (rev 17472)
+++ trunk/packages/kdebase-workspace/debian/patches/22_kdm_xreset_hook_framework.diff	2010-03-20 21:36:07 UTC (rev 17473)
@@ -5,15 +5,17 @@
 
 --- a/kdm/kfrontend/genkdmconf.c
 +++ b/kdm/kfrontend/genkdmconf.c
-@@ -625,6 +625,11 @@ static const char def_reset[] =
- "      exec sessreg -d -l \"$DISPLAY\" -u /var/run/utmp \\\n"
- "                   -h \"`echo $DISPLAY | cut -d: -f1`\" \"$USER\"\n"
- "      # NOTREACHED\n"
-+"fi\n"
+@@ -665,7 +665,12 @@
+ "#chown root /dev/console\n"
+ "#chmod 622 /dev/console\n"
+ "\n"
+-"# XDM configurations typically have sessreg here. KDM has it built-in.\n";
++"# XDM configurations typically have sessreg here. KDM has it built-in.\n"
 +"\n"
 +"# Use common Xreset framework if it exist\n"
 +"if [ -x /etc/X11/Xreset ] ; then\n"
 +"   /etc/X11/Xreset\n"
- "fi\n";
- #endif /* _AIX */
++"fi";
  
+ static const char def_session1[] =
+ "#! /bin/sh\n"

Modified: trunk/packages/kdebase-workspace/debian/patches/series
===================================================================
--- trunk/packages/kdebase-workspace/debian/patches/series	2010-03-20 14:44:16 UTC (rev 17472)
+++ trunk/packages/kdebase-workspace/debian/patches/series	2010-03-20 21:36:07 UTC (rev 17473)
@@ -1,4 +1,3 @@
-00_fix_ftfbs_with_gpsd_2.92.diff
 06_kdm_does_not_wreak_havoc.diff
 07_kdmrc_defaults.diff
 08_genkdmconf.diff

Modified: trunk/packages/kdebase-workspace/debian/plasma-widgets-workspace.install
===================================================================
--- trunk/packages/kdebase-workspace/debian/plasma-widgets-workspace.install	2010-03-20 14:44:16 UTC (rev 17472)
+++ trunk/packages/kdebase-workspace/debian/plasma-widgets-workspace.install	2010-03-20 21:36:07 UTC (rev 17473)
@@ -1,7 +1,3 @@
-#usr/share/kde4/apps/plasma/plasmoids/ggl_photos/config.txt
-#usr/share/kde4/apps/plasma/plasmoids/ggl_rss/config.txt
-#usr/share/kde4/services/plasma-applet-ggl-photos.desktop
-#usr/share/kde4/services/plasma-applet-ggl-rss.desktop
 usr/lib/kde4/plasma_animator_default.so
 usr/lib/kde4/plasma_applet_activitybar.so
 usr/lib/kde4/plasma_applet_battery.so

More information about the pkg-kde-commits mailing list