[Pkg-kde-commits] rev 2403 - branches/kde-3.4.0/packages/kdeartwork/debian

[Christopher Martin]

Author: chrsmrtn
Date: 2005-11-29 14:12:27 +0000 (Tue, 29 Nov 2005)
New Revision: 2403

Modified:
   branches/kde-3.4.0/packages/kdeartwork/debian/copyright
Log:
And backport to 3.4 - why not?


Modified: branches/kde-3.4.0/packages/kdeartwork/debian/copyright
===================================================================
--- branches/kde-3.4.0/packages/kdeartwork/debian/copyright	2005-11-29 14:11:28 UTC (rev 2402)
+++ branches/kde-3.4.0/packages/kdeartwork/debian/copyright	2005-11-29 14:12:27 UTC (rev 2403)
@@ -182,11 +182,19 @@
     IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED
     WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE.
 
-  Since these two licenses are incompatible, the Virtual Machine screen
-  saver is not built and shipped with kdeartwork.  However, the individual
-  source files (each under only a single one of these licenses) are
-  still available in the kdeartwork source package.
+  These licenses would seem incompatible, but note the following:
 
+  /*
+   * Please note that as of July 22, 1999, the licensees and distributors
+   * are no longer required to include the above mentioned acknowledgement
+   * within advertising materials. For full details see
+   * ftp://ftp.cs.berkeley.edu/pub/4bsd/README.Impt.License.Change
+   */
+
+  Since this change is generally though retroactive, the incompatibility
+  is resolved, and we can ship the Virtual Machine screen saver with
+  kdeartwork.
+
   --------------------
 
   Wallpapers: