[SCM] Debian GNU Hurd packaging branch, master, updated. upstream/20120520-600-gbb037c5

[Samuel Thibault]

The following commit has been merged in the master branch:
commit bb037c5e245c0816477e1aa4d6baa5b2eb59958a
Merge: 88fc246e4fdb771a6cacf03e9b6f0d02a9b00a0f 
59e0a9e730ed30e2704a130abcedac2ae9bb4855
Author: Samuel Thibault <address@hidden>
Date:   Sun May 20 14:59:18 2012 +0000

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

diff --combined debian/changelog
index b8bfe3b,253bb23..b306403
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,13 -1,10 +1,15 @@@
 -hurd (20120408-4) UNRELEASED; urgency=low
 +hurd (20120520-1) UNRELEASED; urgency=low
  
 +  * New upstream snapshot, remove libpthread.
    * rules: Bump to gcc-4.7.
 -  * local/setup-translators: Add hd4 and hd5 /dev entries, for some SATA
 -    controlers.
 +  * control: Depend on netdde, recent enough (>= 0.0.20120518~) to avoid
 +    conflicts with gnumach drivers.
-   * local/setup-translators: Setup netdde translator and /dev/eth*.
++  * local/setup-translators:
++    - Setup netdde translator and /dev/eth*.
++    - Add hd4 and hd5 /dev entries, for some SATA controlers.
 +  * debian/hurd.postinst: Migrate pfinet into using /dev/eth0.
  
-  -- Samuel Thibault <address@hidden>  Thu, 26 Apr 2012 19:03:16 +0000
+  -- Samuel Thibault <address@hidden>  Thu, 03 May 2012 01:53:00 +0200
  
  hurd (20120408-3) unstable; urgency=low
  
diff --combined debian/control
index 70b048c,a46f26d..7d23f7e
--- a/debian/control
+++ b/debian/control
@@@ -5,7 -5,7 +5,7 @@@ Maintainer: GNU Hurd Maintainers <debia
  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,
+  debhelper (>= 4.2.0), gcc-4.7, dpkg (>= 1.15.4) | install-info,
   libparted-dev
  Uploaders: Jeff Bailey <address@hidden>,
   Neal H. Walfield <address@hidden>, Michael Banck <address@hidden>, 
@@@ -16,7 -16,7 +16,7 @@@ Vcs-Git: git://git.debian.org/pkg-hurd/
  
  Package: hurd
  Essential: yes
 -Depends: ${misc:Depends}, sysv-rc, libc0.3 (>= 2.13-31~), ${shlibs:Depends}
 +Depends: ${misc:Depends}, sysv-rc, netdde (>= 0.0.20120518~), libc0.3 (>= 
2.13-31~), ${shlibs:Depends}
  Breaks: gnumach (<< 2:1.3.99.dfsg.cvs20070526-1), libc0.3 (<< 2.11.2-12)
  Suggests: hurd-doc
  Recommends: bf-utf-source
@@@ -62,7 -62,7 +62,7 @@@ Priority: optiona
  Section: debian-installer
  Architecture: hurd-any
  XC-Package-Type: udeb
 -Depends: ${misc:Depends}
 +Depends: ${misc:Depends}, netdde (>= 0.0.20120518~)
  Provides: hurd, ext2-modules, fat-modules, ipv6-modules, isofs-modules, 
loop-modules, mouse-modules, nfs-modules, socket-modules, ufs-modules
  Description: GNU Hurd - udeb
   This is the GNU Hurd udeb package. It contains essential system software and
diff --combined debian/local/setup-translators
index 7fbc4d8,aaf5181..f744ef4
--- a/debian/local/setup-translators
+++ b/debian/local/setup-translators
@@@ -126,15 -126,13 +126,15 @@@ md f
  md fdX 01
  md std
  md vcs
- md hdX 0123
- md hdXsY 0123 123456789
- md hdXs1Y 0123 0123456
- md sdX 0123
- md sdXsY 0123 123456789
- md sdXs1Y 0123 0123456
+ md hdX 012345
+ md hdXsY 012345 123456789
+ md hdXs1Y 012345 0123456
+ md sdX 012345
+ md sdXsY 012345 123456789
+ md sdXs1Y 012345 0123456
  md cdX 01
 +md netdde
 +md ethX 0123
  
  if [ "$MINIMAL" ]; then
        md loopX 0123

-- 
Debian GNU Hurd packaging