rev 3112 - kde-extras/digikam/trunk/debian

[Achim Bohnet]

Author: ach-guest
Date: 2006-02-09 02:14:33 +0000 (Thu, 09 Feb 2006)
New Revision: 3112

Modified:
   kde-extras/digikam/trunk/debian/changelog
   kde-extras/digikam/trunk/debian/rules
Log:
digikam:
  * remove image/x-raw.desktop. It is now in upstream's stable branch
    of kdelibs (see http://bugs.kde.org/show_bug.cgi?id=121242).
    Debian's kdelibs >= 4:3.5.1-3 contains this file already.


Modified: kde-extras/digikam/trunk/debian/changelog
===================================================================
--- kde-extras/digikam/trunk/debian/changelog	2006-02-09 02:05:22 UTC (rev 3111)
+++ kde-extras/digikam/trunk/debian/changelog	2006-02-09 02:14:33 UTC (rev 3112)
@@ -1,8 +1,11 @@
-digikam (0.8.1-3) unstable; urgency=low
+digikam (0.8.1-3) UNRELEASED; urgency=low
 
   [ Achim Bohnet ]
   * Remove version from build-dep on libkexif and libkipi.  Lastest
     libkexif and libkipi don't refer to libXft.la anymore.
+  * remove image/x-raw.desktop. It is now in upstream's stable branch
+    of kdelibs (see http://bugs.kde.org/show_bug.cgi?id=121242).
+    Debian's kdelibs >= 4:3.5.1-3 contains this file already.
 
  -- Debian KDE Extras Team <pkg-kde-extras at lists.alioth.debian.org>  Wed,  8 Feb 2006 01:46:51 +0100
 

Modified: kde-extras/digikam/trunk/debian/rules
===================================================================
--- kde-extras/digikam/trunk/debian/rules	2006-02-09 02:05:22 UTC (rev 3111)
+++ kde-extras/digikam/trunk/debian/rules	2006-02-09 02:14:33 UTC (rev 3112)
@@ -16,6 +16,10 @@
 	rmdir $(CURDIR)/debian/digikam/usr/share/applnk/Graphics
 	rmdir $(CURDIR)/debian/digikam/usr/share/applnk
 
+	# image/x-raw is now in kdelibs > 3.5.1 and Debian's kdelibs (4:3.5.1-3)
+	# will include it.
+	rm   $(CURDIR)/debian/digikam/usr/share/mimelnk/image/x-raw.desktop
+
 	rmdir $(CURDIR)/debian/digikam/usr/share/doc/kde/HTML/en/digikam-0.8.1-apidocs/digikam/digikam/html
 	rmdir $(CURDIR)/debian/digikam/usr/share/doc/kde/HTML/en/digikam-0.8.1-apidocs/digikam/digikam
 	rmdir $(CURDIR)/debian/digikam/usr/share/doc/kde/HTML/en/digikam-0.8.1-apidocs/digikam/html