Re: X Strike Force XFree86 SVN commit: r1308 - in trunk/debian: . patches

2004-04-28 Thread Branden Robinson 
On Fri, Apr 23, 2004 at 03:07:12PM +0200, Fabio Massimo Di Nitto wrote:
> Branden, please be so kind to add your magic touch with $ID to the patch
> (hounestly i didn't check how to do that yet) and kill my itaglish here
> and there. I am trying hard to improve my english but i am sure that you
> will spot something wrong with it.

Done.

Just for future reference, the proper magical invocation for setting the
Id property is:

svn propset svn:keywords Id $filename

"propset" can also be abbreviated "ps".

This is already documented in my SVN tutorial[1].  ;-)

[1] 
http://necrotic.deadbeast.net/~branden/svn_pres/common_uses_of_properties.html

-- 
G. Branden Robinson|I must confess to being surprised
Debian GNU/Linux   |by the magnitude of incompatibility
[EMAIL PROTECTED] |with such a minor version bump.
http://people.debian.org/~branden/ |-- Manoj Srivastava


signature.asc
Description: Digital signature

Re: X Strike Force XFree86 SVN commit: r1308 - in trunk/debian: . patches

2004-04-23 Thread Fabio Massimo Di Nitto 
On Fri, 23 Apr 2004, X Strike Force SVN Repository Admin wrote:

> Author: fabbione
> Date: 2004-04-23 08:02:56 -0500 (Fri, 23 Apr 2004)
> New Revision: 1308
>
> Added:
>trunk/debian/patches/913_debian_remove_code_ref_to_object_code_files.d=
> iff
> Modified:
>trunk/debian/changelog
> Log:
> Add patch #913 to remove references to object code files inside the sourc=
> e
> tree and be able to build again. Patch is debian specific (as per
> debian/README)
>
> Problem discovered building from source on i386.
> Fix to the FTBFS tested building from source on i386.
> Unable to test the fix on affect hardware (fabbione doesn't have these ca=
> rds).

