Merge branch 'master' of git.debian.org:/git/pkg-hurd/hurd

5 files changed, 18 insertions, 4 deletions

diff --git a/debian/changelog b/debian/changelog
index 873098a9..fe0237f1 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,14 @@
+hurd (20120222-2) UNRELEASED; urgency=low
+
+  * control:
+    - Bump Standards-Version to 3.9.3 (no changes).
+    - Set hurd-udeb XC-Package-Type to udeb.
+  * patches/libexec.patch: Switch to gnu-mach-color TERM.
+  * hurd-console.default: Document the -f option of the vga module.
+  * patches/run.patch: Fix utmp database creation, and thus w command.
+
+ -- Samuel Thibault <sthibault@debian.org>  Fri, 06 Apr 2012 19:07:15 +0200
+
 hurd (20120222-1) unstable; urgency=low
 
   * New upstream snapshot
diff --git a/debian/control b/debian/control
index 70143527..363f0a0e 100644
--- a/debian/control
+++ b/debian/control
@@ -2,7 +2,7 @@ Source: hurd
 Section: admin
 Priority: required
 Maintainer: GNU Hurd Maintainers <debian-hurd@lists.debian.org>
-Standards-Version: 3.9.2
+Standards-Version: 3.9.3
 Build-Depends: mig (>= 1.3-2), gnumach-dev (>= 2:1.3.99.dfsg.cvs20070526),
  libc0.3-dev (>= 2.9), texinfo, texi2html, libncursesw5-dev, cdbs,
  debhelper (>= 4.2.0), gcc-4.6, dpkg (>= 1.15.4) | install-info,
@@ -61,6 +61,7 @@ Package-Type: udeb
 Priority: optional
 Section: debian-installer
 Architecture: hurd-any
+XC-Package-Type: udeb
 Depends: ${misc:Depends}
 Provides: hurd, ext2-modules, fat-modules, ipv6-modules, isofs-modules, loop-modules, mouse-modules, nfs-modules, socket-modules, ufs-modules
 Description: GNU Hurd - udeb
diff --git a/debian/hurd-console.default b/debian/hurd-console.default
index 2ff9a5e5..3655eb70 100644
--- a/debian/hurd-console.default
+++ b/debian/hurd-console.default
@@ -3,7 +3,8 @@
 # Set this to 'false' to avoid running the Hurd console on bootup.
 ENABLE='true'
 
-# The display driver, mandatory.  Either `vga' or `ncursesw'.
+# The display driver, mandatory.  Either `vga' or `ncursesw'.  In the case of
+# VGA, -f /some/where/file.bdf can be appended to load a specific font.
 DISPLAY='-d vga'
 
 # The keyboard driver, mandatory.  Either `pc_kbd' or `xkb' from the
diff --git a/debian/patches/libexec.patch b/debian/patches/libexec.patch
index f73ea587..12b5a01d 100644
--- a/debian/patches/libexec.patch
+++ b/debian/patches/libexec.patch
@@ -14,7 +14,7 @@ index 6a548d5..d10bfcc 100644
 -tty5	"/libexec/getty 38400"		hurd		on	secure trusted console
 -tty6	"/libexec/getty 38400"		hurd		on	secure trusted console
 -#com0	"/libexec/getty 9600"		dialup		on	secure
-+console	"/sbin/getty 9600"		mach-color	on	secure trusted console
++console	"/sbin/getty 9600"		mach-gnu-color	on	secure trusted console
 +tty1	"/sbin/getty 38400"		hurd		on	secure trusted console
 +tty2	"/sbin/getty 38400"		hurd		on	secure trusted console
 +tty3	"/sbin/getty 38400"		hurd		on	secure trusted console
diff --git a/debian/patches/run.patch b/debian/patches/run.patch
index 6c9dfa60..50f584fb 100644
--- a/debian/patches/run.patch
+++ b/debian/patches/run.patch
@@ -2,7 +2,7 @@ Index: hurd/daemons/rc.sh
 ===================================================================
 --- hurd.orig/daemons/rc.sh	2011-12-06 02:51:32.000000000 +0100
 +++ hurd/daemons/rc.sh	2011-12-06 02:52:16.000000000 +0100
-@@ -98,6 +98,12 @@
+@@ -98,6 +98,13 @@
  	chgrp utmp utmp
      fi; })
  fi
@@ -11,6 +11,7 @@ Index: hurd/daemons/rc.sh
 +rm -fr /run/*
 +mkdir -p /run/lock /run/shm
 +chmod 1777 /run/lock /run/shm
++: > /run/utmp
 +
  echo done