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

[Mark Purcell]

Author: msp
Date: 2010-06-05 00:47:11 +0000 (Sat, 05 Jun 2010)
New Revision: 18266

Added:
   kde-extras/digikam/trunk/debian/digikam-data.install
Modified:
   kde-extras/digikam/trunk/debian/changelog
   kde-extras/digikam/trunk/debian/control
   kde-extras/digikam/trunk/debian/digikam.install
   kde-extras/digikam/trunk/debian/digikam.lintian-overrides
Log:
Add digikam-data package. Fixes arch-dep-package-has-big-usr-share

Modified: kde-extras/digikam/trunk/debian/changelog
===================================================================
--- kde-extras/digikam/trunk/debian/changelog	2010-06-04 17:55:46 UTC (rev 18265)
+++ kde-extras/digikam/trunk/debian/changelog	2010-06-05 00:47:11 UTC (rev 18266)
@@ -1,11 +1,11 @@
-digikam (2:1.2.0-4) UNRELEASED; urgency=low
+digikam (2:1.2.0-4) unstable; urgency=low
 
   * Upload to unstable
   * dh $@ --with kde
-  * dh $@ --with kde
   * Tighten HTML Build-Deps
+  * Add digikam-data package. Fixes arch-dep-package-has-big-usr-share
 
- -- Mark Purcell <msp at debian.org>  Wed, 02 Jun 2010 07:14:23 +1000
+ -- Mark Purcell <msp at debian.org>  Sat, 05 Jun 2010 10:13:31 +1000
 
 digikam (2:1.2.0-3) experimental; urgency=medium
 

Modified: kde-extras/digikam/trunk/debian/control
===================================================================
--- kde-extras/digikam/trunk/debian/control	2010-06-04 17:55:46 UTC (rev 18265)
+++ kde-extras/digikam/trunk/debian/control	2010-06-05 00:47:11 UTC (rev 18266)
@@ -20,7 +20,7 @@
 
 Package: digikam
 Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}, libqt4-sql-sqlite
+Depends: ${shlibs:Depends}, ${misc:Depends}, libqt4-sql-sqlite, digikam-data (= ${source:Version})
 Recommends: www-browser, kipi-plugins
 Suggests: digikam-doc
 Description: digital photo management application for KDE
@@ -73,3 +73,15 @@
 Description: debugging symbols for digikam
  The debugging symbols associated with digikam and showfoto. They will
  automatically be used by gdb for debugging digikam-related issues.
+
+Package: digikam-data
+Architecture: all
+Depends: ${shlibs:Depends}, ${misc:Depends}
+Conflicts: digikam (<= 1.2.0-3)
+Replaces: digikam (<= 1.2.0-3)
+Description: digikam architecture-independant data
+ Contains the significant amount of architecture-independent data that is
+ shipped with digikam.
+ .
+ It has been placed in an architecture all file so we do not have
+ to ship one copy for each architecture.

Added: kde-extras/digikam/trunk/debian/digikam-data.install
===================================================================
--- kde-extras/digikam/trunk/debian/digikam-data.install	                        (rev 0)
+++ kde-extras/digikam/trunk/debian/digikam-data.install	2010-06-05 00:47:11 UTC (rev 18266)
@@ -0,0 +1,2 @@
+usr/share/kde4
+usr/share/locale

Modified: kde-extras/digikam/trunk/debian/digikam.install
===================================================================
--- kde-extras/digikam/trunk/debian/digikam.install	2010-06-04 17:55:46 UTC (rev 18265)
+++ kde-extras/digikam/trunk/debian/digikam.install	2010-06-05 00:47:11 UTC (rev 18266)
@@ -6,8 +6,3 @@
 usr/include
 usr/lib
 usr/share/applications/kde4/digikam.desktop
-usr/share/kde4/apps/digikam
-usr/share/kde4/apps/solid
-usr/share/kde4/services
-usr/share/kde4/servicetypes
-usr/share/locale

Modified: kde-extras/digikam/trunk/debian/digikam.lintian-overrides
===================================================================
--- kde-extras/digikam/trunk/debian/digikam.lintian-overrides	2010-06-04 17:55:46 UTC (rev 18265)
+++ kde-extras/digikam/trunk/debian/digikam.lintian-overrides	2010-06-05 00:47:11 UTC (rev 18266)
@@ -1,4 +1,4 @@
-# libdigikam.so is no 'proper' shared library.  It's contents
+# libdigikam.so is not a '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
@@ -7,3 +7,4 @@
 #
 digikam: non-dev-pkg-with-shlib-symlink 
 digikam: package-name-doesnt-match-sonames
+digikam: no-symbols-control-file