Towards a total X.Org-ization.

To: debian-x@lists.debian.org
Subject: Towards a total X.Org-ization.
From: David Martínez Moreno <ender@debian.org>
Date: Wed, 27 Jul 2005 11:33:03 +0200
Message-id: <[🔎] 200507271133.03941.ender@debian.org>

	Hello, David. Branden has not yet set my account, so please commit the 
attached patch. It fixes a lot of XFree86 references in the debian/ part.

	Best regards,


		Ender.
-- 
Non. Je suis la belette de personne.
		-- Amélie (Le fabuleux destin d'Amélie Poulain).
--
Debian developer

Index: debian/xfs.README.Debian
===================================================================
--- debian/xfs.README.Debian	(revisiÃ³n: 419)
+++ debian/xfs.README.Debian	(copia de trabajo)
@@ -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"
Index: debian/xserver-common.README.Debian
===================================================================
--- debian/xserver-common.README.Debian	(revisiÃ³n: 419)
+++ debian/xserver-common.README.Debian	(copia de trabajo)
@@ -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$
Index: debian/TODO
===================================================================
--- debian/TODO	(revisiÃ³n: 419)
+++ debian/TODO	(copia de trabajo)
@@ -72,7 +72,7 @@
 
 * Burn xserver debconfage to the ground, redesign and reimplement, taking into
   account the many lessons of the past 5 years (and hopefully leveraging the new
-  "autoconfiguration" code in the Xorg X server).
+  "autoconfiguration" code in the X.Org X server).
 
 * Change /var/lib/xfree86 usage to /var/lib/xorg
 
Index: debian/shell-lib.sh
===================================================================
--- debian/shell-lib.sh	(revisiÃ³n: 419)
+++ debian/shell-lib.sh	(copia de trabajo)
@@ -1,4 +1,4 @@
-# $Id: shell-lib.sh 1760 2004-08-28 07:53:52Z branden $
+# $Id$
 
 SOURCE_VERSION=@SOURCE_VERSION@
 OFFICIAL_BUILD=@OFFICIAL_BUILD@
@@ -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
Index: debian/xserver-xorg.bug.script
===================================================================
--- debian/xserver-xorg.bug.script	(revisiÃ³n: 419)
+++ debian/xserver-xorg.bug.script	(copia de trabajo)
@@ -87,7 +87,7 @@
         printf "$XORGCONFIG_CHECKSUM does not exist.\n" >&3
     fi
     printf "\n" >&3
-    printf "Xorg X server configuration file status:\n" >&3
+    printf "X.Org X server configuration file status:\n" >&3
     ls -dl "$XORGCONFIG" >&3
     printf "\n" >&3
     printf "Contents of $XORGCONFIG:\n" >&3
@@ -102,12 +102,12 @@
 XORG_LOGS=$(ls -dt /var/log/Xorg.*.log 2>/dev/null)
 
 if [ -n "$XORG_LOGS" ]; then
-    printf "Xorg X server log files on system:\n" >&3
+    printf "X.Org X server log files on system:\n" >&3
     ls -dlrt /var/log/Xorg.*.log >&3 2>/dev/null
     printf "\n" >&3
     for LOG in $XORG_LOGS; do
         if [ -f "$LOG" ]; then
-            printf "Contents of most recent Xorg X server log file\n" >&3
+            printf "Contents of most recent X.Org X server log file\n" >&3
             printf "%s:\n" "$LOG" >&3
             cat "$LOG" >&3
             # the log files are large; only show the most recent
@@ -115,7 +115,7 @@
         fi
     done
 else
-    printf "No Xorg X server log files found.\n" >&3
+    printf "No X.Org X server log files found.\n" >&3
 fi
 
 printf "\n" >&3
Index: debian/xserver-xorg.postinst.in
===================================================================
--- debian/xserver-xorg.postinst.in	(revisiÃ³n: 419)
+++ debian/xserver-xorg.postinst.in	(copia de trabajo)
@@ -6,7 +6,7 @@
 # /usr/share/common-licenses/GPL or <http://www.gnu.org/copyleft/gpl.txt>.
 # Acknowledgements to Stephen Early, Mark Eichin, and Manoj Srivastava.
 
-# $Id: xserver-xorg.postinst.in 1746M 2004-10-13 12:16:47Z (local) $
+# $Id$
 
 set -e
 
