X Strike Force XFree86 SVN commit: r1959 - trunk/debian
Author: branden
Date: 2004-10-15 17:29:52 -0500 (Fri, 15 Oct 2004)
New Revision: 1959
Modified:
trunk/debian/CHANGESETS
trunk/debian/changelog
trunk/debian/copyright
Log:
Add copyright and (MIT/X11 style) license for Bitstream Type1 fonts to
copyright file. Thanks to Ben Harris for pointing this out.
(Closes: #274018)
Modified: trunk/debian/CHANGESETS
===================================================================
--- trunk/debian/CHANGESETS 2004-10-15 21:36:34 UTC (rev 1958)
+++ trunk/debian/CHANGESETS 2004-10-15 22:29:52 UTC (rev 1959)
@@ -157,4 +157,9 @@
(Closes: #241534)
1957
+Add copyright and (MIT/X11 style) license for Bitstream Type1 fonts to
+copyright file. Thanks to Ben Harris for pointing this out.
+(Closes: #274018)
+ 1959
+
vim:set ai et sts=4 sw=4 tw=80:
Modified: trunk/debian/changelog
===================================================================
--- trunk/debian/changelog 2004-10-15 21:36:34 UTC (rev 1958)
+++ trunk/debian/changelog 2004-10-15 22:29:52 UTC (rev 1959)
@@ -64,6 +64,10 @@
== ctx' failed." for ATI R200 DRI users (thanks, Martin Dickopp).
(Closes: #241534)
+ * Add copyright and (MIT/X11 style) license for Bitstream Type1 fonts to
+ copyright file. Thanks to Ben Harris for pointing this out.
+ (Closes: #274018)
+
Changes by Denis Barbier and Fabio M. Di Nitto:
* Edit xc/programs/xkbcomp/symbols/pc/Imakefile so that the new pc/us_intl
@@ -134,7 +138,7 @@
+ Set UseBios default to "no" for PROSAVAGE_DDR and PROSAVAGE_DDRK, as
described at <URL: http://www.probo.com/timr/savage40.html >.
- -- Branden Robinson <branden@debian.org> Fri, 15 Oct 2004 15:54:53 -0500
+ -- Branden Robinson <branden@debian.org> Fri, 15 Oct 2004 17:28:26 -0500
xfree86 (4.3.0.dfsg.1-8) unstable; urgency=high
Modified: trunk/debian/copyright
===================================================================
--- trunk/debian/copyright 2004-10-15 21:36:34 UTC (rev 1958)
+++ trunk/debian/copyright 2004-10-15 22:29:52 UTC (rev 1959)
@@ -1130,6 +1130,7 @@
XFree86's LICENSE document does not appear to be completely
comprehensive.
+--------------------------------------------------------------------------------
Many files appear to be licensed under the "SGI FREE SOFTWARE
LICENSE B (Version 1.1 [02/22/2000])":
@@ -1396,4 +1397,20 @@
appear in the Notice in the Original Code under the heading "Additional
Notice Provisions"]
+--------------------------------------------------------------------------------
+The Bitstream Type 1 fonts are under the following license:
+
+(c) Copyright 1989-1992, Bitstream Inc., Cambridge, MA.
+
+You are hereby granted permission under all Bitstream propriety rights
+to use, copy, modify, sublicense, sell, and redistribute the 4 Bitstream
+Charter (r) Type 1 outline fonts and the 4 Courier Type 1 outline fonts
+for any purpose and without restriction; provided, that this notice is
+left intact on all copies of such fonts and that Bitstream's trademark
+is acknowledged as shown below on all unmodified copies of the 4 Charter
+Type 1 fonts.
+
+BITSTREAM CHARTER is a registered trademark of Bitstream Inc.
+--------------------------------------------------------------------------------
+
vim:set ai et sw=4 sts=4 tw=72:
Reply to: