rev 7334 - trunk/packages/kdebase/debian

Ana Beatriz Guerrero López ana at alioth.debian.org
Thu Oct 4 08:12:47 UTC 2007


Author: ana
Date: 2007-10-04 08:12:47 +0000 (Thu, 04 Oct 2007)
New Revision: 7334

Modified:
   trunk/packages/kdebase/debian/changelog
   trunk/packages/kdebase/debian/kdebase-data.install
   trunk/packages/kdebase/debian/not-installed.list
   trunk/packages/kdebase/debian/rules
Log:
energy star fun


Modified: trunk/packages/kdebase/debian/changelog
===================================================================
--- trunk/packages/kdebase/debian/changelog	2007-10-04 08:03:45 UTC (rev 7333)
+++ trunk/packages/kdebase/debian/changelog	2007-10-04 08:12:47 UTC (rev 7334)
@@ -1,7 +1,10 @@
-kdebase (4:3.5.7-5) unstable; urgency=low
+kdebase (4:3.5.7.dfsg.1-1) 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)
+  * Repackage to remove the Energy Star logo and icons. It is not clear if
+    this use is permitted under EPA's trademark guidelines. See prune-nonfree 
+    for a list of the removed files.  (Closes: #441269)
+  * Add set of icons to replace the removed *-app-energy_star.png ones. Icons
+    made by Sune Vuorela.
   * Update deb shortcut. Thanks to Raúl Sánchez Siles. (Closes: #440571) 
 
  -- Ana Beatriz Guerrero Lopez <ana at debian.org>  Mon, 01 Oct 2007 17:34:05 +0200

Modified: trunk/packages/kdebase/debian/kdebase-data.install
===================================================================
--- trunk/packages/kdebase/debian/kdebase-data.install	2007-10-04 08:03:45 UTC (rev 7333)
+++ trunk/packages/kdebase/debian/kdebase-data.install	2007-10-04 08:12:47 UTC (rev 7334)
@@ -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/lo-energy.png
 debian/tmp/usr/share/apps/kcontrol/pics/logo.png
 debian/tmp/usr/share/apps/kcontrol/pics/mini-world.png
 debian/tmp/usr/share/apps/kcontrol/pics/monitor.png

Modified: trunk/packages/kdebase/debian/not-installed.list
===================================================================
--- trunk/packages/kdebase/debian/not-installed.list	2007-10-04 08:03:45 UTC (rev 7333)
+++ trunk/packages/kdebase/debian/not-installed.list	2007-10-04 08:12:47 UTC (rev 7334)
@@ -53,6 +53,7 @@
    KDE build system can't be relied on to do it itself on !Linux.
 
 /usr/share/apps/kcontrol/pics/energybig.png
+/usr/share/apps/kcontrol/pics/lo-energy.png
  - It is not clear if this use is permitted under EPA's trademark 
    guidelines. See bug #441269.
 

Modified: trunk/packages/kdebase/debian/rules
===================================================================
--- trunk/packages/kdebase/debian/rules	2007-10-04 08:03:45 UTC (rev 7333)
+++ trunk/packages/kdebase/debian/rules	2007-10-04 08:12:47 UTC (rev 7334)
@@ -35,6 +35,14 @@
 #shlibs_ver = 4:3.5.0-1
 #$(foreach p,$(PACKAGES_WITH_LIBS),$(eval DEB_DH_MAKESHLIBS_ARGS_$(p) := -V'$(p) (>= $(shlibs_ver))'))
 
+makebuilddir::
+	touch kcontrol/energy/pics/energybig.png
+	touch kcontrol/energy/pics/lo-energy.png
+	uudecode -o kcontrol/pics/cr128-app-energy_star.png debian/img/cr128-app-energy_star.png.uu
+	uudecode -o kcontrol/pics/cr16-app-energy_star.png debian/img/cr16-app-energy_star.png.uu
+	uudecode -o kcontrol/pics/cr32-app-energy_star.png debian/img/cr32-app-energy_star.png.uu
+	uudecode -o kcontrol/pics/cr48-app-energy_star.png debian/img/cr48-app-energy_star.png.uu
+	uudecode -o kcontrol/pics/cr64-app-energy_star.png debian/img/cr64-app-energy_star.png.uu
 
 common-install-prehook-arch::
 	grep -v -e joystick -e view1394  debian/kcontrol.install > debian/kcontrol.install.kfreebsd-i386




More information about the pkg-kde-commits mailing list