@@ -786,7 +786,7 @@
       md5sum "$XORGCONFIG" > "$XORGCONFIG_CHECKSUM"
     fi
   else
-    warn "error while preparing new Xorg X server configuration" \
+    warn "Error while preparing new X.Org X server configuration" \
          "file in $NEW_XORGCONFIG; not attempting to update existing" \
          "configuration"
   fi
Index: debian/xserver-xorg.config.in
===================================================================
--- debian/xserver-xorg.config.in	(revisiÃ³n: 419)
+++ debian/xserver-xorg.config.in	(copia de trabajo)
@@ -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 debconf values 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
@@ -483,7 +483,7 @@
   if [ "$RET" != "10 xserver-xfree86/config/display/modes doesn't exist" ]; then
     db_subst xserver-xorg/config/display/modes choices "$RET"
   else
-    # remember to keep this list in sync with postinst.in. Yes it sucks!
+    # remember to keep this list in sync with postinst.in. Yes, it sucks!
     db_subst xserver-xorg/config/display/modes choices "1920x1440, 1920x1200, 1856x1392, 1792x1344, 1680x1050, 1600x1200, 1440x900, 1400x1050, 1280x1024, 1280x960, 1280x854, 1280x800, 1280x768, 1200x800, 1152x864, 1152x768, 1024x768, 800x600, 640x480"
   fi
   # migrate keyboard/rules
@@ -522,7 +522,7 @@
   db_set xserver-xorg/config/monitor/selection-method "Advanced"
 fi
 
-# migrate to Xorg 6.8.1, where there are no pex, xtt or xie modules
+# migrate to X.Org 6.8.1, where there are no pex, xtt or xie modules
 db_get xserver-xorg/config/modules
 SELECTED_MODULES="$(echo $RET | awk 'BEGIN { RS=", "} {print $1}')"
 # are the pex or xie modules selected?
Index: debian/xserver-xorg.postrm.in
===================================================================
--- debian/xserver-xorg.postrm.in	(revisiÃ³n: 419)
+++ debian/xserver-xorg.postrm.in	(copia de trabajo)
@@ -64,7 +64,7 @@
     fi
   fi
 
-  # de-register this file as a handler of the Xorg 4.x X server configuration
+  # de-register this file as a handler of the X.Org 4.x X server configuration
   # file
   if [ -e "$XORGCONFIG_ROSTER" ]; then
     # check existing roster file for our package name
@@ -80,7 +80,7 @@
       else
         # no; remove both the roster and our temporary copy
         rm -f "$XORGCONFIG_ROSTER" "$XORGCONFIG_ROSTER.dpkg-tmp"
-        # remove Xorg X server configuration file if it was still
+        # remove X.Org X server configuration file if it was still
         # managed by the package
         if [ -e "$XORGCONFIG_CHECKSUM" ]; then
           # does it exist?
Index: debian/rules
===================================================================
--- debian/rules	(revisiÃ³n: 419)
+++ debian/rules	(copia de trabajo)
@@ -179,7 +179,7 @@
 	     -a ! -name debian -a ! -name patches -a ! -name .pc \
 	     -a ! -name stampdir | xargs -i{} cp -al {} $(SOURCE_DIR)
 ifndef NOT_BUILDING_XORG_X_SERVER
-	# Create source tree for static, debuggable Xorg server.
+	# Create source tree for static, debuggable X.Org server.
 	if [ -d $(SOURCE_TREE)-xserver-xorg-dbg ]; then \
 	  rm -rf $(SOURCE_TREE)-xserver-xorg-dbg; \
 	fi
@@ -326,8 +326,8 @@
 	  install -m 644 debian/local/update-fonts-$$FOO.8 $(DEBTREEDIR)/usr/share/man/man8; \
 	done
  ifdef NOT_BUILDING_XORG_X_SERVER
-	# These files, which document more than just the Xorg X server, should
-	# be installed by the upstream Imakefiles even when the Xorg X server
+	# These files, which document more than just the X.Org X server, should
+	# be installed by the upstream Imakefiles even when the X.Org X server
 	# isn't being built, but they're poorly placed.  Therefore we have to
 	# create the destination directory ourselves.
 	install -m 755 -d debian/tmp/usr/X11R6/lib/X11/doc
