On Tue, Jan 30, 2024 at 06:16:25PM +0100, Helmut Grohne wrote: > Package: libboinc7t64,libboinc-app7t64 > Version: 7.20.5+dfsg-1.2~exp1 > Severity: serious > User: debian...@lists.debian.org > Usertags: fileconflict > Control: affects -1 + libboinc-app7 libboinc7 > X-Debbugs-Cc: vor...@debian.org
> libboinc-app7t64 and libboinc7t64 have an undeclared file conflict. This > may result in an unpack error from dpkg. Sigh. Thanks for the Cc:. That's because boinc has an idiosyncratic debian/control.in that we failed to patch, and as a result the successful patching of debian/control was clobbered. I'm uploading a follow-up NMU to experimental and attaching an updated patch for the complete delta from the version in unstable. -- 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 boinc-7.20.5+dfsg/debian/changelog boinc-7.20.5+dfsg/debian/changelog
--- boinc-7.20.5+dfsg/debian/changelog 2023-04-25 16:59:54.000000000 +0000
+++ boinc-7.20.5+dfsg/debian/changelog 2024-01-30 21:15:58.000000000 +0000
@@ -1,3 +1,18 @@
+boinc (7.20.5+dfsg-1.2~exp2) experimental; urgency=medium
+
+ * Patch debian/control.in, which uses idiosyncratic format and therefore
+ failed to be automatically patched, then clobbered necessary changes in
+ debian/control regarding Breaks/Replaces/Provides. Closes: #1061984.
+
+ -- Steve Langasek <vor...@debian.org> Tue, 30 Jan 2024 21:15:58 +0000
+
+boinc (7.20.5+dfsg-1.2~exp1) experimental; urgency=medium
+
+ * Non-maintainer upload.
+ * Rename libraries for 64-bit time_t transition.
+
+ -- Steve Langasek <vor...@debian.org> Tue, 30 Jan 2024 07:36:42 +0000
+
boinc (7.20.5+dfsg-1.1) unstable; urgency=medium
* Non-maintainer upload.
diff -Nru boinc-7.20.5+dfsg/debian/control boinc-7.20.5+dfsg/debian/control
--- boinc-7.20.5+dfsg/debian/control 2023-04-25 16:59:54.000000000 +0000
+++ boinc-7.20.5+dfsg/debian/control 2024-01-30 21:15:58.000000000 +0000
@@ -133,7 +133,7 @@
adduser,
ca-certificates,
lsb-base (>= 3.0-6),
- libboinc7 (= ${binary:Version})
+ libboinc7t64 (= ${binary:Version})
Suggests: boinc-manager,
boinc-client-opencl,
boinc-client-nvidia-cuda,
@@ -226,8 +226,8 @@
Architecture: any
Section: libdevel
Depends: ${misc:Depends},
- libboinc-app7 (= ${binary:Version}),
- libboinc7 (= ${binary:Version}),
+ libboinc-app7t64 (= ${binary:Version}),
+ libboinc7t64 (= ${binary:Version}),
libc6-dev | libc-dev,
default-libmysqlclient-dev,
libssl-dev,
@@ -245,15 +245,15 @@
development of scientific applications that work seamlessly across
many Linux distributions and different releases of the same.
-Package: libboinc-app7
+Package: libboinc-app7t64
Architecture: any
Section: libs
-Provides: libboinc-app
+Provides: libboinc-app, ${t64:Provides}
Multi-Arch: same
Pre-Depends: ${misc:Pre-Depends}
-Breaks: boinc-dev (<< 7.0.28+dfsg-3),
+Breaks: libboinc-app7 (<< ${source:Version}), boinc-dev (<< 7.0.28+dfsg-3),
libboinc-app (<= 7.0.34+dfsg-1)
-Replaces: boinc-dev (<< 7.0.28+dfsg-3),
+Replaces: libboinc-app7, boinc-dev (<< 7.0.28+dfsg-3),
libboinc-app (<= 7.0.34+dfsg-1)
Depends: ${misc:Depends}, ${shlibs:Depends}
Description: libraries for BOINC's scientific applications
@@ -264,15 +264,15 @@
This package contains dynamic libraries that are needed for applications
which utilizes the BOINC infrastructure and the boinc-client itself.
-Package: libboinc7
+Package: libboinc7t64
Architecture: any
Section: libs
-Provides: libboinc
+Provides: libboinc, ${t64:Provides}
Multi-Arch: same
Pre-Depends: ${misc:Pre-Depends}
-Breaks: boinc-dev (<< 7.0.28+dfsg-3),
+Breaks: libboinc7 (<< ${source:Version}), boinc-dev (<< 7.0.28+dfsg-3),
libboinc (<= 7.0.34+dfsg-1)
-Replaces: boinc-dev (<< 7.0.28+dfsg-3),
+Replaces: libboinc7, boinc-dev (<< 7.0.28+dfsg-3),
libboinc (<= 7.0.34+dfsg-1)
Depends: ${misc:Depends}, ${shlibs:Depends}
Description: libraries of BOINC the client depends on
diff -Nru boinc-7.20.5+dfsg/debian/control.in
boinc-7.20.5+dfsg/debian/control.in
--- boinc-7.20.5+dfsg/debian/control.in 2022-09-12 21:02:47.000000000 +0000
+++ boinc-7.20.5+dfsg/debian/control.in 2024-01-30 21:13:28.000000000 +0000
@@ -133,7 +133,7 @@
@ adduser,
@ ca-certificates,
@ lsb-base (>= 3.0-6),
-@ libboinc7 (= ${binary:Version})
+@ libboinc7t64 (= ${binary:Version})
@Suggests: boinc-manager,
@ boinc-client-opencl,
@ boinc-client-nvidia-cuda,
@@ -226,8 +226,8 @@
@Architecture: any
@Section: libdevel
@Depends: ${misc:Depends},
-@ libboinc-app7 (= ${binary:Version}),
-@ libboinc7 (= ${binary:Version}),
+@ libboinc-app7t64 (= ${binary:Version}),
+@ libboinc7t64 (= ${binary:Version}),
@ libc6-dev | libc-dev,
@ default-libmysqlclient-dev,
@ libssl-dev,
@@ -245,15 +245,15 @@
@ development of scientific applications that work seamlessly across
@ many Linux distributions and different releases of the same.
@
-@Package: libboinc-app7
+@Package: libboinc-app7t64
@Architecture: any
@Section: libs
-@Provides: libboinc-app
+@Provides: libboinc-app, ${t64:Provides}
@Multi-Arch: same
@Pre-Depends: ${misc:Pre-Depends}
-@Breaks: boinc-dev (<< 7.0.28+dfsg-3),
+@Breaks: libboinc-app7 (<< ${source:Version}), boinc-dev (<< 7.0.28+dfsg-3),
@ libboinc-app (<= 7.0.34+dfsg-1)
-@Replaces: boinc-dev (<< 7.0.28+dfsg-3),
+@Replaces: libboinc-app7, boinc-dev (<< 7.0.28+dfsg-3),
@ libboinc-app (<= 7.0.34+dfsg-1)
@Depends: ${misc:Depends}, ${shlibs:Depends}
@Description: libraries for BOINC's scientific applications
@@ -264,15 +264,15 @@
@ This package contains dynamic libraries that are needed for applications
@ which utilizes the BOINC infrastructure and the boinc-client itself.
@
-@Package: libboinc7
+@Package: libboinc7t64
@Architecture: any
@Section: libs
-@Provides: libboinc
+@Provides: libboinc, ${t64:Provides}
@Multi-Arch: same
@Pre-Depends: ${misc:Pre-Depends}
-@Breaks: boinc-dev (<< 7.0.28+dfsg-3),
+@Breaks: libboinc7 (<< ${source:Version}), boinc-dev (<< 7.0.28+dfsg-3),
@ libboinc (<= 7.0.34+dfsg-1)
-@Replaces: boinc-dev (<< 7.0.28+dfsg-3),
+@Replaces: libboinc7, boinc-dev (<< 7.0.28+dfsg-3),
@ libboinc (<= 7.0.34+dfsg-1)
@Depends: ${misc:Depends}, ${shlibs:Depends}
@Description: libraries of BOINC the client depends on
diff -Nru boinc-7.20.5+dfsg/debian/libboinc-app7.install
boinc-7.20.5+dfsg/debian/libboinc-app7.install
--- boinc-7.20.5+dfsg/debian/libboinc-app7.install 2022-01-26
15:42:50.000000000 +0000
+++ boinc-7.20.5+dfsg/debian/libboinc-app7.install 1970-01-01
00:00:00.000000000 +0000
@@ -1,3 +0,0 @@
-usr/lib/*/libboinc_api*.so.*
-usr/lib/*/libboinc_graphics*.so.*
-usr/lib/*/libboinc_opencl*.so.*
diff -Nru boinc-7.20.5+dfsg/debian/libboinc-app7.links
boinc-7.20.5+dfsg/debian/libboinc-app7.links
--- boinc-7.20.5+dfsg/debian/libboinc-app7.links 2022-01-26
15:42:50.000000000 +0000
+++ boinc-7.20.5+dfsg/debian/libboinc-app7.links 1970-01-01
00:00:00.000000000 +0000
@@ -1,3 +0,0 @@
-# once we have the static libraries redistributed again, we should think about
this
-#usr/lib/libboinc.a usr/share/boinc-dev/lib/libboinc.a
-#usr/lib/libboinc_api.a usr/share/boinc-dev/api/libboinc_api.a
diff -Nru boinc-7.20.5+dfsg/debian/libboinc-app7.lintian-overrides
boinc-7.20.5+dfsg/debian/libboinc-app7.lintian-overrides
--- boinc-7.20.5+dfsg/debian/libboinc-app7.lintian-overrides 2022-01-26
15:42:50.000000000 +0000
+++ boinc-7.20.5+dfsg/debian/libboinc-app7.lintian-overrides 1970-01-01
00:00:00.000000000 +0000
@@ -1,3 +0,0 @@
-# it would not have complained if the package name was
-# libboinc-api7. It is not.
-libboinc-app7 binary: package-name-doesnt-match-sonames
diff -Nru boinc-7.20.5+dfsg/debian/libboinc-app7t64.install
boinc-7.20.5+dfsg/debian/libboinc-app7t64.install
--- boinc-7.20.5+dfsg/debian/libboinc-app7t64.install 1970-01-01
00:00:00.000000000 +0000
+++ boinc-7.20.5+dfsg/debian/libboinc-app7t64.install 2024-01-30
07:36:42.000000000 +0000
@@ -0,0 +1,3 @@
+usr/lib/*/libboinc_api*.so.*
+usr/lib/*/libboinc_graphics*.so.*
+usr/lib/*/libboinc_opencl*.so.*
diff -Nru boinc-7.20.5+dfsg/debian/libboinc-app7t64.links
boinc-7.20.5+dfsg/debian/libboinc-app7t64.links
--- boinc-7.20.5+dfsg/debian/libboinc-app7t64.links 1970-01-01
00:00:00.000000000 +0000
+++ boinc-7.20.5+dfsg/debian/libboinc-app7t64.links 2024-01-30
07:36:42.000000000 +0000
@@ -0,0 +1,3 @@
+# once we have the static libraries redistributed again, we should think about
this
+#usr/lib/libboinc.a usr/share/boinc-dev/lib/libboinc.a
+#usr/lib/libboinc_api.a usr/share/boinc-dev/api/libboinc_api.a
diff -Nru boinc-7.20.5+dfsg/debian/libboinc-app7t64.lintian-overrides
boinc-7.20.5+dfsg/debian/libboinc-app7t64.lintian-overrides
--- boinc-7.20.5+dfsg/debian/libboinc-app7t64.lintian-overrides 1970-01-01
00:00:00.000000000 +0000
+++ boinc-7.20.5+dfsg/debian/libboinc-app7t64.lintian-overrides 2024-01-30
07:36:42.000000000 +0000
@@ -0,0 +1,4 @@
+# it would not have complained if the package name was
+# libboinc-api7. It is not.
+libboinc-app7t64 binary: package-name-doesnt-match-sonames
+libboinc-app7t64: package-name-doesnt-match-sonames libboinc-app7
diff -Nru boinc-7.20.5+dfsg/debian/libboinc7.install
boinc-7.20.5+dfsg/debian/libboinc7.install
--- boinc-7.20.5+dfsg/debian/libboinc7.install 2022-01-26 15:42:50.000000000
+0000
+++ boinc-7.20.5+dfsg/debian/libboinc7.install 1970-01-01 00:00:00.000000000
+0000
@@ -1,8 +0,0 @@
-usr/lib/*/libboinc.so.*
-
-#needed for server
-usr/lib/*/libsched.so.*
-usr/lib/*/libboinc_crypt.so.*
-
-#needed for boinc-app-examples
-usr/lib/*/libboinc_zip.so.*
diff -Nru boinc-7.20.5+dfsg/debian/libboinc7t64.install
boinc-7.20.5+dfsg/debian/libboinc7t64.install
--- boinc-7.20.5+dfsg/debian/libboinc7t64.install 1970-01-01
00:00:00.000000000 +0000
+++ boinc-7.20.5+dfsg/debian/libboinc7t64.install 2024-01-30
07:36:42.000000000 +0000
@@ -0,0 +1,8 @@
+usr/lib/*/libboinc.so.*
+
+#needed for server
+usr/lib/*/libsched.so.*
+usr/lib/*/libboinc_crypt.so.*
+
+#needed for boinc-app-examples
+usr/lib/*/libboinc_zip.so.*
diff -Nru boinc-7.20.5+dfsg/debian/libboinc7t64.lintian-overrides
boinc-7.20.5+dfsg/debian/libboinc7t64.lintian-overrides
--- boinc-7.20.5+dfsg/debian/libboinc7t64.lintian-overrides 1970-01-01
00:00:00.000000000 +0000
+++ boinc-7.20.5+dfsg/debian/libboinc7t64.lintian-overrides 2024-01-30
07:36:42.000000000 +0000
@@ -0,0 +1 @@
+libboinc7t64: package-name-doesnt-match-sonames libboinc7
diff -Nru boinc-7.20.5+dfsg/debian/rules boinc-7.20.5+dfsg/debian/rules
--- boinc-7.20.5+dfsg/debian/rules 2022-06-10 13:04:16.000000000 +0000
+++ boinc-7.20.5+dfsg/debian/rules 2024-01-30 07:36:42.000000000 +0000
@@ -157,6 +157,7 @@
$(shell sed '/^#/d' -i debian/control)
export ENABLE_SERVER_TEST := $(shell dpkg-parsechangelog -S Distribution
|egrep -v 'experimental|UNRELEASED')
+export ENABLE_SERVER_TEST = trash
ifeq (,$(ENABLE_SERVER_TEST))
$(shell sed 's/^%//' -i debian/control)
signature.asc
Description: PGP signature
