rev 4104 - in kde-extras/digikam/trunk/debian: . patches

[Achim Bohnet]

Author: ach-guest
Date: 2006-07-12 00:03:30 +0000 (Wed, 12 Jul 2006)
New Revision: 4104

Modified:
   kde-extras/digikam/trunk/debian/changelog
   kde-extras/digikam/trunk/debian/control
   kde-extras/digikam/trunk/debian/patches/11_only_-lqt-mt.diff
   kde-extras/digikam/trunk/debian/rules
Log:
digikam: not done yet.
  * new upstream release
  * adapt debian/patches/11_only_-lqt-mt.diff to apply cleanly
  * debian/rules:
    - remove applnk/ workaround: digikam.desktop is now properly
      installed in applications/kde/
    - remove x-raw.desktop removal. No longer delivered by upstream
  * debian/control: x-raw.desktop is in kdelibs >= 4:3.5.1-3 so add
    a versioned depend on it.

Modified: kde-extras/digikam/trunk/debian/changelog
===================================================================
--- kde-extras/digikam/trunk/debian/changelog	2006-07-11 18:51:36 UTC (rev 4103)
+++ kde-extras/digikam/trunk/debian/changelog	2006-07-12 00:03:30 UTC (rev 4104)
@@ -1,8 +1,19 @@
-digikam (0.8.1+0.8.2-rc1-3) UNRELEASED; urgency=low
+digikam (0.8.2-1) UNRELEASED; urgency=low
 
   * NOT RELEASED YET
+  !! TODO: check copyright of new translations !!
 
- -- Debian KDE Extras Team <pkg-kde-extras at lists.alioth.debian.org>  Tue, 20 Jun 2006 16:29:39 +0100
+  [ Achim Bohnet ]
+  * new upstream release
+  * adapt debian/patches/11_only_-lqt-mt.diff to apply cleanly
+  * debian/rules:
+    - remove applnk/ workaround: digikam.desktop is now properly
+      installed in applications/kde/
+    - remove x-raw.desktop removal. No longer delivered by upstream
+  * debian/control: x-raw.desktop is in kdelibs >= 4:3.5.1-3 so add
+    a versioned depend on it.
+ 
+ -- Debian KDE Extras Team <pkg-kde-extras at lists.alioth.debian.org>  Wed, 12 Jul 2006 01:26:25 +0200
 
 digikam (0.8.1+0.8.2-rc1-2) unstable; urgency=low
 

Modified: kde-extras/digikam/trunk/debian/control
===================================================================
--- kde-extras/digikam/trunk/debian/control	2006-07-11 18:51:36 UTC (rev 4103)
+++ kde-extras/digikam/trunk/debian/control	2006-07-12 00:03:30 UTC (rev 4104)
@@ -2,7 +2,7 @@
 Priority: optional
 Maintainer: Debian KDE Extras Team <pkg-kde-extras at lists.alioth.debian.org>
 Uploaders: Achim Bohnet <ach at mpe.mpg.de>, Mark Purcell <msp at debian.org>, Paul Telford <pxt at debian.org>
-Build-Depends: debhelper (>> 4.1), cdbs, kdelibs4-dev, libimlib2-dev, libexif-dev (>> 0.6.9), libtiff4-dev, libgphoto2-2-dev, libkexif1-dev, libkipi0-dev, automake1.9, libsqlite3-dev
+Build-Depends: debhelper (>> 4.1), cdbs, kdelibs4-dev (>= 4:3.5.1-3), libimlib2-dev, libexif-dev (>> 0.6.9), libtiff4-dev, libgphoto2-2-dev, libkexif1-dev, libkipi0-dev, automake1.9, libsqlite3-dev
 Standards-Version: 3.6.2
 
 Package: digikam

Modified: kde-extras/digikam/trunk/debian/patches/11_only_-lqt-mt.diff
===================================================================
--- kde-extras/digikam/trunk/debian/patches/11_only_-lqt-mt.diff	2006-07-11 18:51:36 UTC (rev 4103)
+++ kde-extras/digikam/trunk/debian/patches/11_only_-lqt-mt.diff	2006-07-12 00:03:30 UTC (rev 4104)
@@ -27,7 +27,7 @@
  s, at LIB_QPE@,$LIB_QPE,;t t
  s, at kde_qtver@,$kde_qtver,;t t
  s, at KDE_EXTRA_RPATH@,$KDE_EXTRA_RPATH,;t t
-@@ -42016,7 +42016,7 @@
+@@ -42019,7 +42019,7 @@
  s, at MOC@,$MOC,;t t
  s, at UIC@,$UIC,;t t
  s, at UIC_TR@,$UIC_TR,;t t

Modified: kde-extras/digikam/trunk/debian/rules
===================================================================
--- kde-extras/digikam/trunk/debian/rules	2006-07-11 18:51:36 UTC (rev 4103)
+++ kde-extras/digikam/trunk/debian/rules	2006-07-12 00:03:30 UTC (rev 4104)
@@ -12,13 +12,6 @@
 	install -D -o root -g root -m 0644 debian/lintian $(CURDIR)/debian/digikam/usr/share/lintian/overrides/digikam
 	mkdir -p $(CURDIR)/debian/digikam/usr/share/apps/konqueror/servicemenus/
 	install -D -o root -g root -m 0644 debian/digikam_upload_photos.desktop  $(CURDIR)/debian/digikam/usr/share/apps/konqueror/servicemenus/
-	mv $(CURDIR)/debian/digikam/usr/share/applnk/Graphics/digikam.desktop $(CURDIR)/debian/digikam/usr/share/applications/kde/
-	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
-
+	# remove empty API-docs dirs tree
 	rm -rf $(CURDIR)/debian/digikam/usr/share/doc/kde