debian/changelog | 5 ++++
debian/libx11-6.install | 3 --
debian/patches/002_arm_abi_brain_damage.diff | 28 ---------------------------
debian/patches/series | 1
4 files changed, 6 insertions(+), 31 deletions(-)
New commits:
commit 6293703afd8912fc9c7d1330551e45b949c57605
Author: Julien Cristau <jcris...@debian.org>
Date: Fri Jul 31 05:16:20 2009 +0200
Use a glob in libx11-6.install
diff --git a/debian/changelog b/debian/changelog
index bd252d2..2075baf 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -5,6 +5,7 @@ libx11 (2:1.2.2-2) UNRELEASED; urgency=low
[ Julien Cristau ]
* Drop 002_arm_abi_brain_damage.diff, the old ABI arm port is gone.
+ * Use a glob in libx11-6.install.
-- Brice Goglin <bgog...@debian.org> Sun, 19 Jul 2009 22:32:52 +0200
diff --git a/debian/libx11-6.install b/debian/libx11-6.install
index 83207f8..480164b 100644
--- a/debian/libx11-6.install
+++ b/debian/libx11-6.install
@@ -1,2 +1 @@
-usr/lib/libX11.so.6
-usr/lib/libX11.so.6.2.0
+usr/lib/libX11.so.6*
commit a834372c4b706710e8bee2c07e74cd76d9450f9c
Author: Julien Cristau <jcris...@debian.org>
Date: Fri Jul 31 03:02:20 2009 +0200
Drop 002_arm_abi_brain_damage.diff, the old ABI arm port is gone.
diff --git a/debian/changelog b/debian/changelog
index 89bc6c6..bd252d2 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,7 +1,11 @@
libx11 (2:1.2.2-2) UNRELEASED; urgency=low
+ [ Brice Goglin ]
* Bump Standards-Version to 3.8.2.
+ [ Julien Cristau ]
+ * Drop 002_arm_abi_brain_damage.diff, the old ABI arm port is gone.
+
-- Brice Goglin <bgog...@debian.org> Sun, 19 Jul 2009 22:32:52 +0200
libx11 (2:1.2.2-1) unstable; urgency=low
diff --git a/debian/patches/002_arm_abi_brain_damage.diff
b/debian/patches/002_arm_abi_brain_damage.diff
deleted file mode 100644
index cc62ac3..0000000
--- a/debian/patches/002_arm_abi_brain_damage.diff
+++ /dev/null
@@ -1,28 +0,0 @@
-$Id$
-
-We have to do this to kludge around a bad decision made long ago in the
-design of the GCC ARM ABI.
-
-For extensive discussion and rationale, please see
-<URL: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=285396 >.
-
-Not submitted upstream to XFree86 or X.Org.
-
-Index: libx11/include/X11/Xlib.h
-===================================================================
---- libx11.orig/include/X11/Xlib.h 2009-07-19 20:36:43.000000000 +0200
-+++ libx11/include/X11/Xlib.h 2009-07-19 20:36:47.000000000 +0200
-@@ -1062,7 +1062,12 @@
- typedef struct { /* normal 16 bit characters are two bytes */
- unsigned char byte1;
- unsigned char byte2;
--} XChar2b;
-+}
-+#if defined(__GNUC__) && defined(__arm__) && !defined(__ARM_EABI__)
-+__attribute__ ((packed))
-+#endif
-+XChar2b;
-+
-
- typedef struct {
- XChar2b *chars; /* two byte characters */
diff --git a/debian/patches/series b/debian/patches/series
index fdf0075..f20e030 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,4 +1,3 @@
-002_arm_abi_brain_damage.diff
003_recognize_glibc_2.3.2_locale_names.diff
006_tailor_pt_BR.UTF-8_Compose.diff
007_iso8859-15_Compose_fix.diff
--
To UNSUBSCRIBE, email to debian-x-requ...@lists.debian.org
with a subject of "unsubscribe". Trouble? Contact listmas...@lists.debian.org
