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

[Samuel Thibault]

This is an automated email from the git hooks/post-receive script.

sthibault pushed a commit to branch master
in repository hurd.

commit fb0cf26ab4f98b064efeeea531b339cf2d8d4053
Merge: 0b38c14 a774db5
Author: Samuel Thibault <address@hidden>
Date:   Sat Nov 2 14:46:49 2013 +0000

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

 debian/changelog                        |    9 ++++++++-
 debian/control                          |    4 ++--
 debian/hurd.hurd-console.init           |    5 +++--
 debian/patches/proc_set_init_task.patch |   22 ++++++++++++++++++++++
 4 files changed, 35 insertions(+), 5 deletions(-)

diff --cc debian/changelog
index fbd57b8,3f84132..370bed8
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,10 -1,14 +1,17 @@@
 -hurd (1:0.5.git20130928-2) UNRELEASED; urgency=low
 +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 <address@hidden>  Sat, 28 Sep 2013 14:25:53 +0000
+   [ Justus Winter ]
+   * hurd.hurd-console.init: Clean up pid if any.
+ 
+  -- Samuel Thibault <address@hidden>  Sat, 05 Oct 2013 13:30:05 +0200
  
  hurd (1:0.5.git20130928-1) unstable; urgency=low
  
diff --cc debian/control
index 90d3475,82a9bc8..0aec1b1
--- a/debian/control
+++ b/debian/control
@@@ -2,10 -2,10 +2,10 @@@ Source: hur
  Section: admin
  Priority: required
  Maintainer: GNU Hurd Maintainers <address@hidden>
- 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-93~), texinfo, libncursesw5-dev,
 + 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 <address@hidden>, 

-- 
Alioth's /usr/local/bin/git-commit-notice on 
/srv/git.debian.org/git/pkg-hurd/hurd.git