Branden, please be so kind to add your magic touch with $ID to the patch
(hounestly i didn't check how to do that yet) and kill my itaglish here
and there. I am trying hard to improve my english but i am sure that you
will spot something wrong with it.

Thanks
Fabio

-- 
 fajita: step one
 Whatever the problem, step one is always to look in the error log.
 fajita: step two
 When in danger or in doubt, step two is to scream and shout.

X Strike Force XFree86 SVN commit: r1308 - in trunk/debian: . patches

2004-04-23 Thread X Strike Force SVN Repository Admin 
Author: fabbione
Date: 2004-04-23 08:02:56 -0500 (Fri, 23 Apr 2004)
New Revision: 1308

Added:
   trunk/debian/patches/913_debian_remove_code_ref_to_object_code_files.diff
Modified:
   trunk/debian/changelog
Log:
Add patch #913 to remove references to object code files inside the source
tree and be able to build again. Patch is debian specific (as per
debian/README)

Problem discovered building from source on i386.
Fix to the FTBFS tested building from source on i386.
Unable to test the fix on affect hardware (fabbione doesn't have these cards).



Modified: trunk/debian/changelog
===
--- trunk/debian/changelog  2004-04-23 11:27:55 UTC (rev 1307)
+++ trunk/debian/changelog  2004-04-23 13:02:56 UTC (rev 1308)
@@ -4,13 +4,12 @@
 
   * Re-generate .orig tar archive to eliminate files containing object code
 with no corresponding source (none of which are actually needed or used by
-XFree86 at build or run time).  Add these files to the prune-non-free
-script.  Document these DFSG violations in copyright file.  Update patch
-#025 to stop patching one of the affected files (part of the kernel DRM
-sources, so again, it's not used by XFree86 as built by Debian). Update
-MANIFEST and xserver-xfree86.install files for alpha, hurd-i386, i386,
-ia64 and sparc accordingly. Thanks to Nathanael Nerode for his assistance
-with this issue.  (Closes: #242865)
+XFree86 at run time).  Add these files to the prune-non-free script.
+Update patch #025 to stop patching one of the affected files and add patch
+#913 to remove all references to the affected files inside the code
+required to build.  Update MANIFEST and xserver-xfree86.install files for
+alpha, hurd-i386, i386, ia64 and sparc accordingly. Thanks to Nathanael
+Nerode for his assistance with this issue.  (Closes: #242865)
 
   * The tar achive within the .orig tar archive (stored this way due to the
 requirements of dbs) has been re-packed using gzip instead of bzip2.  This

Added: trunk/debian/patches/913_debian_remove_code_ref_to_object_code_files.diff
===
--- trunk/debian/patches/913_debian_remove_code_ref_to_object_code_files.diff   
2004-04-23 11:27:55 UTC (rev 1307)
+++ trunk/debian/patches/913_debian_remove_code_ref_to_object_code_files.diff   
2004-04-23 13:02:56 UTC (rev 1308)
@@ -0,0 +1,157 @@
+diff -Nur xc.orig/programs/Xserver/hw/xfree86/drivers/mga/Imakefile 
xc/programs/Xserver/hw/xfree86/drivers/mga/Imakefile
+--- xc.orig/programs/Xserver/hw/xfree86/drivers/mga/Imakefile  2004-04-23 
09:24:58.0 +0200
 xc/programs/Xserver/hw/xfree86/drivers/mga/Imakefile   2004-04-23 
09:31:29.0 +0200
+@@ -143,7 +143,6 @@
+ InstallDriverSDKNonExecFile(mga_dri.c,$(DRIVERSDKDIR)/drivers/mga)
+ InstallDriverSDKNonExecFile(mgareg_flags.h,$(DRIVERSDKDIR)/drivers/mga)
+ InstallDriverSDKNonExecFile(mga_sarea.h,$(DRIVERSDKDIR)/drivers/mga)
+-InstallDriverSDKNonExecFile(mga_ucode.h,$(DRIVERSDKDIR)/drivers/mga)
+ InstallDriverSDKNonExecFile(client.h,$(DRIVERSDKDIR)/drivers/mga)
+ InstallDriverSDKNonExecFile(clientlx.c,$(DRIVERSDKDIR)/drivers/mga)
+ 
InstallDriverSDKNonExecFile(HALlib/binding.h,$(DRIVERSDKDIR)/drivers/mga/HALlib)
+diff -Nur xc.orig/programs/Xserver/hw/xfree86/drivers/rendition/Imakefile 
xc/programs/Xserver/hw/xfree86/drivers/rendition/Imakefile
+--- xc.orig/programs/Xserver/hw/xfree86/drivers/rendition/Imakefile
2003-02-17 18:06:43.0 +0100
 xc/programs/Xserver/hw/xfree86/drivers/rendition/Imakefile 2004-04-23 
09:51:54.0 +0200
+@@ -44,8 +44,6 @@
+ ObjectFromSpecialSource(accel, accelX, -DPSZ=16)
+ 
+ InstallObjectModule(rendition,$(MODULEDIR),drivers)
+-InstallNonExecFile(v10002d.uc,$(MODULEDIR))
+-InstallNonExecFile(v20002d.uc,$(MODULEDIR))
+ 
+ #if !defined(XF86DriverSDK)
+ InstallModuleManPage(rendition)
+@@ -85,9 +83,6 @@
+ InstallDriverSDKNonExecFile(accelX.c,$(DRIVERSDKDIR)/drivers/rendition)
+ InstallDriverSDKNonExecFile(cmd2d.h,$(DRIVERSDKDIR)/drivers/rendition)
+ 
+-InstallDriverSDKNonExecFile(v10002d.uc,$(DRIVERSDKDIR)/drivers/rendition)
+-InstallDriverSDKNonExecFile(v20002d.uc,$(DRIVERSDKDIR)/drivers/rendition)
+-
+ InstallDriverSDKNonExecFile(README.uc,$(DRIVERSDKDIR)/drivers/rendition)
+ 
+ InstallDriverSDKObjectModule(rendition,$(DRIVERSDKMODULEDIR),drivers)
+diff -Nur xc.orig/programs/Xserver/hw/xfree86/drivers/rendition/vboard.c 
xc/programs/Xserver/hw/xfree86/drivers/rendition/vboard.c
+--- xc.orig/programs/Xserver/hw/xfree86/drivers/rendition/vboard.c 
2002-12-11 18:23:33.0 +0100
 xc/programs/Xserver/hw/xfree86/drivers/rendition/vboard.c  2004-04-23 
09:50:23.0 +0200
+@@ -88,14 +88,6 @@
+ /* reset memory endian */
+ verite_out8(iob+MEMENDIAN, memendian);
+ 
+-if (V1000_DEVICE == pRendition->board.chip){
+-  c=verite_load_ucfile(pScreenInfo, strcat ((char 
*)MICROCODE