rev 4742 - trunk/packages/kdebase/debian

[Christopher Martin]

Author: chrsmrtn
Date: 2006-10-21 14:10:27 +0000 (Sat, 21 Oct 2006)
New Revision: 4742

Modified:
   trunk/packages/kdebase/debian/changelog
   trunk/packages/kdebase/debian/prune-nonfree
Log:
Of course, whoever finally uploads will need to use the script to make a new tarball.


Modified: trunk/packages/kdebase/debian/changelog
===================================================================
--- trunk/packages/kdebase/debian/changelog	2006-10-21 14:00:09 UTC (rev 4741)
+++ trunk/packages/kdebase/debian/changelog	2006-10-21 14:10:27 UTC (rev 4742)
@@ -1,6 +1,6 @@
-kdebase (4:3.5.5a-3) UNRELEASED; urgency=medium
+kdebase (4:3.5.5a.dfsg.1-1) UNRELEASED; urgency=medium
 
-  * Promote eject from recommends to depends.
+  * Promote eject from Recommends to Depends.
 
   * Add a patch to try to use HAL for unmounting before ejecting. This should
     improve user's error messages in case of problems. (This change is
@@ -9,6 +9,9 @@
   * 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.
+    (Closes: #394045)
+
  -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Wed, 18 Oct 2006 14:30:20 +0200
 
 kdebase (4:3.5.5a-2) unstable; urgency=low

Modified: trunk/packages/kdebase/debian/prune-nonfree
===================================================================
--- trunk/packages/kdebase/debian/prune-nonfree	2006-10-21 14:00:09 UTC (rev 4741)
+++ trunk/packages/kdebase/debian/prune-nonfree	2006-10-21 14:10:27 UTC (rev 4742)
@@ -12,6 +12,8 @@
 	rm -f $TOPLEVEL/pics/crystalsvg/cr16-app-firefox.png
 	rm -f $TOPLEVEL/pics/crystalsvg/cr32-app-firefox.png
 	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
 fi
 
 exit 0