[neon/extras/calligra/Neon/release_jammy] debian: minor cleanup and Architecture: all - we want arm64 packages
Carlos De Maine
null at kde.org
Sat Sep 7 11:31:29 BST 2024
Git commit 79ccf71bd5cb64856d9c99635e4b03a77d7024ba by Carlos De Maine.
Committed on 07/09/2024 at 10:31.
Pushed by carlosdem into branch 'Neon/release_jammy'.
minor cleanup and Architecture: all - we want arm64 packages
(cherry picked from commit dcea8c9321e4664a89b4de45651560c02225e638)
M +1 -1 debian/control
M +1 -17 debian/rules
https://invent.kde.org/neon/extras/calligra/-/commit/79ccf71bd5cb64856d9c99635e4b03a77d7024ba
diff --git a/debian/control b/debian/control
index 00b93ef..ac570c2 100644
--- a/debian/control
+++ b/debian/control
@@ -81,7 +81,7 @@ Vcs-Git: https://anonscm.debian.org/git/pkg-kde/calligra/calligra.git
Vcs-Browser: https://anonscm.debian.org/cgit/pkg-kde/calligra/calligra.git
Package: calligra
-Architecture: all
+Architecture: any
Depends: qt6-base,
qt6-svg,
${misc:Depends},
diff --git a/debian/rules b/debian/rules
index c6f48f2..513c621 100755
--- a/debian/rules
+++ b/debian/rules
@@ -10,15 +10,9 @@ export DH_VERBOSE=1
export DEB_LDFLAGS_MAINT_APPEND := -Wl,--as-needed
-DEB_HOST_MULTIARCH ?= $(shell dpkg-architecture -qDEB_HOST_MULTIARCH)
-
%:
dh $@ --with kf6 --buildsystem kf6
-
-#override_dh_auto_configure:
-# dh_auto_configure -- -DCMAKE_CXX_STANDARD=20
-
override_dh_auto_install:
dh_auto_install
# Remove development stuff:
@@ -34,14 +28,4 @@ override_dh_auto_install:
# remove calligra plan translations now in separated plan source
rm -f debian/calligra/usr/share/locale/*/*/*plan*
-
-override_dh_link:
- # the calligra-gemini components are installed in a multi-arch library
- # directory, but kdelibs 4.x does not support that -- instead,
- # create a simple symlink to avoid shuffling things too much
- #if [ -d debian/calligra-gemini ]; then \
- # ln -s $(DEB_HOST_MULTIARCH)/calligra $(CURDIR)/debian/calligra-gemini/usr/lib/calligra; \
- #fi
- #dh_link
-
-.PHONY: override_dh_auto_test
+.PHONY: override_dh_auto_test
\ No newline at end of file
More information about the Neon-commits
mailing list