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

[Steven Michael Robbins]

Author: smr
Date: 2016-07-04 02:04:20 +0000 (Mon, 04 Jul 2016)
New Revision: 20587

Modified:
   kde-extras/digikam/trunk/debian/control
   kde-extras/digikam/trunk/debian/digikam-data.install
   kde-extras/digikam/trunk/debian/digikam-doc.install
   kde-extras/digikam/trunk/debian/digikam.docs
   kde-extras/digikam/trunk/debian/rules
Log:
First iteration of install and package dependencies.  The -doc package is empty and lintian indicates several other issues that remain.

Modified: kde-extras/digikam/trunk/debian/control
===================================================================
--- kde-extras/digikam/trunk/debian/control	2016-07-01 05:25:48 UTC (rev 20586)
+++ kde-extras/digikam/trunk/debian/control	2016-07-04 02:04:20 UTC (rev 20587)
@@ -88,7 +88,7 @@
 
 Package: showfoto
 Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}, digikam-private-libs (= ${binary:Version})
+Depends: ${shlibs:Depends}, ${misc:Depends}, digikam-data (= ${binary:Version}), digikam-private-libs (= ${binary:Version})
 Recommends: dolphin
 Breaks: digikam-doc (<< 2:2.0.0-1), kipi-plugins-common (<< 4:3.1.0-2~)
 Replaces: digikam-doc (<< 2:2.0.0-1), kipi-plugins-common (<< 4:3.1.0-2~)
@@ -113,7 +113,7 @@
 
 Package: digikam-doc
 Architecture: all
-Depends: ${misc:Depends}, khelpcenter4
+Depends: ${misc:Depends}
 Recommends: digikam
 Section: doc
 Description: handbook for digiKam 

Modified: kde-extras/digikam/trunk/debian/digikam-data.install
===================================================================
--- kde-extras/digikam/trunk/debian/digikam-data.install	2016-07-01 05:25:48 UTC (rev 20586)
+++ kde-extras/digikam/trunk/debian/digikam-data.install	2016-07-04 02:04:20 UTC (rev 20587)
@@ -5,5 +5,4 @@
 usr/share/kservices5
 usr/share/kservicetypes5
 usr/share/kxmlgui5/digikam
-usr/share/man
 usr/share/solid

Modified: kde-extras/digikam/trunk/debian/digikam-doc.install
===================================================================
--- kde-extras/digikam/trunk/debian/digikam-doc.install	2016-07-01 05:25:48 UTC (rev 20586)
+++ kde-extras/digikam/trunk/debian/digikam-doc.install	2016-07-04 02:04:20 UTC (rev 20587)
@@ -1 +1 @@
-usr/share/doc/kde/HTML/*/digikam
+

Modified: kde-extras/digikam/trunk/debian/digikam.docs
===================================================================
--- kde-extras/digikam/trunk/debian/digikam.docs	2016-07-01 05:25:48 UTC (rev 20586)
+++ kde-extras/digikam/trunk/debian/digikam.docs	2016-07-04 02:04:20 UTC (rev 20587)
@@ -1,4 +1,4 @@
-core/AUTHORS
-core/TODO*
-core/NEWS
-core/README*
+AUTHORS
+TODO*
+NEWS
+README*

Modified: kde-extras/digikam/trunk/debian/rules
===================================================================
--- kde-extras/digikam/trunk/debian/rules	2016-07-01 05:25:48 UTC (rev 20586)
+++ kde-extras/digikam/trunk/debian/rules	2016-07-04 02:04:20 UTC (rev 20587)
@@ -1,12 +1,8 @@
 #!/usr/bin/make -f
 
-PRIVATE_LIBDIR := /usr/lib/digikam
 export DEB_LDFLAGS_MAINT_APPEND := -Wl,--as-needed
 
-# The following was previously used when building with local libkipi, libkexiv2, and libkdcraw implementation
-#CONFLICTS_SUBSTVAR := libkipi-data, libkexiv2-data, libkdcraw-data, libksane-data
 
-
 DEB_HOST_MULTIARCH ?= $(shell dpkg-architecture -qDEB_HOST_MULTIARCH)
 
 # Augment path to find gphoto2-config; workaround for #826166
@@ -17,41 +13,17 @@
 
 override_dh_auto_configure:
 	dh_auto_configure --buildsystem=kde -- \
-	  -DCMAKE_INSTALL_RPATH="$(PRIVATE_LIBDIR)" \
 	  -DENABLE_MYSQLSUPPORT=ON \
 	  -DENABLE_INTERNALMYSQL=ON
 
 override_dh_auto_install:
 	dh_auto_install
 	# remove development stuff: headers, cmake config files, pkg-config files, .so symlinks, static libs
-	rm -rf --verbose debian/tmp/usr/include
-	rm -rf --verbose debian/tmp/usr/share/kde4/apps/cmake
-	rm -rf --verbose debian/tmp/usr/lib/cmake
-	rm -rf --verbose debian/tmp/usr/lib/pkgconfig
 	find debian/tmp/usr/lib -type l -name '*.so' -exec rm --verbose {} \;
-	# remove potentially conflicting oxygen icons in global icon theme
-	rm -rf --verbose debian/tmp/usr/share/icons/oxygen
-	# remove libkipi translations, provided by kde-l10n-*
-	rm -rf --verbose debian/tmp/usr/share/locale/*/LC_MESSAGES/libkipi.mo
-	# remove haar cascades, the versions in opencv-data will be used instead
-	rm -rf --verbose debian/tmp/usr/share/kde4/apps/libkface/haarcascades
 
-override_dh_installchangelogs:
-	dh_installchangelogs -pdigikam core/ChangeLog
-	dh_installchangelogs -pkipi-plugins extra/kipi-plugins/ChangeLog
-	dh_installchangelogs --remaining-packages
-
 override_dh_install:
 	dh_install --fail-missing
-	# remove duplicate libkipiplugins copied also in digikam-private-libs
-	rm -f --verbose debian/digikam-private-libs/$(PRIVATE_LIBDIR)/libkipiplugins.so.*
+	find debian/digikam-data/usr/share/icons -iname '*showfoto*' | xargs rm
 
-override_dh_shlibdeps:
-	dh_shlibdeps -l$(CURDIR)/debian/digikam-private-libs/$(PRIVATE_LIBDIR):$(CURDIR)/debian/kipi-plugins/$(PRIVATE_LIBDIR)
-
-override_dh_gencontrol:
-	dh_gencontrol -- -Vdigikam:Conflicts='$(CONFLICTS_SUBSTVAR)'
-
 # auto tests require user interaction - override
 override_dh_auto_test:
-