X Strike Force X.Org X11 SVN commit: r133 - trunk/debian
Author: branden
Date: 2005-05-19 23:49:20 -0500 (Thu, 19 May 2005)
New Revision: 133
Modified:
trunk/debian/changelog
trunk/debian/copyright
Log:
Merge change from Debian xfree86 SVN to stop identifying the Compugraphic
and Adobe fonts from the Xprint server as non-DFSG-free; the files have
been removed from the upstream archive for another reason, namely the
existence of the xprint package.
Modified: trunk/debian/changelog
===================================================================
--- trunk/debian/changelog 2005-05-20 04:41:02 UTC (rev 132)
+++ trunk/debian/changelog 2005-05-20 04:49:20 UTC (rev 133)
@@ -19,7 +19,7 @@
- Re-add Branden's copyright to xfs.init
- Merge changes from xfree tree in to xserver-common.config.in
- Merge changes from xfree tree to scripts directory:
- - manifest-install-reconcile
+ - manifest-install-reconcile
- validate-posix-sh
- Merge changes from xfree tree to local directory:
- dexconf
@@ -53,9 +53,9 @@
- Re-enable omnibook and ru_yawerty for xlibs.install
- Comment out remove_conffile in xlibs.postinst, postrm, and preinst
-
+
- Handle xlibs-static package split
- - Add libxvmc-dev.install.hurd-i386 file which removes
+ - Add libxvmc-dev.install.hurd-i386 file which removes
usr/X11R6/lib/libI810XvMC.a. Removing
xlibs-static-dev.install.hurd-386.
- Add libxxf86vm-dev.install.s390 file which removes manpages. Removing
@@ -63,7 +63,7 @@
- Removing xlibs-static-pic-install.[hurd-i386,netbsd-i386,s390] as the
files which they specifically removed in the past don't appear to be
shipped any more.
-
+
- Merge and edit control file to refer to XSF
- Fixes in local
@@ -126,9 +126,12 @@
has no force under U.S. copyright law (asserting copyright in something,
even Free Software, doesn't waive a person's publicity rights anyway).
Remove duplicate Debian copyright notice for Software in the Public
- Interest, Inc.
+ Interest, Inc. Merge change from Debian xfree86 SVN to stop identifying
+ the Compugraphic and Adobe fonts from the Xprint server as non-DFSG-free;
+ the files have been removed from the upstream archive for another reason,
+ namely the existence of the xprint package.
- -- Branden Robinson <branden@debian.org> Thu, 10 Mar 2005 14:53:09 -0500
+ -- Branden Robinson <branden@debian.org> Thu, 19 May 2005 23:46:32 -0500
xorg (6.8.2-10) hoary; urgency=low
Modified: trunk/debian/copyright
===================================================================
--- trunk/debian/copyright 2005-05-20 04:41:02 UTC (rev 132)
+++ trunk/debian/copyright 2005-05-20 04:49:20 UTC (rev 133)
@@ -156,104 +156,7 @@
xc/fonts/scaled/Type1/UTRG____.afm
xc/fonts/scaled/Type1/UTRG____.pfa
- 6) The Compugraphic and Adobe fonts distributed as part of the Xprint
- server are not licensed at all, and some of the fonts bear no
- copyright information whatsoever.
-
- All Rights Reserved.
-
- These font files therefore do not satisfy DFSG 1 ("Free
- Redistribution"), DFSG 2 ("Source Code"), or DFSG 3 ("Derived Works").
-
- xc/programs/Xserver/XpConfig/C/print/models/HPDJ1600C/fonts/9nb00051.pmf
- xc/programs/Xserver/XpConfig/C/print/models/HPDJ1600C/fonts/9nb00052.pmf
- xc/programs/Xserver/XpConfig/C/print/models/HPDJ1600C/fonts/9nb00053.pmf
- xc/programs/Xserver/XpConfig/C/print/models/HPDJ1600C/fonts/9nb00054.pmf
- xc/programs/Xserver/XpConfig/C/print/models/HPDJ1600C/fonts/9nb00055.pmf
- xc/programs/Xserver/XpConfig/C/print/models/HPDJ1600C/fonts/9nb00056.pmf
- xc/programs/Xserver/XpConfig/C/print/models/HPDJ1600C/fonts/9nb00057.pmf
- xc/programs/Xserver/XpConfig/C/print/models/HPDJ1600C/fonts/9nb00058.pmf
- xc/programs/Xserver/XpConfig/C/print/models/HPDJ1600C/fonts/9nb00059.pmf
- xc/programs/Xserver/XpConfig/C/print/models/HPDJ1600C/fonts/9nb00060.pmf
- xc/programs/Xserver/XpConfig/C/print/models/HPDJ1600C/fonts/9nb00061.pmf
- xc/programs/Xserver/XpConfig/C/print/models/HPDJ1600C/fonts/9nb00062.pmf
- xc/programs/Xserver/XpConfig/C/print/models/HPDJ1600C/fonts/9nb00063.pmf
- xc/programs/Xserver/XpConfig/C/print/models/HPDJ1600C/fonts/9nb00064.pmf
- xc/programs/Xserver/XpConfig/C/print/models/HPDJ1600C/fonts/9nb00065.pmf
- xc/programs/Xserver/XpConfig/C/print/models/HPDJ1600C/fonts/9nb00066.pmf
- xc/programs/Xserver/XpConfig/C/print/models/HPDJ1600C/fonts/9nb00067.pmf
- xc/programs/Xserver/XpConfig/C/print/models/HPDJ1600C/fonts/9nb00068.pmf
- xc/programs/Xserver/XpConfig/C/print/models/HPDJ1600C/fonts/9nb00069.pmf
- xc/programs/Xserver/XpConfig/C/print/models/HPDJ1600C/fonts/9nb00070.pmf
- xc/programs/Xserver/XpConfig/C/print/models/HPDJ1600C/fonts/9nb00071.pmf
- xc/programs/Xserver/XpConfig/C/print/models/HPDJ1600C/fonts/9nb00072.pmf
- xc/programs/Xserver/XpConfig/C/print/models/HPDJ1600C/fonts/9nb00073.pmf
- xc/programs/Xserver/XpConfig/C/print/models/HPDJ1600C/fonts/9nb00074.pmf
- xc/programs/Xserver/XpConfig/C/print/models/HPDJ1600C/fonts/9nb00075.pmf
- xc/programs/Xserver/XpConfig/C/print/models/HPDJ1600C/fonts/9nb00076.pmf
- xc/programs/Xserver/XpConfig/C/print/models/HPDJ1600C/fonts/9nb00077.pmf
- xc/programs/Xserver/XpConfig/C/print/models/HPDJ1600C/fonts/9nb00079.pmf
- xc/programs/Xserver/XpConfig/C/print/models/HPDJ1600C/fonts/9nb00080.pmf
- xc/programs/Xserver/XpConfig/C/print/models/HPDJ1600C/fonts/9nb00081.pmf
- xc/programs/Xserver/XpConfig/C/print/models/HPDJ1600C/fonts/9nb00082.pmf
- xc/programs/Xserver/XpConfig/C/print/models/HPDJ1600C/fonts/9nb00083.pmf
- xc/programs/Xserver/XpConfig/C/print/models/HPDJ1600C/fonts/9nb00084.pmf
- xc/programs/Xserver/XpConfig/C/print/models/HPDJ1600C/fonts/9nb00085.pmf
- xc/programs/Xserver/XpConfig/C/print/models/HPDJ1600C/fonts/9nb00086.pmf
- xc/programs/Xserver/XpConfig/C/print/models/HPDJ1600C/fonts/9nb00087.pmf
- xc/programs/Xserver/XpConfig/C/print/models/HPDJ1600C/fonts/9nb00088.pmf
- xc/programs/Xserver/XpConfig/C/print/models/HPDJ1600C/fonts/9nb00089.pmf
- xc/programs/Xserver/XpConfig/C/print/models/HPDJ1600C/fonts/9nb00090.pmf
- xc/programs/Xserver/XpConfig/C/print/models/HPDJ1600C/fonts/9nb00091.pmf
- xc/programs/Xserver/XpConfig/C/print/models/HPDJ1600C/fonts/9nb00092.pmf
- xc/programs/Xserver/XpConfig/C/print/models/HPDJ1600C/fonts/9nb00093.pmf
- xc/programs/Xserver/XpConfig/C/print/models/HPDJ1600C/fonts/9nb00094.pmf
- xc/programs/Xserver/XpConfig/C/print/models/HPLJ4family/fonts/9nb00051.pmf
- xc/programs/Xserver/XpConfig/C/print/models/HPLJ4family/fonts/9nb00052.pmf
- xc/programs/Xserver/XpConfig/C/print/models/HPLJ4family/fonts/9nb00053.pmf
- xc/programs/Xserver/XpConfig/C/print/models/HPLJ4family/fonts/9nb00054.pmf
- xc/programs/Xserver/XpConfig/C/print/models/HPLJ4family/fonts/9nb00055.pmf
- xc/programs/Xserver/XpConfig/C/print/models/HPLJ4family/fonts/9nb00056.pmf
- xc/programs/Xserver/XpConfig/C/print/models/HPLJ4family/fonts/9nb00057.pmf
- xc/programs/Xserver/XpConfig/C/print/models/HPLJ4family/fonts/9nb00058.pmf
- xc/programs/Xserver/XpConfig/C/print/models/HPLJ4family/fonts/9nb00059.pmf
- xc/programs/Xserver/XpConfig/C/print/models/HPLJ4family/fonts/9nb00060.pmf
- xc/programs/Xserver/XpConfig/C/print/models/HPLJ4family/fonts/9nb00061.pmf
- xc/programs/Xserver/XpConfig/C/print/models/HPLJ4family/fonts/9nb00062.pmf
- xc/programs/Xserver/XpConfig/C/print/models/HPLJ4family/fonts/9nb00063.pmf
- xc/programs/Xserver/XpConfig/C/print/models/HPLJ4family/fonts/9nb00064.pmf
- xc/programs/Xserver/XpConfig/C/print/models/HPLJ4family/fonts/9nb00065.pmf
- xc/programs/Xserver/XpConfig/C/print/models/HPLJ4family/fonts/9nb00066.pmf
- xc/programs/Xserver/XpConfig/C/print/models/HPLJ4family/fonts/9nb00067.pmf
- xc/programs/Xserver/XpConfig/C/print/models/HPLJ4family/fonts/9nb00068.pmf
- xc/programs/Xserver/XpConfig/C/print/models/HPLJ4family/fonts/9nb00069.pmf
- xc/programs/Xserver/XpConfig/C/print/models/HPLJ4family/fonts/9nb00070.pmf
- xc/programs/Xserver/XpConfig/C/print/models/HPLJ4family/fonts/9nb00071.pmf
- xc/programs/Xserver/XpConfig/C/print/models/HPLJ4family/fonts/9nb00072.pmf
- xc/programs/Xserver/XpConfig/C/print/models/HPLJ4family/fonts/9nb00073.pmf
- xc/programs/Xserver/XpConfig/C/print/models/HPLJ4family/fonts/9nb00074.pmf
- xc/programs/Xserver/XpConfig/C/print/models/HPLJ4family/fonts/9nb00075.pmf
- xc/programs/Xserver/XpConfig/C/print/models/HPLJ4family/fonts/9nb00076.pmf
- xc/programs/Xserver/XpConfig/C/print/models/HPLJ4family/fonts/9nb00077.pmf
- xc/programs/Xserver/XpConfig/C/print/models/HPLJ4family/fonts/9nb00079.pmf
- xc/programs/Xserver/XpConfig/C/print/models/HPLJ4family/fonts/9nb00080.pmf
- xc/programs/Xserver/XpConfig/C/print/models/HPLJ4family/fonts/9nb00081.pmf
- xc/programs/Xserver/XpConfig/C/print/models/HPLJ4family/fonts/9nb00082.pmf
- xc/programs/Xserver/XpConfig/C/print/models/HPLJ4family/fonts/9nb00083.pmf
- xc/programs/Xserver/XpConfig/C/print/models/HPLJ4family/fonts/9nb00084.pmf
- xc/programs/Xserver/XpConfig/C/print/models/HPLJ4family/fonts/9nb00085.pmf
- xc/programs/Xserver/XpConfig/C/print/models/HPLJ4family/fonts/9nb00086.pmf
- xc/programs/Xserver/XpConfig/C/print/models/HPLJ4family/fonts/9nb00087.pmf
- xc/programs/Xserver/XpConfig/C/print/models/HPLJ4family/fonts/9nb00088.pmf
- xc/programs/Xserver/XpConfig/C/print/models/HPLJ4family/fonts/9nb00089.pmf
- xc/programs/Xserver/XpConfig/C/print/models/HPLJ4family/fonts/9nb00090.pmf
- xc/programs/Xserver/XpConfig/C/print/models/HPLJ4family/fonts/9nb00091.pmf
- xc/programs/Xserver/XpConfig/C/print/models/HPLJ4family/fonts/9nb00092.pmf
- xc/programs/Xserver/XpConfig/C/print/models/HPLJ4family/fonts/9nb00093.pmf
- xc/programs/Xserver/XpConfig/C/print/models/HPLJ4family/fonts/9nb00094.pmf
- xc/programs/Xserver/XpConfig/C/print/models/HPLJ4family/fonts/lpr0ye1a.pmf
-
- 7) VA Linux Systems, Inc.'s DRI documentation has a license which prohibits
+ 6) VA Linux Systems, Inc.'s DRI documentation has a license which prohibits
free modification:
Permission is granted to make and distribute verbatim copies of
@@ -268,7 +171,7 @@
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
+ 7) The following files contain object code without any corresponding
source.
xc/programs/Xserver/hw/xfree86/drivers/mga/mga_ucode.h
@@ -287,8 +190,6 @@
See the debian/patches directory in the source package for all other
changes to upstream source.
-NOTE: point 6 of the above section is still under discussion.
-
-------------------------------------------------------------------------------
Debian copyright(s)/license(s):
Reply to: