sync with upstream packaging

1 files changed, 44 insertions, 15 deletions

diff --git a/debian/control b/debian/control
index f81f7805..5307dcf9 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.6
-Build-Depends: mig (>= 1.4-3~) <!stage1 !stage2 !stage3>, gnumach-dev (>= 1.4+git20141109~) <!stage1 !stage2>,
+Standards-Version: 3.9.7
+Build-Depends: mig (>= 1.4-3~) <!stage1 !stage2 !stage3>, gnumach-dev (>= 1.6+git20160502-1~) <!stage1 !stage2>,
  libc0.3-dev (>= 2.17-94~) <!stage1>, texinfo, libncursesw5-dev <!stage1 !stage2 !stage3>,
- debhelper (>= 9.20141010), dpkg-dev (>= 1.17.14), dh-exec (>= 0.17), autoconf, dh-autoreconf,
+ debhelper (>= 9.20150628), dpkg-dev (>= 1.17.14), dh-exec (>= 0.17), autoconf, dh-autoreconf,
  libparted-dev <!stage1 !stage2 !stage3>, libpciaccess-dev <!stage1 !stage2 !stage3>, libx11-dev <!stage1 !stage2 !stage3>, x11proto-core-dev <!stage1 !stage2 !stage3>, pkg-config <!stage1 !stage2 !stage3>,
  xkb-data <!stage1 !stage2 !stage3>, gawk, flex, bison, autotools-dev, libdaemon-dev <!stage1 !stage2 !stage3>, libpcap0.8-dev <!stage1 !stage2 !stage3>,
  zlib1g-dev <!stage1 !stage2 !stage3>, libbz2-dev <!stage1 !stage2 !stage3>, uuid-dev <!stage1 !stage2 !stage3>, libblkid-dev <!stage1 !stage2 !stage3>
@@ -29,7 +29,7 @@ Description: GNU Hurd (libraries)
 Package: hurd
 Essential: yes
 Pre-Depends: hurd-libs0.3
-Depends: ${misc:Depends}, hurd-libs0.3 (= ${binary:Version}), sysv-rc, netdde (>= 0.0.20120518~), ${shlibs:Depends}, xkb-data
+Depends: ${misc:Depends}, hurd-libs0.3 (= ${binary:Version}), sysv-rc <!stage3>, netdde (>= 0.0.20120518~) <!stage3>, ${shlibs:Depends}, xkb-data <!stage3>
 Breaks: gnumach (<< 2:1.3.99.dfsg.cvs20070526-1), libc0.3 (<< 2.19-15~), netdde (<< 0.0.20121127-2)
 Built-Using: ${built-using}
 Suggests: hurd-doc
@@ -43,25 +43,54 @@ Description: GNU Hurd
  This is the GNU Hurd package. It contains essential system software and
  libraries.
 
+Package: hurd-prof
+Pre-Depends: hurd-libs0.3
+Depends: ${misc:Depends}, hurd-libs0.3 (= ${binary:Version}), sysv-rc <!stage3>, netdde (>= 0.0.20120518~) <!stage3>, ${shlibs:Depends}, xkb-data <!stage3>
+Breaks: gnumach (<< 2:1.3.99.dfsg.cvs20070526-1), libc0.3 (<< 2.19-15~), netdde (<< 0.0.20121127-2)
+Built-Using: ${built-using}
+Suggests: hurd-doc
+Recommends: bf-utf-source
+Architecture: hurd-any
+Build-Profiles: <!stage1 !stage2>
+Description: GNU Hurd
+ This is the GNU Hurd package. It contains essential system software and
+ libraries, with gprof profiling enabled.
+
 Package: hurd-dev
 Priority: standard
 Section: libdevel
 Architecture: hurd-any
 Depends: ${misc:Depends}, ${shlibs:Depends}, ${perl:Depends},
- libc0.3-dev (>= 2.13-31~) <!stage1>, hurd (= ${binary:Version}) <!stage1 !stage2>
-Replaces: hurd (<< 20130226-2~)
-Breaks: hurd (<< 20130226-2~)
+ libc0.3-dev (>= 2.13-31~) <!stage1>, hurd (= ${binary:Version}) <!stage3>
+Provides: hurd-headers-dev, libihash-dev, libdde-linux26-dev <!stage3>
+Replaces: hurd (<< 20130226-2~), hurd-headers-dev, libihash-dev
+Breaks: hurd (<< 20130226-2~), hurd-headers-dev, libihash-dev
+Build-Profiles: <!stage1 !stage2>
 Description: GNU Hurd (development files)
  This package includes the header files and the static libraries.
 
-Package: hurd-dbg
-Priority: extra
-Section: debug
-Architecture: hurd-any
-Build-Profiles: <!stage1 !stage2>
-Depends: ${misc:Depends}, hurd (= ${binary:Version})
-Description: GNU Hurd (debugging files)
- This package includes the unstripped binaries and libraries.
+# Dropped for now, see #818618
+#Package: hurd-headers-dev
+#Priority: standard
+#Section: libdevel
+#Architecture: hurd-any
+#Depends: ${misc:Depends}, ${shlibs:Depends}
+#Build-Profiles: <stage1> <stage2>
+#Description: GNU Hurd (development files)
+# This package includes the header files and the static libraries.
+# .
+# This package is only used for bootstrap, it contains headers needed for libc
+#
+#Package: libihash-dev
+#Priority: standard
+#Section: libdevel
+#Architecture: hurd-any
+#Depends: ${misc:Depends}, ${shlibs:Depends}
+#Build-Profiles: <stage2>
+#Description: GNU Hurd (development files)
+# This package includes the header files and the static libraries.
+# .
+# This package is only used for bootstrap, it contains libihash needed for libc.
 
 Package: hurd-doc
 Priority: optional