X Strike Force X.Org X11 SVN commit: r971 - trunk/debian
Author: dnusinow
Date: 2005-12-28 18:10:26 -0500 (Wed, 28 Dec 2005)
New Revision: 971
Modified:
trunk/debian/MANIFEST.alpha.in
trunk/debian/MANIFEST.amd64.in
trunk/debian/MANIFEST.hppa.in
trunk/debian/MANIFEST.ia64.in
trunk/debian/MANIFEST.powerpc.in
trunk/debian/MANIFEST.sparc.in
trunk/debian/changelog
trunk/debian/xserver-xorg.postinst.in
Log:
+ MANIFEST Updates
- amd64 Thanks to Ari Pollak and others (closes: #343693)
* Remove obsolete patch general/033_radeon_fix_for_no_accel.diff
* Fix xserver-xorg config script to properly output resolutions other than
640x480. Thanks Colin Watson. (closes: #344785, #328259)
Modified: trunk/debian/MANIFEST.alpha.in
===================================================================
--- trunk/debian/MANIFEST.alpha.in 2005-12-27 07:32:07 UTC (rev 970)
+++ trunk/debian/MANIFEST.alpha.in 2005-12-28 23:10:26 UTC (rev 971)
@@ -476,7 +476,6 @@
usr/X11R6/bin/mmapw
usr/X11R6/bin/oclock
usr/X11R6/bin/pcitweak
-usr/X11R6/bin/pclcomp
usr/X11R6/bin/proxymngr
usr/X11R6/bin/revpath
usr/X11R6/bin/rstart
@@ -1740,7 +1739,6 @@
usr/X11R6/man/man1/mkhtmlindex.1x
usr/X11R6/man/man1/oclock.1x
usr/X11R6/man/man1/pcitweak.1x
-usr/X11R6/man/man1/pclcomp.1x
usr/X11R6/man/man1/proxymngr.1x
usr/X11R6/man/man1/revpath.1x
usr/X11R6/man/man1/rstart.1x
Modified: trunk/debian/MANIFEST.amd64.in
===================================================================
--- trunk/debian/MANIFEST.amd64.in 2005-12-27 07:32:07 UTC (rev 970)
+++ trunk/debian/MANIFEST.amd64.in 2005-12-28 23:10:26 UTC (rev 971)
@@ -476,7 +476,6 @@
usr/X11R6/bin/mmapw
usr/X11R6/bin/oclock
usr/X11R6/bin/pcitweak
-usr/X11R6/bin/pclcomp
usr/X11R6/bin/proxymngr
usr/X11R6/bin/revpath
usr/X11R6/bin/rstart
@@ -1740,7 +1739,6 @@
usr/X11R6/man/man1/mkhtmlindex.1x
usr/X11R6/man/man1/oclock.1x
usr/X11R6/man/man1/pcitweak.1x
-usr/X11R6/man/man1/pclcomp.1x
usr/X11R6/man/man1/proxymngr.1x
usr/X11R6/man/man1/revpath.1x
usr/X11R6/man/man1/rstart.1x
Modified: trunk/debian/MANIFEST.hppa.in
===================================================================
--- trunk/debian/MANIFEST.hppa.in 2005-12-27 07:32:07 UTC (rev 970)
+++ trunk/debian/MANIFEST.hppa.in 2005-12-28 23:10:26 UTC (rev 971)
@@ -491,7 +491,6 @@
usr/X11R6/bin/mmapw
usr/X11R6/bin/oclock
usr/X11R6/bin/pcitweak
-usr/X11R6/bin/pclcomp
usr/X11R6/bin/proxymngr
usr/X11R6/bin/revpath
usr/X11R6/bin/rstart
@@ -3526,7 +3525,6 @@
usr/X11R6/lib/modules/multimedia/theatre_detect_drv.so
usr/X11R6/lib/modules/multimedia/theatre_drv.so
usr/X11R6/lib/modules/multimedia/uda1380_drv.so
-usr/X11R6/man/man1/pclcomp.1x
usr/X11R6/man/man1/xdbedizzy.1x
usr/X11R6/man/man1/xdpr.1x
usr/X11R6/man/man1/xpr.1x
Modified: trunk/debian/MANIFEST.ia64.in
===================================================================
--- trunk/debian/MANIFEST.ia64.in 2005-12-27 07:32:07 UTC (rev 970)
+++ trunk/debian/MANIFEST.ia64.in 2005-12-28 23:10:26 UTC (rev 971)
@@ -476,7 +476,6 @@
usr/X11R6/bin/mmapw
usr/X11R6/bin/oclock
usr/X11R6/bin/pcitweak
-usr/X11R6/bin/pclcomp
usr/X11R6/bin/proxymngr
usr/X11R6/bin/revpath
usr/X11R6/bin/rstart
@@ -3559,7 +3558,6 @@
usr/X11R6/man/man1/XevieSelectInput.3x
usr/X11R6/man/man1/XevieSendEvent.3x
usr/X11R6/man/man1/XevieStart.3x
-usr/X11R6/man/man1/pclcomp.1x
usr/X11R6/man/man1/xdbedizzy.1x
usr/X11R6/man/man1/xdpr.1x
usr/X11R6/man/man1/xpr.1x
Modified: trunk/debian/MANIFEST.powerpc.in
===================================================================
--- trunk/debian/MANIFEST.powerpc.in 2005-12-27 07:32:07 UTC (rev 970)
+++ trunk/debian/MANIFEST.powerpc.in 2005-12-28 23:10:26 UTC (rev 971)
@@ -475,7 +475,6 @@
usr/X11R6/bin/mmapw
usr/X11R6/bin/oclock
usr/X11R6/bin/pcitweak
-usr/X11R6/bin/pclcomp
usr/X11R6/bin/proxymngr
usr/X11R6/bin/revpath
usr/X11R6/bin/rstart
@@ -1737,7 +1736,6 @@
usr/X11R6/man/man1/mkhtmlindex.1x
usr/X11R6/man/man1/oclock.1x
usr/X11R6/man/man1/pcitweak.1x
-usr/X11R6/man/man1/pclcomp.1x
usr/X11R6/man/man1/proxymngr.1x
usr/X11R6/man/man1/revpath.1x
usr/X11R6/man/man1/rstart.1x
Modified: trunk/debian/MANIFEST.sparc.in
===================================================================
--- trunk/debian/MANIFEST.sparc.in 2005-12-27 07:32:07 UTC (rev 970)
+++ trunk/debian/MANIFEST.sparc.in 2005-12-28 23:10:26 UTC (rev 971)
@@ -475,7 +475,6 @@
usr/X11R6/bin/mmapw
usr/X11R6/bin/oclock
usr/X11R6/bin/pcitweak
-usr/X11R6/bin/pclcomp
usr/X11R6/bin/proxymngr
usr/X11R6/bin/revpath
usr/X11R6/bin/rstart
@@ -1755,7 +1754,6 @@
usr/X11R6/man/man1/mkhtmlindex.1x
usr/X11R6/man/man1/oclock.1x
usr/X11R6/man/man1/pcitweak.1x
-usr/X11R6/man/man1/pclcomp.1x
usr/X11R6/man/man1/proxymngr.1x
usr/X11R6/man/man1/revpath.1x
usr/X11R6/man/man1/rstart.1x
Modified: trunk/debian/changelog
===================================================================
--- trunk/debian/changelog 2005-12-27 07:32:07 UTC (rev 970)
+++ trunk/debian/changelog 2005-12-28 23:10:26 UTC (rev 971)
@@ -4,9 +4,13 @@
+ remove obsolete patch debian/993_debian_no_pclcomp.diff as pclcomp has
also been removed upstream for non-freeness
+ Remove pclcomp from prune/non-free
+ + MANIFEST Updates
+ - amd64 Thanks to Ari Pollak and others (closes: #343693)
* Remove obsolete patch general/033_radeon_fix_for_no_accel.diff
+ * Fix xserver-xorg config script to properly output resolutions other than
+ 640x480. Thanks Colin Watson. (closes: #344785, #328259)
- -- David Nusinow <dnusinow@debian.org> Tue, 27 Dec 2005 02:13:04 -0500
+ -- David Nusinow <dnusinow@debian.org> Tue, 27 Dec 2005 20:26:33 -0500
xorg-x11 (6.8.99.903.dfsg.1-1) experimental; urgency=low
Modified: trunk/debian/xserver-xorg.postinst.in
===================================================================
--- trunk/debian/xserver-xorg.postinst.in 2005-12-27 07:32:07 UTC (rev 970)
+++ trunk/debian/xserver-xorg.postinst.in 2005-12-28 23:10:26 UTC (rev 971)
@@ -392,10 +392,10 @@
db_metaget xserver-xorg/config/display/modes choices
if [ -n "$RET" ]; then
DCRESOLUTIONS="$RET"
- DCRESOLUTIONS=$(echo $DCRESOLUTIONS | sed -e 's/, / /g')
else
DCRESOLUTIONS=@DEFAULT_DCRESOLUTIONS@
fi
+ DCRESOLUTIONS=$(echo $DCRESOLUTIONS | sed -e 's/, / /g')
if [ -n "$RESOLUTIONS" ]; then
DCRESOLUTIONS=$(for i in $DCRESOLUTIONS $RESOLUTIONS; do echo $i; done | sort -unr)
fi
Reply to: