xutils-dev: Changes to 'debian-experimental'
debian/changelog | 7 +++
debian/patches/07_cf_GNUArchitecture_for_GNU_kFreeBSD.diff | 27 +++++++++++++
debian/patches/series | 1
3 files changed, 35 insertions(+)
New commits:
commit 24e5ca8d47b8b0cb581f4e23cfd129523f06e0e2
Author: Julien Cristau <jcristau@debian.org>
Date: Sat Feb 17 18:41:21 2007 +0100
[xorg-cf-files] Define GNUArchitecture on GNU/kFreeBSD.
Add patch by Robert Millan applied to upstream git to define GNUArchitecture
when __GLIBC__ is defined.
diff --git a/debian/changelog b/debian/changelog
index e8fb56d..6ce8096 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+xutils-dev (1:7.2.ds-2) UNRELEASED; urgency=low
+
+ * [xorg-cf-files] Add patch from upstream git to define GNUArchitecture on
+ GNU/kFreeBSD. Thanks, Robert Millan (closes: #357582).
+
+ -- Julien Cristau <jcristau@debian.org> Sat, 17 Feb 2007 18:35:32 +0100
+
xutils-dev (1:7.2.ds-1) experimental; urgency=low
* Update util-macros to 1.1.5 (X11R7.2).
diff --git a/debian/patches/07_cf_GNUArchitecture_for_GNU_kFreeBSD.diff b/debian/patches/07_cf_GNUArchitecture_for_GNU_kFreeBSD.diff
new file mode 100644
index 0000000..1fc0af2
--- /dev/null
+++ b/debian/patches/07_cf_GNUArchitecture_for_GNU_kFreeBSD.diff
@@ -0,0 +1,27 @@
+From 9c8ca4fe2066924754c3c1ea78ef0788ceaf320b Mon Sep 17 00:00:00 2001
+From: Robert Millan <rmh@aybabtu.com>
+Date: Fri, 14 Jul 2006 18:50:34 -0700
+Subject: [PATCH] Bug #6310: GNUArchitecture needed for GNU/kFreeBSD
+
+<https://bugs.freedesktop.org/show_bug.cgi?id=6310>
+---
+ Imake.cf | 3 +++
+ 1 files changed, 3 insertions(+), 0 deletions(-)
+
+diff --git a/xorg-cf-files/Imake.cf b/xorg-cf-files/Imake.cf
+index 3edd6a7..8676ad7 100644
+--- a/xorg-cf-files/Imake.cf
++++ b/xorg-cf-files/Imake.cf
+@@ -787,6 +787,9 @@ XCOMM $XFree86: xc/config/cf/Imake.cf,v 3.88 2003/12/16 21:30:21 herrb Exp $
+ # ifdef __linux__
+ # define LinuxArchitecture
+ # endif
++# ifdef __GLIBC__
++# define GNUArchitecture
++# endif
+ # ifdef i386
+ # ifndef i386Architecture
+ # define i386Architecture
+--
+1.4.4.4
+
diff --git a/debian/patches/series b/debian/patches/series
index f54478f..f5871a1 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -4,3 +4,4 @@
04_xutils-dev-debian.diff
05_xaw_without_xp.diff
06_font_path.diff
+07_cf_GNUArchitecture_for_GNU_kFreeBSD.diff
Reply to: