X Strike Force XFree86 SVN commit: r1280 - in trunk/debian: . scripts
Author: branden
Date: 2004-04-19 11:44:23 -0500 (Mon, 19 Apr 2004)
New Revision: 1280
Modified:
trunk/debian/changelog
trunk/debian/copyright
trunk/debian/scripts/prune-non-free
Log:
Add files containing object code with no corresponding source to
prune-non-free, and document DFSG violation in copyright file (see
#242865; thanks, Nathanael Nerode).
Modified: trunk/debian/changelog
===================================================================
--- trunk/debian/changelog 2004-04-19 15:42:05 UTC (rev 1279)
+++ trunk/debian/changelog 2004-04-19 16:44:23 UTC (rev 1280)
@@ -265,8 +265,12 @@
* Rewrite prune-non-free script, and move it to debian/scripts directory.
- -- Branden Robinson <branden@debian.org> Mon, 19 Apr 2004 10:39:43 -0500
+ * Add files containing object code with no corresponding source to
+ prune-non-free, and document DFSG violation in copyright file (see
+ #242865; thanks, Nathanael Nerode).
+ -- Branden Robinson <branden@debian.org> Mon, 19 Apr 2004 11:42:53 -0500
+
xfree86 (4.3.0-7) unstable; urgency=medium
* Urgency due to fix for FTBFS. Yes -- I too am begging for it to stop.
Modified: trunk/debian/copyright
===================================================================
--- trunk/debian/copyright 2004-04-19 15:42:05 UTC (rev 1279)
+++ trunk/debian/copyright 2004-04-19 16:44:23 UTC (rev 1280)
@@ -8,7 +8,7 @@
Debian modifications to upstream sources:
The following files were removed from the source package due to
- non-DFSG-compliant licensing (see
+ failure to satisfy the Debian Free Software Guidelines (see
<URL:http://www.debian.org/social_contract>):
1) The Beth Mardutho Meltho OpenType fonts have a license which prohibits
@@ -287,6 +287,22 @@
xc/programs/Xserver/hw/xfree86/doc/sgml/DRI.sgml
xc/programs/Xserver/hw/xfree86/doc/sgml/DRIcomp.sgml
+ 8) The following files contain object code without any corresponding
+ source.
+
+ xc/programs/Xserver/hw/xfree86/drivers/mga/mga_ucode.h
+ xc/programs/Xserver/hw/xfree86/drivers/rendition/v10002d.uc
+ xc/programs/Xserver/hw/xfree86/drivers/rendition/v20002d.uc
+ xc/programs/Xserver/hw/xfree86/os-support/shared/drm/kernel/r128_cce.c
+ xc/programs/Xserver/hw/xfree86/os-support/shared/drm/kernel/radeon_cp.c
+ xc/programs/Xserver/hw/xfree86/os-support/shared/drm/kernel/mga_ucode.h
+
+ (The files r128_cce.c and radeon_cp.c only partially consist of
+ sourceless object code, but because they are not required to build
+ this package, the files have been removed altogether.)
+
+ These files therefore do not satisfy DFSG 2 ("Source Code").
+
See the debian/patches directory in the source package for all other
changes to upstream source.
Modified: trunk/debian/scripts/prune-non-free
===================================================================
--- trunk/debian/scripts/prune-non-free 2004-04-19 15:42:05 UTC (rev 1279)
+++ trunk/debian/scripts/prune-non-free 2004-04-19 16:44:23 UTC (rev 1280)
@@ -222,4 +222,11 @@
rm -f xc/programs/Xserver/hw/xfree86/doc/sgml/DRI.sgml
rm -f xc/programs/Xserver/hw/xfree86/doc/sgml/DRIcomp.sgml
+rm -f xc/programs/Xserver/hw/xfree86/drivers/mga/mga_ucode.h
+rm -f xc/programs/Xserver/hw/xfree86/drivers/rendition/v10002d.uc
+rm -f xc/programs/Xserver/hw/xfree86/drivers/rendition/v20002d.uc
+rm -f xc/programs/Xserver/hw/xfree86/os-support/shared/drm/kernel/r128_cce.c
+rm -f xc/programs/Xserver/hw/xfree86/os-support/shared/drm/kernel/radeon_cp.c
+rm -f xc/programs/Xserver/hw/xfree86/os-support/shared/drm/kernel/mga_ucode.h
+
# vim:set ai et sts=4 sw=4 tw=80:
Reply to: