Apologies, I don't know how this got uploaded with an incomplete and incorrect patch. I have uploaded a corrected NMU to experimental; please see the attached updated patch.
On Sun, Feb 04, 2024 at 09:32:48PM +0100, Helmut Grohne wrote: > Package: libstdgpu-openmp0t64 > Version: 1.3.0+git20220507.32e0517-5.1~exp1 > Severity: serious > User: debian...@lists.debian.org > Usertags: fileconflict > Control: affects -1 + libstdgpu-openmp0d > X-Debbugs-Cc: vor...@debian.org > > libstdgpu-openmp0t64 has an undeclared file conflict. This may result in > an unpack error from dpkg. > > The file /usr/lib/x86_64-linux-gnu/libstdgpu_openmp.so.1.3.0.20220507 is > contained in the packages > * libstdgpu-openmp0d/1.3.0+git20220507.32e0517-5 as present in > trixie|unstable > * libstdgpu-openmp0t64/1.3.0+git20220507.32e0517-5.1~exp1 as present in > experimental > > These packages can be unpacked concurrently, because there is no > relevant Replaces or Conflicts relation. Attempting to unpack these > packages concurrently results in an unpack error from dpkg, because none > of the packages installs a diversion for the affected file. > > Kind regards > > The Debian Usr Merge Analysis Tool > > This bug report has been automatically filed with no human intervention. > The source code is available at https://salsa.debian.org/helmutg/dumat. > If the filing is unclear or in error, don't hesitate to contact > hel...@subdivi.de for assistance. > -- Steve Langasek Give me a lever long enough and a Free OS Debian Developer to set it on, and I can move the world. Ubuntu Developer https://www.debian.org/ slanga...@ubuntu.com vor...@debian.org
diff -Nru stdgpu-1.3.0+git20220507.32e0517/debian/changelog
stdgpu-1.3.0+git20220507.32e0517/debian/changelog
--- stdgpu-1.3.0+git20220507.32e0517/debian/changelog 2023-07-01
21:13:20.000000000 +0000
+++ stdgpu-1.3.0+git20220507.32e0517/debian/changelog 2024-02-18
00:39:25.000000000 +0000
@@ -1,3 +1,10 @@
+stdgpu (1.3.0+git20220507.32e0517-5.1) experimental; urgency=medium
+
+ * Non-maintainer upload.
+ * Rename libraries for 64-bit time_t transition.
+
+ -- Steve Langasek <vor...@debian.org> Sun, 18 Feb 2024 00:39:25 +0000
+
stdgpu (1.3.0+git20220507.32e0517-5) unstable; urgency=medium
* Fix wrong alignment test to actually provoke wrong alignment
diff -Nru stdgpu-1.3.0+git20220507.32e0517/debian/control
stdgpu-1.3.0+git20220507.32e0517/debian/control
--- stdgpu-1.3.0+git20220507.32e0517/debian/control 2023-07-01
21:13:11.000000000 +0000
+++ stdgpu-1.3.0+git20220507.32e0517/debian/control 2024-02-18
00:38:51.000000000 +0000
@@ -21,7 +21,11 @@
agnostic and native algorithms that look like sequential CPU code but are
executed in parallel on the GPU.
-Package: libstdgpu-openmp0d
+Package: libstdgpu-openmp0t64
+Provides: ${t64:Provides}
+X-Time64-Compat: libstdgpu-openmp0d
+Replaces: libstdgpu-openmp0d
+Breaks: libstdgpu-openmp0d (<< ${source:Version})
Architecture: any
Multi-Arch: same
Depends:
@@ -40,7 +44,7 @@
Provides: libstdgpu-dev
Depends:
${misc:Depends},
- libstdgpu-openmp0d (= ${binary:Version}),
+ libstdgpu-openmp0t64 (= ${binary:Version}),
libthrust-dev,
Description: ${source:Synopsis} (OpenMP development headers)
${source:Extended-Description}
diff -Nru stdgpu-1.3.0+git20220507.32e0517/debian/libstdgpu-openmp0d.install
stdgpu-1.3.0+git20220507.32e0517/debian/libstdgpu-openmp0d.install
--- stdgpu-1.3.0+git20220507.32e0517/debian/libstdgpu-openmp0d.install
2023-07-01 21:13:11.000000000 +0000
+++ stdgpu-1.3.0+git20220507.32e0517/debian/libstdgpu-openmp0d.install
1970-01-01 00:00:00.000000000 +0000
@@ -1 +0,0 @@
-usr/lib/*/lib*.so.*
diff -Nru stdgpu-1.3.0+git20220507.32e0517/debian/libstdgpu-openmp0t64.install
stdgpu-1.3.0+git20220507.32e0517/debian/libstdgpu-openmp0t64.install
--- stdgpu-1.3.0+git20220507.32e0517/debian/libstdgpu-openmp0t64.install
1970-01-01 00:00:00.000000000 +0000
+++ stdgpu-1.3.0+git20220507.32e0517/debian/libstdgpu-openmp0t64.install
2023-07-01 21:13:11.000000000 +0000
@@ -0,0 +1 @@
+usr/lib/*/lib*.so.*
diff -Nru
stdgpu-1.3.0+git20220507.32e0517/debian/libstdgpu-openmp0t64.lintian-overrides
stdgpu-1.3.0+git20220507.32e0517/debian/libstdgpu-openmp0t64.lintian-overrides
---
stdgpu-1.3.0+git20220507.32e0517/debian/libstdgpu-openmp0t64.lintian-overrides
1970-01-01 00:00:00.000000000 +0000
+++
stdgpu-1.3.0+git20220507.32e0517/debian/libstdgpu-openmp0t64.lintian-overrides
2024-02-18 00:38:51.000000000 +0000
@@ -0,0 +1 @@
+libstdgpu-openmp0t64: package-name-doesnt-match-sonames libstdgpu-openmp0d
diff -Nru stdgpu-1.3.0+git20220507.32e0517/debian/rules
stdgpu-1.3.0+git20220507.32e0517/debian/rules
--- stdgpu-1.3.0+git20220507.32e0517/debian/rules 2023-07-01
21:13:11.000000000 +0000
+++ stdgpu-1.3.0+git20220507.32e0517/debian/rules 2024-02-18
00:39:25.000000000 +0000
@@ -4,7 +4,8 @@
BUILD_TESTS := $(if $(filter nocheck,$(DEB_BUILD_OPTIONS)),OFF,ON)
BUILD_HIP := $(if $(filter amd64 arm64 ppc64el,$(DEB_HOST_ARCH)),ON,OFF)
-SOVERSION := 0d
+SOVERSION := 0t64
+SOVERSION_HIP := 0d
%:
dh $@ --buildsystem=cmake
@@ -28,7 +29,7 @@
-DSTDGPU_BUILD_SHARED_LIBS=ON \
-DSTDGPU_BACKEND=STDGPU_BACKEND_HIP \
-DCMAKE_HIP_ARCHITECTURES=OFF \
- -DSTDGPU_SOVERSION=$(SOVERSION) \
+ -DSTDGPU_SOVERSION=$(SOVERSION_HIP) \
-DSTDGPU_OUTPUT_NAME=stdgpu_hip
endif
@@ -53,6 +54,6 @@
override_dh_install:
dh_install --package=libstdgpu-openmp$(SOVERSION)
--package=libstdgpu-openmp-dev --sourcedir=debian/tmp-openmp
ifeq ($(BUILD_HIP),ON)
- dh_install --package=libstdgpu-hip$(SOVERSION)
--package=libstdgpu-hip-dev --sourcedir=debian/tmp-hip
+ dh_install --package=libstdgpu-hip$(SOVERSION_HIP)
--package=libstdgpu-hip-dev --sourcedir=debian/tmp-hip
endif
signature.asc
Description: PGP signature
