Author: ender
Date: 2005-08-01 07:32:38 -0500 (Mon, 01 Aug 2005)
New Revision: 461
Modified:
trunk/debian/changelog
trunk/debian/xserver-xorg.config.in
Log:
- Added more GNU/kFreeBSD fixes, for xserver-xorg.config.in, in order to obtain
the list of mouse devices dynamically.
- Fixed reference to migrated items in xserver.xorg.config.in. Thanks,
Joey Hess (closes: #318276).
- Fixed several style typos in the changelog.
Modified: trunk/debian/changelog
===================================================================
--- trunk/debian/changelog 2005-08-01 09:49:36 UTC (rev 460)
+++ trunk/debian/changelog 2005-08-01 12:32:38 UTC (rev 461)
@@ -50,15 +50,15 @@
Changes by Julien Cristau:
- Clean up FAQ to refer to X.Org instead of XFree86. Closes: #319407
- Changes by David Martínez Moreno
- - Include upstream X.Org changelog in x11-common documents
+ Changes bt David Martínez Moreno:
+ - Include upstream X.Org changelog in x11-common documents.
- Remove various references to XFree86 and its trappings.
- - Remove obsolete XF86Config.7 manpage
- - Minor updates to HURD files
- - Various fixes to xserver-xorg.templates
- - Typofix
- - Don't add load GLcore module, which is ignored by the server anyway
- - Remove extraneous reference to the now removed speedo fonts
+ - Remove obsolete XF86Config.7 manpage.
+ - Minor updates to Hurd files.
+ - Various fixes to xserver-xorg.templates.
+ - Typofix.
+ - Don't add load GLcore module, which is ignored by the server anyway.
+ - Remove extraneous reference to the now removed speedo fonts.
- patches/general/000_stolen_from_unichrome.sf.net.diff: Added high
resolution modes for KM400, patch by Luc Verhagen (closes: #318348).
- Added patches/general/025_XStandards_manpage_typo.diff: Fixed typo in
@@ -70,8 +70,12 @@
- Updated Spanish translation.
- Added Simplified Chinese translation (zh_CN.po). Thanks, Carlos Z.F.
Liu! (closes: #320657).
+ - Added more GNU/kFreeBSD fixes, for xserver-xorg.config.in, in order to
obtain
+ the list of mouse devices dynamically.
+ - Fixed reference to migrated items in xserver.xorg.config.in. Thanks,
+ Joey Hess (closes: #318276).
- Changes by Eugene Konev and David Nusinow
+ Changes by Eugene Konev and David Nusinow:
- Switch from dbs to quilt
- Document how to use the system in debian/README
- Re-organize patches in to subdirectories
@@ -79,7 +83,7 @@
- Add general/022_disable_xmh.diff to not build it
- Remove xmh from MANIFEST files and xlibs-data.installs
- -- David Martínez Moreno <[EMAIL PROTECTED]> Mon, 1 Aug 2005 11:46:19 +0200
+ -- David Martínez Moreno <[EMAIL PROTECTED]> Mon, 1 Aug 2005 14:30:32 +0200
xorg-x11 (6.8.2.dfsg.1-4) unstable; urgency=low
Modified: trunk/debian/xserver-xorg.config.in
===================================================================
--- trunk/debian/xserver-xorg.config.in 2005-08-01 09:49:36 UTC (rev 460)
+++ trunk/debian/xserver-xorg.config.in 2005-08-01 12:32:38 UTC (rev 461)
@@ -466,7 +466,7 @@
if [ -n "$FIRSTINST" ] && [ -z "$RECONFIGURE" ] && [ -n "$XF86TEMPLATELIST" ];
then
MIGRATE_XF86=true
- warn "Migrating xserver-xfree86 templates to xserver-xorg."
+ warn "Migrating xserver-xfree86 debconf values to xserver-xorg."
# set +e is required otherwise debconf will kick us out if the template is
not
# there.
set +e
@@ -486,7 +486,7 @@
if [ "$RET" != "10 xserver-xfree86/config/display/modes doesn't exist" ];
then
db_subst xserver-xorg/config/display/modes choices "$RET"
else
- # remember to keep this list in sync with postinst.in. Yes it sucks!
+ # remember to keep this list in sync with postinst.in. Yes, it sucks!
db_subst xserver-xorg/config/display/modes choices "1920x1440, 1920x1200,
1856x1392, 1792x1344, 1680x1050, 1600x1200, 1440x900, 1400x1050, 1280x1024,
1280x960, 1280x854, 1280x800, 1280x768, 1200x800, 1152x864, 1152x768, 1024x768,
800x600, 640x480"
fi
# migrate keyboard/rules
@@ -525,7 +525,7 @@
db_set xserver-xorg/config/monitor/selection-method "Advanced"
fi
-# migrate to Xorg 6.8.1, where there are no pex, xtt or xie modules
+# migrate to X.Org 6.8.1, where there are no pex, xtt or xie modules
db_get xserver-xorg/config/modules
SELECTED_MODULES="$(echo $RET | awk 'BEGIN { RS=", "} {print $1}')"
# are the pex or xie modules selected?
@@ -1284,8 +1284,13 @@
fi
;;
GNU/kFreeBSD)
- MOUSE_PORT_CHOICES="/dev/cuaa0, /dev/cuaa1, /dev/cuaa2, /dev/cuaa3,
/dev/mse0, /dev/psm0, /dev/sysmouse, /dev/ums0, /dev/ums1, /dev/ums2, /dev/ums3"
- DEFAULT_PORT="/dev/ums0"
+ MOUSE_PORT_CHOICES="`(for i in ums psm mse cuaa ; do
+ for j in 0 1 2 3 ; do
+ if test -e /dev/${i}${j} ; then echo -n \"/dev/${i}${j} \" ; fi
+ done
+ done
+ if test -e /dev/sysmouse ; then echo /dev/sysmouse ; fi) | sed -e \"s/
$//g\" -e \"s/ /, /g\"`"
+ DEFAULT_PORT="`echo ${MOUSE_PORT_CHOICES} | sed -e "s/,.*//g"`"
;;
esac
--
To UNSUBSCRIBE, email to [EMAIL PROTECTED]
with a subject of "unsubscribe". Trouble? Contact [EMAIL PROTECTED]
