diff options
| author | Julien Cristau <jcristau@debian.org> | 2010-01-02 10:20:39 +0000 |
|---|---|---|
| committer | Julien Cristau <jcristau@debian.org> | 2010-01-02 10:20:39 +0000 |
| commit | e348e85bd3cd20f11bb5354da32278f5f813eb52 (patch) | |
| tree | 6b4ef8e618173f104a99a759000fa9c342dbe134 | |
| parent | 2f3a506d211dd9958cded9b569a95b8ed5c5a08c (diff) | |
| download | xutils-dev-e348e85bd3cd20f11bb5354da32278f5f813eb52.tar.gz | |
Drop 07_cf_GNUArchitecture_for_GNU_kFreeBSD.diff, applied upstream.
| -rw-r--r-- | debian/changelog | 1 | ||||
| -rw-r--r-- | debian/patches/07_cf_GNUArchitecture_for_GNU_kFreeBSD.diff | 27 | ||||
| -rw-r--r-- | debian/patches/series | 1 |
3 files changed, 1 insertions, 28 deletions
diff --git a/debian/changelog b/debian/changelog index aa65df4..3718f6a 100644 --- a/debian/changelog +++ b/debian/changelog @@ -5,6 +5,7 @@ xutils-dev (1:7.5+1) UNRELEASED; urgency=low - makedepend 1.0.2 - util-macros 1.4.1 - xorg-cf-files 1.0.3 + * Drop 07_cf_GNUArchitecture_for_GNU_kFreeBSD.diff, applied upstream. -- Julien Cristau <jcristau@debian.org> Sat, 02 Jan 2010 09:56:54 +0000 diff --git a/debian/patches/07_cf_GNUArchitecture_for_GNU_kFreeBSD.diff b/debian/patches/07_cf_GNUArchitecture_for_GNU_kFreeBSD.diff deleted file mode 100644 index 1fc0af2..0000000 --- a/debian/patches/07_cf_GNUArchitecture_for_GNU_kFreeBSD.diff +++ /dev/null @@ -1,27 +0,0 @@ -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 56e830f..57ac33b 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -4,4 +4,3 @@ 04_xutils-dev-debian.diff 05_xaw_without_xp.diff 06_font_path.diff -07_cf_GNUArchitecture_for_GNU_kFreeBSD.diff |