@@ -335,7 +335,7 @@
 	               $(SOURCE_TREE)/programs/Xserver/hw/xfree86/doc/README.fonts \
 	               debian/tmp/usr/X11R6/lib/X11/doc
  else
-	# Install the static, debuggable Xorg server.
+	# Install the static, debuggable X.Org server.
 	install -m 755 $(SOURCE_TREE)-xserver-xorg-dbg/programs/Xserver/Xorg \
 	               debian/tmp/usr/X11R6/bin/Xorg-debug
 	mkdir -p $(DEBTREEDIR)/etc/X11/cursors
@@ -477,7 +477,7 @@
 	dh_testroot
 	dh_install --sourcedir=debian/tmp
 	# Special handling: don't do this if the manpage doesn't exist, which
-	# will be the case if this architecture doesn't build the Xorg X server.
+	# will be the case if this architecture doesn't build the X.Org X server.
 	if [ -e debian/tmp/usr/X11R6/man/man1/Xorg.1x ]; then \
 	  install -m 755 -d debian/xserver-xorg-dbg/usr/X11R6/man/man1; \
 	  install -m 644 debian/tmp/usr/X11R6/man/man1/Xorg.1x debian/xserver-xorg-dbg/usr/X11R6/man/man1/Xorg-debug.1x; \
@@ -587,7 +587,7 @@
 	@echo '$$(XWSD_SPECIAL_DEPENDS)' is \"$(XWSD_SPECIAL_DEPENDS)\"
 	@echo '$$(XLIBMESA_GL_SPECIAL_DEPENDS)' is \"$(XLIBMESA_GL_SPECIAL_DEPENDS)\"
 ifdef NOT_BUILDING_XORG_X_SERVER
-	@echo '*** This architecture does not build the Xorg X server packages.'
+	@echo '*** This architecture does not build the X.Org X server packages.'
 endif
 	@echo 'See debian/control for build dependencies.'
 
@@ -603,7 +603,7 @@
 build-server: $(STAMP_DIR)/build-server
 $(STAMP_DIR)/build-server: setup $(STAMP_DIR)/genscripts
 	dh_testdir
-	# Create source tree for static, debuggable Xorg server.
+	# Create source tree for static, debuggable X.Org server.
 	cp -drl $(SOURCE_TREE) $(SOURCE_TREE)-xserver-xorg-dbg
 ifndef test_rules
 	$(MAKE) -C $(SOURCE_TREE) WORLDOPTS="" IMAKE_DEFINES="$(IMAKE_DEFINES) -DBuildServersOnly=YES" World
@@ -623,7 +623,7 @@
 	umask 022
 	dh_clean -k
 	$(MAKE) -C $(SOURCE_TREE) SHELL="/bin/sh -e" DESTDIR=$(DEBTREEDIR) install install.man
-	# Install the static, debuggable Xorg server.
+	# Install the static, debuggable X.Org server.
 	install -m 755 $(SOURCE_TREE)-xserver-xorg-dbg/programs/Xserver/Xorg \
 	               debian/tmp/usr/X11R6/bin/Xorg-debug
 else
Index: debian/xserver-xorg.templates
===================================================================
--- debian/xserver-xorg.templates       (revisiÃ³n: 419)
+++ debian/xserver-xorg.templates       (copia de trabajo)
@@ -157,7 +157,7 @@
  .
  For users of multi-head setups, this option will configure only one of the
  heads.  Further configuration will have to be done manually in the X server
- configuration file, /etc/X11/xorg.conf
+ configuration file, /etc/X11/xorg.conf.
  .
  Users of SGI Indigo2 XL machines, or machines with other buses not yet
  fully supported, should specify simply "1" here.  (This is not guaranteed

Attachment: pgpSPc75sduWn.pgp
Description: PGP signature

Reply to:

Follow-Ups:
- Re: Towards a total X.Org-ization.
  - From: Julien Cristau <julien.cristau@ens-lyon.fr>
- Re: Towards a total X.Org-ization.
  - From: David Nusinow <david_nusinow@verizon.net>

Prev by Date: Re: i915 DRI broken after suspend/resume
Next by Date: Bug#320136: mouse.o: EmulateWheelTimeout seems to be missing
Previous by thread: Bug#320041: I have found the explanation
Next by thread: Re: Towards a total X.Org-ization.
Index(es):
- Date
- Thread