[hurd] 01/01: patches/ports_h_loop.patch: Fix header inclusion loop.

[Samuel Thibault]

This is an automated email from the git hooks/post-receive script.

sthibault pushed a commit to branch master
in repository hurd.

commit c99fd651ac94d1cdf06ca36d0c3cdbd64e2530a8
Author: Samuel Thibault <address@hidden>
Date:   Thu Dec 11 17:49:15 2014 +0000

    patches/ports_h_loop.patch: Fix header inclusion loop.
---
 debian/changelog                  |  6 ++++++
 debian/patches/ports_h_loop.patch | 35 +++++++++++++++++++++++++++++++++++
 debian/patches/series             |  1 +
 3 files changed, 42 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index cc1aa09..bba26a5 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+hurd (1:0.5.git20141210-2) unstable; urgency=medium
+
+  * patches/ports_h_loop.patch: Fix header inclusion loop.
+
+ -- Samuel Thibault <address@hidden>  Thu, 11 Dec 2014 12:08:08 +0000
+
 hurd (1:0.5.git20141210-1) unstable; urgency=medium
 
   * New upstream snapshot.
diff --git a/debian/patches/ports_h_loop.patch 
b/debian/patches/ports_h_loop.patch
new file mode 100644
index 0000000..6729b6e
--- /dev/null
+++ b/debian/patches/ports_h_loop.patch
@@ -0,0 +1,35 @@
+Index: hurd-debian/hurd/hurd_types.defs
+===================================================================
+--- hurd-debian.orig/hurd/hurd_types.defs
++++ hurd-debian/hurd/hurd_types.defs
+@@ -42,7 +42,6 @@ the Free Software Foundation, 675 Mass A
+ #undef HURD_DEFAULT_PAYLOAD_TO_PORT
+ #endif
+ #else
+-   import <hurd/ports.h>;
+ #define HURD_DEFAULT_PAYLOAD_TO_PORT ports_payload_get_name
+ #endif
+ 
+Index: hurd-debian/mach-defpager/Makefile
+===================================================================
+--- hurd-debian.orig/mach-defpager/Makefile
++++ hurd-debian/mach-defpager/Makefile
+@@ -35,4 +35,4 @@ LDFLAGS += -static
+ 
+ include ../Makeconf
+ 
+-MIGSFLAGS = -DSEQNOS -imacros $(srcdir)/mig-mutate.h
++MIGSFLAGS = -DSEQNOS -imacros $(srcdir)/mig-mutate.h 
-DHURD_DEFAULT_PAYLOAD_TO_PORT=1
+Index: hurd-debian/boot/Makefile
+===================================================================
+--- hurd-debian.orig/boot/Makefile
++++ hurd-debian/boot/Makefile
+@@ -37,6 +37,8 @@ include ../Makeconf
+ #/usr/local/bin/uxboot: uxboot
+ #     cp $< $@
+ 
++MIGSFLAGS = -DHURD_DEFAULT_PAYLOAD_TO_PORT=1
++
+ all: boot # uxboot
+ 
+ uxboot.o: boot.c
diff --git a/debian/patches/series b/debian/patches/series
index 03d1047..806adcd 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -42,3 +42,4 @@ xkb-compat.patch
 MAKEDEV-apm.patch
 newRPC.patch
 libmachdev-link.patch
+ports_h_loop.patch

-- 
Alioth's /usr/local/bin/git-commit-notice on 
/srv/git.debian.org/git/pkg-hurd/hurd.git