[hurd] 01/01: 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 annotated tag debian/1%0.5.git20141108-2
in repository hurd.

commit 0ff287c6722313bb2cd3665a785350edca180e00
Merge: e8e2baa 767e747
Author: Samuel Thibault <address@hidden>
Date:   Sun Nov 9 11:07:44 2014 +0000

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

 debian/changelog                                           | 10 ++++++++++
 debian/control                                             |  5 +++--
 debian/local/finish-install.d/51hurd_config-target-network |  9 ---------
 debian/local/setup-translators                             |  3 ++-
 4 files changed, 15 insertions(+), 12 deletions(-)

diff --cc debian/changelog
index 73e26df,afa2af1..d91a7a0
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,13 -1,15 +1,23 @@@
 -hurd (1:0.5.git20140526-3) UNRELEASED; urgency=medium
++hurd (1:0.5.git20141108-2) unstable; urgency=medium
+ 
 -  [ Samuel Thibault ]
 -  * patches/git-random_buffer.patch: Fix random translator crash during
 -    heimdal testsuite.
+   * control: Add zlib1g-dev and libbz2-dev build dependencies.
+   * Bump Standards-Version to 3.9.6 (no changes).
+   * local/finish-install.d/51hurd_config-target-network: Remove, useless now
+     that we use Debian's ifup/ifdown.
+   * local/setup-translators: Also setup /servers/socket/26.
+ 
 - -- Samuel Thibault <address@hidden>  Tue, 27 May 2014 22:06:43 +0200
++ -- Samuel Thibault <address@hidden>  Sun, 09 Nov 2014 11:07:34 +0000
++
 +hurd (1:0.5.git20141108-1) unstable; urgency=medium
 +
 +  * New upstream snapshot.
 +    - Fix random translator crash during heimdal testsuite.
 +    - patches/newRPC.patch: Update.
 +    - patches/git-R-protected-payloads.patch: Revert upstream commit, breaks
 +      mach-defpager startup.
 +    - Closes: #752237
 +
 + -- Samuel Thibault <address@hidden>  Sun, 09 Nov 2014 02:22:38 +0000
  
  hurd (1:0.5.git20140526-2) unstable; urgency=medium
  

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