[pkg-nvidia-devel] r1044 - in /packages/nvidia-graphics-drivers/trunk/debian: changelog nvidia-glx.README.Debian.in nvidia-glx.examples rules

[anbe-guest at users.alioth.debian.org]

Author: anbe-guest
Date: Mon Jun  7 10:58:15 2010
New Revision: 1044

URL: http://svn.debian.org/wsvn/pkg-nvidia/?sc=1&rev=1044
Log:
rename XF86Config.sample to xorg.conf.sample (closes: #392243)

Modified:
    packages/nvidia-graphics-drivers/trunk/debian/changelog
    packages/nvidia-graphics-drivers/trunk/debian/nvidia-glx.README.Debian.in
    packages/nvidia-graphics-drivers/trunk/debian/nvidia-glx.examples
    packages/nvidia-graphics-drivers/trunk/debian/rules

Modified: packages/nvidia-graphics-drivers/trunk/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-nvidia/packages/nvidia-graphics-drivers/trunk/debian/changelog?rev=1044&op=diff
==============================================================================
--- packages/nvidia-graphics-drivers/trunk/debian/changelog (original)
+++ packages/nvidia-graphics-drivers/trunk/debian/changelog Mon Jun  7 10:58:15 2010
@@ -54,6 +54,7 @@
   * nvidia-glx.README.Debian: update instructions on configuring xorg.conf
     (closes: #516379, #576295)
   * nvidia-glx.README.Debian: add a note about XvMC (closes: #390932)
+  * rename XF86Config.sample to xorg.conf.sample (closes: #392243)
 
  -- Russ Allbery <rra at debian.org>  Wed, 26 May 2010 07:19:43 -0700
 

Modified: packages/nvidia-graphics-drivers/trunk/debian/nvidia-glx.README.Debian.in
URL: http://svn.debian.org/wsvn/pkg-nvidia/packages/nvidia-graphics-drivers/trunk/debian/nvidia-glx.README.Debian.in?rev=1044&op=diff
==============================================================================
--- packages/nvidia-graphics-drivers/trunk/debian/nvidia-glx.README.Debian.in (original)
+++ packages/nvidia-graphics-drivers/trunk/debian/nvidia-glx.README.Debian.in Mon Jun  7 10:58:15 2010
@@ -41,7 +41,7 @@
 There are many more settings that can be tuned in xorg.conf.  For file
 format description and general options please see the xorg.conf(5) manpage.
 See /usr/share/doc/nvidia-glx#LEGACY#/README.txt.gz and
-/usr/share/doc/nvidia-glx#LEGACY#/examples/XF86Config.sample.gz
+/usr/share/doc/nvidia-glx#LEGACY#/examples/xorg.conf.sample.gz
 for descriptions of all supported NVIDIA driver specific options.
 
 

Modified: packages/nvidia-graphics-drivers/trunk/debian/nvidia-glx.examples
URL: http://svn.debian.org/wsvn/pkg-nvidia/packages/nvidia-graphics-drivers/trunk/debian/nvidia-glx.examples?rev=1044&op=diff
==============================================================================
--- packages/nvidia-graphics-drivers/trunk/debian/nvidia-glx.examples (original)
+++ packages/nvidia-graphics-drivers/trunk/debian/nvidia-glx.examples Mon Jun  7 10:58:15 2010
@@ -1,1 +1,1 @@
-debian/tmp/usr/share/doc/XF86Config.sample
+debian/tmp/usr/share/doc/xorg.conf.sample

Modified: packages/nvidia-graphics-drivers/trunk/debian/rules
URL: http://svn.debian.org/wsvn/pkg-nvidia/packages/nvidia-graphics-drivers/trunk/debian/rules?rev=1044&op=diff
==============================================================================
--- packages/nvidia-graphics-drivers/trunk/debian/rules (original)
+++ packages/nvidia-graphics-drivers/trunk/debian/rules Mon Jun  7 10:58:15 2010
@@ -83,6 +83,14 @@
 override_dh_auto_install:
 	# "Install" into debian/tmp.
 	cp -al NVIDIA-Linux-$(DEB_HOST_ARCH)/ debian/tmp
+
+	# Create xorg.conf.sample
+	sed \
+	    -e 's/XF86Config(4\/5)/xorg.conf(5)/g' \
+	    -e 's/XF86Config/xorg.conf/g' \
+	    -e 's/XFree86/Xorg/g' \
+	    < debian/tmp/usr/share/doc/XF86Config.sample \
+	    > debian/tmp/usr/share/doc/xorg.conf.sample
 
 	# Build the nvidia-kernel-source tree.
 	mkdir -p $(module_source)