Author: dparsons
Date: 2006-09-16 12:35:54 -0400 (Sat, 16 Sep 2006)
New Revision: 3222
Modified:
branches/7.1/debian/xorg/debian/changelog
branches/7.1/debian/xorg/debian/rules
branches/7.1/debian/xorg/debian/x11-common.install
branches/7.1/debian/xorg/debian/x11-common.manpages
branches/7.1/debian/xorg/debian/xserver-xorg.postinst.in
Log:
* Fix encoding of Monitor localisations in xserver-xorg.postinst.in.
(see bug #387698).
* Use dh_installman to install man pages. Closes: #368316, #375391, #376764.
Modified: branches/7.1/debian/xorg/debian/changelog
===================================================================
--- branches/7.1/debian/xorg/debian/changelog 2006-09-16 09:27:28 UTC (rev
3221)
+++ branches/7.1/debian/xorg/debian/changelog 2006-09-16 16:35:54 UTC (rev
3222)
@@ -1,3 +1,11 @@
+xorg (1:7.1.0~2) UNRELEASED; urgency=low
+
+ * Fix encoding of Monitor localisations in xserver-xorg.postinst.in.
+ (see bug #387698).
+ * Use dh_installman to install man pages. Closes: #368316, #375391, #376764.
+
+ -- Drew Parsons <[EMAIL PROTECTED]> Sun, 17 Sep 2006 02:34:11 +1000
+
xorg (1:7.1.0~1) experimental; urgency=low
[ Drew Parsons ]
Modified: branches/7.1/debian/xorg/debian/rules
===================================================================
--- branches/7.1/debian/xorg/debian/rules 2006-09-16 09:27:28 UTC (rev
3221)
+++ branches/7.1/debian/xorg/debian/rules 2006-09-16 16:35:54 UTC (rev
3222)
@@ -103,6 +103,7 @@
dh_installdebconf
dh_installdirs
dh_installdocs
+ dh_installman
dh_installinit
dh_installchangelogs
dh_link
Modified: branches/7.1/debian/xorg/debian/x11-common.install
===================================================================
--- branches/7.1/debian/xorg/debian/x11-common.install 2006-09-16 09:27:28 UTC
(rev 3221)
+++ branches/7.1/debian/xorg/debian/x11-common.install 2006-09-16 16:35:54 UTC
(rev 3222)
@@ -2,8 +2,6 @@
debian/local/dexconf usr/bin
debian/local/rgb.txt etc/X11
debian/local/Xsession etc/X11
-debian/local/Xsession.5 usr/share/man/man5
debian/local/Xsession.d/* etc/X11/Xsession.d
debian/local/Xsession.options etc/X11
-debian/local/Xsession.options.5 usr/share/man/man5
debian/changelog.Debian.old usr/share/doc/x11-common
Modified: branches/7.1/debian/xorg/debian/x11-common.manpages
===================================================================
--- branches/7.1/debian/xorg/debian/x11-common.manpages 2006-09-16 09:27:28 UTC
(rev 3221)
+++ branches/7.1/debian/xorg/debian/x11-common.manpages 2006-09-16 16:35:54 UTC
(rev 3222)
@@ -1,2 +1,4 @@
debian/local/dexconf.1
debian/local/Xwrapper.config.5
+debian/local/Xsession.5
+debian/local/Xsession.options.5
Modified: branches/7.1/debian/xorg/debian/xserver-xorg.postinst.in
===================================================================
--- branches/7.1/debian/xorg/debian/xserver-xorg.postinst.in 2006-09-16
09:27:28 UTC (rev 3221)
+++ branches/7.1/debian/xorg/debian/xserver-xorg.postinst.in 2006-09-16
16:35:54 UTC (rev 3222)
@@ -336,13 +336,13 @@
# Set a sane monitor id default if probe fails
if [ -z "$MONITOR_IDENTIFIER" ]; then
case "${LC_ALL:-${LC_MESSAGES:-$LANG}}" in
- ca_*) DEFAULT="Monitor gen�ric" ;;
- da_*) DEFAULT="Standard Sk�rm" ;;
+ ca_*) DEFAULT="Monitor genèric" ;;
+ da_*) DEFAULT="Standard Skærm" ;;
de_*) DEFAULT="Standardbildschirm" ;;
- es_*) DEFAULT="Monitor gen�rico" ;;
- fr_*) DEFAULT="�cran g�n�rique";;
+ es_*) DEFAULT="Monitor genérico" ;;
+ fr_*) DEFAULT="Écran générique";;
it_*) DEFAULT="Monitor Generico" ;;
- pt_BR) DEFAULT="Monitor Gen�rico" ;;
+ pt_BR) DEFAULT="Monitor Genérico" ;;
*) DEFAULT="Generic Monitor" ;;
esac
MONITOR_IDENTIFIER="$DEFAULT"
--
To UNSUBSCRIBE, email to [EMAIL PROTECTED]
with a subject of "unsubscribe". Trouble? Contact [EMAIL PROTECTED]
