[Date Prev][Date Next] [Thread Prev][Thread Next] [Date Index] [Thread Index]

X Strike Force X.Org X11 SVN commit: r3282 - in trunk/driver/xserver-xorg-video-cyrix/debian: . patches



Author: dparsons
Date: 2006-09-18 10:58:02 -0400 (Mon, 18 Sep 2006)
New Revision: 3282

Added:
   trunk/driver/xserver-xorg-video-cyrix/debian/patches/
   trunk/driver/xserver-xorg-video-cyrix/debian/patches/1-man-typo
   trunk/driver/xserver-xorg-video-cyrix/debian/patches/series
   trunk/driver/xserver-xorg-video-cyrix/debian/xserver-xorg-video-cyrix.manpages
Modified:
   trunk/driver/xserver-xorg-video-cyrix/debian/changelog
   trunk/driver/xserver-xorg-video-cyrix/debian/compat
   trunk/driver/xserver-xorg-video-cyrix/debian/control
   trunk/driver/xserver-xorg-video-cyrix/debian/rules
   trunk/driver/xserver-xorg-video-cyrix/debian/xserver-xorg-video-cyrix.install
Log:
  * Standards version 3.7.2.
  * Use debhelper 5.
  * Use dh_installman to install man pages.
  * Exclude cyrix_drv.la from dh_install.
  * Patch 1-man-typo fixes typo in man page. Closes: #364557.
  * Use patch and xsfclean rules in debian/rules.
	    


Modified: trunk/driver/xserver-xorg-video-cyrix/debian/changelog
===================================================================
--- trunk/driver/xserver-xorg-video-cyrix/debian/changelog	2006-09-18 14:31:48 UTC (rev 3281)
+++ trunk/driver/xserver-xorg-video-cyrix/debian/changelog	2006-09-18 14:58:02 UTC (rev 3282)
@@ -1,9 +1,18 @@
-xserver-xorg-video-cyrix (1:1.1.0-3) UNRELEASED; urgency=low
+xserver-xorg-video-cyrix (1:1.1.0-3) unstable; urgency=low
 
+  [ Steve Langasek ]
   * Upload to unstable
 
- -- Steve Langasek <vorlon@debian.org>  Mon, 18 Sep 2006 03:42:40 -0700
+  [ Drew Parsons ]
+  * Standards version 3.7.2.
+  * Use debhelper 5.
+  * Use dh_installman to install man pages.
+  * Exclude cyrix_drv.la from dh_install.
+  * Patch 1-man-typo fixes typo in man page. Closes: #364557.
+  * Use patch and xsfclean rules in debian/rules.
 
+ -- Drew Parsons <dparsons@debian.org>  Tue, 19 Sep 2006 00:56:32 +1000
+
 xserver-xorg-video-cyrix (1:1.1.0-2) experimental; urgency=low
 
   [ Drew Parsons ]

Modified: trunk/driver/xserver-xorg-video-cyrix/debian/compat
===================================================================
--- trunk/driver/xserver-xorg-video-cyrix/debian/compat	2006-09-18 14:31:48 UTC (rev 3281)
+++ trunk/driver/xserver-xorg-video-cyrix/debian/compat	2006-09-18 14:58:02 UTC (rev 3282)
@@ -1 +1 @@
-4
+5

Modified: trunk/driver/xserver-xorg-video-cyrix/debian/control
===================================================================
--- trunk/driver/xserver-xorg-video-cyrix/debian/control	2006-09-18 14:31:48 UTC (rev 3281)
+++ trunk/driver/xserver-xorg-video-cyrix/debian/control	2006-09-18 14:58:02 UTC (rev 3282)
@@ -3,8 +3,8 @@
 Priority: optional
 Maintainer: Debian X Strike Force <debian-x@lists.debian.org>
 Uploaders: David Nusinow <dnusinow@debian.org>, Branden Robinson <branden@debian.org>, Fabio M. Di Nitto <fabbione@fabbione.net>
