[neon/neon-packaging/digikam/Neon/release] debian: rebase

Carlos De Maine null at kde.org
Tue Jul 2 23:40:05 BST 2024


Git commit f7257be0a11a2842195130b6cacffa5e97c5e825 by Carlos De Maine.
Committed on 02/07/2024 at 22:38.
Pushed by carlosdem into branch 'Neon/release'.

rebase

M  +2    -10   debian/rules

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

diff --git a/debian/rules b/debian/rules
index 3b37751..244d0f8 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 \
@@ -51,4 +42,5 @@ override_dh_gencontrol:
 	dh_gencontrol -- -Vdigikam:Conflicts='$(CONFLICTS_SUBSTVAR)'
 
 # auto tests require user interaction - override
-override_dh_auto_test:
\ No newline at end of file
+override_dh_auto_test:
+	.
\ No newline at end of file



More information about the Neon-commits mailing list