[SCM] KDE Base Workspace module packaging branch, squeeze, updated. debian/4.4.5-4-7-gb4f8a7b

[Modestas Vainius]

The following commit has been merged in the squeeze branch:
commit 1352ae05a7b79eee89470e0ea0c0628d29d3e4a1
Author: Modestas Vainius <modax at debian.org>
Date:   Sat Nov 27 23:32:41 2010 +0200

    Fix support for ConsoleTTYs on kFreeBSD.
    
    Monitor proper TTYv names on kFreeBSD.
---
 .../patches/31_kdm_vt_switching_on_kfreebsd.diff   |   26 ++++++++++++++++++-
 1 files changed, 24 insertions(+), 2 deletions(-)

diff --git a/debian/patches/31_kdm_vt_switching_on_kfreebsd.diff b/debian/patches/31_kdm_vt_switching_on_kfreebsd.diff
index 74b9da2..e6c6107 100644
--- a/debian/patches/31_kdm_vt_switching_on_kfreebsd.diff
+++ b/debian/patches/31_kdm_vt_switching_on_kfreebsd.diff
@@ -149,7 +149,7 @@ FreeBSD (only kFreeBSD) while it could perfectly do so.
  		getInitTab();
  		ASPrintf( (char **)&ce->value, "-%d", maxTTY + 1 );
  		ce->active = ce->written = True;
-@@ -1495,7 +1496,8 @@ static void
+@@ -1495,14 +1496,19 @@ static void
  upd_consolettys( Entry *ce, Section *cs ATTR_UNUSED )
  {
  	if (!ce->active) { /* there is only the Global one */
@@ -159,7 +159,18 @@ FreeBSD (only kFreeBSD) while it could perfectly do so.
  		char *buf;
  		int i;
  
-@@ -3072,7 +3074,7 @@ int main( int argc, char **argv )
+ 		getInitTab();
+ 		for (i = 0, buf = 0; i < 16; i++)
+ 			if (TTYmask & (1 << i))
++#if defined(__linux__)
+ 				strCat( &buf, ",tty%d", i + 1 );
++#elif defined(__FreeBSD_kernel__)
++				strCat( &buf, ",ttyv%x", i );
++#endif
+ 		if (buf) {
+ 			ce->value = buf + 1;
+ 			ce->active = ce->written = True;
+@@ -3072,7 +3078,7 @@ int main( int argc, char **argv )
  			}
  		}
  	}
@@ -168,3 +179,14 @@ FreeBSD (only kFreeBSD) while it could perfectly do so.
  	if (!stat( "/etc/debian_version", &st )) { /* debian */
  		defminuid = "1000";
  		defmaxuid = "29999";
+--- a/kdm/config.def
++++ b/kdm/config.def
+@@ -870,7 +870,7 @@ Description:
+  This option is for operating systems (<acronym>OS</acronym>s) with support
+  for virtual terminals (<acronym>VT</acronym>s), by both &kdm; and the
+  <acronym>OS</acronym>s itself.
+- Currently this applies only to Linux.
++ Currently this applies only to Linux and kFreeBSD.
+  </para><para>
+  When &kdm; switches to console mode, it starts monitoring all
+  <acronym>TTY</acronym> lines listed here (without the leading

-- 
KDE Base Workspace module packaging