merge debian changes

2 files changed, 66 insertions, 1 deletions

diff --git a/debian/changelog b/debian/changelog
index e8e068e..0c927b3 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,68 @@
+gnumach (2:1.4+git20141109-1) unstable; urgency=medium
+
+  * New upstream snapshot. Fixes protected payload support.
+  * patches/git-R-vm_map.patch: Revert upstream commit for now, it seems to
+    interact badly with paging.
+
+ -- Samuel Thibault <sthibault@debian.org>  Sun, 09 Nov 2014 22:03:06 +0000
+
+gnumach (2:1.4+git20141107-1) unstable; urgency=medium
+
+  * New upstream snapshot
+  * rules: ignore +git version.
+  * patches/git-*, patches/80_missing_files.patch: Remove.
+  * Bump Standards-Version to 3.9.6 (no changes).
+  * control: rename into control.in with 1.4 replaced with @version@, so
+    that...
+  * rules: ... make DEB_BUILD_OPTIONS=custom use the package version instead
+    of the upstream version. Thanks Svante Signell for the original patch.
+    Closes: Bug#762175.
+
+ -- Samuel Thibault <sthibault@debian.org>  Fri, 07 Nov 2014 01:06:55 +0000
+
+gnumach (2:1.4-12) unstable; urgency=medium
+
+  * rules: Rebuild info documentation once (in the source tree) before building
+    all variants in parallel. Closes: Bug#756909.
+  * patches/git-vm-tune.patch: New patch that tunes VM parameters.
+  * patches/git-vm_map.patch: New patch to fix vm_map with anywhere=true.
+
+ -- Samuel Thibault <sthibault@debian.org>  Sat, 06 Sep 2014 10:37:40 +0000
+
+gnumach (2:1.4-11) unstable; urgency=medium
+
+  * patches/git-halt.patch: Add ACPI powerdown support.
+  * patches/git-xen_races.patch: New patch to fix race conditions, notably in
+    disk writes.
+
+ -- Samuel Thibault <sthibault@debian.org>  Fri, 25 Jul 2014 17:05:41 +0000
+
+gnumach (2:1.4-10) unstable; urgency=medium
+
+  * patches/git-notify_translatable{,2}.patch: New patch to make notify
+    functions mutable.
+  * patches/git-device_translatable.patch: New patch to make device
+    functions mutable.
+  * patches/git-memory_object_translatable2.patch: Fix memory object reference
+    leak.
+  * patches/git-mach_debug{,2}.patch: Install mach_debug defs files.
+  * patches/90-fix_headers.patch: Remove, replaced by patch above.
+
+ -- Samuel Thibault <sthibault@debian.org>  Sun, 25 May 2014 20:06:12 +0000
+
+gnumach (2:1.4-9) unstable; urgency=medium
+
+  * patches/git-memory_object_translatable.patch: New patch to make memory
+    object types translation functions mutable.
+
+ -- Samuel Thibault <sthibault@debian.org>  Wed, 26 Mar 2014 09:59:55 +0000
+
+gnumach (2:1.4-8) unstable; urgency=medium
+
+  * patches/git-physical-access.patch: Fix overflow brought by patch.
+
+ -- Samuel Thibault <sthibault@debian.org>  Sat, 22 Mar 2014 15:05:11 +0000
+
 gnumach (2:1.4-7) unstable; urgency=medium
 
   [ Samuel Thibault ]
diff --git a/debian/control b/debian/control
index 2667584..48c99a1 100644
--- a/debian/control
+++ b/debian/control
@@ -8,7 +8,7 @@ Vcs-Browser: http://anonscm.debian.org/gitweb/?p=pkg-hurd/gnumach.git
 Vcs-Git: git://anonscm.debian.org/pkg-hurd/gnumach.git
 Build-Depends: debhelper (>= 7), mig (>= 1.4-2), sharutils,
  autoconf, automake, texinfo
-Standards-Version: 3.9.5
+Standards-Version: 3.9.6
 
 Package: gnumach
 Architecture: any-i386