rev 3751 - in trunk/packages/kdebase/debian: . patches

Christopher Martin chrsmrtn at costa.debian.org
Sun May 14 17:53:09 UTC 2006 

Author: chrsmrtn
Date: 2006-05-14 17:52:54 +0000 (Sun, 14 May 2006)
New Revision: 3751

Modified:
   trunk/packages/kdebase/debian/changelog
   trunk/packages/kdebase/debian/control
   trunk/packages/kdebase/debian/patches/10_kdmrc_defaults.diff
   trunk/packages/kdebase/debian/patches/11_genkdmconf.diff
Log:
Better solution to the zsh / Etch kdm problem. See changelog.


Modified: trunk/packages/kdebase/debian/changelog
===================================================================
--- trunk/packages/kdebase/debian/changelog	2006-05-14 17:40:29 UTC (rev 3750)
+++ trunk/packages/kdebase/debian/changelog	2006-05-14 17:52:54 UTC (rev 3751)
@@ -1,4 +1,4 @@
-kdebase (4:3.5.3-0) UNRELEASED; urgency=low
+kdebase (4:3.5.3-1) UNRELEASED; urgency=low
 
   * New upstream release.
     + fix kwin alt-tab problems. (Closes: #363357, #361421, #361127)
@@ -6,27 +6,32 @@
 
   +++ Changes by Christopher Martin:
 
-  * Add konqueror Recommends for java, since java works (more or less)
+  * Add konqueror Suggests for java, since java works (more or less)
     with the DFSG-free gij-4.1 and libgcj7-awt.
 
+  * Lower konqueror's Recommends on ksvg to a Suggests.
+
   * Improve kpager's package description. Thanks to David Liontooth.
     (Closes: #366476)
 
   * Update the kate manpage. (Closes: #347883)
 
+  * Manually add /usr/bin/X11 to the KDM's default session path, as otherwise
+    systems still running X11R6.9 won't be able to find X binaries, which can
+    cause the login process to fail under certain circumstances. This bit of
+    cruft (for X11R7 users) should be harmless, and can be removed post-Etch.
+    (Closes: #367072)
+
   +++ Changes by Pierre Habouzit:
 
   * Move arch indep files from kcontrol into kdebase-data. (Closes: #233379)
     (still *.desktop files remains in kcontrol to avoid beeing advertised from
     KDE menus with no corresponding binaries).
 
-  * Make kdm depends upon recent x11-common, so that /usr/X11R6/bin is a
-    symlink to /usr/bin. (Closes: #367072).
-
-  * add ru debconf templates translation thanks to Yuriy Talakan.
+  * Add 'ru' debconf templates translation, thanks to Yuriy Talakan.
     (Closes: #367206)
 
- -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Sat, 29 Apr 2006 15:10:24 -0400
+ -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Sun, 14 May 2006 08:49:25 -0400
 
 kdebase (4:3.5.2-2) unstable; urgency=low
 

Modified: trunk/packages/kdebase/debian/control
===================================================================
--- trunk/packages/kdebase/debian/control	2006-05-14 17:40:29 UTC (rev 3750)
+++ trunk/packages/kdebase/debian/control	2006-05-14 17:52:54 UTC (rev 3751)
@@ -223,7 +223,7 @@
 Package: kdm
 Section: kde
 Architecture: any
-Depends: ${shlibs:Depends}, kdebase-bin (= ${Source-Version}), kdebase-data (>> ${KDE-Version3}), kdebase-data (<< ${KDE-Next-Version3}), debconf (>= 1.2.9) | debconf-2.0, libpam-runtime (>= 0.76-14), xbase-clients, x11-common (>= 1:7.0.18)
+Depends: ${shlibs:Depends}, kdebase-bin (= ${Source-Version}), kdebase-data (>> ${KDE-Version3}), kdebase-data (<< ${KDE-Next-Version3}), debconf (>= 1.2.9) | debconf-2.0, libpam-runtime (>= 0.76-14), xbase-clients
 Recommends: logrotate
 Suggests: khelpcenter, ksmserver (= ${Source-Version}), kdepasswd (= ${Source-Version}), menu
 Provides: x-display-manager
@@ -319,8 +319,7 @@
 Architecture: any
 Provides: info-browser, man-browser, www-browser
 Depends: ${shlibs:Depends}, kcontrol (= ${Source-Version}), kdebase-kio-plugins (= ${Source-Version}), kdesktop (= ${Source-Version}), kfind (= ${Source-Version})
-Recommends: ksvg, gij-4.1, libgcj7-awt
-Suggests: khelpcenter, konq-plugins
+Suggests: khelpcenter, konq-plugins, ksvg, gij-4.1, libgcj7-awt
 Conflicts: kdebase-audiolibs (<< 4:3.0.0), kdebase-libs (<< 4:3.0.0)
 Replaces: kdebase (<< 4:3.0.0), kdebase-audiolibs (<< 4:3.0.0), kdebase-doc (<< 4:3.0.0), kdebase-libs (<< 4:3.0.0)
 Description: KDE's advanced file manager, web browser and document viewer

Modified: trunk/packages/kdebase/debian/patches/10_kdmrc_defaults.diff
===================================================================
--- trunk/packages/kdebase/debian/patches/10_kdmrc_defaults.diff	2006-05-14 17:40:29 UTC (rev 3750)
+++ trunk/packages/kdebase/debian/patches/10_kdmrc_defaults.diff	2006-05-14 17:52:54 UTC (rev 3751)
@@ -26,13 +26,13 @@
  #if defined(BSD) || defined(__linux__)
 -# define DEF_USER_PATH "/usr/local/bin:/usr/bin:/bin:" XBINDIR ":/usr/games"
 -# define DEF_SYSTEM_PATH "/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:" XBINDIR
-+# define DEF_USER_PATH "/usr/local/bin:/usr/bin:/bin:/usr/games"
-+# define DEF_SYSTEM_PATH "/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin"
++# define DEF_USER_PATH "/usr/local/bin:/usr/bin:/bin:/usr/bin/X11:/usr/games"
++# define DEF_SYSTEM_PATH "/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/usr/bin/X11"
  #else
 -# define DEF_USER_PATH "/usr/local/bin:/usr/bin:/bin:" XBINDIR ":/usr/games:/usr/ucb"
 -# define DEF_SYSTEM_PATH "/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:" XBINDIR ":/etc:/usr/ucb"
-+# define DEF_USER_PATH "/usr/local/bin:/usr/bin:/bin:/usr/games:/usr/ucb"
-+# define DEF_SYSTEM_PATH "/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/etc:/usr/ucb"
++# define DEF_USER_PATH "/usr/local/bin:/usr/bin:/bin:/usr/bin/X11:/usr/games:/usr/ucb"
++# define DEF_SYSTEM_PATH "/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/usr/bin/X11:/etc:/usr/ucb"
  #endif
  
  #if 0 /*def HASXDMAUTH*/

Modified: trunk/packages/kdebase/debian/patches/11_genkdmconf.diff
===================================================================
--- trunk/packages/kdebase/debian/patches/11_genkdmconf.diff	2006-05-14 17:40:29 UTC (rev 3750)
+++ trunk/packages/kdebase/debian/patches/11_genkdmconf.diff	2006-05-14 17:52:54 UTC (rev 3751)
@@ -18,7 +18,7 @@
  "\n"
  "#\n"
  "# If you'd prefer to configure the set of hosts each terminal sees,\n"
-@@ -585,35 +585,23 @@
+@@ -585,35 +585,25 @@
  "#! /bin/sh\n"
  "# Xstartup - run as root before session starts\n"
  "\n"
@@ -30,16 +30,7 @@
 -"# This is not required if you use PAM with the pam_console module.\n"
 -"#\n"
 -"#chown $USER /dev/console\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"
-+"    xmessage -file /etc/nologin -geometry 640x480\n"
-+"  fi\n"
-+"  if [ \"$(id -u)\" != \"0\" ] && \\\n"
-+"     ! grep -qs '^ignore-nologin' /etc/kde3/kdm/kdm.options; then\n"
-+"    exit 1\n"
-+"  fi\n"
-+"fi\n"
++"PATH=\"$PATH:/usr/bin/X11\"\n"
  "\n"
 -#ifdef _AIX
 -"# We create a pseudodevice for finger.  (host:0 becomes xdm/host_0)\n"
@@ -61,6 +52,17 @@
 -#endif /* _AIX */
 -" $USER\n"
 -"\n# NOTE: The session is aborted if the last command returns non-zero.\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"
++"    xmessage -file /etc/nologin -geometry 640x480\n"
++"  fi\n"
++"  if [ \"$(id -u)\" != \"0\" ] && \\\n"
++"     ! grep -qs '^ignore-nologin' /etc/kde3/kdm/kdm.options; then\n"
++"    exit 1\n"
++"  fi\n"
++"fi\n"
++"\n"
 +"if grep -qs '^use-sessreg' /etc/kde3/kdm/kdm.options && \\\n"
 +"   which sessreg > /dev/null 2>&1; then\n"
 +"      exec sessreg -a -l \"$DISPLAY\" -u /var/run/utmp \\\n"
@@ -70,7 +72,7 @@
  
  static const char def_reset[] =
  "#! /bin/sh\n"
-@@ -629,12 +617,13 @@
+@@ -629,12 +619,13 @@
  "#devname=`echo $DISPLAY | cut -c1-8`\n"
  "#exec sessreg -d -l xdm/$devname -h \"`echo $DISPLAY | cut -d: -f1`\""
  #else
@@ -89,7 +91,7 @@
  
  static const char def_session1[] =
  "#! /bin/sh\n"
-@@ -666,6 +655,7 @@
+@@ -666,6 +657,7 @@
  "    [ -f $zhome/.zprofile ] && . $zhome/.zprofile\n"
  "    [ -f $zdir/zlogin ] && . $zdir/zlogin\n"
  "    [ -f $zhome/.zlogin ] && . $zhome/.zlogin\n"
@@ -97,7 +99,7 @@
  "    ;;\n"
  "  */csh|*/tcsh)\n"
  "    # [t]cshrc is always sourced automatically.\n"
-@@ -682,28 +672,8 @@
+@@ -682,28 +674,8 @@
  "    [ -f $HOME/.profile ] && . $HOME/.profile\n"
  "    ;;\n"
  "esac\n"
@@ -128,7 +130,7 @@
  
  static const char def_background[] =
  "[Desktop0]\n"
-@@ -978,29 +948,6 @@
+@@ -978,29 +950,6 @@
  
  	if (maxTTY)
  		return;

More information about the pkg-kde-commits mailing list