xsf-tools: Changes to 'master'
mrconfig | 18 ++++++++++--------
mrconfig-update | 3 +++
xsf-list-udebs | 45 +++++++++++++++++++++++++++++++++++++++++++++
3 files changed, 58 insertions(+), 8 deletions(-)
New commits:
commit 1520e115cbc7dea9492144a82cc37011380a4d72
Author: Cyril Brulebois <kibi@debian.org>
Date: Sun Feb 6 16:44:58 2011 +0100
Update repository list.
Move 7 unmaintained devices to the attic.
diff --git a/mrconfig b/mrconfig
index 0fe21b6..fad567c 100644
--- a/mrconfig
+++ b/mrconfig
@@ -54,10 +54,14 @@ remoteaddupstream =
#[attic/app/heliodor.git]
#[attic/app/xbase-clients.git]
#[attic/driver/xserver-xorg-input-calcomp.git]
+#[attic/driver/xserver-xorg-input-citron.git]
#[attic/driver/xserver-xorg-input-digitaledge.git]
#[attic/driver/xserver-xorg-input-dmc.git]
#[attic/driver/xserver-xorg-input-dynapro.git]
#[attic/driver/xserver-xorg-input-elo2300.git]
+#[attic/driver/xserver-xorg-input-evtouch.git]
+#[attic/driver/xserver-xorg-input-fpit.git]
+#[attic/driver/xserver-xorg-input-hyperpen.git]
#[attic/driver/xserver-xorg-input-jamstudio.git]
#[attic/driver/xserver-xorg-input-magellan.git]
#[attic/driver/xserver-xorg-input-magictouch.git]
@@ -74,7 +78,10 @@ remoteaddupstream =
#[attic/driver/xserver-xorg-video-dove.git]
#[attic/driver/xserver-xorg-video-imstt.git]
#[attic/driver/xserver-xorg-video-nsc.git]
+#[attic/driver/xserver-xorg-video-nv.git]
+#[attic/driver/xserver-xorg-video-radeonhd.git]
#[attic/driver/xserver-xorg-video-sunbw2.git]
+#[attic/driver/xserver-xorg-video-v4l.git]
#[attic/driver/xserver-xorg-video-vga.git]
#[attic/driver/xserver-xorg-video-via.git]
#[attic/lib/drm-snapshot.git]
@@ -109,12 +116,8 @@ remoteaddupstream =
[doc/xorg-sgml-doctools.git]
[driver/xserver-xorg-input-acecad.git]
[driver/xserver-xorg-input-aiptek.git]
-[driver/xserver-xorg-input-citron.git]
[driver/xserver-xorg-input-elographics.git]
[driver/xserver-xorg-input-evdev.git]
-[driver/xserver-xorg-input-evtouch.git]
-[driver/xserver-xorg-input-fpit.git]
-[driver/xserver-xorg-input-hyperpen.git]
[driver/xserver-xorg-input-joystick.git]
[driver/xserver-xorg-input-keyboard.git]
[driver/xserver-xorg-input-mouse.git]
@@ -141,11 +144,9 @@ remoteaddupstream =
[driver/xserver-xorg-video-neomagic.git]
[driver/xserver-xorg-video-newport.git]
[driver/xserver-xorg-video-nouveau.git]
-[driver/xserver-xorg-video-nv.git]
[driver/xserver-xorg-video-openchrome.git]
[driver/xserver-xorg-video-qxl.git]
[driver/xserver-xorg-video-r128.git]
-[driver/xserver-xorg-video-radeonhd.git]
[driver/xserver-xorg-video-rendition.git]
[driver/xserver-xorg-video-s3.git]
[driver/xserver-xorg-video-s3virge.git]
@@ -163,7 +164,6 @@ remoteaddupstream =
[driver/xserver-xorg-video-tga.git]
[driver/xserver-xorg-video-trident.git]
[driver/xserver-xorg-video-tseng.git]
-[driver/xserver-xorg-video-v4l.git]
[driver/xserver-xorg-video-vesa.git]
[driver/xserver-xorg-video-vmware.git]
[driver/xserver-xorg-video-voodoo.git]
commit 35be785f25db0fb7132125c7d6a4eb5674d4a85e
Author: Cyril Brulebois <kibi@debian.org>
Date: Thu Feb 3 12:09:14 2011 +0100
Update repository list.
The dove driver isn't exactly maintained upstream, only shipped in Ubuntu.
And it can be moved back into place if things start going better.
diff --git a/mrconfig b/mrconfig
index 0472842..0fe21b6 100644
--- a/mrconfig
+++ b/mrconfig
@@ -71,6 +71,7 @@ remoteaddupstream =
#[attic/driver/xserver-xorg-video-ast.git]
#[attic/driver/xserver-xorg-video-avivo.git]
#[attic/driver/xserver-xorg-video-cyrix.git]
+#[attic/driver/xserver-xorg-video-dove.git]
#[attic/driver/xserver-xorg-video-imstt.git]
#[attic/driver/xserver-xorg-video-nsc.git]
#[attic/driver/xserver-xorg-video-sunbw2.git]
@@ -127,7 +128,6 @@ remoteaddupstream =
[driver/xserver-xorg-video-ati.git]
[driver/xserver-xorg-video-chips.git]
[driver/xserver-xorg-video-cirrus.git]
-[driver/xserver-xorg-video-dove.git]
[driver/xserver-xorg-video-dummy.git]
[driver/xserver-xorg-video-fbdev.git]
[driver/xserver-xorg-video-glide.git]
commit 1980c66aab913275fc7a36ced8efaac43438f06f
Author: Cyril Brulebois <kibi@debian.org>
Date: Sat Jan 29 03:38:17 2011 +0100
Let pkg-xorg.git appear, but commented.
Probably due to some crontab, it gets created again and again behind our
back. It could be skipped entirely, but having it commented doesn't hurt
(it might even serve as a reminder to possibly see whether that can be
avoided at all).
diff --git a/mrconfig b/mrconfig
index b4ee712..0472842 100644
--- a/mrconfig
+++ b/mrconfig
@@ -214,6 +214,7 @@ remoteaddupstream =
[lib/pixman.git]
[lib/xft.git]
[lib/xtrans.git]
+#[pkg-xorg.git]
[proto/x11proto-bigreqs.git]
[proto/x11proto-composite.git]
[proto/x11proto-core.git]
diff --git a/mrconfig-update b/mrconfig-update
index f03d638..c8719f8 100755
--- a/mrconfig-update
+++ b/mrconfig-update
@@ -25,6 +25,9 @@ for repo in $repos; do
attic/*)
echo "#[$repo]"
;;
+ pkg-xorg.git)
+ echo "#[$repo]"
+ ;;
# Real repository:
*)
echo "[$repo]"
commit 6e06a00cbdfb8c07e37d771b726e9f4f720aa73a
Author: Cyril Brulebois <kibi@debian.org>
Date: Sat Jan 29 03:37:10 2011 +0100
Update repository list.
diff --git a/mrconfig b/mrconfig
index f9b7876..b4ee712 100644
--- a/mrconfig
+++ b/mrconfig
@@ -193,6 +193,7 @@ remoteaddupstream =
[lib/libxfont.git]
[lib/libxi.git]
[lib/libxinerama.git]
+[lib/libxkbcommon.git]
[lib/libxkbfile.git]
[lib/libxmu.git]
[lib/libxp.git]
commit ccd3254792126b284e2bd82db7aa9b3416150a5d
Author: Cyril Brulebois <kibi@debian.org>
Date: Fri Jan 28 07:53:13 2011 +0100
xsf-list-udebs: Add help/usage, plus more accurate output.
diff --git a/xsf-list-udebs b/xsf-list-udebs
index 206c20f..d998b2e 100755
--- a/xsf-list-udebs
+++ b/xsf-list-udebs
@@ -14,8 +14,24 @@ ADDRESS=${ADDRESS:-debian-x@lists.debian.org}
# Take an optional single parameter:
type=$1
case $type in
- "-s") type=Source;;
- *) type=Package;;
+ "-h")
+ echo "Usage: $0 [-s]";
+ echo
+ echo "By default, output binary packages. With -s, output source packages."
+ echo
+ echo "The following variables can be set:"
+ echo " MIRROR : $MIRROR"
+ echo " ARCH : $ARCH"
+ echo " DIST : $DIST"
+ echo " ADDRESS : $ADDRESS"
+ exit 0
+ ;;
+ "-s")
+ type=Source
+ ;;
+ *)
+ type=Package
+ ;;
esac
# Make sure dctrl-tools is installed:
@@ -25,5 +41,5 @@ if ! which grep-dctrl >/dev/null 2>&1; then
fi
# Fetch, uncompress, and grep:
-echo "Listing $type for packages maintained by $ADDRESS" >&2
+echo "ADDRESS=$ADDRESS, ARCH=$ARCH, DIST=$DIST, MIRROR=$MIRROR:" >&2
wget -q http://$MIRROR/debian/dists/$DIST/main/debian-installer/binary-$ARCH/Packages.gz -O - | zcat | grep-dctrl -F Maintainer -s $type $ADDRESS
commit 01d177e5cc91176af22bdb83a55cdf99f26c98a7
Author: Cyril Brulebois <kibi@debian.org>
Date: Fri Jan 28 07:33:31 2011 +0100
Add xsf-list-udebs script.
It makes it trivial to keep track of the packages we maintain and which
ship udebs. We probably should be keeping an eye on the size of these
udebs.
diff --git a/xsf-list-udebs b/xsf-list-udebs
new file mode 100755
index 0000000..206c20f
--- /dev/null
+++ b/xsf-list-udebs
@@ -0,0 +1,29 @@
+#!/bin/sh
+# © 2011 Cyril Brulebois <kibi@debian.org>
+#
+# apt-cache can't really help since one usually doesn't specify
+# main/debian-installer in ones sources.list
+set -e
+
+# Define some defaults, which can be overriden through env variables:
+MIRROR=${MIRROR:-ftp.debian.org}
+ARCH=${ARCH:-i386}
+DIST=${DIST:-unstable}
+ADDRESS=${ADDRESS:-debian-x@lists.debian.org}
+
+# Take an optional single parameter:
+type=$1
+case $type in
+ "-s") type=Source;;
+ *) type=Package;;
+esac
+
+# Make sure dctrl-tools is installed:
+if ! which grep-dctrl >/dev/null 2>&1; then
+ echo "E: grep-dctrl tool missing. dctrl-tools package not installed?" >&2
+ exit 1
+fi
+
+# Fetch, uncompress, and grep:
+echo "Listing $type for packages maintained by $ADDRESS" >&2
+wget -q http://$MIRROR/debian/dists/$DIST/main/debian-installer/binary-$ARCH/Packages.gz -O - | zcat | grep-dctrl -F Maintainer -s $type $ADDRESS
Reply to: