X Strike Force XFree86 SVN commit: r1986 - in branches/ubuntu/debian: . po
Author: fabbione
Date: 2004-10-30 00:31:48 -0500 (Sat, 30 Oct 2004)
New Revision: 1986
Modified:
branches/ubuntu/debian/CHANGESETS
branches/ubuntu/debian/changelog
branches/ubuntu/debian/control
branches/ubuntu/debian/libx11-6.preinst.in
branches/ubuntu/debian/libxt6.preinst.in
branches/ubuntu/debian/po/POTFILES.in
branches/ubuntu/debian/po/ca.po
branches/ubuntu/debian/po/cs.po
branches/ubuntu/debian/po/da.po
branches/ubuntu/debian/po/de.po
branches/ubuntu/debian/po/el.po
branches/ubuntu/debian/po/es.po
branches/ubuntu/debian/po/fr.po
branches/ubuntu/debian/po/gl.po
branches/ubuntu/debian/po/it.po
branches/ubuntu/debian/po/ja.po
branches/ubuntu/debian/po/nl.po
branches/ubuntu/debian/po/pl.po
branches/ubuntu/debian/po/pt_BR.po
branches/ubuntu/debian/po/ru.po
branches/ubuntu/debian/po/sv.po
branches/ubuntu/debian/po/templates.pot
branches/ubuntu/debian/po/tr.po
branches/ubuntu/debian/rules
branches/ubuntu/debian/shell-lib.sh
branches/ubuntu/debian/xserver-xfree86.config.in
branches/ubuntu/debian/xserver-xfree86.postinst.in
branches/ubuntu/debian/xserver-xfree86.templates
Log:
Import 4.3.0.dfsg.1-6ubuntu10 release.
Modified: branches/ubuntu/debian/CHANGESETS
===================================================================
--- branches/ubuntu/debian/CHANGESETS 2004-10-30 05:30:06 UTC (rev 1985)
+++ branches/ubuntu/debian/CHANGESETS 2004-10-30 05:31:48 UTC (rev 1986)
@@ -14,7 +14,7 @@
Miscellaneous cosmetic fixes.
1607, 1608, 1624, 1626, 1627, 1636, 1651, 1654, 1663, 1664, 1675, 1685,
- 1690, 1713, 1715, 1716, 1718, 1736, 1737, 1743
+ 1690, 1713, 1715, 1716, 1718, 1736, 1737, 1743, 1761
Grab latest version of XTerm (#191) from Thomas Dickey's website.
1609
@@ -143,7 +143,7 @@
+ Reduce the build time by 20 to 30 percent when the "binary-arch" target
is used (ccache users might see even more improvement).
+ Make the buildd admins hate us less.
- 1658, 1659, 1661, 1670, 1671, 1679, 1681
+ 1658, 1659, 1661, 1670, 1671, 1679, 1681, 1756
Fix missing element of Debian X FAQ conversion to XHTML; correct
s390-specific version of xfree86-common dh_installdocs file to recognize
@@ -435,4 +435,62 @@
xserver-xfree86 (<< 4.3.0.dfsg.1-7)'!"
1746, 1747, 1748, 1749, 1750
+Rewrite migration of app-defaults (in libxt6) and xkb (in libx11-6)
+directories.
++ Enhance the shell libary with new functions:
+ - Implement check_symlink() and change check_symlinks_and_warn() and
+ check_symlinks_and_bomb() to use it.
+ - Implement make_symlink_sane(). Ensure that the specified symbolic
+ link symlink exists, and points to the specified target. If symlink
+ does not exist, create it and point it at target. If symlink exists
+ but is not a symbolic link, back it up. If symlink exists, is a
+ symbolic link, but points to the wrong location, fix it. If symlink
+ exists, is a symbolic link, and already points to target, do nothing.
+ This function wouldn't be needed if ln had an -I, --idempotent option.
+ - Implement migrate_dir_to_symlink(). Per Debian Policy section 6.5.4,
+ "A directory will never be replaced by a symbolic link to a directory
+ or vice versa; instead, the existing state (symlink or not) will be
+ left alone and dpkg will follow the symlink if there is one." We have
+ to do it ourselves. This function moves the contents of old_location,
+ a directory, into new_location, a directory, then makes old_location a
+ symbolic link to new_location. old_location need not exist, but if it
+ does, it must be a directory (or a symlink to a directory). If it is
+ not, it is backed up. If new_location exists already and is not a
+ directory, it is backed up.
++ Add config scripts for libx11-6 and libxt6, which detect if
+ /usr/X11R6/lib/X11/{app-defaults,xkb} is a directory but not a symlink,
+ and use debconf to prompt the user (at low priority) whether the
+ directories should be moved. If the user says no, abort the script. If
+ the user says yes (default), start the migration with
+ migrate_dir_to_symlink().
++ Update preinst scripts to use debconf as the configs script do; this is
+ unusual but necessary because if we're going to do the migration we need
+ to start before any other packages (which may use the old directories)
+ are unpacked.
++ In the preinst scripts, call check_symlink(), and if that fails, call
+ make_symlink_sane(). Stop calling check_symlinks_and_warn().
++ Update postinst scripts to indicate that migration is completed.
++ Update postrm scripts to run migration in reverse if it had been started
+ and the package installation or upgrade is aborted.
++ We keep shipping /etc/X11/{app-defaults,xkb} symlinks as part of the
+ package payloads, because manipulating them in the preinst isn't enough
+ -- dpkg will remove "disappearing" files from the system *after* the
+ preinst runs but before the postinst does, leaving a window for packages
+ using the legacy paths to unpack to the old location with no symlink to
+ redirect them, which is precisely what we don't want (see section 6.5 of
+ the Debian Policy Manual).
+ 1753, 1757, 1760, 1763
+
+* Add french and danish translation of "Generic Monitor" to
+ xserver-xfree86.config.in. Thanks to Christian Perrier and Anders Dybdal.
+ 1762
+
+* Add danish translation of "Generic Video Card" to
+ xserver-xfree86.config.in. Thanks to Anders Dybdal.
+ 1764
+
+* Fix validate_monitor_frequency_db_input() regexp to match for proper
+ values.
+ 1766
+
vim:set ai et sts=4 sw=4 tw=80:
Modified: branches/ubuntu/debian/changelog
===================================================================
--- branches/ubuntu/debian/changelog 2004-10-30 05:30:06 UTC (rev 1985)
+++ branches/ubuntu/debian/changelog 2004-10-30 05:31:48 UTC (rev 1986)
@@ -1,3 +1,14 @@
+xfree86 (4.3.0.dfsg.1-6ubuntu10) warty; urgency=low
+
+ * Resync changes with Debian r1766.
+ * Rewrote xserver-xfree86 postinst logic:
+ + Add dynamic template for resolution modes.
+ * Fix reconfigure and upgrade problem that was mangling X config file.
+ * Global debconf cleanup:
+ + reenable a few questions in reconfiguration mode that were lost.
+
+ -- Fabio M. Di Nitto <fabbione@fabbione.net> Fri, 27 Aug 2004 12:02:48 +0200
+
xfree86 (4.3.0.dfsg.1-6ubuntu9) warty; urgency=low
* Change mouse -> synaptic driver.
@@ -474,6 +485,34 @@
person, of *course* dpkg and apt accept 'Conflicts: (4.3.0.dfsg.1-4 <<)
xserver-xfree86 (<< 4.3.0.dfsg.1-7)'!"
+ Changes by Fabio M. Di Nitto and Branden Robinson:
+
+ * Support building only the parts of the source tree needed by
+ architecture-specific packages.
+ + Modify Debian Imake configuration to support building with fonts and
+ specs docs turned off (patch #003). Resynchronize GNU/Hurd,
+ GNU/FreeBSD, and GNU/NetBSD Imake configurations with Debian
+ configuration (patches #800, #820, #842, #900). Resync diffs in patches
+ #004, #099c, #600.
+ + Modify Imakefiles to build and install the font utilities even if the
+ fonts themselves are not being shipped (patch #095).
+ + Make the "build" target a dummy target, replacing it with
+ "build-arch-only" and "build-all" targets. Target-specific variable
+ values are used to invoke a "real-build" target, turning off the
+ building of fonts and "specs docs" as needed.
+ + Add comments to rules file, update $(stampdir_targets) and .PHONY
+ target.
+ + Split MANIFEST files into arch-specific and arch-independent parts.
+ Update the README to explain how these files work now and how to update
+ them.
+ + Ship the XTerm control sequences document only in the xspecs package.
+ Consequences:
+ + Reduce the disk space required to build the package by ~520MB when the
+ "binary-arch" target is used (e.g., by "dpkg-buildpackage -B".)
+ + Reduce the build time by 20 to 30 percent when the "binary-arch" target
+ is used (ccache users might see even more improvement).
+ + Make the buildd admins hate us less.
+
* Rewrite migration of app-defaults (in libxt6) and xkb (in libx11-6)
directories.
+ Enhance the shell libary with new functions:
@@ -519,34 +558,6 @@
redirect them, which is precisely what we don't want (see section 6.5 of
the Debian Policy Manual).
- Changes by Fabio M. Di Nitto and Branden Robinson:
-
- * Support building only the parts of the source tree needed by
- architecture-specific packages.
- + Modify Debian Imake configuration to support building with fonts and
- specs docs turned off (patch #003). Resynchronize GNU/Hurd,
- GNU/FreeBSD, and GNU/NetBSD Imake configurations with Debian
- configuration (patches #800, #820, #842, #900). Resync diffs in patches
- #004, #099c, #600.
- + Modify Imakefiles to build and install the font utilities even if the
- fonts themselves are not being shipped (patch #095).
- + Make the "build" target a dummy target, replacing it with
- "build-arch-only" and "build-all" targets. Target-specific variable
- values are used to invoke a "real-build" target, turning off the
- building of fonts and "specs docs" as needed.
- + Add comments to rules file, update $(stampdir_targets) and .PHONY
- target.
- + Split MANIFEST files into arch-specific and arch-independent parts.
- Update the README to explain how these files work now and how to update
- them.
- + Ship the XTerm control sequences document only in the xspecs package.
- Consequences:
- + Reduce the disk space required to build the package by ~520MB when the
- "binary-arch" target is used (e.g., by "dpkg-buildpackage -B".)
- + Reduce the build time by 20 to 30 percent when the "binary-arch" target
- is used (ccache users might see even more improvement).
- + Make the buildd admins hate us less.
-
Changes by Robert Millan:
* Get glxinfo to link properly with g++ (instead of adding -lstdc++).
@@ -560,6 +571,15 @@
autodetection would cause the script to think it had detected one X server
or XFree86 video driver instead ($(echo "" | wc -l) is "1", not "0").
+ * Add french and danish translation of "Generic Monitor" to
+ xserver-xfree86.config.in. Thanks to Christian Perrier and Anders Dybdal.
+
+ * Add danish translation of "Generic Video Card" to
+ xserver-xfree86.config.in. Thanks to Anders Dybdal.
+
+ * Fix validate_monitor_frequency_db_input() regexp to match for proper
+ values.
+
-- Branden Robinson <branden@debian.org> Wed, 25 Aug 2004 11:41:15 -0500
xfree86 (4.3.0.dfsg.1-6) unstable; urgency=low
Modified: branches/ubuntu/debian/control
===================================================================
--- branches/ubuntu/debian/control 2004-10-30 05:30:06 UTC (rev 1985)
+++ branches/ubuntu/debian/control 2004-10-30 05:31:48 UTC (rev 1986)
@@ -1599,7 +1599,7 @@
Package: xserver-xfree86
Architecture: alpha amd64 arm hppa hurd-i386 i386 ia64 m68k mips mipsel netbsd-i386 powerpc sh3 sh4 sparc
-Depends: xserver-common (>= 4.3.0.dfsg.1-6ubuntu8), ${shlibs:Depends}, ${misc:Depends}
+Depends: xserver-common (>= ${Source-Version}), ${shlibs:Depends}, ${misc:Depends}
Suggests: discover, mdetect, xresprobe, libglide2 (>> 2001.01.26), laptop-detect
Conflicts: libxfont-xtt
Replaces: xserver-common (<< 4.0), libxfont-xtt
@@ -1633,7 +1633,7 @@
Package: xserver-xfree86-dbg
Priority: extra
Architecture: alpha amd64 arm hppa hurd-i386 i386 ia64 m68k mips mipsel netbsd-i386 powerpc sh3 sh4 sparc
-Depends: xserver-common (>= 4.3.0.dfsg.1-6ubuntu8), ${shlibs:Depends}, ${misc:Depends}
+Depends: xserver-common (>= ${Source-Version}), ${shlibs:Depends}, ${misc:Depends}
Recommends: xserver-xfree86
Suggests: discover, mdetect, xresprobe, laptop-detect
Conflicts: libxfont-xtt
Modified: branches/ubuntu/debian/libx11-6.preinst.in
===================================================================
--- branches/ubuntu/debian/libx11-6.preinst.in 2004-10-30 05:30:06 UTC (rev 1985)
+++ branches/ubuntu/debian/libx11-6.preinst.in 2004-10-30 05:31:48 UTC (rev 1986)
@@ -18,41 +18,38 @@
#INCLUDE_SHELL_LIB#
if [ "$1" = "install" ] || [ "$1" = "upgrade" ]; then
- # If there is no $2, this is a fresh install.
- if [ -n "$2" ]; then
- # xkb directory moved in 4.0
- MIGRATION_FILE=/var/run/libx11-6.xkb.migration
- DIR=/usr/X11R6/lib/X11/xkb
- if [ -d "$DIR" ] && [ ! -L "$DIR" ]; then
- # We do this debconf stuff in the preinst, not the postinst, because the
- # migration needs to happen *before* other packages are unpacked.
- # The question may not have been seen yet if this package wasn't
- # pre-configured. If not, we must ask now.
- run db_metaget libx11-6/migrate_xkb_dir seen
- if [ "$RET" != "true" ]; then
- run db_input low libx11-6/migrate_xkb_dir
- run db_go
- fi
- if db_get libx11-6/migrate_xkb_dir; then
- if [ "$RET" = "true" ]; then
- if migrate_dir_to_symlink "$DIR" "$(maplink "$DIR")"; then
- >"$MIGRATION_FILE"
- else
- die "failed to migrate $DIR to $(maplink "$DIR")"
- fi
+ # xkb directory moved in 4.0
+ MIGRATION_FILE=/var/run/libx11-6.xkb.migration
+ DIR=/usr/X11R6/lib/X11/xkb
+ if [ -d "$DIR" ] && [ ! -L "$DIR" ]; then
+ # We do this debconf stuff in the preinst, not the postinst, because the
+ # migration needs to happen *before* other packages are unpacked.
+ # The question may not have been seen yet if this package wasn't
+ # pre-configured. If not, we must ask now.
+ run db_metaget libx11-6/migrate_xkb_dir seen
+ if [ "$RET" != "true" ]; then
+ run db_input low libx11-6/migrate_xkb_dir
+ run db_go
+ fi
+ if db_get libx11-6/migrate_xkb_dir; then
+ if [ "$RET" = "true" ]; then
+ if migrate_dir_to_symlink "$DIR" "$(maplink "$DIR")"; then
+ >"$MIGRATION_FILE"
else
- die "aborting at user request"
+ die "failed to migrate $DIR to $(maplink "$DIR")"
fi
else
- internal_error "failure using db_get to retrieve" \
- "libx11-6/migrate_xkb_dir"
+ die "aborting at user request"
fi
+ else
+ internal_error "failure using db_get to retrieve" \
+ "libx11-6/migrate_xkb_dir"
fi
- # Ensure the app-defaults directory is in the correct place.
- if ! check_symlink "$DIR"; then
- make_symlink_sane "$DIR" "$(maplink "$DIR")"
- fi
fi
+ # Ensure the app-defaults directory is in the correct place.
+ if ! check_symlink "$DIR"; then
+ make_symlink_sane "$DIR" "$(maplink "$DIR")"
+ fi
fi
#DEBHELPER#
Modified: branches/ubuntu/debian/libxt6.preinst.in
===================================================================
--- branches/ubuntu/debian/libxt6.preinst.in 2004-10-30 05:30:06 UTC (rev 1985)
+++ branches/ubuntu/debian/libxt6.preinst.in 2004-10-30 05:31:48 UTC (rev 1986)
@@ -18,41 +18,38 @@
#INCLUDE_SHELL_LIB#
if [ "$1" = "install" ] || [ "$1" = "upgrade" ]; then
- # If there is no $2, this is a fresh install.
- if [ -n "$2" ]; then
- # app-defaults directory moved in 4.0
- MIGRATION_FILE=/var/run/libxt6.app-defaults.migration
- DIR=/usr/X11R6/lib/X11/app-defaults
- if [ -d "$DIR" ] && [ ! -L "$DIR" ]; then
- # We do this debconf stuff in the preinst, not the postinst, because the
- # migration needs to happen *before* other packages are unpacked.
- # The question may not have been seen yet if this package wasn't
- # pre-configured. If not, we must ask now.
- run db_metaget libxt6/migrate_app_defaults_dir seen
- if [ "$RET" != "true" ]; then
- run db_input low libxt6/migrate_app_defaults_dir
- run db_go
- fi
- if db_get libxt6/migrate_app_defaults_dir; then
- if [ "$RET" = "true" ]; then
- if migrate_dir_to_symlink "$DIR" "$(maplink "$DIR")"; then
- >"$MIGRATION_FILE"
- else
- die "failed to migrate $DIR to $(maplink "$DIR")"
- fi
+ # app-defaults directory moved in 4.0
+ MIGRATION_FILE=/var/run/libxt6.app-defaults.migration
+ DIR=/usr/X11R6/lib/X11/app-defaults
+ if [ -d "$DIR" ] && [ ! -L "$DIR" ]; then
+ # We do this debconf stuff in the preinst, not the postinst, because the
+ # migration needs to happen *before* other packages are unpacked.
+ # The question may not have been seen yet if this package wasn't
+ # pre-configured. If not, we must ask now.
+ run db_metaget libxt6/migrate_app_defaults_dir seen
+ if [ "$RET" != "true" ]; then
+ run db_input low libxt6/migrate_app_defaults_dir
+ run db_go
+ fi
+ if db_get libxt6/migrate_app_defaults_dir; then
+ if [ "$RET" = "true" ]; then
+ if migrate_dir_to_symlink "$DIR" "$(maplink "$DIR")"; then
+ >"$MIGRATION_FILE"
else
- die "aborting at user request"
+ die "failed to migrate $DIR to $(maplink "$DIR")"
fi
else
- internal_error "failure using db_get to retrieve" \
- "libxt6/migrate_app_defaults_dir"
+ die "aborting at user request"
fi
+ else
+ internal_error "failure using db_get to retrieve" \
+ "libxt6/migrate_app_defaults_dir"
fi
- # Ensure the app-defaults directory is in the correct place.
- if ! check_symlink "$DIR"; then
- make_symlink_sane "$DIR" "$(maplink "$DIR")"
- fi
fi
+ # Ensure the app-defaults directory is in the correct place.
+ if ! check_symlink "$DIR"; then
+ make_symlink_sane "$DIR" "$(maplink "$DIR")"
+ fi
fi
#DEBHELPER#
Modified: branches/ubuntu/debian/po/POTFILES.in
===================================================================
--- branches/ubuntu/debian/po/POTFILES.in 2004-10-30 05:30:06 UTC (rev 1985)
+++ branches/ubuntu/debian/po/POTFILES.in 2004-10-30 05:31:48 UTC (rev 1986)
@@ -1,3 +1,5 @@
+[type: gettext/rfc822deb] libx11-6.templates
+[type: gettext/rfc822deb] libxt6.templates
[type: gettext/rfc822deb] xdm.templates
[type: gettext/rfc822deb] xfree86-common.templates
[type: gettext/rfc822deb] xserver-common.templates
Modified: branches/ubuntu/debian/po/ca.po
===================================================================
--- branches/ubuntu/debian/po/ca.po 2004-10-30 05:30:06 UTC (rev 1985)
+++ branches/ubuntu/debian/po/ca.po 2004-10-30 05:31:48 UTC (rev 1986)
@@ -26,7 +26,7 @@
msgstr ""
"Project-Id-Version: xfree86 4.3.0.dfsg.1-5\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2004-07-31 11:50+0000\n"
+"POT-Creation-Date: 2004-08-30 11:49+0000\n"
"PO-Revision-Date: 2004-06-09 20:08+0200\n"
"Last-Translator: Ivan Vilata i Balaguer <ivan@selidor.net>\n"
"Language-Team: Catalan <debian-l10n-catalan@lists.debian.org>\n"
@@ -34,6 +34,66 @@
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
+#. Type: boolean
+#. Description
+#: ../libx11-6.templates:4
+msgid "Migrate XKB configuration directory?"
+msgstr ""
+
+#. Type: boolean
+#. Description
+#: ../libx11-6.templates:4
+msgid ""
+"The directory where configuration information (including keyboard data) for "
+"the X KEYBOARD Extension (XKB) is stored has been changed from /usr/X11R6/"
+"lib/X11/xkb to /etc/X11/xkb."
+msgstr ""
+
+#. Type: boolean
+#. Description
+#: ../libx11-6.templates:4 ../libxt6.templates:4
+msgid ""
+"Your system is using the old location, and some programs, such as those from "
+"old or unofficial Debian packages, may continue to install files there."
+msgstr ""
+
+#. Type: boolean
+#. Description
+#: ../libx11-6.templates:4
+msgid ""
+"Would you like the XKB configuration files on the system to be automatically "
+"migrated from the old location to the new one? Any existing files in the "
+"new location that have the same name will be backed up and replaced by the "
+"files from the old location. A symbolic link from the old location to the "
+"new one will be created to prevent legacy applications from breaking."
+msgstr ""
+
+#. Type: boolean
+#. Description
+#: ../libxt6.templates:4
+msgid "Migrate Xt application defaults directory?"
+msgstr ""
+
+#. Type: boolean
+#. Description
+#: ../libxt6.templates:4
+msgid ""
+"The directory where application defaults for X Window System client programs "
+"based on the X Toolkit Intrinsics (Xt) are stored has been changed from /usr/"
+"X11R6/lib/X11/app-defaults to /etc/X11/app-defaults."
+msgstr ""
+
+#. Type: boolean
+#. Description
+#: ../libxt6.templates:4
+msgid ""
+"Would you like the app-defaults files on the system to be automatically "
+"migrated from the old location to the new one? Any existing files in the "
+"new location that have the same name will be backed up and replaced by the "
+"files from the old location. A symbolic link from the old location to the "
+"new one will be created to prevent legacy applications from breaking."
+msgstr ""
+
#. Type: select
#. Description
#: ../xdm.templates:4
Modified: branches/ubuntu/debian/po/cs.po
===================================================================
--- branches/ubuntu/debian/po/cs.po 2004-10-30 05:30:06 UTC (rev 1985)
+++ branches/ubuntu/debian/po/cs.po 2004-10-30 05:31:48 UTC (rev 1986)
@@ -26,7 +26,7 @@
msgstr ""
"Project-Id-Version: xfree86\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2004-07-31 11:50+0000\n"
+"POT-Creation-Date: 2004-08-30 11:49+0000\n"
"PO-Revision-Date: 2004-05-29 17:03+0200\n"
"Last-Translator: Miroslav Kure <kurem@debian.cz>\n"
"Language-Team: Czech <provoz@debian.cz>\n"
@@ -34,6 +34,66 @@
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
+#. Type: boolean
+#. Description
+#: ../libx11-6.templates:4
+msgid "Migrate XKB configuration directory?"
+msgstr ""
+
+#. Type: boolean
+#. Description
+#: ../libx11-6.templates:4
+msgid ""
+"The directory where configuration information (including keyboard data) for "
+"the X KEYBOARD Extension (XKB) is stored has been changed from /usr/X11R6/"
+"lib/X11/xkb to /etc/X11/xkb."
+msgstr ""
+
+#. Type: boolean
+#. Description
+#: ../libx11-6.templates:4 ../libxt6.templates:4
+msgid ""
+"Your system is using the old location, and some programs, such as those from "
+"old or unofficial Debian packages, may continue to install files there."
+msgstr ""
+
+#. Type: boolean
+#. Description
+#: ../libx11-6.templates:4
+msgid ""
+"Would you like the XKB configuration files on the system to be automatically "
+"migrated from the old location to the new one? Any existing files in the "
+"new location that have the same name will be backed up and replaced by the "
+"files from the old location. A symbolic link from the old location to the "
+"new one will be created to prevent legacy applications from breaking."
+msgstr ""
+
+#. Type: boolean
+#. Description
+#: ../libxt6.templates:4
+msgid "Migrate Xt application defaults directory?"
+msgstr ""
+
+#. Type: boolean
+#. Description
+#: ../libxt6.templates:4
+msgid ""
+"The directory where application defaults for X Window System client programs "
+"based on the X Toolkit Intrinsics (Xt) are stored has been changed from /usr/"
+"X11R6/lib/X11/app-defaults to /etc/X11/app-defaults."
+msgstr ""
+
+#. Type: boolean
+#. Description
+#: ../libxt6.templates:4
+msgid ""
+"Would you like the app-defaults files on the system to be automatically "
+"migrated from the old location to the new one? Any existing files in the "
+"new location that have the same name will be backed up and replaced by the "
+"files from the old location. A symbolic link from the old location to the "
+"new one will be created to prevent legacy applications from breaking."
+msgstr ""
+
#. Type: select
#. Description
#: ../xdm.templates:4
Modified: branches/ubuntu/debian/po/da.po
===================================================================
--- branches/ubuntu/debian/po/da.po 2004-10-30 05:30:06 UTC (rev 1985)
+++ branches/ubuntu/debian/po/da.po 2004-10-30 05:31:48 UTC (rev 1986)
@@ -28,7 +28,7 @@
msgstr ""
"Project-Id-Version: xfree86_4.3.0-3_da\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2004-07-31 11:50+0000\n"
+"POT-Creation-Date: 2004-08-30 11:49+0000\n"
"PO-Revision-Date: 2004-03-02 21:22+0100\n"
"Last-Translator: Claus Hindsgaul <claus_h@image.dk>\n"
"Language-Team: Danish <dansk@klid.dk>\n"
@@ -37,6 +37,66 @@
"Content-Transfer-Encoding: 8bit\n"
"X-Generator: KBabel 1.0.2\n"
+#. Type: boolean
+#. Description
+#: ../libx11-6.templates:4
+msgid "Migrate XKB configuration directory?"
+msgstr ""
+
+#. Type: boolean
+#. Description
+#: ../libx11-6.templates:4
+msgid ""
+"The directory where configuration information (including keyboard data) for "
+"the X KEYBOARD Extension (XKB) is stored has been changed from /usr/X11R6/"
+"lib/X11/xkb to /etc/X11/xkb."
+msgstr ""
+
+#. Type: boolean
+#. Description
+#: ../libx11-6.templates:4 ../libxt6.templates:4
+msgid ""
+"Your system is using the old location, and some programs, such as those from "
+"old or unofficial Debian packages, may continue to install files there."
+msgstr ""
+
+#. Type: boolean
+#. Description
+#: ../libx11-6.templates:4
+msgid ""
+"Would you like the XKB configuration files on the system to be automatically "
+"migrated from the old location to the new one? Any existing files in the "
+"new location that have the same name will be backed up and replaced by the "
+"files from the old location. A symbolic link from the old location to the "
+"new one will be created to prevent legacy applications from breaking."
+msgstr ""
+
+#. Type: boolean
+#. Description
+#: ../libxt6.templates:4
+msgid "Migrate Xt application defaults directory?"
+msgstr ""
+
+#. Type: boolean
+#. Description
+#: ../libxt6.templates:4
+msgid ""
+"The directory where application defaults for X Window System client programs "
+"based on the X Toolkit Intrinsics (Xt) are stored has been changed from /usr/"
+"X11R6/lib/X11/app-defaults to /etc/X11/app-defaults."
+msgstr ""
+
+#. Type: boolean
+#. Description
+#: ../libxt6.templates:4
+msgid ""
+"Would you like the app-defaults files on the system to be automatically "
+"migrated from the old location to the new one? Any existing files in the "
+"new location that have the same name will be backed up and replaced by the "
+"files from the old location. A symbolic link from the old location to the "
+"new one will be created to prevent legacy applications from breaking."
+msgstr ""
+
#. Type: select
#. Description
#: ../xdm.templates:4
Modified: branches/ubuntu/debian/po/de.po
===================================================================
--- branches/ubuntu/debian/po/de.po 2004-10-30 05:30:06 UTC (rev 1985)
+++ branches/ubuntu/debian/po/de.po 2004-10-30 05:31:48 UTC (rev 1986)
@@ -34,7 +34,7 @@
msgstr ""
"Project-Id-Version: de\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2004-07-31 11:50+0000\n"
+"POT-Creation-Date: 2004-08-30 11:49+0000\n"
"PO-Revision-Date: 2004-07-24 15:03+0200\n"
"Last-Translator: Alwin Meschede <ameschede@gmx.de>\n"
"Language-Team: <gnome-de@gnome.org>\n"
@@ -43,6 +43,66 @@
"Content-Transfer-Encoding: 8bit\n"
"X-Generator: KBabel 1.0.2\n"
+#. Type: boolean
+#. Description
+#: ../libx11-6.templates:4
+msgid "Migrate XKB configuration directory?"
+msgstr ""
+
+#. Type: boolean
+#. Description
+#: ../libx11-6.templates:4
+msgid ""
+"The directory where configuration information (including keyboard data) for "
+"the X KEYBOARD Extension (XKB) is stored has been changed from /usr/X11R6/"
+"lib/X11/xkb to /etc/X11/xkb."
+msgstr ""
+
+#. Type: boolean
+#. Description
+#: ../libx11-6.templates:4 ../libxt6.templates:4
+msgid ""
+"Your system is using the old location, and some programs, such as those from "
+"old or unofficial Debian packages, may continue to install files there."
+msgstr ""
+
+#. Type: boolean
+#. Description
+#: ../libx11-6.templates:4
+msgid ""
+"Would you like the XKB configuration files on the system to be automatically "
+"migrated from the old location to the new one? Any existing files in the "
+"new location that have the same name will be backed up and replaced by the "
+"files from the old location. A symbolic link from the old location to the "
+"new one will be created to prevent legacy applications from breaking."
+msgstr ""
+
+#. Type: boolean
+#. Description
+#: ../libxt6.templates:4
+msgid "Migrate Xt application defaults directory?"
+msgstr ""
+
+#. Type: boolean
+#. Description
+#: ../libxt6.templates:4
+msgid ""
+"The directory where application defaults for X Window System client programs "
+"based on the X Toolkit Intrinsics (Xt) are stored has been changed from /usr/"
+"X11R6/lib/X11/app-defaults to /etc/X11/app-defaults."
+msgstr ""
+
+#. Type: boolean
+#. Description
+#: ../libxt6.templates:4
+msgid ""
+"Would you like the app-defaults files on the system to be automatically "
+"migrated from the old location to the new one? Any existing files in the "
+"new location that have the same name will be backed up and replaced by the "
+"files from the old location. A symbolic link from the old location to the "
+"new one will be created to prevent legacy applications from breaking."
+msgstr ""
+
#. Type: select
#. Description
#: ../xdm.templates:4
Modified: branches/ubuntu/debian/po/el.po
===================================================================
--- branches/ubuntu/debian/po/el.po 2004-10-30 05:30:06 UTC (rev 1985)
+++ branches/ubuntu/debian/po/el.po 2004-10-30 05:31:48 UTC (rev 1986)
@@ -26,7 +26,7 @@
msgstr ""
"Project-Id-Version: el\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2004-07-31 11:50+0000\n"
+"POT-Creation-Date: 2004-08-30 11:49+0000\n"
"PO-Revision-Date: 2004-05-27 21:10EEST\n"
"Last-Translator: Konstantinos Margaritis <markos@debian.org>\n"
"Language-Team: Greek <debian-l10n-greek@lists.debian.org>\n"
@@ -35,6 +35,66 @@
"Content-Transfer-Encoding: 8bit\n"
"X-Generator: KBabel 1.3.1\n"
+#. Type: boolean
+#. Description
+#: ../libx11-6.templates:4
+msgid "Migrate XKB configuration directory?"
+msgstr ""
+
+#. Type: boolean
+#. Description
+#: ../libx11-6.templates:4
+msgid ""
+"The directory where configuration information (including keyboard data) for "
+"the X KEYBOARD Extension (XKB) is stored has been changed from /usr/X11R6/"
+"lib/X11/xkb to /etc/X11/xkb."
+msgstr ""
+
+#. Type: boolean
+#. Description
+#: ../libx11-6.templates:4 ../libxt6.templates:4
+msgid ""
+"Your system is using the old location, and some programs, such as those from "
+"old or unofficial Debian packages, may continue to install files there."
+msgstr ""
+
+#. Type: boolean
+#. Description
+#: ../libx11-6.templates:4
+msgid ""
+"Would you like the XKB configuration files on the system to be automatically "
+"migrated from the old location to the new one? Any existing files in the "
+"new location that have the same name will be backed up and replaced by the "
+"files from the old location. A symbolic link from the old location to the "
+"new one will be created to prevent legacy applications from breaking."
+msgstr ""
+
+#. Type: boolean
+#. Description
+#: ../libxt6.templates:4
+msgid "Migrate Xt application defaults directory?"
+msgstr ""
+
+#. Type: boolean
+#. Description
+#: ../libxt6.templates:4
+msgid ""
+"The directory where application defaults for X Window System client programs "
+"based on the X Toolkit Intrinsics (Xt) are stored has been changed from /usr/"
+"X11R6/lib/X11/app-defaults to /etc/X11/app-defaults."
+msgstr ""
+
+#. Type: boolean
+#. Description
+#: ../libxt6.templates:4
+msgid ""
+"Would you like the app-defaults files on the system to be automatically "
+"migrated from the old location to the new one? Any existing files in the "
+"new location that have the same name will be backed up and replaced by the "
+"files from the old location. A symbolic link from the old location to the "
+"new one will be created to prevent legacy applications from breaking."
+msgstr ""
+
#. Type: select
#. Description
#: ../xdm.templates:4
Modified: branches/ubuntu/debian/po/es.po
===================================================================
--- branches/ubuntu/debian/po/es.po 2004-10-30 05:30:06 UTC (rev 1985)
+++ branches/ubuntu/debian/po/es.po 2004-10-30 05:31:48 UTC (rev 1986)
@@ -28,7 +28,7 @@
msgstr ""
"Project-Id-Version: xfree86 4.2.1-6\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2004-07-31 11:50+0000\n"
+"POT-Creation-Date: 2004-08-30 11:49+0000\n"
"PO-Revision-Date: 2003-03-24 20:21+0100\n"
"Last-Translator: Javier Fernandez-Sanguino Pe�jfs@debian.org>\n"
"Language-Team: ES <debian-l10n-spanish@lists.debian.org>\n"
@@ -36,6 +36,66 @@
"Content-Type: text/plain; charset=ISO-8859-15\n"
"Content-Transfer-Encoding: 8bit\n"
+#. Type: boolean
+#. Description
+#: ../libx11-6.templates:4
+msgid "Migrate XKB configuration directory?"
+msgstr ""
+
+#. Type: boolean
+#. Description
+#: ../libx11-6.templates:4
+msgid ""
+"The directory where configuration information (including keyboard data) for "
+"the X KEYBOARD Extension (XKB) is stored has been changed from /usr/X11R6/"
+"lib/X11/xkb to /etc/X11/xkb."
+msgstr ""
+
+#. Type: boolean
+#. Description
+#: ../libx11-6.templates:4 ../libxt6.templates:4
+msgid ""
+"Your system is using the old location, and some programs, such as those from "
+"old or unofficial Debian packages, may continue to install files there."
+msgstr ""
+
+#. Type: boolean
+#. Description
+#: ../libx11-6.templates:4
+msgid ""
+"Would you like the XKB configuration files on the system to be automatically "
+"migrated from the old location to the new one? Any existing files in the "
+"new location that have the same name will be backed up and replaced by the "
+"files from the old location. A symbolic link from the old location to the "
+"new one will be created to prevent legacy applications from breaking."
+msgstr ""
+
+#. Type: boolean
+#. Description
+#: ../libxt6.templates:4
+msgid "Migrate Xt application defaults directory?"
+msgstr ""
+
+#. Type: boolean
+#. Description
+#: ../libxt6.templates:4
+msgid ""
+"The directory where application defaults for X Window System client programs "
+"based on the X Toolkit Intrinsics (Xt) are stored has been changed from /usr/"
+"X11R6/lib/X11/app-defaults to /etc/X11/app-defaults."
+msgstr ""
+
+#. Type: boolean
+#. Description
+#: ../libxt6.templates:4
+msgid ""
+"Would you like the app-defaults files on the system to be automatically "
+"migrated from the old location to the new one? Any existing files in the "
+"new location that have the same name will be backed up and replaced by the "
+"files from the old location. A symbolic link from the old location to the "
+"new one will be created to prevent legacy applications from breaking."
+msgstr ""
+
#. Type: select
#. Description
#: ../xdm.templates:4
Modified: branches/ubuntu/debian/po/fr.po
===================================================================
--- branches/ubuntu/debian/po/fr.po 2004-10-30 05:30:06 UTC (rev 1985)
+++ branches/ubuntu/debian/po/fr.po 2004-10-30 05:31:48 UTC (rev 1986)
@@ -31,7 +31,7 @@
msgstr ""
"Project-Id-Version: xfree86 4.2.1-10\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2004-07-31 11:50+0000\n"
+"POT-Creation-Date: 2004-08-30 11:49+0000\n"
"PO-Revision-Date: 2004-06-21 08:55+0200\n"
"Last-Translator: Christian Perrier <bubulle@debian.org>\n"
"Language-Team: French <debian-l10n-french@lists.debian.org>\n"
@@ -42,6 +42,66 @@
"Plural-Forms: Plural-Forms: nplurals=2; plural=n>1;\n"
"\n"
+#. Type: boolean
+#. Description
+#: ../libx11-6.templates:4
+msgid "Migrate XKB configuration directory?"
+msgstr ""
+
+#. Type: boolean
+#. Description
+#: ../libx11-6.templates:4
+msgid ""
+"The directory where configuration information (including keyboard data) for "
+"the X KEYBOARD Extension (XKB) is stored has been changed from /usr/X11R6/"
+"lib/X11/xkb to /etc/X11/xkb."
+msgstr ""
+
+#. Type: boolean
+#. Description
+#: ../libx11-6.templates:4 ../libxt6.templates:4
+msgid ""
+"Your system is using the old location, and some programs, such as those from "
+"old or unofficial Debian packages, may continue to install files there."
+msgstr ""
+
+#. Type: boolean
+#. Description
+#: ../libx11-6.templates:4
+msgid ""
+"Would you like the XKB configuration files on the system to be automatically "
+"migrated from the old location to the new one? Any existing files in the "
+"new location that have the same name will be backed up and replaced by the "
+"files from the old location. A symbolic link from the old location to the "
+"new one will be created to prevent legacy applications from breaking."
+msgstr ""
+
+#. Type: boolean
+#. Description
+#: ../libxt6.templates:4
+msgid "Migrate Xt application defaults directory?"
+msgstr ""
+
+#. Type: boolean
+#. Description
+#: ../libxt6.templates:4
+msgid ""
+"The directory where application defaults for X Window System client programs "
+"based on the X Toolkit Intrinsics (Xt) are stored has been changed from /usr/"
+"X11R6/lib/X11/app-defaults to /etc/X11/app-defaults."
+msgstr ""
+
+#. Type: boolean
+#. Description
+#: ../libxt6.templates:4
+msgid ""
+"Would you like the app-defaults files on the system to be automatically "
+"migrated from the old location to the new one? Any existing files in the "
+"new location that have the same name will be backed up and replaced by the "
+"files from the old location. A symbolic link from the old location to the "
+"new one will be created to prevent legacy applications from breaking."
+msgstr ""
+
#. Type: select
#. Description
#: ../xdm.templates:4
Modified: branches/ubuntu/debian/po/gl.po
===================================================================
--- branches/ubuntu/debian/po/gl.po 2004-10-30 05:30:06 UTC (rev 1985)
+++ branches/ubuntu/debian/po/gl.po 2004-10-30 05:31:48 UTC (rev 1986)
@@ -26,7 +26,7 @@
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2004-07-31 11:50+0000\n"
+"POT-Creation-Date: 2004-08-30 11:49+0000\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
@@ -34,6 +34,66 @@
"Content-Type: text/plain; charset=ISO-8859-15\n"
"Content-Transfer-Encoding: 8bit\n"
+#. Type: boolean
+#. Description
+#: ../libx11-6.templates:4
+msgid "Migrate XKB configuration directory?"
+msgstr ""
+
+#. Type: boolean
+#. Description
+#: ../libx11-6.templates:4
+msgid ""
+"The directory where configuration information (including keyboard data) for "
+"the X KEYBOARD Extension (XKB) is stored has been changed from /usr/X11R6/"
+"lib/X11/xkb to /etc/X11/xkb."
+msgstr ""
+
+#. Type: boolean
+#. Description
+#: ../libx11-6.templates:4 ../libxt6.templates:4
+msgid ""
+"Your system is using the old location, and some programs, such as those from "
+"old or unofficial Debian packages, may continue to install files there."
+msgstr ""
+
+#. Type: boolean
+#. Description
+#: ../libx11-6.templates:4
+msgid ""
+"Would you like the XKB configuration files on the system to be automatically "
+"migrated from the old location to the new one? Any existing files in the "
+"new location that have the same name will be backed up and replaced by the "
+"files from the old location. A symbolic link from the old location to the "
+"new one will be created to prevent legacy applications from breaking."
+msgstr ""
+
+#. Type: boolean
+#. Description
+#: ../libxt6.templates:4
+msgid "Migrate Xt application defaults directory?"
+msgstr ""
+
+#. Type: boolean
+#. Description
+#: ../libxt6.templates:4
+msgid ""
+"The directory where application defaults for X Window System client programs "
+"based on the X Toolkit Intrinsics (Xt) are stored has been changed from /usr/"
+"X11R6/lib/X11/app-defaults to /etc/X11/app-defaults."
+msgstr ""
+
+#. Type: boolean
+#. Description
+#: ../libxt6.templates:4
+msgid ""
+"Would you like the app-defaults files on the system to be automatically "
+"migrated from the old location to the new one? Any existing files in the "
+"new location that have the same name will be backed up and replaced by the "
+"files from the old location. A symbolic link from the old location to the "
+"new one will be created to prevent legacy applications from breaking."
+msgstr ""
+
#. Type: select
#. Description
#: ../xdm.templates:4
Modified: branches/ubuntu/debian/po/it.po
===================================================================
--- branches/ubuntu/debian/po/it.po 2004-10-30 05:30:06 UTC (rev 1985)
+++ branches/ubuntu/debian/po/it.po 2004-10-30 05:31:48 UTC (rev 1986)
@@ -27,7 +27,7 @@
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2004-07-31 11:50+0000\n"
+"POT-Creation-Date: 2004-08-30 11:49+0000\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
@@ -35,6 +35,66 @@
"Content-Type: text/plain; charset=ISO-8859-15\n"
"Content-Transfer-Encoding: 8bit\n"
+#. Type: boolean
+#. Description
+#: ../libx11-6.templates:4
+msgid "Migrate XKB configuration directory?"
+msgstr ""
+
+#. Type: boolean
+#. Description
+#: ../libx11-6.templates:4
+msgid ""
+"The directory where configuration information (including keyboard data) for "
+"the X KEYBOARD Extension (XKB) is stored has been changed from /usr/X11R6/"
+"lib/X11/xkb to /etc/X11/xkb."
+msgstr ""
+
+#. Type: boolean
+#. Description
+#: ../libx11-6.templates:4 ../libxt6.templates:4
+msgid ""
+"Your system is using the old location, and some programs, such as those from "
+"old or unofficial Debian packages, may continue to install files there."
+msgstr ""
+
+#. Type: boolean
+#. Description
+#: ../libx11-6.templates:4
+msgid ""
+"Would you like the XKB configuration files on the system to be automatically "
+"migrated from the old location to the new one? Any existing files in the "
+"new location that have the same name will be backed up and replaced by the "
+"files from the old location. A symbolic link from the old location to the "
+"new one will be created to prevent legacy applications from breaking."
+msgstr ""
+
+#. Type: boolean
+#. Description
+#: ../libxt6.templates:4
+msgid "Migrate Xt application defaults directory?"
+msgstr ""
+
+#. Type: boolean
+#. Description
+#: ../libxt6.templates:4
+msgid ""
+"The directory where application defaults for X Window System client programs "
+"based on the X Toolkit Intrinsics (Xt) are stored has been changed from /usr/"
+"X11R6/lib/X11/app-defaults to /etc/X11/app-defaults."
+msgstr ""
+
+#. Type: boolean
+#. Description
+#: ../libxt6.templates:4
+msgid ""
+"Would you like the app-defaults files on the system to be automatically "
+"migrated from the old location to the new one? Any existing files in the "
+"new location that have the same name will be backed up and replaced by the "
+"files from the old location. A symbolic link from the old location to the "
+"new one will be created to prevent legacy applications from breaking."
+msgstr ""
+
#. Type: select
#. Description
#: ../xdm.templates:4
Modified: branches/ubuntu/debian/po/ja.po
===================================================================
--- branches/ubuntu/debian/po/ja.po 2004-10-30 05:30:06 UTC (rev 1985)
+++ branches/ubuntu/debian/po/ja.po 2004-10-30 05:31:48 UTC (rev 1986)
@@ -29,7 +29,7 @@
msgstr ""
"Project-Id-Version: xfree86 4.3.0\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2004-07-31 11:50+0000\n"
+"POT-Creation-Date: 2004-08-30 11:49+0000\n"
"PO-Revision-Date: 2004-06-25 09:21+0900\n"
"Last-Translator: Kenshi Muto <kmuto@debian.org> and ISHIKAWA Mutsumi "
"<ishikawa@debian.org>\n"
@@ -38,6 +38,66 @@
"Content-Type: text/plain; charset=EUC-JP\n"
"Content-Transfer-Encoding: 8bit\n"
+#. Type: boolean
+#. Description
+#: ../libx11-6.templates:4
+msgid "Migrate XKB configuration directory?"
+msgstr ""
+
+#. Type: boolean
+#. Description
+#: ../libx11-6.templates:4
+msgid ""
+"The directory where configuration information (including keyboard data) for "
+"the X KEYBOARD Extension (XKB) is stored has been changed from /usr/X11R6/"
+"lib/X11/xkb to /etc/X11/xkb."
+msgstr ""
+
+#. Type: boolean
+#. Description
+#: ../libx11-6.templates:4 ../libxt6.templates:4
+msgid ""
+"Your system is using the old location, and some programs, such as those from "
+"old or unofficial Debian packages, may continue to install files there."
+msgstr ""
+
+#. Type: boolean
+#. Description
+#: ../libx11-6.templates:4
+msgid ""
+"Would you like the XKB configuration files on the system to be automatically "
+"migrated from the old location to the new one? Any existing files in the "
+"new location that have the same name will be backed up and replaced by the "
+"files from the old location. A symbolic link from the old location to the "
+"new one will be created to prevent legacy applications from breaking."
+msgstr ""
+
+#. Type: boolean
+#. Description
+#: ../libxt6.templates:4
+msgid "Migrate Xt application defaults directory?"
+msgstr ""
+
+#. Type: boolean
+#. Description
+#: ../libxt6.templates:4
+msgid ""
+"The directory where application defaults for X Window System client programs "
+"based on the X Toolkit Intrinsics (Xt) are stored has been changed from /usr/"
+"X11R6/lib/X11/app-defaults to /etc/X11/app-defaults."
+msgstr ""
+
+#. Type: boolean
+#. Description
+#: ../libxt6.templates:4
+msgid ""
+"Would you like the app-defaults files on the system to be automatically "
+"migrated from the old location to the new one? Any existing files in the "
+"new location that have the same name will be backed up and replaced by the "
+"files from the old location. A symbolic link from the old location to the "
+"new one will be created to prevent legacy applications from breaking."
+msgstr ""
+
#. Type: select
#. Description
#: ../xdm.templates:4
Modified: branches/ubuntu/debian/po/nl.po
===================================================================
--- branches/ubuntu/debian/po/nl.po 2004-10-30 05:30:06 UTC (rev 1985)
+++ branches/ubuntu/debian/po/nl.po 2004-10-30 05:31:48 UTC (rev 1986)
@@ -28,7 +28,7 @@
msgstr ""
"Project-Id-Version: xfree86\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2004-07-31 11:50+0000\n"
+"POT-Creation-Date: 2004-08-30 11:49+0000\n"
"PO-Revision-Date: 2004-07-04 20:22-0500\n"
"Last-Translator: Bart Cornelis <cobaco@linux.be>\n"
"Language-Team: debian-l10n-dutch <debian-l10n-dutch@lists.debian.org>\n"
@@ -36,6 +36,66 @@
"Content-Type: text/plain; charset=ISO-8859-15\n"
"Content-Transfer-Encoding: 8bit\n"
+#. Type: boolean
+#. Description
+#: ../libx11-6.templates:4
+msgid "Migrate XKB configuration directory?"
+msgstr ""
+
+#. Type: boolean
+#. Description
+#: ../libx11-6.templates:4
+msgid ""
+"The directory where configuration information (including keyboard data) for "
+"the X KEYBOARD Extension (XKB) is stored has been changed from /usr/X11R6/"
+"lib/X11/xkb to /etc/X11/xkb."
+msgstr ""
+
+#. Type: boolean
+#. Description
+#: ../libx11-6.templates:4 ../libxt6.templates:4
+msgid ""
+"Your system is using the old location, and some programs, such as those from "
+"old or unofficial Debian packages, may continue to install files there."
+msgstr ""
+
+#. Type: boolean
+#. Description
+#: ../libx11-6.templates:4
+msgid ""
+"Would you like the XKB configuration files on the system to be automatically "
+"migrated from the old location to the new one? Any existing files in the "
+"new location that have the same name will be backed up and replaced by the "
+"files from the old location. A symbolic link from the old location to the "
+"new one will be created to prevent legacy applications from breaking."
+msgstr ""
+
+#. Type: boolean
+#. Description
+#: ../libxt6.templates:4
+msgid "Migrate Xt application defaults directory?"
+msgstr ""
+
+#. Type: boolean
+#. Description
+#: ../libxt6.templates:4
+msgid ""
+"The directory where application defaults for X Window System client programs "
+"based on the X Toolkit Intrinsics (Xt) are stored has been changed from /usr/"
+"X11R6/lib/X11/app-defaults to /etc/X11/app-defaults."
+msgstr ""
+
+#. Type: boolean
+#. Description
+#: ../libxt6.templates:4
+msgid ""
+"Would you like the app-defaults files on the system to be automatically "
+"migrated from the old location to the new one? Any existing files in the "
+"new location that have the same name will be backed up and replaced by the "
+"files from the old location. A symbolic link from the old location to the "
+"new one will be created to prevent legacy applications from breaking."
+msgstr ""
+
#. Type: select
#. Description
#: ../xdm.templates:4
Modified: branches/ubuntu/debian/po/pl.po
===================================================================
--- branches/ubuntu/debian/po/pl.po 2004-10-30 05:30:06 UTC (rev 1985)
+++ branches/ubuntu/debian/po/pl.po 2004-10-30 05:31:48 UTC (rev 1986)
@@ -26,7 +26,7 @@
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2004-07-31 11:50+0000\n"
+"POT-Creation-Date: 2004-08-30 11:49+0000\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
@@ -34,6 +34,66 @@
"Content-Type: text/plain; charset=ISO-8859-2\n"
"Content-Transfer-Encoding: 8bit\n"
+#. Type: boolean
+#. Description
+#: ../libx11-6.templates:4
+msgid "Migrate XKB configuration directory?"
+msgstr ""
+
+#. Type: boolean
+#. Description
+#: ../libx11-6.templates:4
+msgid ""
+"The directory where configuration information (including keyboard data) for "
+"the X KEYBOARD Extension (XKB) is stored has been changed from /usr/X11R6/"
+"lib/X11/xkb to /etc/X11/xkb."
+msgstr ""
+
+#. Type: boolean
+#. Description
+#: ../libx11-6.templates:4 ../libxt6.templates:4
+msgid ""
+"Your system is using the old location, and some programs, such as those from "
+"old or unofficial Debian packages, may continue to install files there."
+msgstr ""
+
+#. Type: boolean
+#. Description
+#: ../libx11-6.templates:4
+msgid ""
+"Would you like the XKB configuration files on the system to be automatically "
+"migrated from the old location to the new one? Any existing files in the "
+"new location that have the same name will be backed up and replaced by the "
+"files from the old location. A symbolic link from the old location to the "
+"new one will be created to prevent legacy applications from breaking."
+msgstr ""
+
+#. Type: boolean
+#. Description
+#: ../libxt6.templates:4
+msgid "Migrate Xt application defaults directory?"
+msgstr ""
+
+#. Type: boolean
+#. Description
+#: ../libxt6.templates:4
+msgid ""
+"The directory where application defaults for X Window System client programs "
+"based on the X Toolkit Intrinsics (Xt) are stored has been changed from /usr/"
+"X11R6/lib/X11/app-defaults to /etc/X11/app-defaults."
+msgstr ""
+
+#. Type: boolean
+#. Description
+#: ../libxt6.templates:4
+msgid ""
+"Would you like the app-defaults files on the system to be automatically "
+"migrated from the old location to the new one? Any existing files in the "
+"new location that have the same name will be backed up and replaced by the "
+"files from the old location. A symbolic link from the old location to the "
+"new one will be created to prevent legacy applications from breaking."
+msgstr ""
+
#. Type: select
#. Description
#: ../xdm.templates:4
Modified: branches/ubuntu/debian/po/pt_BR.po
===================================================================
--- branches/ubuntu/debian/po/pt_BR.po 2004-10-30 05:30:06 UTC (rev 1985)
+++ branches/ubuntu/debian/po/pt_BR.po 2004-10-30 05:31:48 UTC (rev 1986)
@@ -28,7 +28,7 @@
msgstr ""
"Project-Id-Version: xfree86\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2004-07-31 11:50+0000\n"
+"POT-Creation-Date: 2004-08-30 11:49+0000\n"
"PO-Revision-Date: 2004-07-25 15:41-0300\n"
"Last-Translator: Andr�u�Lopes <andrelop@debian.org>\n"
"Language-Team: Debian-BR Project <debian-l10n-portuguese@lists.debian.org>\n"
@@ -36,6 +36,66 @@
"Content-Type: text/plain; charset=ISO-8859-1\n"
"Content-Transfer-Encoding: 8bit\n"
+#. Type: boolean
+#. Description
+#: ../libx11-6.templates:4
+msgid "Migrate XKB configuration directory?"
+msgstr ""
+
+#. Type: boolean
+#. Description
+#: ../libx11-6.templates:4
+msgid ""
+"The directory where configuration information (including keyboard data) for "
+"the X KEYBOARD Extension (XKB) is stored has been changed from /usr/X11R6/"
+"lib/X11/xkb to /etc/X11/xkb."
+msgstr ""
+
+#. Type: boolean
+#. Description
+#: ../libx11-6.templates:4 ../libxt6.templates:4
+msgid ""
+"Your system is using the old location, and some programs, such as those from "
+"old or unofficial Debian packages, may continue to install files there."
+msgstr ""
+
+#. Type: boolean
+#. Description
+#: ../libx11-6.templates:4
+msgid ""
+"Would you like the XKB configuration files on the system to be automatically "
+"migrated from the old location to the new one? Any existing files in the "
+"new location that have the same name will be backed up and replaced by the "
+"files from the old location. A symbolic link from the old location to the "
+"new one will be created to prevent legacy applications from breaking."
+msgstr ""
+
+#. Type: boolean
+#. Description
+#: ../libxt6.templates:4
+msgid "Migrate Xt application defaults directory?"
+msgstr ""
+
+#. Type: boolean
+#. Description
+#: ../libxt6.templates:4
+msgid ""
+"The directory where application defaults for X Window System client programs "
+"based on the X Toolkit Intrinsics (Xt) are stored has been changed from /usr/"
+"X11R6/lib/X11/app-defaults to /etc/X11/app-defaults."
+msgstr ""
+
+#. Type: boolean
+#. Description
+#: ../libxt6.templates:4
+msgid ""
+"Would you like the app-defaults files on the system to be automatically "
+"migrated from the old location to the new one? Any existing files in the "
+"new location that have the same name will be backed up and replaced by the "
+"files from the old location. A symbolic link from the old location to the "
+"new one will be created to prevent legacy applications from breaking."
+msgstr ""
+
#. Type: select
#. Description
#: ../xdm.templates:4
Modified: branches/ubuntu/debian/po/ru.po
===================================================================
--- branches/ubuntu/debian/po/ru.po 2004-10-30 05:30:06 UTC (rev 1985)
+++ branches/ubuntu/debian/po/ru.po 2004-10-30 05:31:48 UTC (rev 1986)
@@ -27,7 +27,7 @@
msgstr ""
"Project-Id-Version: xfree86_4.2.1-11\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2004-07-31 11:50+0000\n"
+"POT-Creation-Date: 2004-08-30 11:49+0000\n"
"PO-Revision-Date: 2003-10-05 16:57+0600\n"
"Last-Translator: Ilgiz Kalmetev <translator@ilgiz.pp.ru>\n"
"Language-Team: russian <debian-russian@lists.debian.org>\n"
@@ -36,6 +36,66 @@
"Content-Transfer-Encoding: 8bit\n"
"X-Generator: KBabel 1.0.1\n"
+#. Type: boolean
+#. Description
+#: ../libx11-6.templates:4
+msgid "Migrate XKB configuration directory?"
+msgstr ""
+
+#. Type: boolean
+#. Description
+#: ../libx11-6.templates:4
+msgid ""
+"The directory where configuration information (including keyboard data) for "
+"the X KEYBOARD Extension (XKB) is stored has been changed from /usr/X11R6/"
+"lib/X11/xkb to /etc/X11/xkb."
+msgstr ""
+
+#. Type: boolean
+#. Description
+#: ../libx11-6.templates:4 ../libxt6.templates:4
+msgid ""
+"Your system is using the old location, and some programs, such as those from "
+"old or unofficial Debian packages, may continue to install files there."
+msgstr ""
+
+#. Type: boolean
+#. Description
+#: ../libx11-6.templates:4
+msgid ""
+"Would you like the XKB configuration files on the system to be automatically "
+"migrated from the old location to the new one? Any existing files in the "
+"new location that have the same name will be backed up and replaced by the "
+"files from the old location. A symbolic link from the old location to the "
+"new one will be created to prevent legacy applications from breaking."
+msgstr ""
+
+#. Type: boolean
+#. Description
+#: ../libxt6.templates:4
+msgid "Migrate Xt application defaults directory?"
+msgstr ""
+
+#. Type: boolean
+#. Description
+#: ../libxt6.templates:4
+msgid ""
+"The directory where application defaults for X Window System client programs "
+"based on the X Toolkit Intrinsics (Xt) are stored has been changed from /usr/"
+"X11R6/lib/X11/app-defaults to /etc/X11/app-defaults."
+msgstr ""
+
+#. Type: boolean
+#. Description
+#: ../libxt6.templates:4
+msgid ""
+"Would you like the app-defaults files on the system to be automatically "
+"migrated from the old location to the new one? Any existing files in the "
+"new location that have the same name will be backed up and replaced by the "
+"files from the old location. A symbolic link from the old location to the "
+"new one will be created to prevent legacy applications from breaking."
+msgstr ""
+
#. Type: select
#. Description
#: ../xdm.templates:4
Modified: branches/ubuntu/debian/po/sv.po
===================================================================
--- branches/ubuntu/debian/po/sv.po 2004-10-30 05:30:06 UTC (rev 1985)
+++ branches/ubuntu/debian/po/sv.po 2004-10-30 05:31:48 UTC (rev 1986)
@@ -28,7 +28,7 @@
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2004-07-31 11:50+0000\n"
+"POT-Creation-Date: 2004-08-30 11:49+0000\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
@@ -36,6 +36,66 @@
"Content-Type: text/plain; charset=ISO-8859-1\n"
"Content-Transfer-Encoding: 8bit\n"
+#. Type: boolean
+#. Description
+#: ../libx11-6.templates:4
+msgid "Migrate XKB configuration directory?"
+msgstr ""
+
+#. Type: boolean
+#. Description
+#: ../libx11-6.templates:4
+msgid ""
+"The directory where configuration information (including keyboard data) for "
+"the X KEYBOARD Extension (XKB) is stored has been changed from /usr/X11R6/"
+"lib/X11/xkb to /etc/X11/xkb."
+msgstr ""
+
+#. Type: boolean
+#. Description
+#: ../libx11-6.templates:4 ../libxt6.templates:4
+msgid ""
+"Your system is using the old location, and some programs, such as those from "
+"old or unofficial Debian packages, may continue to install files there."
+msgstr ""
+
+#. Type: boolean
+#. Description
+#: ../libx11-6.templates:4
+msgid ""
+"Would you like the XKB configuration files on the system to be automatically "
+"migrated from the old location to the new one? Any existing files in the "
+"new location that have the same name will be backed up and replaced by the "
+"files from the old location. A symbolic link from the old location to the "
+"new one will be created to prevent legacy applications from breaking."
+msgstr ""
+
+#. Type: boolean
+#. Description
+#: ../libxt6.templates:4
+msgid "Migrate Xt application defaults directory?"
+msgstr ""
+
+#. Type: boolean
+#. Description
+#: ../libxt6.templates:4
+msgid ""
+"The directory where application defaults for X Window System client programs "
+"based on the X Toolkit Intrinsics (Xt) are stored has been changed from /usr/"
+"X11R6/lib/X11/app-defaults to /etc/X11/app-defaults."
+msgstr ""
+
+#. Type: boolean
+#. Description
+#: ../libxt6.templates:4
+msgid ""
+"Would you like the app-defaults files on the system to be automatically "
+"migrated from the old location to the new one? Any existing files in the "
+"new location that have the same name will be backed up and replaced by the "
+"files from the old location. A symbolic link from the old location to the "
+"new one will be created to prevent legacy applications from breaking."
+msgstr ""
+
#. Type: select
#. Description
#: ../xdm.templates:4
Modified: branches/ubuntu/debian/po/templates.pot
===================================================================
--- branches/ubuntu/debian/po/templates.pot 2004-10-30 05:30:06 UTC (rev 1985)
+++ branches/ubuntu/debian/po/templates.pot 2004-10-30 05:31:48 UTC (rev 1986)
@@ -25,7 +25,7 @@
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2004-07-31 11:50+0000\n"
+"POT-Creation-Date: 2004-08-30 11:49+0000\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
@@ -33,6 +33,66 @@
"Content-Type: text/plain; charset=CHARSET\n"
"Content-Transfer-Encoding: 8bit\n"
+#. Type: boolean
+#. Description
+#: ../libx11-6.templates:4
+msgid "Migrate XKB configuration directory?"
+msgstr ""
+
+#. Type: boolean
+#. Description
+#: ../libx11-6.templates:4
+msgid ""
+"The directory where configuration information (including keyboard data) for "
+"the X KEYBOARD Extension (XKB) is stored has been changed from /usr/X11R6/"
+"lib/X11/xkb to /etc/X11/xkb."
+msgstr ""
+
+#. Type: boolean
+#. Description
+#: ../libx11-6.templates:4 ../libxt6.templates:4
+msgid ""
+"Your system is using the old location, and some programs, such as those from "
+"old or unofficial Debian packages, may continue to install files there."
+msgstr ""
+
+#. Type: boolean
+#. Description
+#: ../libx11-6.templates:4
+msgid ""
+"Would you like the XKB configuration files on the system to be automatically "
+"migrated from the old location to the new one? Any existing files in the "
+"new location that have the same name will be backed up and replaced by the "
+"files from the old location. A symbolic link from the old location to the "
+"new one will be created to prevent legacy applications from breaking."
+msgstr ""
+
+#. Type: boolean
+#. Description
+#: ../libxt6.templates:4
+msgid "Migrate Xt application defaults directory?"
+msgstr ""
+
+#. Type: boolean
+#. Description
+#: ../libxt6.templates:4
+msgid ""
+"The directory where application defaults for X Window System client programs "
+"based on the X Toolkit Intrinsics (Xt) are stored has been changed from /usr/"
+"X11R6/lib/X11/app-defaults to /etc/X11/app-defaults."
+msgstr ""
+
+#. Type: boolean
+#. Description
+#: ../libxt6.templates:4
+msgid ""
+"Would you like the app-defaults files on the system to be automatically "
+"migrated from the old location to the new one? Any existing files in the "
+"new location that have the same name will be backed up and replaced by the "
+"files from the old location. A symbolic link from the old location to the "
+"new one will be created to prevent legacy applications from breaking."
+msgstr ""
+
#. Type: select
#. Description
#: ../xdm.templates:4
Modified: branches/ubuntu/debian/po/tr.po
===================================================================
--- branches/ubuntu/debian/po/tr.po 2004-10-30 05:30:06 UTC (rev 1985)
+++ branches/ubuntu/debian/po/tr.po 2004-10-30 05:31:48 UTC (rev 1986)
@@ -27,7 +27,7 @@
msgstr ""
"Project-Id-Version: xserver-xfree86\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2004-07-31 11:50+0000\n"
+"POT-Creation-Date: 2004-08-30 11:49+0000\n"
"PO-Revision-Date: 2004-06-26 16:54+0300\n"
"Last-Translator: Osman Yüksel <yuxel@sonsuzdongu.com>\n"
"Language-Team: Turkish <debian-l10n-turkish@lists.debian.org>\n"
@@ -35,6 +35,66 @@
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
+#. Type: boolean
+#. Description
+#: ../libx11-6.templates:4
+msgid "Migrate XKB configuration directory?"
+msgstr ""
+
+#. Type: boolean
+#. Description
+#: ../libx11-6.templates:4
+msgid ""
+"The directory where configuration information (including keyboard data) for "
+"the X KEYBOARD Extension (XKB) is stored has been changed from /usr/X11R6/"
+"lib/X11/xkb to /etc/X11/xkb."
+msgstr ""
+
+#. Type: boolean
+#. Description
+#: ../libx11-6.templates:4 ../libxt6.templates:4
+msgid ""
+"Your system is using the old location, and some programs, such as those from "
+"old or unofficial Debian packages, may continue to install files there."
+msgstr ""
+
+#. Type: boolean
+#. Description
+#: ../libx11-6.templates:4
+msgid ""
+"Would you like the XKB configuration files on the system to be automatically "
+"migrated from the old location to the new one? Any existing files in the "
+"new location that have the same name will be backed up and replaced by the "
+"files from the old location. A symbolic link from the old location to the "
+"new one will be created to prevent legacy applications from breaking."
+msgstr ""
+
+#. Type: boolean
+#. Description
+#: ../libxt6.templates:4
+msgid "Migrate Xt application defaults directory?"
+msgstr ""
+
+#. Type: boolean
+#. Description
+#: ../libxt6.templates:4
+msgid ""
+"The directory where application defaults for X Window System client programs "
+"based on the X Toolkit Intrinsics (Xt) are stored has been changed from /usr/"
+"X11R6/lib/X11/app-defaults to /etc/X11/app-defaults."
+msgstr ""
+
+#. Type: boolean
+#. Description
+#: ../libxt6.templates:4
+msgid ""
+"Would you like the app-defaults files on the system to be automatically "
+"migrated from the old location to the new one? Any existing files in the "
+"new location that have the same name will be backed up and replaced by the "
+"files from the old location. A symbolic link from the old location to the "
+"new one will be created to prevent legacy applications from breaking."
+msgstr ""
+
#. Type: select
#. Description
#: ../xdm.templates:4
Modified: branches/ubuntu/debian/rules
===================================================================
--- branches/ubuntu/debian/rules 2004-10-30 05:30:06 UTC (rev 1985)
+++ branches/ubuntu/debian/rules 2004-10-30 05:31:48 UTC (rev 1986)
@@ -354,12 +354,12 @@
# Construct MANIFEST files from MANIFEST.$(ARCH).in and
# MANIFEST.$(ARCH).all or MANIFEST.all.
if expr "$(findstring -DBuildFonts=NO,$(IMAKE_DEFINES))" : "-DBuildFonts=NO" >/dev/null 2>&1; then \
- sort -u debian/MANIFEST.$(ARCH).in >debian/MANIFEST.$(ARCH); \
+ LC_ALL=C sort -u debian/MANIFEST.$(ARCH).in >debian/MANIFEST.$(ARCH); \
else \
if [ -e debian/MANIFEST.$(ARCH).all ]; then \
- sort -u debian/MANIFEST.$(ARCH).in debian/MANIFEST.$(ARCH).all >debian/MANIFEST.$(ARCH); \
+ LC_ALL=C sort -u debian/MANIFEST.$(ARCH).in debian/MANIFEST.$(ARCH).all >debian/MANIFEST.$(ARCH); \
else \
- sort -u debian/MANIFEST.$(ARCH).in debian/MANIFEST.all >debian/MANIFEST.$(ARCH); \
+ LC_ALL=C sort -u debian/MANIFEST.$(ARCH).in debian/MANIFEST.all >debian/MANIFEST.$(ARCH); \
fi; \
fi
# confirm that the installed file list has not changed
Modified: branches/ubuntu/debian/shell-lib.sh
===================================================================
--- branches/ubuntu/debian/shell-lib.sh 2004-10-30 05:30:06 UTC (rev 1985)
+++ branches/ubuntu/debian/shell-lib.sh 2004-10-30 05:31:48 UTC (rev 1986)
@@ -655,6 +655,7 @@
observe "link from $symlink to $target already exists"
else
observe "creating symbolic link from $symlink to $target"
+ mkdir -p "${target%/*}" "${symlink%/*}"
ln -s -b -S ".dpkg-old" "$target" "$symlink"
fi
}
Modified: branches/ubuntu/debian/xserver-xfree86.config.in
===================================================================
--- branches/ubuntu/debian/xserver-xfree86.config.in 2004-10-30 05:30:06 UTC (rev 1985)
+++ branches/ubuntu/debian/xserver-xfree86.config.in 2004-10-30 05:31:48 UTC (rev 1986)
@@ -277,7 +277,7 @@
# string, needs input validation; a simple regex match will have to do;
# force first character to be a number to avoid hideous problems in the
# debconf dialog frontend in 0.3.83 (it needs to be one anyway)
- if expr "$RET" : "^[0-9][-0-9,. ]\+$" > /dev/null 2>&1; then
+ if [ "$(echo "$RET" | grep -E '^[0-9]{2,3}-[0-9]{2,3}')" ]; then
break # valid input
fi
# we only get to this point if the input was invalid; restore the known
@@ -482,12 +482,6 @@
debug_echo "Configuring $THIS_PACKAGE."
-if [ "`which laptop-detect`" ]; then
- if laptop-detect >/dev/null; then
- LAPTOP=yes
- fi
-fi
-
# default X server
# if the X server symlink file already exists and points to an executable X
@@ -733,7 +727,7 @@
# fall back to some language-specific generic text
case "${LC_ALL:-${LC_MESSAGES:-$LANG}}" in
ca_*) DEFAULT="Targeta de v�o gen�ca" ;;
- # da
+ da_*) DEFAULT="Standard Video Kort" ;;
de_*) DEFAULT="Standardgrafikkarte" ;;
es_*) DEFAULT="Tarjeta de v�o gen�ca" ;;
fr_*) DEFAULT="Carte vid�g�rique" ;;
@@ -1174,10 +1168,10 @@
# fall back to some language-specific generic text
case "${LC_ALL:-${LC_MESSAGES:-$LANG}}" in
ca_*) DEFAULT="Monitor gen�c" ;;
- # da
+ da_*) DEFAULT="Standard Sk�" ;;
de_*) DEFAULT="Standardbildschirm" ;;
es_*) DEFAULT="Monitor gen�co" ;;
- # fr
+ fr_*) DEFAULT="�ran g�rique" ;;
# gl
it_*) DEFAULT="Monitor Generico" ;;
# ja
Modified: branches/ubuntu/debian/xserver-xfree86.postinst.in
===================================================================
--- branches/ubuntu/debian/xserver-xfree86.postinst.in 2004-10-30 05:30:06 UTC (rev 1985)
+++ branches/ubuntu/debian/xserver-xfree86.postinst.in 2004-10-30 05:31:48 UTC (rev 1986)
@@ -17,6 +17,96 @@
#INCLUDE_SHELL_LIB#
+# Importing functions from config.in
+
+validate_string_db_input () {
+ # Syntax: validate_string_db_input priority template
+ #
+ # validate string input; can't have doublequotes
+ # If $MAY_BE_NULL is a non-null value (e.g., "yes"), the string may be null.
+ if [ $# -ne 2 ]; then
+ echo "internal error: validate_string_db_input() called with wrong number of arguments: $*" >&2
+ exit 1
+ fi
+ PRIORITY=$1
+ TEMPLATE=$2
+ db_get "$TEMPLATE"
+ SAFE="$RET"
+ set +e
+ while :; do
+ db_input "$PRIORITY" "$TEMPLATE"
+ # is the question going to be asked?
+ if [ $? -eq 30 ]; then
+ break # no; bail out of validation loop
+ fi
+ db_go
+ db_get "$TEMPLATE"
+ if [ -n "$RET" ]; then
+ if ! expr "$RET" : '.*".*' > /dev/null 2>&1; then
+ break # valid input
+ else
+ ERROR=xserver-xfree86/config/doublequote_in_string_error
+ fi
+ else
+ if [ -n "$MAY_BE_NULL" ]; then
+ break # valid (null) input
+ else
+ ERROR=xserver-xfree86/config/null_string_error
+ fi
+ fi
+ # we only get to this point if the input was invalid; restore the known
+ # good value in case we are interrupted before the user provides a valid
+ # one
+ db_set "$TEMPLATE" "$SAFE"
+ db_fset "$TEMPLATE" seen false
+ # now show the user the error message
+ db_fset "$ERROR" seen false
+ db_input critical "$ERROR"
+ db_go
+ done
+ set -e
+}
+
+validate_monitor_frequency_db_input () {
+ # Syntax: validate_monitor_frequency_db_input priority template
+ #
+ # validate monitor frequency input
+ if [ $# -ne 2 ]; then
+ echo "internal error: validate_monitor_frequency_db_input() called with wrong number of arguments: $*" >&2
+ exit 1
+ fi
+ PRIORITY=$1
+ TEMPLATE=$2
+ db_get "$TEMPLATE"
+ SAFE="$RET"
+ set +e
+ while :; do
+ db_input "$PRIORITY" "$TEMPLATE"
+ # is the question going to be asked?
+ if [ $? -eq 30 ]; then
+ break # no; bail out of validation loop
+ fi
+ db_go
+ db_get "$TEMPLATE"
+ # string, needs input validation; a simple regex match will have to do;
+ # force first character to be a number to avoid hideous problems in the
+ # debconf dialog frontend in 0.3.83 (it needs to be one anyway)
+ if [ "$(echo "$RET" | grep -E '^[0-9]{2,3}-[0-9]{2,3}')" ]; then
+ break # valid input
+ fi
+ # we only get to this point if the input was invalid; restore the known
+ # good value in case we are interrupted before the user provides a
+ # valid one
+ db_set "$TEMPLATE" "$SAFE"
+ db_fset "$TEMPLATE" seen false
+ # now show the user the error message
+ db_fset xserver-xfree86/config/monitor/range_input_error seen false
+ db_input critical xserver-xfree86/config/monitor/range_input_error
+ db_go
+ done
+ set -e
+}
+
CONFIG_DIR=/etc/X11
SERVER_SYMLINK="$CONFIG_DIR/X"
XF86CONFIG="$CONFIG_DIR/XF86Config-4"
@@ -32,41 +122,57 @@
#DEBHELPER#
xresprobeint() {
- NRES=0
- MONITOR_IDENTIFIER=
- if [ "`which xresprobe`" ]; then
- db_get xserver-xfree86/config/device/driver
- DEVICE_DRIVER="$RET"
- if [ -n "$NOPROBE" ]; then
- # we are reconfiguring
- db_get xserver-xfree86/config/monitor/identifier
- MONITOR_IDENTIFIER="$RES"
- db_get xserver-xfree86/config/display/modes
- RESOLUTION="$RES"
- else
- # detecting via = crash
- if [ "$DEVICE_DRIVER" != "via" ]; then
- set +e
- PROBE_DUMP=$(xresprobe "$DEVICE_DRIVER")
- set -e
- fi
- MONITOR_IDENTIFIER=$(echo "$PROBE_DUMP" | grep "^id:" | sed -e 's/^id: //g')
- RESOLUTION=$(echo "$PROBE_DUMP" | grep "^res:" | sed -e 's/^res: //g' -e 's/\ /\,\ /g')
- HORIZ_SYNC=$(echo "$PROBE_DUMP" | grep "^freq:" | sed -e 's/^freq: //g' | cut -d " " -f 1)
- VERT_REFRESH=$(echo "$PROBE_DUMP" | grep "^freq:" | sed -e 's/^freq: //g' | cut -d " " -f 2)
+ if [ -z "$NOPROBE" ]; then
+ # clean vars
+ MONITOR_IDENTIFIER=
+ RESOLUTIONS=
+ HORIZ_SYNC=
+ VERT_REFRESH=
+
+ # first install, we attempt a probe
+ if [ "`which xresprobe`" ]; then
+
+ # we know the driver from config.in
+ db_get xserver-xfree86/config/device/driver
+ DEVICE_DRIVER="$RET"
+ # blacklist driver
+ case "$DEVICE_DRIVER" in
+ via)
+ PROBE_DUMP=
+ ;;
+ *)
+ set +e
+ PROBE_DUMP=$(xresprobe "$DEVICE_DRIVER")
+ set -e
+ ;;
+ esac
fi
- NRES=0
- for i in $RESOLUTION; do
- NRES=$(expr $NRES + 1)
- done
+
+ # Set proper vars.
+ MONITOR_IDENTIFIER=$(echo "$PROBE_DUMP" | grep "^id:" | sed -e 's/^id: //g')
+ RESOLUTIONS=$(echo "$PROBE_DUMP" | grep "^res:" | sed -e 's/^res: //g')
+ HORIZ_SYNC=$(echo "$PROBE_DUMP" | grep "^freq:" | sed -e 's/^freq: //g' | cut -d " " -f 1)
+ VERT_REFRESH=$(echo "$PROBE_DUMP" | grep "^freq:" | sed -e 's/^freq: //g' | cut -d " " -f 2)
+ else
+ # reconfiguring. debconf should have sane defaults
+ db_get xserver-xfree86/config/monitor/identifier
+ MONITOR_IDENTIFIER="$RET"
+ db_get xserver-xfree86/config/display/modes
+ RESOLUTIONS=$(echo "$RET" | sed -e 's/,//g')
+ db_get xserver-xfree86/config/monitor/horiz-sync
+ HORIZ_SYNC="$RET"
+ db_get xserver-xfree86/config/monitor/vert-refresh
+ VERT_REFRESH="$RET"
fi
+
+ # 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�c" ;;
- # da
+ da_*) DEFAULT="Standard Sk�" ;;
de_*) DEFAULT="Standardbildschirm" ;;
es_*) DEFAULT="Monitor gen�co" ;;
- # fr
+ fr_*) DEFAULT="�ran g�rique";;
# gl
it_*) DEFAULT="Monitor Generico" ;;
# ja
@@ -78,133 +184,202 @@
esac
MONITOR_IDENTIFIER="$DEFAULT"
fi
-
db_set xserver-xfree86/config/monitor/identifier "$MONITOR_IDENTIFIER"
- db_input low xserver-xfree86/config/monitor/identifier || true
+ MAY_BE_NULL= validate_string_db_input low xserver-xfree86/config/monitor/identifier || true
- if [ "$NRES" -gt "0" ]; then
- db_set xserver-xfree86/config/display/modes "$RESOLUTION"
- PRIORITY=medium
+ # Resolution hell:
+ # we need to know if we probed resolutions, if so add them to debconf template
+ # as choises, so that we don't loose them across updates or reconfiguration.
+
+ PRIORITY=high
+ if [ -z "$NOPROBE" ]; then
+
+ NRES=0
+ for i in $RESOLUTIONS; do
+ NRES=$(expr $NRES + 1)
+ done
+
+ if [ "$NRES" -gt "0" ]; then
+ # got RESOLUTIONS. Lower question priority
+ PRIORITY=medium
+ DCRESOLUTIONS=$(for i in $DCRESOLUTIONS $RESOLUTIONS; do echo $i; done | sort -unr)
+ DCRESOLUTIONS=$(echo $DCRESOLUTIONS | sed -e 's/ /, /g')
+ fi
+ fi
+
+ db_metaget xserver-xfree86/config/display/modes choices
+ if [ -n "$RET" ]; then
+ DCRESOLUTIONS="$RET"
+ DCRESOLUTIONS=$(echo $DCRESOLUTIONS | sed -e 's/, / /g')
else
- PRIORITY=high
+ DCRESOLUTIONS="1920x1440 1856x1392 1792x1344 1600x1200 1440x900 1400x1050 1280x1024 1280x960 1280x854 1280x800 1200x800 1152x864 1152x768 1024x768 800x600 640x480"
fi
+ if [ -n "$RESOLUTIONS" ]; then
+ DCRESOLUTIONS=$(for i in $DCRESOLUTIONS $RESOLUTIONS; do echo $i; done | sort -unr)
+ fi
+ # set the old choise + the probed ones (if any).
+ DCRESOLUTIONS=$(echo $DCRESOLUTIONS | sed -e 's/ /, /g')
+ db_subst xserver-xfree86/config/display/modes choices "$DCRESOLUTIONS"
+ if [ -n "$RESOLUTIONS" ]; then
+ RESOLUTIONS=$(echo $RESOLUTIONS | sed -e 's/ /, /g')
+ db_set xserver-xfree86/config/display/modes "$RESOLUTIONS"
+ fi
db_input $PRIORITY xserver-xfree86/config/display/modes || true
db_go
if [ -n "$HORIZ_SYNC" -a -n "$VERT_REFRESH" ]; then
+ # monitor frequencies detected
db_set xserver-xfree86/config/monitor/horiz-sync "$HORIZ_SYNC"
db_set xserver-xfree86/config/monitor/vert-refresh "$VERT_REFRESH"
else
+ # get the highest resolution selected or detected to create sane defaults
db_get xserver-xfree86/config/display/modes
- RESOLUTION="$RES"
- RESOLUTION=$(echo $RESOLUTION | sed -e 's/,//g')
- RESOLUTION=$(for i in $RESOLUTION; do echo $i; done | sort -unr | head -n 1)
- HZ=
- if [ "`which laptop-detect`" ]; then
- if laptop-detect > /dev/null ; then
- HZ="60"
- fi
- fi
- if [ -z "$HZ" ]; then
- case "$RESOLUTION" in
- "1152x864")
- HZ="75"
- ;;
- "1280x960")
- HZ="85"
- ;;
- *)
- HZ="60"
- ;;
- esac
- fi
- RESOLUTION="$RESOLUTION @ $HZ"Hz
- case "$RESOLUTION" in
- "640x480 @ 60Hz")
- db_set xserver-xfree86/config/monitor/horiz-sync "28-33"
- db_set xserver-xfree86/config/monitor/vert-refresh "43-72"
- ;;
- "640x480 @ 72Hz"|"800x600 @ 60Hz")
- db_set xserver-xfree86/config/monitor/horiz-sync "28-38"
- db_set xserver-xfree86/config/monitor/vert-refresh "43-72"
- ;;
- "800x600 @ 72Hz")
- db_set xserver-xfree86/config/monitor/horiz-sync "28-48"
- db_set xserver-xfree86/config/monitor/vert-refresh "43-72"
- ;;
- "800x600 @ 85Hz")
- db_set xserver-xfree86/config/monitor/horiz-sync "30-54"
- db_set xserver-xfree86/config/monitor/vert-refresh "50-85"
- ;;
- "1024x768 @ 60Hz")
- db_set xserver-xfree86/config/monitor/horiz-sync "28-49"
- db_set xserver-xfree86/config/monitor/vert-refresh "43-72"
- ;;
- "1024x768 @ 70Hz")
- db_set xserver-xfree86/config/monitor/horiz-sync "30-57"
- db_set xserver-xfree86/config/monitor/vert-refresh "43-72"
- ;;
- "1024x768 @ 75Hz"|"1280x960 @ 60Hz")
- db_set xserver-xfree86/config/monitor/horiz-sync "30-60"
- db_set xserver-xfree86/config/monitor/vert-refresh "50-75"
- ;;
- "1280x1024 @ 60Hz")
- db_set xserver-xfree86/config/monitor/horiz-sync "30-65"
- db_set xserver-xfree86/config/monitor/vert-refresh "50-75"
- ;;
- "1152x864 @ 75Hz")
- db_set xserver-xfree86/config/monitor/horiz-sync "30-68"
- db_set xserver-xfree86/config/monitor/vert-refresh "50-85"
- ;;
- "1280x960 @ 85Hz")
- db_set xserver-xfree86/config/monitor/horiz-sync "30-92"
- db_set xserver-xfree86/config/monitor/vert-refresh "50-85"
- ;;
- "1600x1200 @ 60Hz")
- db_set xserver-xfree86/config/monitor/horiz-sync "30-75"
- db_set xserver-xfree86/config/monitor/vert-refresh "50-85"
- ;;
- "1600x1200 @ 75Hz")
- db_set xserver-xfree86/config/monitor/horiz-sync "30-94"
- db_set xserver-xfree86/config/monitor/vert-refresh "50-75"
- ;;
- "1600x1200 @ 85Hz"|"1792x1344 @ 75Hz")
- db_set xserver-xfree86/config/monitor/horiz-sync "30-107"
- db_set xserver-xfree86/config/monitor/vert-refresh "50-85"
- ;;
- "1792x1344 @ 60Hz")
- db_set xserver-xfree86/config/monitor/horiz-sync "30-84"
- db_set xserver-xfree86/config/monitor/vert-refresh "50-75"
- ;;
- "1856x1392 @ 60Hz")
- db_set xserver-xfree86/config/monitor/horiz-sync "30-87"
- db_set xserver-xfree86/config/monitor/vert-refresh "50-75"
- ;;
- "1856x1392 @ 75Hz")
- db_set xserver-xfree86/config/monitor/horiz-sync "30-113"
- db_set xserver-xfree86/config/monitor/vert-refresh "50-75"
- ;;
- "1920x1440 @ 60Hz")
- db_set xserver-xfree86/config/monitor/horiz-sync "30-90"
- db_set xserver-xfree86/config/monitor/vert-refresh "50-75"
- ;;
- "1920x1440 @ 75Hz")
- db_set xserver-xfree86/config/monitor/horiz-sync "30-130"
- db_set xserver-xfree86/config/monitor/vert-refresh "60-160"
- ;;
- "2048x1536 @ 60Hz")
- db_set xserver-xfree86/config/monitor/horiz-sync "30-109"
- db_set xserver-xfree86/config/monitor/vert-refresh "48-160"
- ;;
- *)
- db_set xserver-xfree86/config/monitor/horiz-sync "28-50"
- db_set xserver-xfree86/config/monitor/vert-refresh "43-75"
- ;;
- esac
- db_input low xserver-xfree86/config/monitor/horiz-sync || true
- db_input low xserver-xfree86/config/monitor/vert-refresh || true
- db_go
+ HMAX=$(echo $RET | sed -e 's/,//g')
+ HMAX=$(for i in $HMAX; do echo $i; done | sort -unr | head -n 1 | cut -d "x" -f 1)
+ # apparently all the known resolution/horiz-sync combinantion have a ratio that
+ # can go from 19 to 21. Only one exception was 18. We can safely assume a ratio of 20
+ # for default setup. DDC should do the rest.
+ HMAX=$(expr $HMAX / 20)
+ db_set xserver-xfree86/config/monitor/horiz-sync "28-$HMAX"
+ # sane default for everything. Experts will do this manually or reconfiguring.
+ db_set xserver-xfree86/config/monitor/vert-refresh "43-60"
fi
+
+ db_subst xserver-xfree86/config/monitor/selection-method choices "Simple, Medium, Advanced"
+ db_subst xserver-xfree86/config/monitor/selection-method default "Medium"
+ db_set xserver-xfree86/config/monitor/selection-method "Medium"
+ db_input low xserver-xfree86/config/monitor/selection-method || true
+ db_go
+
+ db_get xserver-xfree86/config/monitor/selection-method
+ case "$RET" in
+ Simple)
+ db_input low xserver-xfree86/config/monitor/screen-size || true
+ db_go
+ db_get xserver-xfree86/config/monitor/screen-size
+ case "$RET" in
+ 'Up to 14 inches (355 mm)')
+ db_set xserver-xfree86/config/monitor/horiz-sync "28-33"
+ db_set xserver-xfree86/config/monitor/vert-refresh "43-72"
+ ;;
+ '15 inches (380 mm)')
+ db_set xserver-xfree86/config/monitor/horiz-sync "28-50"
+ db_set xserver-xfree86/config/monitor/vert-refresh "43-75"
+ ;;
+ '17 inches (430 mm)')
+ db_set xserver-xfree86/config/monitor/horiz-sync "30-70"
+ db_set xserver-xfree86/config/monitor/vert-refresh "50-160"
+ ;;
+ '19-20 inches (480-510 mm)')
+ db_set xserver-xfree86/config/monitor/horiz-sync "30-100"
+ db_set xserver-xfree86/config/monitor/vert-refresh "50-160"
+ ;;
+ '21 inches (530 mm) or more')
+ db_set xserver-xfree86/config/monitor/horiz-sync "30-130"
+ db_set xserver-xfree86/config/monitor/vert-refresh "50-160"
+ ;;
+ esac
+ ;;
+ Medium)
+ db_input low xserver-xfree86/config/monitor/mode-list || true
+ db_go
+ case "$RET" in
+ "640x480 @ 60Hz")
+ db_set xserver-xfree86/config/monitor/horiz-sync "28-33"
+ db_set xserver-xfree86/config/monitor/vert-refresh "43-72"
+ ;;
+ "640x480 @ 72Hz"|"800x600 @ 60Hz")
+ db_set xserver-xfree86/config/monitor/horiz-sync "28-38"
+ db_set xserver-xfree86/config/monitor/vert-refresh "43-72"
+ ;;
+ "800x600 @ 72Hz")
+ db_set xserver-xfree86/config/monitor/horiz-sync "28-48"
+ db_set xserver-xfree86/config/monitor/vert-refresh "43-72"
+ ;;
+ "800x600 @ 85Hz")
+ db_set xserver-xfree86/config/monitor/horiz-sync "30-54"
+ db_set xserver-xfree86/config/monitor/vert-refresh "50-85"
+ ;;
+ "1024x768 @ 60Hz")
+ db_set xserver-xfree86/config/monitor/horiz-sync "28-49"
+ db_set xserver-xfree86/config/monitor/vert-refresh "43-72"
+ ;;
+ "1024x768 @ 70Hz")
+ db_set xserver-xfree86/config/monitor/horiz-sync "30-57"
+ db_set xserver-xfree86/config/monitor/vert-refresh "43-72"
+ ;;
+ "1024x768 @ 75Hz"|"1280x960 @ 60Hz")
+ db_set xserver-xfree86/config/monitor/horiz-sync "30-60"
+ db_set xserver-xfree86/config/monitor/vert-refresh "50-75"
+ ;;
+ "1280x1024 @ 60Hz")
+ db_set xserver-xfree86/config/monitor/horiz-sync "30-65"
+ db_set xserver-xfree86/config/monitor/vert-refresh "50-75"
+ ;;
+ "1152x864 @ 75Hz")
+ db_set xserver-xfree86/config/monitor/horiz-sync "30-68"
+ db_set xserver-xfree86/config/monitor/vert-refresh "50-85"
+ ;;
+ "1280x960 @ 85Hz")
+ db_set xserver-xfree86/config/monitor/horiz-sync "30-92"
+ db_set xserver-xfree86/config/monitor/vert-refresh "50-85"
+ ;;
+ "1600x1200 @ 60Hz")
+ db_set xserver-xfree86/config/monitor/horiz-sync "30-75"
+ db_set xserver-xfree86/config/monitor/vert-refresh "50-85"
+ ;;
+ "1600x1200 @ 75Hz")
+ db_set xserver-xfree86/config/monitor/horiz-sync "30-94"
+ db_set xserver-xfree86/config/monitor/vert-refresh "50-75"
+ ;;
+ "1600x1200 @ 85Hz"|"1792x1344 @ 75Hz")
+ db_set xserver-xfree86/config/monitor/horiz-sync "30-107"
+ db_set xserver-xfree86/config/monitor/vert-refresh "50-85"
+ ;;
+ "1792x1344 @ 60Hz")
+ db_set xserver-xfree86/config/monitor/horiz-sync "30-84"
+ db_set xserver-xfree86/config/monitor/vert-refresh "50-75"
+ ;;
+ "1856x1392 @ 60Hz")
+ db_set xserver-xfree86/config/monitor/horiz-sync "30-87"
+ db_set xserver-xfree86/config/monitor/vert-refresh "50-75"
+ ;;
+ "1856x1392 @ 75Hz")
+ db_set xserver-xfree86/config/monitor/horiz-sync "30-113"
+ db_set xserver-xfree86/config/monitor/vert-refresh "50-75"
+ ;;
+ "1920x1440 @ 60Hz")
+ db_set xserver-xfree86/config/monitor/horiz-sync "30-90"
+ db_set xserver-xfree86/config/monitor/vert-refresh "50-75"
+ ;;
+ "1920x1440 @ 75Hz")
+ db_set xserver-xfree86/config/monitor/horiz-sync "30-130"
+ db_set xserver-xfree86/config/monitor/vert-refresh "60-160"
+ ;;
+ esac
+ ;;
+ Advanced)
+ validate_monitor_frequency_db_input low xserver-xfree86/config/monitor/horiz-sync || true
+ validate_monitor_frequency_db_input low xserver-xfree86/config/monitor/vert-refresh || true
+ db_go
+ ;;
+ esac
+
+ db_get xserver-xfree86/config/device/driver
+ case "$RET" in
+ newport)
+ DEFAULT_DEPTH=8
+ ;;
+ vga)
+ DEFAULT_DEPTH=4
+ ;;
+ *)
+ DEFAULT_DEPTH=24
+ ;;
+ esac
+
+ db_input low xserver-xfree86/config/display/default_depth || true
+ db_go
}
Modified: branches/ubuntu/debian/xserver-xfree86.templates
===================================================================
--- branches/ubuntu/debian/xserver-xfree86.templates 2004-10-30 05:30:06 UTC (rev 1985)
+++ branches/ubuntu/debian/xserver-xfree86.templates 2004-10-30 05:31:48 UTC (rev 1986)
@@ -479,8 +479,8 @@
Template: xserver-xfree86/config/display/modes
Type: multiselect
-Choices: 1920x1440, 1856x1392, 1792x1344, 1600x1200, 1440x900, 1400x1050, 1280x1024, 1280x960, 1280x854, 1280x800, 1200x800, 1152x864, 1152x768, 1024x768, 800x600, 640x480
-Default: 1152x864, 1024x768, 800x600, 640x480
+Choices: ${choices}
+Default: 1024x768, 800x600, 640x480
_Description: Select the video modes you would like the X server to use.
If there are some resolutions you would not like the X server to use even if
your hardware is capable of them, remove them from the list below. Removing
Reply to: