Author: dnusinow
Date: 2006-02-26 23:08:14 -0500 (Sun, 26 Feb 2006)
New Revision: 1347
Added:
branches/modular/driver/xf86-video-rendition-X11R7.0-4.0.1.3/debian/patches/
branches/modular/driver/xf86-video-rendition-X11R7.0-4.0.1.3/debian/patches/01_debian_remove_code_ref_to_object_code_files.diff
branches/modular/driver/xf86-video-rendition-X11R7.0-4.0.1.3/debian/patches/series
branches/modular/driver/xf86-video-rendition-X11R7.0-4.0.1.3/debian/prune/
branches/modular/driver/xf86-video-rendition-X11R7.0-4.0.1.3/debian/prune/non-free
Removed:
branches/modular/driver/xf86-video-rendition-X11R7.0-4.0.1.3/src/README.uc
branches/modular/driver/xf86-video-rendition-X11R7.0-4.0.1.3/src/v10002d.uc
branches/modular/driver/xf86-video-rendition-X11R7.0-4.0.1.3/src/v20002d.uc
Modified:
branches/modular/driver/xf86-video-rendition-X11R7.0-4.0.1.3/debian/changelog
branches/modular/driver/xf86-video-rendition-X11R7.0-4.0.1.3/debian/rules
Log:
* Port patches from trunk
+ debian/913_debian_remove_code_ref_to_object_code_files.diff
* Prune non-free files README.uc, v10002d.uc, and v20002d.uc
Modified:
branches/modular/driver/xf86-video-rendition-X11R7.0-4.0.1.3/debian/changelog
===================================================================
---
branches/modular/driver/xf86-video-rendition-X11R7.0-4.0.1.3/debian/changelog
2006-02-27 03:56:22 UTC (rev 1346)
+++
branches/modular/driver/xf86-video-rendition-X11R7.0-4.0.1.3/debian/changelog
2006-02-27 04:08:14 UTC (rev 1347)
@@ -1,3 +1,11 @@
+xserver-xorg-video-rendition (1:4.0.1.3.dfsg.1-1) experimental; urgency=low
+
+ * Port patches from trunk
+ + debian/913_debian_remove_code_ref_to_object_code_files.diff
+ * Prune non-free files README.uc, v10002d.uc, and v20002d.uc
+
+ -- David Nusinow <[EMAIL PROTECTED]> Sun, 26 Feb 2006 23:06:55 -0500
+
xserver-xorg-video-rendition (1:4.0.1.3-1) experimental; urgency=low
* First upload to Debian
Added:
branches/modular/driver/xf86-video-rendition-X11R7.0-4.0.1.3/debian/patches/01_debian_remove_code_ref_to_object_code_files.diff
===================================================================
---
branches/modular/driver/xf86-video-rendition-X11R7.0-4.0.1.3/debian/patches/01_debian_remove_code_ref_to_object_code_files.diff
2006-02-27 03:56:22 UTC (rev 1346)
+++
branches/modular/driver/xf86-video-rendition-X11R7.0-4.0.1.3/debian/patches/01_debian_remove_code_ref_to_object_code_files.diff
2006-02-27 04:08:14 UTC (rev 1347)
@@ -0,0 +1,26 @@
+$Id$
+
+Eliminate references to sourceless object code pruned from the source
+distribution in Debian packages.
+
+This patch by Fabio Massimo Di Nitto.
+
+Index: src/vboard.c
+===================================================================
+--- src/vboard.c.orig 2005-08-02 22:04:31.000000000 -0400
++++ src/vboard.c 2005-08-03 00:40:01.000000000 -0400
+@@ -92,14 +92,6 @@
+ /* reset memory endian */
+ verite_out8(iob+MEMENDIAN, memendian);
+
+- if (V1000_DEVICE == pRendition->board.chip){
+- c=verite_load_ucfile(pScreenInfo, strcat ((char
*)MICROCODE_DIR,"v10002d.uc"));
+- }
+- else {
+- /* V2x00 chip */
+- c=verite_load_ucfile(pScreenInfo, strcat ((char
*)MICROCODE_DIR,"v20002d.uc"));
+- }
+-
+ if (c == -1) {
+ xf86DrvMsg(pScreenInfo->scrnIndex, X_ERROR,
+ ("Microcode loading failed !!!\n"));
Added:
branches/modular/driver/xf86-video-rendition-X11R7.0-4.0.1.3/debian/patches/series
===================================================================
---
branches/modular/driver/xf86-video-rendition-X11R7.0-4.0.1.3/debian/patches/series
2006-02-27 03:56:22 UTC (rev 1346)
+++
branches/modular/driver/xf86-video-rendition-X11R7.0-4.0.1.3/debian/patches/series
2006-02-27 04:08:14 UTC (rev 1347)
@@ -0,0 +1 @@
+01_debian_remove_code_ref_to_object_code_files.diff -p0
Added:
branches/modular/driver/xf86-video-rendition-X11R7.0-4.0.1.3/debian/prune/non-free
===================================================================
---
branches/modular/driver/xf86-video-rendition-X11R7.0-4.0.1.3/debian/prune/non-free
2006-02-27 03:56:22 UTC (rev 1346)
+++
branches/modular/driver/xf86-video-rendition-X11R7.0-4.0.1.3/debian/prune/non-free
2006-02-27 04:08:14 UTC (rev 1347)
@@ -0,0 +1,3 @@
+src/README.uc
+src/v10002d.uc
+src/v20002d.uc
Modified:
branches/modular/driver/xf86-video-rendition-X11R7.0-4.0.1.3/debian/rules
===================================================================
--- branches/modular/driver/xf86-video-rendition-X11R7.0-4.0.1.3/debian/rules
2006-02-27 03:56:22 UTC (rev 1346)
+++ branches/modular/driver/xf86-video-rendition-X11R7.0-4.0.1.3/debian/rules
2006-02-27 04:08:14 UTC (rev 1347)
@@ -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
Deleted:
branches/modular/driver/xf86-video-rendition-X11R7.0-4.0.1.3/src/README.uc
===================================================================
--- branches/modular/driver/xf86-video-rendition-X11R7.0-4.0.1.3/src/README.uc
2006-02-27 03:56:22 UTC (rev 1346)
+++ branches/modular/driver/xf86-video-rendition-X11R7.0-4.0.1.3/src/README.uc
2006-02-27 04:08:14 UTC (rev 1347)
@@ -1,5 +0,0 @@
-The microcode files included here are, with Renditions
-permissions, included from following Windows drivers :
-
-* V1000 2.1 beta 2
-* V2x00 3.0 beta 5
Deleted:
branches/modular/driver/xf86-video-rendition-X11R7.0-4.0.1.3/src/v10002d.uc
===================================================================
(Binary files differ)
Deleted:
branches/modular/driver/xf86-video-rendition-X11R7.0-4.0.1.3/src/v20002d.uc
===================================================================
(Binary files differ)
--
To UNSUBSCRIBE, email to [EMAIL PROTECTED]
with a subject of "unsubscribe". Trouble? Contact [EMAIL PROTECTED]
