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

Conflicts:
	debian/changelog
	debian/control

4 files changed, 35 insertions, 5 deletions

diff --git a/debian/changelog b/debian/changelog
index fbd57b83..370bed83 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,10 +1,17 @@
 hurd (1:0.5.git20131101-1) UNRELEASED; urgency=low
 
+  [ Samuel Thibault ]
   * New upstream snapshot.
   * control: bump libc0.3-dev dependency to make sure we don't get internal
     inlines exported by previous versions.
+  * patches/proc_set_init_task.patch: Fix kernel pid in procfs too.
+  * Remove dpkg | install-info dependency.
+  * Bump Standards-Version to 3.9.5.
 
- -- Samuel Thibault <sthibault@debian.org>  Sat, 28 Sep 2013 14:25:53 +0000
+  [ Justus Winter ]
+  * hurd.hurd-console.init: Clean up pid if any.
+
+ -- Samuel Thibault <sthibault@debian.org>  Sat, 05 Oct 2013 13:30:05 +0200
 
 hurd (1:0.5.git20130928-1) unstable; urgency=low
 
diff --git a/debian/control b/debian/control
index 90d3475f..0aec1b13 100644
--- a/debian/control
+++ b/debian/control
@@ -2,10 +2,10 @@ Source: hurd
 Section: admin
 Priority: required
 Maintainer: GNU Hurd Maintainers <debian-hurd@lists.debian.org>
-Standards-Version: 3.9.4
+Standards-Version: 3.9.5
 Build-Depends: mig (>= 1.3-2), gnumach-dev (>= 2:1.3.99.dfsg.cvs20070526),
  libc0.3-dev (>= 2.17-94~), texinfo, libncursesw5-dev,
- debhelper (>= 7.0.50~), gcc-4.7, dpkg (>= 1.15.4) | install-info, autoconf, dh-autoreconf,
+ debhelper (>= 7.0.50~), gcc-4.7, autoconf, dh-autoreconf,
  libparted-dev, libpciaccess-dev, libx11-dev, x11proto-core-dev, pkg-config,
  xkb-data, gawk, flex, bison, autotools-dev, libdaemon-dev, libpcap0.8-dev
 Uploaders: Michael Banck <mbanck@debian.org>, 
diff --git a/debian/hurd.hurd-console.init b/debian/hurd.hurd-console.init
index a14b0a5c..cac6fc2d 100644
--- a/debian/hurd.hurd-console.init
+++ b/debian/hurd.hurd-console.init
@@ -71,8 +71,9 @@ do_stop()
 	RETVAL="$?"
 
 	[ "$?" = 2 ] && return 2
-	# Many daemons don't delete their pidfiles when they exit.
-	#rm -f $PIDFILE
+	# The hurd-console usually deletes its pidfile when it
+	# exits. However, if it exits uncleanly, it is left behind.
+	rm -f $PIDFILE
 	return "$RETVAL"
 }
 
diff --git a/debian/patches/proc_set_init_task.patch b/debian/patches/proc_set_init_task.patch
index 0f9397b2..84383fe1 100644
--- a/debian/patches/proc_set_init_task.patch
+++ b/debian/patches/proc_set_init_task.patch
@@ -276,3 +276,25 @@ index 80f8397..b544b8d 100644
  struct proc *allocate_proc (task_t);
  void proc_death_notify (struct proc *);
  void complete_proc (struct proc *, pid_t);
+diff --git a/procfs/main.c b/procfs/main.c
+index 54e9682..8727f86 100644
+--- a/procfs/main.c
++++ b/procfs/main.c
+@@ -42,7 +42,7 @@ uid_t opt_anon_owner;
+ #define OPT_CLK_TCK    sysconf(_SC_CLK_TCK)
+ #define OPT_STAT_MODE  0400
+ #define OPT_FAKE_SELF  -1
+-#define OPT_KERNEL_PID 2
++#define OPT_KERNEL_PID 3
+ #define OPT_ANON_OWNER 0
+ 
+ #define NODEV_KEY  -1 /* <= 0, so no short option. */
+@@ -153,7 +153,7 @@ struct argp_option common_options[] = {
+   { "kernel-process", 'k', "PID", 0,
+       "Process identifier for the kernel, used to retreive its command "
+       "line, as well as the global up and idle times. "
+-      "(default: 2)" },
++      "(default: 3)" },
+   { "compatible", 'c', NULL, 0,
+       "Try to be compatible with the Linux procps utilities.  "
+       "Currently equivalent to -h 100 -s 0444 -S 1." },