Control: tags 1100593 + patch

Dear maintainer,

I've prepared an NMU for kokkos (versioned as 4.5.01-1.1). The diff
is attached to this message. I can push them to Salsa once you pushed the latest version.

Regards.

Jochen
diff -Nru kokkos-4.5.01/debian/changelog kokkos-4.5.01/debian/changelog
--- kokkos-4.5.01/debian/changelog	2025-03-04 09:28:58.000000000 +0100
+++ kokkos-4.5.01/debian/changelog	2025-03-25 22:09:46.000000000 +0100
@@ -1,3 +1,11 @@
+kokkos (4.5.01-1.1) unstable; urgency=medium
+
+  * Non-maintainer upload.
+  * Remove unnecessary build dependencies (Closes: #1100593)
+  * Remove deprecated compile options and enable tests
+
+ -- Nils Schild <nils.sch...@posteo.de>  Tue, 25 Mar 2025 22:09:46 +0100
+
 kokkos (4.5.01-1) unstable; urgency=medium
 
   * New upstream version.
diff -Nru kokkos-4.5.01/debian/control kokkos-4.5.01/debian/control
--- kokkos-4.5.01/debian/control	2025-03-04 09:28:58.000000000 +0100
+++ kokkos-4.5.01/debian/control	2025-03-25 22:09:46.000000000 +0100
@@ -5,11 +5,7 @@
 Build-Depends:
  debhelper-compat (= 13),
  cmake,
- libhwloc-dev,
- libnuma-dev,
- libmemkind-dev [!s390x],
- libopenmpi-dev,
- pkgconf
+ python3,
 Standards-Version: 4.7.1
 Homepage: https://github.com/kokkos/kokkos
 Vcs-Browser: https://salsa.debian.org/debian/kokkos
diff -Nru kokkos-4.5.01/debian/rules kokkos-4.5.01/debian/rules
--- kokkos-4.5.01/debian/rules	2023-02-26 18:25:39.000000000 +0100
+++ kokkos-4.5.01/debian/rules	2025-03-25 22:09:46.000000000 +0100
@@ -1,23 +1,17 @@
 #!/usr/bin/make -f
-#export DH_VERBOSE = 1
 
 # see FEATURE AREAS in dpkg-buildflags(1)
 export DEB_BUILD_MAINT_OPTIONS = hardening=+all
 
-# see ENVIRONMENT in dpkg-buildflags(1)
-# package maintainers to append CFLAGS
-export DEB_CFLAGS_MAINT_APPEND  = -Wall -pedantic
-# package maintainers to append LDFLAGS
-#export DEB_LDFLAGS_MAINT_APPEND = -Wl,--as-needed
-
 %:
 	dh $@
 
 override_dh_auto_configure:
 	dh_auto_configure -- \
 	-DBUILD_SHARED_LIBS=ON \
-	-DKokkos_ENABLE_HWLOC=ON \
-	-DKokkos_ENABLE_LIBNUMA=ON \
-	-DKokkos_ENABLE_MEMKIND=ON \
-	-DKokkos_ENABLE_OPENMP=ON
-#	-DCMAKE_LIBRARY_PATH=$(DEB_HOST_MULTIARCH)
+	-DKokkos_ENABLE_OPENMP=ON \
+	-DKokkos_ENABLE_TESTS=ON
+
+# Tests use all CPUs and would run into time outs when blocked
+override_dh_auto_test:
+	dh_auto_test --no-parallel
From 81382cb1a6f6a34bcc1e32d1f30861de1e90a471 Mon Sep 17 00:00:00 2001
From: Nils Schild <nils.sch...@posteo.de>
Date: Tue, 25 Mar 2025 22:10:34 +0100
Subject: [PATCH 3/3] Update changelog for 4.5.01-1.1 release

---
 debian/changelog | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index 1b586da..32e77f8 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+kokkos (4.5.01-1.1) unstable; urgency=medium
+
+  * Non-maintainer upload.
+  * Remove unnecessary build dependencies (Closes: #1100593)
+  * Remove deprecated compile options and enable tests
+
+ -- Nils Schild <nils.sch...@posteo.de>  Tue, 25 Mar 2025 22:09:46 +0100
+
 kokkos (4.5.01-1) unstable; urgency=medium
 
   * New upstream version.
-- 
2.49.0

From ed41c203d184276e004120312568eb3ab24b3273 Mon Sep 17 00:00:00 2001
From: Nils Schild <nils.sch...@posteo.de>
Date: Tue, 25 Mar 2025 21:14:12 +0100
Subject: [PATCH 2/3] Remove deprecated compile options and enable tests

- Python3 dependency for Tests
---
 debian/control |  1 +
 debian/rules   | 18 ++++++------------
 2 files changed, 7 insertions(+), 12 deletions(-)

diff --git a/debian/control b/debian/control
index be89029..e264bba 100644
--- a/debian/control
+++ b/debian/control
@@ -5,6 +5,7 @@ Maintainer: Alex Myczko <t...@debian.org>
 Build-Depends:
  debhelper-compat (= 13),
  cmake,
+ python3,
 Standards-Version: 4.7.1
 Homepage: https://github.com/kokkos/kokkos
 Vcs-Browser: https://salsa.debian.org/debian/kokkos
diff --git a/debian/rules b/debian/rules
index 34322fd..45be831 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,23 +1,17 @@
 #!/usr/bin/make -f
-#export DH_VERBOSE = 1
 
 # see FEATURE AREAS in dpkg-buildflags(1)
 export DEB_BUILD_MAINT_OPTIONS = hardening=+all
 
-# see ENVIRONMENT in dpkg-buildflags(1)
-# package maintainers to append CFLAGS
-export DEB_CFLAGS_MAINT_APPEND  = -Wall -pedantic
-# package maintainers to append LDFLAGS
-#export DEB_LDFLAGS_MAINT_APPEND = -Wl,--as-needed
-
 %:
 	dh $@
 
 override_dh_auto_configure:
 	dh_auto_configure -- \
 	-DBUILD_SHARED_LIBS=ON \
-	-DKokkos_ENABLE_HWLOC=ON \
-	-DKokkos_ENABLE_LIBNUMA=ON \
-	-DKokkos_ENABLE_MEMKIND=ON \
-	-DKokkos_ENABLE_OPENMP=ON
-#	-DCMAKE_LIBRARY_PATH=$(DEB_HOST_MULTIARCH)
+	-DKokkos_ENABLE_OPENMP=ON \
+	-DKokkos_ENABLE_TESTS=ON
+
+# Tests use all CPUs and would run into time outs when blocked
+override_dh_auto_test:
+	dh_auto_test --no-parallel
-- 
2.49.0

From 17839e8f34054be6bbef05e8b30ebe3003889edd Mon Sep 17 00:00:00 2001
From: Nils Schild <nils.sch...@posteo.de>
Date: Tue, 25 Mar 2025 21:12:58 +0100
Subject: [PATCH 1/3] Remove unnecessary build dependencies

---
 debian/control | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/debian/control b/debian/control
index 2661a89..be89029 100644
--- a/debian/control
+++ b/debian/control
@@ -5,11 +5,6 @@ Maintainer: Alex Myczko <t...@debian.org>
 Build-Depends:
  debhelper-compat (= 13),
  cmake,
- libhwloc-dev,
- libnuma-dev,
- libmemkind-dev [!s390x],
- libopenmpi-dev,
- pkgconf
 Standards-Version: 4.7.1
 Homepage: https://github.com/kokkos/kokkos
 Vcs-Browser: https://salsa.debian.org/debian/kokkos
-- 
2.49.0

Attachment: signature.asc
Description: PGP signature

Reply via email to