[neon/neon-packaging/digikam/Neon/unstable] debian: arch aware please

Carlos De Maine null at kde.org
Fri Nov 24 10:01:23 GMT 2023


Git commit 7e31a009b62c3ea67e56c6afe571f53216ae4267 by Carlos De Maine.
Committed on 24/11/2023 at 11:01.
Pushed by carlosdem into branch 'Neon/unstable'.

arch aware please

M  +3    -3    debian/digikam-dev.install
M  +0    -6    debian/rules

https://invent.kde.org/neon/neon-packaging/digikam/-/commit/7e31a009b62c3ea67e56c6afe571f53216ae4267

diff --git a/debian/digikam-dev.install b/debian/digikam-dev.install
index bda6e66..31924fe 100644
--- a/debian/digikam-dev.install
+++ b/debian/digikam-dev.install
@@ -1,4 +1,4 @@
 usr/include/digikam/
-usr/lib/x86_64-linux-gnu/libdigikamcore.so
-usr/lib/x86_64-linux-gnu/libdigikamdatabase.so
-usr/lib/x86_64-linux-gnu/libdigikamgui.so exists 
\ No newline at end of file
+usr/lib/*/libdigikamcore.so
+usr/lib/*/libdigikamdatabase.so
+usr/lib/*/libdigikamgui.so exists 
\ No newline at end of file
diff --git a/debian/rules b/debian/rules
index f7e665e..c17fbf6 100755
--- a/debian/rules
+++ b/debian/rules
@@ -53,12 +53,6 @@ override_dh_auto_configure:
 #	help2man -n 'digital photo management application' --no-info obj-*/core/app/digikam > debian/man/digikam.1
 #	help2man -n 'image viewer/editor' --no-info obj-*/core/showfoto/showfoto > debian/man/showfoto.1
 
-override_dh_auto_install:
-	dh_auto_install
-	# remove potentially conflicting oxygen icons in global icon theme
-	rm -rf --verbose debian/tmp/usr/share/icons/oxygen
-	# 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 ChangeLog


More information about the Neon-commits mailing list