[Pkg-kde-commits] rev 2431 - in branches/kde-3.4.0/packages/kdebase/debian: . patches

[Adeodato Simó]

Author: adeodato
Date: 2005-11-30 00:18:09 +0000 (Wed, 30 Nov 2005)
New Revision: 2431

Added:
   branches/kde-3.4.0/packages/kdebase/debian/patches/01_kdebase_branch_r484262.diff
Modified:
   branches/kde-3.4.0/packages/kdebase/debian/changelog
Log:
kdebase branch pull, upload to unstable.


Modified: branches/kde-3.4.0/packages/kdebase/debian/changelog
===================================================================
--- branches/kde-3.4.0/packages/kdebase/debian/changelog	2005-11-30 00:13:52 UTC (rev 2430)
+++ branches/kde-3.4.0/packages/kdebase/debian/changelog	2005-11-30 00:18:09 UTC (rev 2431)
@@ -1,8 +1,8 @@
-kdebase (4:3.4.3-3) UNRELEASED; urgency=low
+kdebase (4:3.4.3-3) unstable; urgency=low
 
   * Upload to unstable, rebuilding against kdelibs4c2a.
 
-  * KDE_3_4_BRANCH update (up to r477941).
+  * KDE_3_4_BRANCH update (up to r484262).
 
   +++ Changes by Christopher Martin:
 
@@ -16,7 +16,7 @@
   * Backport a fix from KDE 3.5 for a bug that caused switching to
     Administrator mode in KControl to fail on occasion. (Closes: #306951)
 
- -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Date
+ -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Wed, 30 Nov 2005 01:14:06 +0100
 
 kdebase (4:3.4.3-2) experimental; urgency=low
 

Added: branches/kde-3.4.0/packages/kdebase/debian/patches/01_kdebase_branch_r484262.diff
===================================================================
--- branches/kde-3.4.0/packages/kdebase/debian/patches/01_kdebase_branch_r484262.diff	2005-11-30 00:13:52 UTC (rev 2430)
+++ branches/kde-3.4.0/packages/kdebase/debian/patches/01_kdebase_branch_r484262.diff	2005-11-30 00:18:09 UTC (rev 2431)
@@ -0,0 +1,13 @@
+#DPATCHLEVEL=0
+--- kdm/backend/ctrl.c	(revision 477941)
++++ kdm/backend/ctrl.c	(revision 484262)
+@@ -770,6 +770,9 @@
+ 			case BO_NOMAN:
+ 				fLog( d, fd, "notsup", "boot options unavailable" );
+ 				goto bust;
++			case BO_IO:
++				fLog( d, fd, "io", "io error" );
++				goto bust;
+ 			}
+ 			Reply( "ok\t" );
+ 			for (i = 0; opts[i]; i++) {