rev 4756 - trunk/packages/kdebase/debian

[Christopher Martin]

Author: chrsmrtn
Date: 2006-10-22 19:23:58 +0000 (Sun, 22 Oct 2006)
New Revision: 4756

Modified:
   trunk/packages/kdebase/debian/changelog
   trunk/packages/kdebase/debian/kdebase-data.install
   trunk/packages/kdebase/debian/prune-nonfree
Log:
Drop the mozilla icons as well.


Modified: trunk/packages/kdebase/debian/changelog
===================================================================
--- trunk/packages/kdebase/debian/changelog	2006-10-22 18:42:12 UTC (rev 4755)
+++ trunk/packages/kdebase/debian/changelog	2006-10-22 19:23:58 UTC (rev 4756)
@@ -28,7 +28,7 @@
   * Version our build-conflict with nvidia-glx, since newer packages should
     work. (Closes: #393855)
 
-  * Drop thunderbird icons from the tarball, as they are non-free.
+  * Drop thunderbird and mozilla icons from the tarball, as they are non-free.
     (Closes: #394045)
 
  -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Sun, 22 Oct 2006 14:08:55 -0400

Modified: trunk/packages/kdebase/debian/kdebase-data.install
===================================================================
--- trunk/packages/kdebase/debian/kdebase-data.install	2006-10-22 18:42:12 UTC (rev 4755)
+++ trunk/packages/kdebase/debian/kdebase-data.install	2006-10-22 19:23:58 UTC (rev 4756)
@@ -404,7 +404,6 @@
 debian/tmp/usr/share/icons/crystalsvg/128x128/apps/linuxconf.png
 debian/tmp/usr/share/icons/crystalsvg/128x128/apps/locale.png
 debian/tmp/usr/share/icons/crystalsvg/128x128/apps/looknfeel.png
-debian/tmp/usr/share/icons/crystalsvg/128x128/apps/mozilla.png
 debian/tmp/usr/share/icons/crystalsvg/128x128/apps/multimedia.png
 debian/tmp/usr/share/icons/crystalsvg/128x128/apps/netscape.png
 debian/tmp/usr/share/icons/crystalsvg/128x128/apps/package_applications.png
@@ -513,9 +512,6 @@
 debian/tmp/usr/share/icons/crystalsvg/16x16/apps/looknfeel.png
 debian/tmp/usr/share/icons/crystalsvg/16x16/apps/lyx.png
 debian/tmp/usr/share/icons/crystalsvg/16x16/apps/mathematica.png
-debian/tmp/usr/share/icons/crystalsvg/16x16/apps/mozilla_mail.png
-debian/tmp/usr/share/icons/crystalsvg/16x16/apps/mozilla_m.png
-debian/tmp/usr/share/icons/crystalsvg/16x16/apps/mozilla.png
 debian/tmp/usr/share/icons/crystalsvg/16x16/apps/multimedia.png
 debian/tmp/usr/share/icons/crystalsvg/16x16/apps/nedit.png
 debian/tmp/usr/share/icons/crystalsvg/16x16/apps/netscape.png
@@ -703,9 +699,6 @@
 debian/tmp/usr/share/icons/crystalsvg/32x32/apps/looknfeel.png
 debian/tmp/usr/share/icons/crystalsvg/32x32/apps/lyx.png
 debian/tmp/usr/share/icons/crystalsvg/32x32/apps/mathematica.png
-debian/tmp/usr/share/icons/crystalsvg/32x32/apps/mozilla_mail.png
-debian/tmp/usr/share/icons/crystalsvg/32x32/apps/mozilla_m.png
-debian/tmp/usr/share/icons/crystalsvg/32x32/apps/mozilla.png
 debian/tmp/usr/share/icons/crystalsvg/32x32/apps/multimedia.png
 debian/tmp/usr/share/icons/crystalsvg/32x32/apps/nedit.png
 debian/tmp/usr/share/icons/crystalsvg/32x32/apps/netscape.png
@@ -847,9 +840,6 @@
 debian/tmp/usr/share/icons/crystalsvg/48x48/apps/linuxconf.png
 debian/tmp/usr/share/icons/crystalsvg/48x48/apps/locale.png
 debian/tmp/usr/share/icons/crystalsvg/48x48/apps/looknfeel.png
-debian/tmp/usr/share/icons/crystalsvg/48x48/apps/mozilla_mail.png
-debian/tmp/usr/share/icons/crystalsvg/48x48/apps/mozilla_m.png
-debian/tmp/usr/share/icons/crystalsvg/48x48/apps/mozilla.png
 debian/tmp/usr/share/icons/crystalsvg/48x48/apps/multimedia.png
 debian/tmp/usr/share/icons/crystalsvg/48x48/apps/nedit.png
 debian/tmp/usr/share/icons/crystalsvg/48x48/apps/netscape.png
@@ -946,7 +936,6 @@
 debian/tmp/usr/share/icons/crystalsvg/64x64/apps/linuxconf.png
 debian/tmp/usr/share/icons/crystalsvg/64x64/apps/locale.png
 debian/tmp/usr/share/icons/crystalsvg/64x64/apps/looknfeel.png
-debian/tmp/usr/share/icons/crystalsvg/64x64/apps/mozilla.png
 debian/tmp/usr/share/icons/crystalsvg/64x64/apps/multimedia.png
 debian/tmp/usr/share/icons/crystalsvg/64x64/apps/nedit.png
 debian/tmp/usr/share/icons/crystalsvg/64x64/apps/netscape.png

Modified: trunk/packages/kdebase/debian/prune-nonfree
===================================================================
--- trunk/packages/kdebase/debian/prune-nonfree	2006-10-22 18:42:12 UTC (rev 4755)
+++ trunk/packages/kdebase/debian/prune-nonfree	2006-10-22 19:23:58 UTC (rev 4756)
@@ -14,6 +14,17 @@
 	rm -f $TOPLEVEL/pics/crystalsvg/cr48-app-firefox.png
 	rm -f $TOPLEVEL/pics/crystalsvg/cr16-app-thunderbird.png
 	rm -f $TOPLEVEL/pics/crystalsvg/cr32-app-thunderbird.png
+	rm -f $TOPLEVEL/pics/crystalsvg/cr128-app-mozilla.png
+	rm -f $TOPLEVEL/pics/crystalsvg/cr16-app-mozilla_mail.png
+	rm -f $TOPLEVEL/pics/crystalsvg/cr16-app-mozilla_m.png
+	rm -f $TOPLEVEL/pics/crystalsvg/cr16-app-mozilla.png
+	rm -f $TOPLEVEL/pics/crystalsvg/cr32-app-mozilla_mail.png
+	rm -f $TOPLEVEL/pics/crystalsvg/cr32-app-mozilla_m.png
+	rm -f $TOPLEVEL/pics/crystalsvg/cr32-app-mozilla.png
+	rm -f $TOPLEVEL/pics/crystalsvg/cr48-app-mozilla_mail.png
+	rm -f $TOPLEVEL/pics/crystalsvg/cr48-app-mozilla_m.png
+	rm -f $TOPLEVEL/pics/crystalsvg/cr48-app-mozilla.png
+	rm -f $TOPLEVEL/pics/crystalsvg/cr64-app-mozilla.png
 fi
 
 exit 0