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

[Mark Purcell]

Author: msp
Date: 2008-07-16 10:43:09 +0000 (Wed, 16 Jul 2008)
New Revision: 11592

Added:
   kde-extras/digikam/trunk/debian/digikam.lintian-overrides
Removed:
   kde-extras/digikam/trunk/debian/lintian
Modified:
   kde-extras/digikam/trunk/debian/changelog
   kde-extras/digikam/trunk/debian/digikam.install
   kde-extras/digikam/trunk/debian/rules
   kde-extras/digikam/trunk/debian/showfoto.install
Log:
* Install pixmaps in debian/*.install
* Add debian/digikam.lintian-overrides

Modified: kde-extras/digikam/trunk/debian/changelog
===================================================================
--- kde-extras/digikam/trunk/debian/changelog	2008-07-16 08:59:29 UTC (rev 11591)
+++ kde-extras/digikam/trunk/debian/changelog	2008-07-16 10:43:09 UTC (rev 11592)
@@ -4,6 +4,8 @@
     - 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>  Mon, 14 Jul 2008 07:43:17 +1000
 

Modified: kde-extras/digikam/trunk/debian/digikam.install
===================================================================
--- kde-extras/digikam/trunk/debian/digikam.install	2008-07-16 08:59:29 UTC (rev 11591)
+++ kde-extras/digikam/trunk/debian/digikam.install	2008-07-16 10:43:09 UTC (rev 11592)
@@ -8,3 +8,5 @@
 usr/share/locale
 usr/share/servicetypes/digikamimageplugin.desktop
 usr/share/services
+debian/xpm.d/digikam.xpm usr/share/pixmaps/
+debian/xpm.d/digikam-16.xpm usr/share/pixmaps/

Copied: kde-extras/digikam/trunk/debian/digikam.lintian-overrides (from rev 11590, kde-extras/digikam/trunk/debian/lintian)
===================================================================
--- kde-extras/digikam/trunk/debian/digikam.lintian-overrides	                        (rev 0)
+++ kde-extras/digikam/trunk/debian/digikam.lintian-overrides	2008-07-16 10:43:09 UTC (rev 11592)
@@ -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/trunk/debian/digikam.lintian-overrides
___________________________________________________________________
Name: svn:mergeinfo
   + 

Deleted: kde-extras/digikam/trunk/debian/lintian

Modified: kde-extras/digikam/trunk/debian/rules
===================================================================
--- kde-extras/digikam/trunk/debian/rules	2008-07-16 08:59:29 UTC (rev 11591)
+++ kde-extras/digikam/trunk/debian/rules	2008-07-16 10:43:09 UTC (rev 11592)
@@ -27,18 +27,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

Modified: kde-extras/digikam/trunk/debian/showfoto.install
===================================================================
--- kde-extras/digikam/trunk/debian/showfoto.install	2008-07-16 08:59:29 UTC (rev 11591)
+++ kde-extras/digikam/trunk/debian/showfoto.install	2008-07-16 10:43:09 UTC (rev 11592)
@@ -2,3 +2,5 @@
 usr/share/apps/showfoto
 usr/share/applications/kde/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/