diff options
| author | Samuel Thibault <samuel.thibault@ens-lyon.org> | 2012-05-20 14:59:18 +0000 |
|---|---|---|
| committer | Samuel Thibault <samuel.thibault@ens-lyon.org> | 2012-05-20 14:59:18 +0000 |
| commit | b9c3d7f4b1616dab55b12626589638fa37bbe0ee (patch) | |
| tree | 0c96f6dc29995f2fccca80420ba76b9fa159a542 /debian | |
| parent | 9ac323cdce70fe8d3eca17a36069de4d14b8b781 (diff) | |
| parent | 425378784011af251a8e215c3a1be26386884440 (diff) | |
Merge branch 'master' of git.debian.org:/git/pkg-hurd/hurd
Conflicts:
debian/changelog
Diffstat (limited to 'debian')
| -rw-r--r-- | debian/changelog | 6 | ||||
| -rw-r--r-- | debian/control | 2 | ||||
| -rwxr-xr-x | debian/local/setup-translators | 12 |
3 files changed, 11 insertions, 9 deletions
diff --git a/debian/changelog b/debian/changelog index b8bfe3b8..b3064036 100644 --- a/debian/changelog +++ b/debian/changelog @@ -4,10 +4,12 @@ hurd (20120520-1) UNRELEASED; urgency=low * rules: Bump to gcc-4.7. * 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 <sthibault@debian.org> Thu, 26 Apr 2012 19:03:16 +0000 + -- Samuel Thibault <sthibault@debian.org> Thu, 03 May 2012 01:53:00 +0200 hurd (20120408-3) unstable; urgency=low diff --git a/debian/control b/debian/control index 70b048ce..7d23f7ed 100644 --- a/debian/control +++ b/debian/control @@ -5,7 +5,7 @@ Maintainer: GNU Hurd Maintainers <debian-hurd@lists.debian.org> 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 <jbailey@raspberryginger.com>, Neal H. Walfield <neal@debian.org>, Michael Banck <mbanck@debian.org>, diff --git a/debian/local/setup-translators b/debian/local/setup-translators index 7fbc4d87..f744ef45 100755 --- a/debian/local/setup-translators +++ b/debian/local/setup-translators @@ -126,12 +126,12 @@ md fd 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 |