rev 7309 - trunk/packages/kdebase/debian

[Ana Beatriz Guerrero López]

Author: ana
Date: 2007-10-01 15:23:32 +0000 (Mon, 01 Oct 2007)
New Revision: 7309

Modified:
   trunk/packages/kdebase/debian/changelog
   trunk/packages/kdebase/debian/kdebase-data.install
   trunk/packages/kdebase/debian/not-installed.list
Log:
Do not install the Energy Star logo because it is not clear if this use is
permitted under EPA's trademark guidelines. (Closes: #441269)



Modified: trunk/packages/kdebase/debian/changelog
===================================================================
--- trunk/packages/kdebase/debian/changelog	2007-09-30 11:04:12 UTC (rev 7308)
+++ trunk/packages/kdebase/debian/changelog	2007-10-01 15:23:32 UTC (rev 7309)
@@ -1,3 +1,10 @@
+kdebase (4:3.5.7-5) unstable; urgency=low
+
+  * Do not show the Energy Star logo because it is not clear if this use is 
+    permitted under EPA's trademark guidelines. (Closes: #441269)
+
+ -- Ana Beatriz Guerrero Lopez <ana at debian.org>  Mon, 01 Oct 2007 17:17:39 +0200
+
 kdebase (4:3.5.7-4) unstable; urgency=low
 
   * Add patch to fix unauthorized login problem in kdm.

Modified: trunk/packages/kdebase/debian/kdebase-data.install
===================================================================
--- trunk/packages/kdebase/debian/kdebase-data.install	2007-09-30 11:04:12 UTC (rev 7308)
+++ trunk/packages/kdebase/debian/kdebase-data.install	2007-10-01 15:23:32 UTC (rev 7309)
@@ -41,7 +41,6 @@
 debian/tmp/usr/share/apps/kcontrol/about/main.html
 debian/tmp/usr/share/apps/kcontrol/about/top-right-kcontrol.png
 debian/tmp/usr/share/apps/kcontrol/kcontrolui.rc
-debian/tmp/usr/share/apps/kcontrol/pics/energybig.png
 debian/tmp/usr/share/apps/kcontrol/pics/lo-energy.png
 debian/tmp/usr/share/apps/kcontrol/pics/logo.png
 debian/tmp/usr/share/apps/kcontrol/pics/mini-world.png

Modified: trunk/packages/kdebase/debian/not-installed.list
===================================================================
--- trunk/packages/kdebase/debian/not-installed.list	2007-09-30 11:04:12 UTC (rev 7308)
+++ trunk/packages/kdebase/debian/not-installed.list	2007-10-01 15:23:32 UTC (rev 7309)
@@ -51,3 +51,8 @@
 /usr/share/apps/kcmview1394/oui.db
  - this file is installed, but manually, in debian/rules, since the
    KDE build system can't be relied on to do it itself on !Linux.
+
+/usr/share/apps/kcontrol/pics/energybig.png
+ - It is not clear if this use is permitted under EPA's trademark 
+   guidelines. See bug #441269.
+