From 69b0f3ca40e064e8571e5ed2ba6560329edcd763 Mon Sep 17 00:00:00 2001
From: Justus Winter <4winter@informatik.uni-hamburg.de>
Date: Fri, 15 Jan 2016 18:42:43 +0100
Subject: sync with upstream packaging

---
 debian/changelog       | 13 ++++++++++---
 debian/control         |  4 ++--
 debian/hurd.install.in |  3 ++-
 3 files changed, 14 insertions(+), 6 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index f422c330..1ef118c8 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,11 +1,18 @@
-hurd (1:0.7-2) UNRELEASED; urgency=medium
+hurd (1:0.7.git20160114-1) unstable; urgency=medium
 
+  * New upstream snapshot
   * control, rules: Add a stage3 which builds everything that can be built
     with libc.so.
   * patches/external.patch: Do not build DDE when libpciaccess is not
     available, do not build eth-filter when libpcap is not available.
-
- -- Samuel Thibault <sthibault@debian.org>  Fri, 27 Nov 2015 21:45:18 +0100
+  * patches/cross-link.patch: Fix cross-linking by making make look at the
+    right library path.
+  * hurd.install.in: Fix stage3 build by not including xkb files.
+  * local/runsystem: Try to warn even earlier about not enough memory for
+    running the installer.
+  * control: Add perl Build-depends.
+
+ -- Samuel Thibault <sthibault@debian.org>  Thu, 14 Jan 2016 01:03:07 +0000
 
 hurd (1:0.7-1) unstable; urgency=medium
 
diff --git a/debian/control b/debian/control
index 579b9d24..2cac06dc 100644
--- a/debian/control
+++ b/debian/control
@@ -5,9 +5,9 @@ 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>,
  libc0.3-dev (>= 2.17-94~) <!stage1>, texinfo, libncursesw5-dev <!stage1 !stage2 !stage3>,
- debhelper (>= 9), dh-exec (>= 0.17), autoconf, dh-autoreconf,
+ debhelper (>= 9.20141010), 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>,
+ xkb-data <!stage1 !stage2 !stage3>, gawk, flex, bison, autotools-dev, perl, 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>
 Uploaders: Michael Banck <mbanck@debian.org>, 
  Samuel Thibault <sthibault@debian.org>
diff --git a/debian/hurd.install.in b/debian/hurd.install.in
index ac918925..06ab2847 100644
--- a/debian/hurd.install.in
+++ b/debian/hurd.install.in
@@ -1,3 +1,4 @@
+#! /usr/bin/dh-exec
 ../../console/motd.UTF8 etc
 ../../release/servers.boot boot
 ../local/random-hurd.sh hurd
@@ -65,4 +66,4 @@ usr/bin/fakeroot-hurd
 usr/bin/uptime-hurd
 usr/bin/vmstat-hurd
 usr/bin/w-hurd
-usr/share/X11/xkb
+<!stage3> usr/share/X11/xkb
-- 
cgit v1.2.3