Bug#1061984: libboinc-app7t64 and libboinc7t64 have an undeclared file conflict

2024-02-28 Thread Steve Langasek
On Wed, Feb 28, 2024 at 11:31:05AM +0100, Helmut Grohne wrote:

> Not sure what happened here exactly. The current libboinc7t64 in
> unstable version 7.24.1+dfsg-2.1 has the following it is uploaded
> debian/control file (from the dsc):
> 
> | Package: libboinc7t64
> | Architecture: any
> | Section: libs
> | Provides: libboinc
> | Multi-Arch: same
> | Pre-Depends: ${misc:Pre-Depends}
> | Breaks: boinc-dev (<< 7.0.28+dfsg-3),
> | libboinc (<= 7.0.34+dfsg-1)
> | Replaces: 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
> 
> Notably:
>  * There is no t64:Provides.
>  * There is no Replaces: libboinc7.
>  * There is no Breaks: libboinc7
> 
> Hence reopening the bug.

I didn't see that the reopen happened, but it appears Gianfranco has sorted
this out now with a maintainer upload.

-- 
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


signature.asc
Description: PGP signature


Bug#1061984: libboinc-app7t64 and libboinc7t64 have an undeclared file conflict

2024-02-28 Thread Gianfranco Costamagna

control: fixed -1 7.24.1+dfsg-3
control: close -1

thanks!

G.


OpenPGP_signature.asc
Description: OpenPGP digital signature


Bug#1061984: libboinc-app7t64 and libboinc7t64 have an undeclared file conflict

2024-02-28 Thread Helmut Grohne
Control: reopen -1

On Tue, Jan 30, 2024 at 01:37:42PM -0800, Steve Langasek wrote:
> > 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.

Not sure what happened here exactly. The current libboinc7t64 in
unstable version 7.24.1+dfsg-2.1 has the following it is uploaded
debian/control file (from the dsc):

| Package: libboinc7t64
| Architecture: any
| Section: libs
| Provides: libboinc
| Multi-Arch: same
| Pre-Depends: ${misc:Pre-Depends}
| Breaks: boinc-dev (<< 7.0.28+dfsg-3),
| libboinc (<= 7.0.34+dfsg-1)
| Replaces: 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

Notably:
 * There is no t64:Provides.
 * There is no Replaces: libboinc7.
 * There is no Breaks: libboinc7

Hence reopening the bug.

Helmut



Bug#1061934: Bug#1061984: libboinc-app7t64 and libboinc7t64 have an undeclared file conflict

2024-01-30 Thread Steve Langasek
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.0 +
+++ boinc-7.20.5+dfsg/debian/changelog  2024-01-30 21:15:58.0 +
@@ -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   Tue, 30 Jan 2024 21:15:58 +
+
+boinc (7.20.5+dfsg-1.2~exp1) experimental; urgency=medium
+
+  * Non-maintainer upload.
+  * Rename libraries for 64-bit time_t transition.
+
+ -- Steve Langasek   Tue, 30 Jan 2024 07:36:42 +
+
 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/control2023-04-25 16:59:54.0 +
+++ boinc-7.20.5+dfsg/debian/control2024-01-30 21:15:58.0 +
@@ -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.0 +
+++ boinc-7.20.5+dfsg/debian/control.in 2024-01-30 21:13:28.0 +
@@ -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}),
+@ 

Bug#1061984: libboinc-app7t64 and libboinc7t64 have an undeclared file conflict

2024-01-30 Thread Helmut Grohne
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.

The files
 * /usr/lib/x86_64-linux-gnu/libboinc_api.so.7
 * /usr/lib/x86_64-linux-gnu/libboinc_api.so.7.20.5
 * /usr/lib/x86_64-linux-gnu/libboinc_graphics2.so.7
 * /usr/lib/x86_64-linux-gnu/libboinc_graphics2.so.7.20.5
 * /usr/lib/x86_64-linux-gnu/libboinc_opencl.so.7
 * /usr/lib/x86_64-linux-gnu/libboinc_opencl.so.7.20.5
are contained in the packages
 * libboinc-app7
   * 7.20.5+dfsg-1.1 as present in bookworm
   * 7.20.5+dfsg-1.1+b2 as present in trixie|unstable
 * libboinc-app7t64/7.20.5+dfsg-1.2~exp1 as present in experimental

The files
 * /usr/lib/x86_64-linux-gnu/libboinc.so.7
 * /usr/lib/x86_64-linux-gnu/libboinc.so.7.20.5
 * /usr/lib/x86_64-linux-gnu/libboinc_crypt.so.7
 * /usr/lib/x86_64-linux-gnu/libboinc_crypt.so.7.20.5
 * /usr/lib/x86_64-linux-gnu/libboinc_zip.so.7
 * /usr/lib/x86_64-linux-gnu/libboinc_zip.so.7.20.5
 * /usr/lib/x86_64-linux-gnu/libsched.so.7
 * /usr/lib/x86_64-linux-gnu/libsched.so.7.20.5
are contained in the packages
 * libboinc7
   * 7.20.5+dfsg-1.1 as present in bookworm
   * 7.20.5+dfsg-1.1+b2 as present in trixie|unstable
 * libboinc7t64/7.20.5+dfsg-1.2~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 files.

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.