[neon/extras/calligra/Neon/unstable] debian: minor cleanup and Architecture: any

Carlos De Maine null at kde.org
Sun Sep 8 06:54:44 BST 2024


Git commit cb9498f3ebefdaf8a49bca2f76d9c9e237e26a53 by Carlos De Maine.
Committed on 07/09/2024 at 10:28.
Pushed by carlosdem into branch 'Neon/unstable'.

minor cleanup and Architecture: any

we want arm64 packages

M  +2    -2    debian/control
M  +1    -17   debian/rules

https://invent.kde.org/neon/extras/calligra/-/commit/cb9498f3ebefdaf8a49bca2f76d9c9e237e26a53

diff --git a/debian/control b/debian/control
index d1faf90..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},
@@ -138,4 +138,4 @@ Description: extensive productivity and creative suite
  This suite is a set of applications written to help you to accomplish your
  work. It includes office applications such as a word processor,
  a spreadsheet, a presentation program, a database application, with raster
- and vector graphics tools, etc.
\ No newline at end of file
+ and vector graphics tools, etc.
diff --git a/debian/rules b/debian/rules
index e2d2a59..4e9c24e 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
\ No newline at end of file
+.PHONY: override_dh_auto_test


More information about the Neon-commits mailing list