-Build-Depends: debhelper (>= 4.0.0), pkg-config, xserver-xorg-dev (>= 2:1.1.1), x11proto-xext-dev, x11proto-xf86dga-dev, x11proto-core-dev, x11proto-fonts-dev, x11proto-randr-dev, x11proto-render-dev
-Standards-Version: 3.6.1
+Build-Depends: debhelper (>= 5), pkg-config, xserver-xorg-dev (>= 2:1.1.1), x11proto-xext-dev, x11proto-xf86dga-dev, x11proto-core-dev, x11proto-fonts-dev, x11proto-randr-dev, x11proto-render-dev
+Standards-Version: 3.7.2
 
 Package: xserver-xorg-video-cyrix
 Architecture: any

Added: trunk/driver/xserver-xorg-video-cyrix/debian/patches/1-man-typo
===================================================================
--- trunk/driver/xserver-xorg-video-cyrix/debian/patches/1-man-typo	                        (rev 0)
+++ trunk/driver/xserver-xorg-video-cyrix/debian/patches/1-man-typo	2006-09-18 14:58:02 UTC (rev 3282)
@@ -0,0 +1,13 @@
+Index: xserver-xorg-video-cyrix/man/cyrix.man
+===================================================================
+--- xserver-xorg-video-cyrix.orig/man/cyrix.man	2006-09-19 00:43:30.000000000 +1000
++++ xserver-xorg-video-cyrix/man/cyrix.man	2006-09-19 00:44:44.000000000 +1000
+@@ -26,7 +26,7 @@
+ .PP
+ The MediaGX run length compresses its shared framebuffer, for the best
+ performance on a MediaGX machine pick backgrounds that compress well
+-horizonally.
++horizontally.
+ .SH CONFIGURATION DETAILS
+ Please refer to __xconfigfile__(__filemansuffix__) for general configuration
+ details.  This section only covers configuration details specific to this

Added: trunk/driver/xserver-xorg-video-cyrix/debian/patches/series
===================================================================
--- trunk/driver/xserver-xorg-video-cyrix/debian/patches/series	                        (rev 0)
+++ trunk/driver/xserver-xorg-video-cyrix/debian/patches/series	2006-09-18 14:58:02 UTC (rev 3282)
@@ -0,0 +1 @@
+1-man-typo

Modified: trunk/driver/xserver-xorg-video-cyrix/debian/rules
===================================================================
--- trunk/driver/xserver-xorg-video-cyrix/debian/rules	2006-09-18 14:31:48 UTC (rev 3281)
+++ trunk/driver/xserver-xorg-video-cyrix/debian/rules	2006-09-18 14:58:02 UTC (rev 3282)
@@ -31,7 +31,7 @@
 # kbd_drv.a isn't phenomenally useful; kbd_drv.so more so
 confflags += --disable-static
 
-build: build-stamp
+build: patch build-stamp
 build-stamp:
 	dh_testdir
 
@@ -44,7 +44,7 @@
 
 	touch build-stamp
 
-clean:
+clean: xsfclean
 	dh_testdir
 	dh_testroot
 	rm -f build-stamp
@@ -72,7 +72,8 @@
 
 	dh_installdocs
 	dh_installchangelogs
-	dh_install --sourcedir=debian/tmp --list-missing
+	dh_install --sourcedir=debian/tmp --list-missing --exclude=cyrix_drv.la --exclude=usr/share/man/man4
+	dh_installman
 	dh_link
 	dh_strip
 	dh_compress

Modified: trunk/driver/xserver-xorg-video-cyrix/debian/xserver-xorg-video-cyrix.install
===================================================================
--- trunk/driver/xserver-xorg-video-cyrix/debian/xserver-xorg-video-cyrix.install	2006-09-18 14:31:48 UTC (rev 3281)
+++ trunk/driver/xserver-xorg-video-cyrix/debian/xserver-xorg-video-cyrix.install	2006-09-18 14:58:02 UTC (rev 3282)
@@ -1,2 +1 @@
 usr/lib/xorg/modules/drivers/*.so
-usr/share/man/man4/*

Added: trunk/driver/xserver-xorg-video-cyrix/debian/xserver-xorg-video-cyrix.manpages
===================================================================
--- trunk/driver/xserver-xorg-video-cyrix/debian/xserver-xorg-video-cyrix.manpages	                        (rev 0)
+++ trunk/driver/xserver-xorg-video-cyrix/debian/xserver-xorg-video-cyrix.manpages	2006-09-18 14:58:02 UTC (rev 3282)
@@ -0,0 +1 @@
+debian/tmp/usr/share/man/man4/*



Reply to: