xorg: Changes to 'debian-unstable'
debian/changelog | 8 ++++++++
debian/control | 2 +-
debian/scripts/vars.sparc64 | 34 ++++++++++++++++++++++++++++++++++
3 files changed, 43 insertions(+), 1 deletion(-)
New commits:
commit 665f99c85fa643240e1299e4882a599e9e790d2a
Author: Julien Cristau <jcristau@debian.org>
Date: Tue Sep 14 14:54:20 2010 +0200
Use linux-any for the xserver-xorg-input-evdev dependency
Instead of an ever-changing list of architectures, just use a wildcard.
diff --git a/debian/changelog b/debian/changelog
index 303dc33..4f02504 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,8 @@
xorg (1:7.5+8) UNRELEASED; urgency=low
* Add support for sparc64 (closes: #596828). Thanks, Aurélien Jarno!
+ * Use linux-any instead of an ever-changing list of architectures for the
+ xserver-xorg-input-evdev dependency.
-- Julien Cristau <jcristau@debian.org> Tue, 14 Sep 2010 14:52:03 +0200
diff --git a/debian/control b/debian/control
index 3950bd1..d7f6549 100644
--- a/debian/control
+++ b/debian/control
@@ -31,7 +31,7 @@ Depends:
xserver-xorg-core (>= 2:1.7),
xserver-xorg-video-all | xserver-xorg-video-6,
xserver-xorg-input-all | xserver-xorg-input-7,
- xserver-xorg-input-evdev [alpha amd64 arm armeb armel hppa i386 ia64 lpia m32r m68k mips mipsel powerpc sparc sparc64],
+ xserver-xorg-input-evdev [linux-any],
hal (>= 0.5.12~git20090406) [kfreebsd-any],
${shlibs:Depends},
${misc:Depends},
commit df93f3040013e190d1ddcc93da2ce4a447460c8a
Author: Julien Cristau <jcristau@debian.org>
Date: Tue Sep 14 14:52:31 2010 +0200
Changelog entry
diff --git a/debian/changelog b/debian/changelog
index a0495fc..303dc33 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+xorg (1:7.5+8) UNRELEASED; urgency=low
+
+ * Add support for sparc64 (closes: #596828). Thanks, Aurélien Jarno!
+
+ -- Julien Cristau <jcristau@debian.org> Tue, 14 Sep 2010 14:52:03 +0200
+
xorg (1:7.5+7) unstable; urgency=low
[ Julien Cristau ]
commit 8637d1a19ef22ed0432fad3fc2b1cd119a9e1cb9
Author: Aurelien Jarno <aurel32@debian.org>
Date: Tue Sep 14 14:27:27 2010 +0200
Bug#596828: xorg: support for sparc64
Please find below a patch that it is necessary to build xorg on
sparc64. It is basically a copy of the sparc configuration.
diff --git a/debian/control b/debian/control
index 4b87f47..3950bd1 100644
--- a/debian/control
+++ b/debian/control
@@ -31,7 +31,7 @@ Depends:
xserver-xorg-core (>= 2:1.7),
xserver-xorg-video-all | xserver-xorg-video-6,
xserver-xorg-input-all | xserver-xorg-input-7,
- xserver-xorg-input-evdev [alpha amd64 arm armeb armel hppa i386 ia64 lpia m32r m68k mips mipsel powerpc sparc],
+ xserver-xorg-input-evdev [alpha amd64 arm armeb armel hppa i386 ia64 lpia m32r m68k mips mipsel powerpc sparc sparc64],
hal (>= 0.5.12~git20090406) [kfreebsd-any],
${shlibs:Depends},
${misc:Depends},
diff --git a/debian/scripts/vars.sparc64 b/debian/scripts/vars.sparc64
new file mode 100644
index 0000000..5cb831a
--- /dev/null
+++ b/debian/scripts/vars.sparc64
@@ -0,0 +1,34 @@
+
+# This file is NOT a shell script.
+#
+# This file gets included by both debian/rules (make) AND the scripts in
+# debian/scripts (Bourne shell).
+XSERVER_XORG_VIDEO_DEPENDS="xserver-xorg-video-apm, \
+ xserver-xorg-video-ark, \
+ xserver-xorg-video-ati, \
+ xserver-xorg-video-chips, \
+ xserver-xorg-video-cirrus, \
+ xserver-xorg-video-fbdev, \
+ xserver-xorg-video-i128, \
+ xserver-xorg-video-i740, \
+ xserver-xorg-video-mga, \
+ xserver-xorg-video-neomagic, \
+ xserver-xorg-video-nv, \
+ xserver-xorg-video-rendition, \
+ xserver-xorg-video-s3virge, \
+ xserver-xorg-video-savage, \
+ xserver-xorg-video-siliconmotion, \
+ xserver-xorg-video-suncg14, \
+ xserver-xorg-video-suncg3, \
+ xserver-xorg-video-suncg6, \
+ xserver-xorg-video-sunffb, \
+ xserver-xorg-video-sunleo, \
+ xserver-xorg-video-suntcx, \
+ xserver-xorg-video-tdfx, \
+ xserver-xorg-video-trident, \
+ xserver-xorg-video-vesa, \
+"
+
+XSERVER_XORG_INPUT_DEPENDS="xserver-xorg-input-evdev, \
+ xserver-xorg-input-synaptics, \
+ xserver-xorg-input-wacom"
Reply to: