xorg: Changes to 'debian-unstable'
debian/changelog | 7 ++++++-
debian/control | 2 +-
debian/scripts/vars.armel | 10 ++++++++++
3 files changed, 17 insertions(+), 2 deletions(-)
New commits:
commit 7aa1f50ebf7c6467f4f5b597a40f9850782ec76c
Author: Brice Goglin <Brice.Goglin@ens-lyon.org>
Date: Mon Apr 30 12:21:11 2007 +0200
Make xephem conflict versioned as <= 3.4-5 (closes: #419533)
diff --git a/debian/changelog b/debian/changelog
index 014f398..64c3194 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -7,8 +7,9 @@ xorg (1:7.2-4) UNRELEASED; urgency=low
[ Brice Goglin ]
* Add armel support, thanks to Riku Voipio (closes: #408817).
+ * Make xephem conflict versioned as <= 3.4-5 (closes: #419533).
- -- Brice Goglin <Brice.Goglin@ens-lyon.org> Mon, 30 Apr 2007 12:12:17 +0200
+ -- Brice Goglin <Brice.Goglin@ens-lyon.org> Mon, 30 Apr 2007 12:17:46 +0200
xorg (1:7.2-3) unstable; urgency=low
diff --git a/debian/control b/debian/control
index aad0059..3d8c70e 100644
--- a/debian/control
+++ b/debian/control
@@ -59,7 +59,7 @@ Conflicts: xfree86-common, xorg-common, xserver-common, x-common,
beaver (<= 0.2.5-2), lsb-core (<= 3.1-4), yank (<=0.2.1-7.2),
xpmumon (<= 1.3.0), ivtools-dev (<= 1.1.3-5), ppxp (<= 0.2001080415-14),
guitar (<= 0.1.4-11), xftp, xext, xpaste, ghostview, xv (<= 3.10a-26),
- xserver-xfree86-dbg, grace6 (<= 5.99.0+final-4), xephem,
+ xserver-xfree86-dbg, grace6 (<= 5.99.0+final-4), xephem (<= 3.4-5),
opera (<< 9.10-20060616), hamsoft (<< 0.2.3-1), phototk, tkworld,
ucbmpeg-play (<< 2.3p-13), netscape-base-4, communicator-smotif-477, epan,
navigator-smotif-477, stella (<< 2.2-1), xfractint (<< 20.3.01-1), xgobi,
commit 128f8a4868cd4bd3d184c1356a1b018408f64d74
Author: Brice Goglin <Brice.Goglin@ens-lyon.org>
Date: Mon Apr 30 12:13:41 2007 +0200
Add armel support, thanks to Riku Voipio (closes: #408817).
diff --git a/debian/changelog b/debian/changelog
index 6c7480e..014f398 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,10 +1,14 @@
xorg (1:7.2-4) UNRELEASED; urgency=low
+ [ Julien Cristau ]
* Add ${shlibs:Depends} to x11-common's Depends field, because the X server
wrapper is an ELF object... oops.
* Allow libgl1 as alternative to libgl1-mesa-glx in xorg's dependencies.
- -- Julien Cristau <jcristau@debian.org> Mon, 30 Apr 2007 04:38:04 +0200
+ [ Brice Goglin ]
+ * Add armel support, thanks to Riku Voipio (closes: #408817).
+
+ -- Brice Goglin <Brice.Goglin@ens-lyon.org> Mon, 30 Apr 2007 12:12:17 +0200
xorg (1:7.2-3) unstable; urgency=low
diff --git a/debian/scripts/vars.armel b/debian/scripts/vars.armel
new file mode 100644
index 0000000..4c26f80
--- /dev/null
+++ b/debian/scripts/vars.armel
@@ -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_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-cyrix, xserver-xorg-video-dummy, xserver-xorg-video-fbdev, xserver-xorg-video-glint, xserver-xorg-video-i128, xserver-xorg-video-i740, xserver-xorg-video-i810 | xserver-xorg-video-intel | xserver-xorg-video-i810-modesetting | xserver-xorg-video-intel-modesetting, 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-voodoo, xserver-xorg-video-v4l"
+
+# xserver-xorg-video-glide,
+
+XSERVER_XORG_INPUT_DEPENDS="xserver-xorg-input-evdev, xserver-xorg-input-kbd, xserver-xorg-input-mouse, xserver-xorg-input-synaptics, xserver-xorg-input-wacom"
Reply to: