sync with upstream packaging

5 files changed, 179 insertions, 31 deletions

diff --git a/debian/changelog b/debian/changelog
index e9b17cac..f4d99b3b 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,9 +1,96 @@
-hurd (1:0.7.git20160114-2) UNRELEASED; urgency=medium
+hurd (1:0.7.git20160502-2) UNRELEASED; urgency=medium
 
+  * Bump gnumach-dev build-dep to fix stdint use in headers.
+
+ -- Samuel Thibault <sthibault@debian.org>  Tue, 03 May 2016 09:58:10 +0200
+
+hurd (1:0.7.git20160502-1) unstable; urgency=medium
+
+  * New upstream snapshot.
+  * rules: Add prof dpkg build profile to build gprof versions of the main
+    translators.
+
+ -- Samuel Thibault <sthibault@debian.org>  Mon, 02 May 2016 23:06:25 +0000
+
+hurd (1:0.7.git20160320-2) unstable; urgency=medium
+
+  * patches/git-update.patch: Cherry-pick patches from upstream to fix
+    /proc/swaps inside d-i.
+
+ -- Samuel Thibault <sthibault@debian.org>  Thu, 24 Mar 2016 10:38:16 +0000
+
+hurd (1:0.7.git20160320-1) unstable; urgency=medium
+
+  * New upstream snapshot.
+  * Completely drop hurd-headers-dev and libihash-dev for now.
+
+ -- Samuel Thibault <sthibault@debian.org>  Wed, 23 Mar 2016 17:38:21 +0000
+
+hurd (1:0.7.git20160311-1) unstable; urgency=medium
+
+  * New upstream snapshot.
+  * control: Make hurd-dev provides libdde-linux26-dev (but not at stage3).
+  * patches/libports-iterate-refcount.patch: New patch to avoid a crash in
+    libports.
+
+ -- Samuel Thibault <sthibault@debian.org>  Fri, 11 Mar 2016 22:21:27 +0000
+
+hurd (1:0.7.git20160228-1) unstable; urgency=medium
+
+  * New upstream snapshot.
+    - patches/parallel_build.diff,cross-fix.diff: Drop, merged upstream.
+  * control: Fix spurious build of hurd-headers-dev and libihash-dev in unstaged
+    builds.
+  * rules: Fix cross-build of libdde-linux26.
+  * patches/using_std.patch: Fix external reference to using_std variable.
+  * patches/netdde_log.patch: Move logs to /var/run.
+
+ -- Samuel Thibault <sthibault@debian.org>  Sun, 28 Feb 2016 16:35:27 +0000
+
+hurd (1:0.7.git20160223-2) unstable; urgency=medium
+
+  * control:
+    - Avoid hurd's sysv-rc, netdde, and xkb-data dependencies in stage3,
+    they are only really useful for the final stage.
+    - Avoid hurd-dev depend on hurd in stage3, for the same reason.
+  * Move stage1 hurd-dev content to hurd-headers-dev, and stage2 hurd-dev
+    content to libihash-dev.
+  * patches/parallel_build.diff: New patch to fix parallel install.
+  * rules: Allow parallel build.
+  * patches/cross-fix.diff: Upstream patch to fix cross-linking.
+
+ -- Samuel Thibault <sthibault@debian.org>  Sat, 27 Feb 2016 15:55:33 +0000
+
+hurd (1:0.7.git20160223-1) unstable; urgency=medium
+
+  * New upstream snapshot.
+  * patches/mtab-siglost.patch: Remove, fixed upstream another way.
+  * hurd-udeb.install.in: Install udeb's exec.static to /boot for d-i.
+  * patches/crash-logging.patch: New patch to dump information on process crash.
+
+ -- Samuel Thibault <sthibault@debian.org>  Tue, 23 Feb 2016 22:48:43 +0000
+
+hurd (1:0.7.git20160214-2) unstable; urgency=medium
+
+  * Drop setting passive translator on /proc, sysvinit now mounts it
+    already.  That will allow easier management of chroots.
+
+ -- Samuel Thibault <sthibault@debian.org>  Mon, 15 Feb 2016 19:37:06 +0000
+
+hurd (1:0.7.git20160214-1) unstable; urgency=medium
+
+  * New upstream snapshot
   * control: Drop perl build-dep, it is already build-essential.
   * rules: Fix noudeb build profile.
-
- -- Samuel Thibault <sthibault@debian.org>  Fri, 15 Jan 2016 19:45:32 +0100
+  * rules: Set ddeb-migration.
+  * control: Depend on debhelper 9.20150628 for ddeb-migration.
+  * control: Bump Standards-Version to 3.9.7 (no change).
+  * patches/mtab-siglost.patch: New patch to avoid mtab crashing when mounted
+    from /etc/init.d/rc.
+  * patches/procfs-compatible: New patch to make procfs use compatibility by
+    default, until sysvinit uses the option by default.
+
+ -- Samuel Thibault <sthibault@debian.org>  Sun, 14 Feb 2016 21:28:27 +0000
 
 hurd (1:0.7.git20160114-1) unstable; urgency=medium
 
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
diff --git a/debian/hurd-dev.install.in b/debian/hurd-dev.install.in
index 0463bd6c..a8bb13ef 100755
--- a/debian/hurd-dev.install.in
+++ b/debian/hurd-dev.install.in
@@ -1,12 +1,12 @@
 #! /usr/bin/dh-exec
-<!stage1 !stage2 !stage3> ../../libdde-linux26/Makeconf* usr/share/libdde_linux26
-<!stage1 !stage2 !stage3> ../../libdde-linux26/lib/src/libdde_*.a usr/lib/@DEB_HOST_MULTIARCH@
-<!stage1 !stage2 !stage3> ../../libdde-linux26/mk usr/share/libdde_linux26
-<!stage1 !stage2 !stage3> usr/share/libdde_linux26/build usr/share/libdde_linux26
-<!stage1 !stage2> ../local/cdrom.h usr/include/sys
-<!stage1 !stage2> ../local/soundcard.h usr/include/sys
-<!stage1 !stage2> bin/fstests
-<!stage1 !stage2> bin/timertest
+<!stage3> ../../libdde-linux26/Makeconf* usr/share/libdde_linux26
+<!stage3> ../../libdde-linux26/lib/src/libdde_*.a usr/lib/@DEB_HOST_MULTIARCH@
+<!stage3> ../../libdde-linux26/mk usr/share/libdde_linux26
+<!stage3> usr/share/libdde_linux26/build usr/share/libdde_linux26
+../local/cdrom.h usr/include/sys
+../local/soundcard.h usr/include/sys
+bin/fstests
+bin/timertest
 include/* usr/include
-<!stage1> lib/@DEB_HOST_MULTIARCH@/*.a
-<!stage1 !stage2> lib/@DEB_HOST_MULTIARCH@/*.so
+lib/@DEB_HOST_MULTIARCH@/*.a
+lib/@DEB_HOST_MULTIARCH@/*.so
diff --git a/debian/hurd-udeb.install.in b/debian/hurd-udeb.install.in
index a2049dc0..9e003732 100644
--- a/debian/hurd-udeb.install.in
+++ b/debian/hurd-udeb.install.in
@@ -34,6 +34,7 @@ hurd/auth
 hurd/console
 hurd/devnode
 hurd/exec
+hurd/exec.static /boot
 hurd/ext2fs
 hurd/ext2fs.static /boot
 hurd/fatfs
diff --git a/debian/rules b/debian/rules
index ac54b644..1bd31917 100755
--- a/debian/rules
+++ b/debian/rules
@@ -19,6 +19,9 @@
 
 DEB_DESTDIR = $(CURDIR)/debian/tmp
 DEB_DESTDIR_UDEB = $(CURDIR)/debian/tmp-udeb
+DEB_DESTDIR_PROF = $(CURDIR)/debian/tmp-prof
+
+TRANSLATORS_PROF = auth exec ext2fs pfinet pflocal proc procfs term
 
 ifeq (,$(filter stage1 stage2 stage3,$(DEB_BUILD_PROFILES)))
 CONFIGURE_ARGS = --disable-profile --enable-static-progs='ext2fs,iso9660fs'
@@ -53,11 +56,20 @@ INSTALL_generated := $(patsubst %.in,%,$(INSTALL_in))
 
 BUILT_USING := $(shell dpkg-query -f '$${source:Package} (= $${source:Version}), ' -W libc0.3-dev libparted-dev zlib1g-dev libbz2-dev uuid-dev libblkid-dev)
 
+ifeq ($(DEB_BUILD_GNU_TYPE),$(DEB_HOST_GNU_TYPE))
+       CC=gcc
+else
+       CC=$(DEB_HOST_GNU_TYPE)-gcc
+endif
+
 %:
-	dh $@ -Bbuild-deb --with autotools_dev,autoreconf
+	dh $@ -Bbuild-deb --with autotools_dev,autoreconf --parallel
 
 override_dh_auto_configure:
 	dh_auto_configure -Bbuild-deb -- $(CONFIGURE_ARGS) $(CONFIGURE_ARGS_deb) $(shell dpkg-buildflags --export=configure)
+ifneq (,$(filter prof,$(DEB_BUILD_PROFILES)))
+	dh_auto_configure -Bbuild-prof -- $(CONFIGURE_ARGS) $(CONFIGURE_ARGS_deb) $(shell DEB_CFLAGS_APPEND=-pg dpkg-buildflags --export=configure)
+endif
 ifeq (,$(filter stage1 stage2 stage3 noudeb,$(DEB_BUILD_PROFILES)))
 	dh_auto_configure -Bbuild-udeb -- $(CONFIGURE_ARGS) $(CONFIGURE_ARGS_udeb) $(shell dpkg-buildflags --export=configure)
 endif
@@ -73,14 +85,23 @@ else
 	dh_auto_build -Bbuild-udeb
   endif
 	dh_auto_build -Bbuild-deb
+ifneq (,$(filter prof,$(DEB_BUILD_PROFILES)))
+	dh_auto_build -Bbuild-prof
+	for i in $(TRANSLATORS_PROF) ; do \
+		$(MAKE) -C build-prof/$$i $$i.static ; \
+	      done
+endif
 	cd build-deb/doc && make && makeinfo --html --split=chapter ../../doc/hurd.texi
   ifeq (,$(filter stage3,$(DEB_BUILD_PROFILES)))
-	$(MAKE) -C libdde-linux26 BUILDDIR=$(CURDIR)/build-deb LDFLAGS=
+	$(MAKE) -C libdde-linux26 BUILDDIR=$(CURDIR)/build-deb LDFLAGS= CC=$(CC)
   endif
 endif
 
 override_dh_auto_clean:
 	dh_auto_clean -Bbuild-deb
+ifneq (,$(filter prof,$(DEB_BUILD_PROFILES)))
+	dh_auto_clean -Bbuild-prof
+endif
 ifeq (,$(filter stage1 stage2 stage3 noudeb,$(DEB_BUILD_PROFILES)))
 	dh_auto_clean -Bbuild-udeb
 endif
@@ -98,6 +119,12 @@ ifneq (,$(filter stage1 stage2,$(DEB_BUILD_PROFILES)))
   endif
 else
 	dh_auto_install -Bbuild-deb -- prefix=$(DEB_DESTDIR) libdir=$(DEB_DESTDIR)/lib/$(DEB_HOST_MULTIARCH) libexecdir=$(DEB_DESTDIR)/lib/hurd sysconfdir=$(DEB_DESTDIR)/etc localstatedir=$(DEB_DESTDIR)/var XKB_BASE=$(DEB_DESTDIR)/usr/share/X11/xkb
+ifneq (,$(filter prof,$(DEB_BUILD_PROFILES)))
+	install -d $(DEB_DESTDIR_PROF)/hurd
+	for i in $(TRANSLATORS_PROF) ; do \
+		install -m 755 build-prof/$$i/$$i.static $(DEB_DESTDIR_PROF)/hurd/$$i.prof ; \
+	done
+endif
 ifeq (,$(filter noudeb,$(DEB_BUILD_PROFILES)))
 	dh_auto_install -Bbuild-udeb -- prefix=$(DEB_DESTDIR_UDEB) libdir=$(DEB_DESTDIR_UDEB)/lib libexecdir=$(DEB_DESTDIR_UDEB)/lib/hurd sysconfdir=$(DEB_DESTDIR_UDEB)/etc localstatedir=$(DEB_DESTDIR_UDEB)/var XKB_BASE=$(DEB_DESTDIR_UDEB)/usr/share/X11/xkb
 endif
@@ -138,6 +165,9 @@ override_dh_install: $(INSTALL_generated)
 ifeq (,$(filter stage1 stage2 stage3 noudeb,$(DEB_BUILD_PROFILES)))
 	dh_install $(addprefix -p,$(filter %-udeb,$(shell dh_listpackages))) --sourcedir=debian/tmp-udeb
 endif
+ifneq (,$(filter prof,$(DEB_BUILD_PROFILES)))
+	dh_install -phurd-prof --sourcedir=debian/tmp-prof
+endif
 	dh_install --remaining-packages --list-missing --sourcedir=debian/tmp
 ifeq (,$(filter stage1 stage2 stage3 noudeb,$(DEB_BUILD_PROFILES)))
 	mkdir -p debian/hurd-udeb/usr/share/lintian/overrides
@@ -153,7 +183,7 @@ override_dh_installchangelogs:
 
 override_dh_strip:
 ifeq (,$(filter stage1 stage2,$(DEB_BUILD_PROFILES)))
-	dh_strip -phurd-libs0.3 -phurd --dbg-package=hurd-dbg
+	dh_strip -phurd-libs0.3 -phurd --ddeb-migration='hurd-dbg (<< 1:0.7.git20160114-2~)'
 endif
 	dh_strip --remaining-packages
 
@@ -173,6 +203,7 @@ override_dh_gencontrol:
 override_dh_clean:
 	dh_clean
 	rm -rf debian/tmp-udeb
+	rm -rf debian/tmp-prof
 
 debian/%.install: debian/%.install.in
 	cat $^ | sed -e 's/@DEB_HOST_MULTIARCH@/$(DEB_HOST_MULTIARCH)/g' > $@