Author: dnusinow
Date: 2005-07-27 22:31:19 -0500 (Wed, 27 Jul 2005)
New Revision: 422
Modified:
trunk/debian/changelog
trunk/debian/shell-lib.sh
trunk/debian/xfs.README.Debian
trunk/debian/xserver-common.README.Debian
trunk/debian/xserver-xorg.config.in
Log:
- Remove various references to XFree86 and its trappings.
Modified: trunk/debian/changelog
===================================================================
--- trunk/debian/changelog 2005-07-28 03:20:59 UTC (rev 421)
+++ trunk/debian/changelog 2005-07-28 03:31:19 UTC (rev 422)
@@ -28,6 +28,7 @@
Changes by David MartÃnez Moreno
- Include upstream X.Org changelog in x11-common documents
+ - Remove various references to XFree86 and its trappings.
Changes by Eugene Konev and David Nusinow
- Switch from dbs to quilt
Modified: trunk/debian/shell-lib.sh
===================================================================
--- trunk/debian/shell-lib.sh 2005-07-28 03:20:59 UTC (rev 421)
+++ trunk/debian/shell-lib.sh 2005-07-28 03:31:19 UTC (rev 422)
@@ -1,4 +1,4 @@
-# $Id: shell-lib.sh 1760 2004-08-28 07:53:52Z branden $
+# $Id$
[EMAIL PROTECTED]@
[EMAIL PROTECTED]@
@@ -236,7 +236,7 @@
if [ -d $_dpkg_info_dir ]; then
if [ "$(echo $_dpkg_info_dir/*.list)" != "$_dpkg_info_dir/*.list" ]; then
_possible_culprits=$(ls -1 $_dpkg_info_dir/*.list | egrep -v \
- "(xbase-clients|xfree86-common|xfs|xlibs)")
+ "(xbase-clients|x11-common|xfs|xlibs)")
if [ -n "$_possible_culprits" ]; then
_smoking_guns=$(grep -l "$1" $_possible_culprits)
if [ -n "$_smoking_guns" ]; then
@@ -248,7 +248,7 @@
_bad_packages=$(printf "%s\n%s" "$_bad_packages" "$_package")
done
_msg=$(cat <<EOF
-The following packages appear to have file overlaps with the XFree86 packages;
+The following packages appear to have file overlaps with the X.Org packages;
these packages are either very old, or in violation of Debian Policy. Try
upgrading each of these packages to the latest available version if possible:
for example, with the command "apt-get install". If no newer version of a
Modified: trunk/debian/xfs.README.Debian
===================================================================
--- trunk/debian/xfs.README.Debian 2005-07-28 03:20:59 UTC (rev 421)
+++ trunk/debian/xfs.README.Debian 2005-07-28 03:31:19 UTC (rev 422)
@@ -26,7 +26,7 @@
/etc/X11/fs/config.
To use xfs you must add it to the X server's FontPath, in the "Files" section
-of your XF86Config (or XF86Config-4).
+of your xorg.conf file.
Section "Files"
FontPath "unix/:7100"
Modified: trunk/debian/xserver-common.README.Debian
===================================================================
--- trunk/debian/xserver-common.README.Debian 2005-07-28 03:20:59 UTC (rev
421)
+++ trunk/debian/xserver-common.README.Debian 2005-07-28 03:31:19 UTC (rev
422)
@@ -8,7 +8,7 @@
$ zcat /usr/share/doc/x11-common/FAQ.gz | pager
The XFree86 Video Timings HOWTO, which explains the art of hand-crafting
-Modelines for the XF86Config file, is included in the doc-linux-text (plain
+Modelines for the xorg.conf file, is included in the doc-linux-text (plain
ASCII format) and doc-linux-html (HTML format) packages.
$Id$
Modified: trunk/debian/xserver-xorg.config.in
===================================================================
--- trunk/debian/xserver-xorg.config.in 2005-07-28 03:20:59 UTC (rev 421)
+++ trunk/debian/xserver-xorg.config.in 2005-07-28 03:31:19 UTC (rev 422)
@@ -5,7 +5,7 @@
# Licensed under the GNU General Public License, version 2. See the file
# /usr/share/common-licenses/GPL or <http://www.gnu.org/copyleft/gpl.txt>.
-# $Id: xserver-xorg.config.in 1772M 2004-10-11 05:44:28Z (local) $
+# $Id$
set -e
@@ -463,13 +463,13 @@
if [ -n "$FIRSTINST" ] && [ -z "$RECONFIGURE" ] && [ -n "$XF86TEMPLATELIST" ];
then
MIGRATE_XF86=true
- warn "migrating xserver-xfree86 templates to xserver-xorg."
+ warn "Migrating xserver-xfree86 templates to xserver-xorg."
# set +e is required otherwise debconf will kick us out if the template is
not
# there.
set +e
for XF86TEMPLATE in $XF86TEMPLATELIST; do
XORGTEMPLATE=$(echo "$XF86TEMPLATE" | sed -e
's/xserver-xfree86/xserver-xorg/g')
- # db_get doesn't need checking. If we are her is because it is in the list.
+ # db_get doesn't need checking. If we are here is because it is in the
list.
db_get "$XF86TEMPLATE"
db_set "$XORGTEMPLATE" "$RET"
if [ "$RET" = "10 $XORGTEMPLATE doesn't exist" ]; then
--
To UNSUBSCRIBE, email to [EMAIL PROTECTED]
with a subject of "unsubscribe". Trouble? Contact [EMAIL PROTECTED]
