X Strike Force X.Org X11 SVN commit: r1932 - in trunk/debian/xorg/debian: . scripts
Author: dnusinow
Date: 2006-04-22 10:13:56 -0400 (Sat, 22 Apr 2006)
New Revision: 1932
Added:
trunk/debian/xorg/debian/scripts/vars.hurd-i386
Modified:
trunk/debian/xorg/debian/changelog
Log:
(closes: #364210), xterm (<< 208-1), and xmh (<= 6.8.2.dfsg.1-4);
* Add vars.hurd-i386 to allow this package to build on that arch. Thanks
Samuel Thibault and Michael Banck. (closes: #358692)
Modified: trunk/debian/xorg/debian/changelog
===================================================================
--- trunk/debian/xorg/debian/changelog 2006-04-22 05:16:14 UTC (rev 1931)
+++ trunk/debian/xorg/debian/changelog 2006-04-22 14:13:56 UTC (rev 1932)
@@ -24,17 +24,21 @@
* Increment the conflict with xfs-xtt, because -6 existed in the
archive even if it wasn't released with sarge. Closes: #364056.
* Add additional conflicts for xnest (<= 6.9.0.dfsg.1-6)
- (closes: #364210), xterm (<< 208-1), and xmh (<= 6.8.2.dfsg.1-4);
+ (closes: #364210), xterm (<< 208-1), and xmh (<= 6.8.2.dfsg.1-4);
these packages all depended on a package that x11-common already
conflicted with, but that's only enough to force deconfiguration, not
removal.
-
+
[ ISHIKAWA Mutsumi ]
* Debconf translations:
- Update Japanese translation (Kenshi Muto).
- -- Steve Langasek <vorlon@debian.org> Thu, 20 Apr 2006 15:53:58 -0700
+ [ David Nusinow ]
+ * Add vars.hurd-i386 to allow this package to build on that arch. Thanks
+ Samuel Thibault and Michael Banck. (closes: #358692)
+ -- David Nusinow <dnusinow@debian.org> Sat, 22 Apr 2006 10:12:30 -0400
+
xorg (1:7.0.14) unstable; urgency=low
* Add more versioned conflicts (libmotif-dev, motif-clients, xslideshow,
Added: trunk/debian/xorg/debian/scripts/vars.hurd-i386
===================================================================
--- trunk/debian/xorg/debian/scripts/vars.hurd-i386 2006-04-22 05:16:14 UTC (rev 1931)
+++ trunk/debian/xorg/debian/scripts/vars.hurd-i386 2006-04-22 14:13:56 UTC (rev 1932)
@@ -0,0 +1,10 @@
+# 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_INPUT_DEPENDS="xserver-xorg-input-kbd, xserver-xorg-input-mouse"
+
+# , xserver-xorg-input-wacom
+
+XSERVER_XORG_VIDEO_DEPENDS="xserver-xorg-video-apm, server-xorg-video-ark, xserver-xorg-video-ati, xserver-xorg-video-chips, xserver-xorg-video-cirrus, xserver-xorg-video-cyrix, xserver-xorg-video-dummy, xserver-xorg-video-glint, xserver-xorg-video-i128, xserver-xorg-video-i740, xserver-xorg-video-i810, xserver-xorg-video-imstt, xserver-xorg-video-mga, xserver-xorg-video-neomagic, xserver-xorg-video-newport, xserver-xorg-video-nsc, xserver-xorg-video-nv, xserver-xorg-video-rendition, xserver-xorg-video-s3, xserver-xorg-video-s3virge, xserver-xorg-video-savage, xserver-xorg-video-siliconmotion, xserver-xorg-video-sis, xserver-xorg-video-sisusb, xserver-xorg-video-tdfx, xserver-xorg-video-tga, xserver-xorg-video-trident, xserver-xorg-video-tseng, xserver-xorg-video-vesa, xserver-xorg-video-vga, xserver-xorg-video-via, xserver-xorg-video-vmware, xserver-xorg-video-voodoo"
Reply to: