[neon/neon-packaging/digikam/Neon/release_jammy] debian: strip it right back

Carlos De Maine null at kde.org
Tue Jul 2 14:47:43 BST 2024


Git commit b24e01d7cdfadc34e08890c0852f448afb78de7a by Carlos De Maine.
Committed on 02/07/2024 at 13:47.
Pushed by carlosdem into branch 'Neon/release_jammy'.

strip it right back

M  +1    -9    debian/rules

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

diff --git a/debian/rules b/debian/rules
index 75fe50b..8a6024c 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,13 +1,5 @@
 #!/usr/bin/make -f
 
-PRIVATE_LIBDIR := /usr/lib/digikam
-include /usr/share/dpkg/pkg-info.mk
-
-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
@@ -28,7 +20,6 @@ override_dh_clean:
 
 override_dh_auto_configure:
 	dh_auto_configure -- \
-					  -DCMAKE_INSTALL_RPATH="$(PRIVATE_LIBDIR)" \
 					  -DDIGIKAMSC_CHECKOUT_DOC=ON \
 					  -DDIGIKAMSC_COMPILE_DOC=ON \
 					  -DDIGIKAMSC_COMPILE_PO=ON \
@@ -52,3 +43,4 @@ override_dh_gencontrol:
 
 # auto tests require user interaction - override
 override_dh_auto_test:
+	.


More information about the Neon-commits mailing list