rev 11869 - kde-extras/digikam/branches/kde4/debian

[Mark Purcell]

Author: msp
Date: 2008-08-08 05:14:22 +0000 (Fri, 08 Aug 2008)
New Revision: 11869

Added:
   kde-extras/digikam/branches/kde4/debian/digikam.lintian-overrides
Removed:
   kde-extras/digikam/branches/kde4/debian/lintian
Modified:
   kde-extras/digikam/branches/kde4/debian/changelog
   kde-extras/digikam/branches/kde4/debian/compat
   kde-extras/digikam/branches/kde4/debian/digikam.install
   kde-extras/digikam/branches/kde4/debian/rules
   kde-extras/digikam/branches/kde4/debian/showfoto.install
Log:
Merge from trunk


Modified: kde-extras/digikam/branches/kde4/debian/changelog
===================================================================
--- kde-extras/digikam/branches/kde4/debian/changelog	2008-08-08 02:22:06 UTC (rev 11868)
+++ kde-extras/digikam/branches/kde4/debian/changelog	2008-08-08 05:14:22 UTC (rev 11869)
@@ -4,6 +4,23 @@
 
  -- Mark Purcell <msp at debian.org>  Fri, 18 Jul 2008 18:12:37 +1000
 
+digikam (2:0.9.4-1) unstable; urgency=low
+
+  * New upstream release
+    - digiKam 0.9.4 Release Plan (KDE3) ~ 13 July 08 (Closes: #490144)
+  * DEB_CONFIGURE_EXTRA_FLAGS := --without-included-sqlite3
+  * Debhelper compatibility level V7
+  * Install pixmaps in debian/*.install
+  * Add debian/digikam.lintian-overrides
+
+ -- Mark Purcell <msp at debian.org>  Thu, 17 Jul 2008 20:25:39 +1000
+
+digikam (2:0.9.4~rc2-1) experimental; urgency=low
+
+  * New upstream release
+
+ -- Mark Purcell <msp at debian.org>  Tue, 08 Jul 2008 13:01:17 +1000
+
 digikam (2:0.10.0~beta1-1) experimental; urgency=low
 
   * New upstream release

Modified: kde-extras/digikam/branches/kde4/debian/compat
===================================================================
--- kde-extras/digikam/branches/kde4/debian/compat	2008-08-08 02:22:06 UTC (rev 11868)
+++ kde-extras/digikam/branches/kde4/debian/compat	2008-08-08 05:14:22 UTC (rev 11869)
@@ -1 +1 @@
-5
+7

Modified: kde-extras/digikam/branches/kde4/debian/digikam.install
===================================================================
--- kde-extras/digikam/branches/kde4/debian/digikam.install	2008-08-08 02:22:06 UTC (rev 11868)
+++ kde-extras/digikam/branches/kde4/debian/digikam.install	2008-08-08 05:14:22 UTC (rev 11869)
@@ -2,5 +2,9 @@
 usr/include
 usr/lib
 usr/share/applications/kde4/digikam.desktop
+usr/share/apps/digikam
 usr/share/icons/hicolor/*/apps/digikam.png
 usr/share/locale
+usr/share/kde4
+debian/xpm.d/digikam.xpm usr/share/pixmaps/
+debian/xpm.d/digikam-16.xpm usr/share/pixmaps/

Copied: kde-extras/digikam/branches/kde4/debian/digikam.lintian-overrides (from rev 11868, kde-extras/digikam/branches/kde4/debian/lintian)
===================================================================
--- kde-extras/digikam/branches/kde4/debian/digikam.lintian-overrides	                        (rev 0)
+++ kde-extras/digikam/branches/kde4/debian/digikam.lintian-overrides	2008-08-08 05:14:22 UTC (rev 11869)
@@ -0,0 +1,9 @@
+# libdigikam.so is no 'proper' shared library.  It's contents
+# changes as needed. Upstream does not support any use beside
+# for digikam and digikamimageplugins (that are released to-
+# gether when the API changes). Therefore we did not split out a
+# libdigikam and libdigikam-dev pkgs.  For further discussion
+# see bug report #324592
+#
+digikam: non-dev-pkg-with-shlib-symlink 
+digikam: package-name-doesnt-match-sonames


Property changes on: kde-extras/digikam/branches/kde4/debian/digikam.lintian-overrides
___________________________________________________________________
Name: svn:mergeinfo
   + 

Deleted: kde-extras/digikam/branches/kde4/debian/lintian

Modified: kde-extras/digikam/branches/kde4/debian/rules
===================================================================
--- kde-extras/digikam/branches/kde4/debian/rules	2008-08-08 02:22:06 UTC (rev 11868)
+++ kde-extras/digikam/branches/kde4/debian/rules	2008-08-08 05:14:22 UTC (rev 11869)
@@ -7,8 +7,8 @@
 
 TARBALL_EXT=tar.bz2
 
+DEB_CONFIGURE_EXTRA_FLAGS := --without-included-sqlite3
 DEB_CONFIGURE_SCRIPT_ENV += LDFLAGS="-Wl,--as-needed"
-DEB_DH_INSTALL_ARGS := --sourcedir=debian/tmp
 
 DEB_KDE_ENABLE_FINAL := yes
 DEB_INSTALL_DOCS_ALL :=
@@ -26,22 +26,5 @@
 endif
 
 install/digikam::
-	install -D -o root -g root -m 0644 debian/lintian $(CURDIR)/debian/digikam/usr/share/lintian/overrides/digikam
-
-	# Icon 32x32 digikam/digikam/pics/cr32-app-digikam.png digikam.xpm
-	# Icon 16x16 digikam/digikam/pics/cr16-app-digikam.png digikam-16.xpm
-	install -D -p -m 0644 debian/xpm.d/digikam.xpm $(CURDIR)/debian/digikam/usr/share/pixmaps/digikam.xpm
-	install -D -p -m 0644 debian/xpm.d/digikam-16.xpm $(CURDIR)/debian/digikam/usr/share/pixmaps/digikam-16.xpm
-
 	# remove empty API-docs dirs tree
 	rm -rf $(CURDIR)/debian/digikam/usr/share/doc/kde
-
-install/showfoto::
-	# Icon 32x32 digikam/showfoto/cr32-app-showfoto.png showfoto.xpm
-	# Icon 16x16 digikam/showfoto/cr16-app-showfoto.png showfoto-16.xpm
-	install -D -p -m 0644 debian/xpm.d/showfoto.xpm $(CURDIR)/debian/showfoto/usr/share/pixmaps/showfoto.xpm
-	install -D -p -m 0644 debian/xpm.d/showfoto-16.xpm $(CURDIR)/debian/showfoto/usr/share/pixmaps/showfoto-16.xpm
-
-clean::
-	rm -f po/*/*.gmo
-

Modified: kde-extras/digikam/branches/kde4/debian/showfoto.install
===================================================================
--- kde-extras/digikam/branches/kde4/debian/showfoto.install	2008-08-08 02:22:06 UTC (rev 11868)
+++ kde-extras/digikam/branches/kde4/debian/showfoto.install	2008-08-08 05:14:22 UTC (rev 11869)
@@ -1,3 +1,5 @@
 usr/bin/showfoto
 usr/share/applications/kde4/showfoto.desktop
 usr/share/icons/hicolor/*/apps/showfoto.png
+debian/xpm.d/showfoto.xpm usr/share/pixmaps/
+debian/xpm.d/showfoto-16.xpm usr/share/pixmaps/