Merge ~liushuyu-011/ubuntu/+source/hdf5:ubuntu/devel into ubuntu/+source/hdf5:ubuntu/devel

Proposed by Zixing Liu
Status: Needs review
Proposed branch: ~liushuyu-011/ubuntu/+source/hdf5:ubuntu/devel
Merge into: ubuntu/+source/hdf5:ubuntu/devel
Diff against target: 107 lines (+19/-12)
3 files modified
debian/changelog (+7/-0)
debian/control (+6/-6)
debian/control.in (+6/-6)
Reviewer Review Type Date Requested Status
Steve Langasek (community) Approve
Review via email: mp+462287@code.launchpad.net

Description of the change

This MP corrects all the hardcoded binary package dependencies after the 64-bit time_t transition.

To post a comment you must log in.
Revision history for this message
Zixing Liu (liushuyu-011) wrote :
Revision history for this message
Steve Langasek (vorlon) wrote :

This needs fixing in debian/control.in, not just in debian/control.

review: Needs Fixing
Revision history for this message
Zixing Liu (liushuyu-011) wrote :

Done

Revision history for this message
Steve Langasek (vorlon) :
review: Approve

Unmerged commits

6403f22... by Zixing Liu

d/control: fix renamed t64 dependencies

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
diff --git a/debian/changelog b/debian/changelog
index 1216133..bf167c0 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
1hdf5 (1.10.10+repack-3.1ubuntu2) noble; urgency=medium
2
3 * Rename previously missed libraries for 64-bit time_t transition.
4 (LP: #2057741)
5
6 -- Zixing Liu <zixing.liu@canonical.com> Tue, 12 Mar 2024 23:42:20 -0600
7
1hdf5 (1.10.10+repack-3.1ubuntu1) noble; urgency=medium8hdf5 (1.10.10+repack-3.1ubuntu1) noble; urgency=medium
29
3 * Merge with Debian; remaining changes:10 * Merge with Debian; remaining changes:
diff --git a/debian/control b/debian/control
index 1ddd6d0..8a86652 100644
--- a/debian/control
+++ b/debian/control
@@ -141,11 +141,11 @@ Description: HDF5 High Level C++ runtime files - serial version
141Package: libhdf5-dev141Package: libhdf5-dev
142Architecture: any142Architecture: any
143Section: libdevel143Section: libdevel
144Depends: libhdf5-103-1 (= ${binary:Version}),144Depends: libhdf5-103-1t64 (= ${binary:Version}),
145 libhdf5-fortran-102t64 (= ${binary:Version}),145 libhdf5-fortran-102t64 (= ${binary:Version}),
146 libhdf5-hl-100t64 (= ${binary:Version}),146 libhdf5-hl-100t64 (= ${binary:Version}),
147 libhdf5-hl-fortran-100t64 (= ${binary:Version}),147 libhdf5-hl-fortran-100t64 (= ${binary:Version}),
148 libhdf5-cpp-103-1 (= ${binary:Version}),148 libhdf5-cpp-103-1t64 (= ${binary:Version}),
149 libhdf5-hl-cpp-100t64 (= ${binary:Version}),149 libhdf5-hl-cpp-100t64 (= ${binary:Version}),
150 zlib1g-dev,150 zlib1g-dev,
151 libjpeg-dev,151 libjpeg-dev,
@@ -287,11 +287,11 @@ Description: HDF5 High Level C++ runtime files - OpenMPI version - unsupported
287Package: libhdf5-openmpi-dev287Package: libhdf5-openmpi-dev
288Architecture: any288Architecture: any
289Section: libdevel289Section: libdevel
290Depends: libhdf5-openmpi-103-1 (= ${binary:Version}),290Depends: libhdf5-openmpi-103-1t64 (= ${binary:Version}),
291 libhdf5-openmpi-fortran-102t64 (= ${binary:Version}),291 libhdf5-openmpi-fortran-102t64 (= ${binary:Version}),
292 libhdf5-openmpi-hl-100t64 (= ${binary:Version}),292 libhdf5-openmpi-hl-100t64 (= ${binary:Version}),
293 libhdf5-openmpi-hl-fortran-100t64 (= ${binary:Version}),293 libhdf5-openmpi-hl-fortran-100t64 (= ${binary:Version}),
294 libhdf5-openmpi-cpp-103-1 (= ${binary:Version}),294 libhdf5-openmpi-cpp-103-1t64 (= ${binary:Version}),
295 libhdf5-openmpi-hl-cpp-100t64 (= ${binary:Version}),295 libhdf5-openmpi-hl-cpp-100t64 (= ${binary:Version}),
296 zlib1g-dev,296 zlib1g-dev,
297 libaec-dev,297 libaec-dev,
@@ -431,11 +431,11 @@ Description: HDF5 High Level C++ runtime files - MPICH2 version - unsupported
431Package: libhdf5-mpich-dev431Package: libhdf5-mpich-dev
432Architecture: any432Architecture: any
433Section: libdevel433Section: libdevel
434Depends: libhdf5-mpich-103-1 (= ${binary:Version}),434Depends: libhdf5-mpich-103-1t64 (= ${binary:Version}),
435 libhdf5-mpich-fortran-102t64 (= ${binary:Version}),435 libhdf5-mpich-fortran-102t64 (= ${binary:Version}),
436 libhdf5-mpich-hl-100t64 (= ${binary:Version}),436 libhdf5-mpich-hl-100t64 (= ${binary:Version}),
437 libhdf5-mpich-hl-fortran-100t64 (= ${binary:Version}),437 libhdf5-mpich-hl-fortran-100t64 (= ${binary:Version}),
438 libhdf5-mpich-cpp-103-1 (= ${binary:Version}),438 libhdf5-mpich-cpp-103-1t64 (= ${binary:Version}),
439 libhdf5-mpich-hl-cpp-100t64 (= ${binary:Version}),439 libhdf5-mpich-hl-cpp-100t64 (= ${binary:Version}),
440 zlib1g-dev,440 zlib1g-dev,
441 libaec-dev,441 libaec-dev,
diff --git a/debian/control.in b/debian/control.in
index b9f211f..da5cb4d 100644
--- a/debian/control.in
+++ b/debian/control.in
@@ -141,11 +141,11 @@ Description: HDF5 High Level C++ runtime files - serial version
141Package: libhdf5-dev141Package: libhdf5-dev
142Architecture: any142Architecture: any
143Section: libdevel143Section: libdevel
144Depends: libhdf5-@SONAME@@EXT@ (= ${binary:Version}),144Depends: libhdf5-@SONAME@@EXT@t64 (= ${binary:Version}),
145 libhdf5-fortran-@SONAME_F@t64 (= ${binary:Version}),145 libhdf5-fortran-@SONAME_F@t64 (= ${binary:Version}),
146 libhdf5-hl-@SONAME_HL@t64 (= ${binary:Version}),146 libhdf5-hl-@SONAME_HL@t64 (= ${binary:Version}),
147 libhdf5-hl-fortran-@SONAME_HL_F@t64 (= ${binary:Version}),147 libhdf5-hl-fortran-@SONAME_HL_F@t64 (= ${binary:Version}),
148 libhdf5-cpp-@SONAME_CXX@@EXT@ (= ${binary:Version}),148 libhdf5-cpp-@SONAME_CXX@@EXT@t64 (= ${binary:Version}),
149 libhdf5-hl-cpp-@SONAME_HL_CXX@t64 (= ${binary:Version}),149 libhdf5-hl-cpp-@SONAME_HL_CXX@t64 (= ${binary:Version}),
150 zlib1g-dev,150 zlib1g-dev,
151 libjpeg-dev,151 libjpeg-dev,
@@ -287,11 +287,11 @@ Description: HDF5 High Level C++ runtime files - OpenMPI version - unsupported
287Package: libhdf5-openmpi-dev287Package: libhdf5-openmpi-dev
288Architecture: @OMPIARCHS@288Architecture: @OMPIARCHS@
289Section: libdevel289Section: libdevel
290Depends: libhdf5-openmpi-@SONAME@@EXT@ (= ${binary:Version}),290Depends: libhdf5-openmpi-@SONAME@@EXT@t64 (= ${binary:Version}),
291 libhdf5-openmpi-fortran-@SONAME_F@t64 (= ${binary:Version}),291 libhdf5-openmpi-fortran-@SONAME_F@t64 (= ${binary:Version}),
292 libhdf5-openmpi-hl-@SONAME_HL@t64 (= ${binary:Version}),292 libhdf5-openmpi-hl-@SONAME_HL@t64 (= ${binary:Version}),
293 libhdf5-openmpi-hl-fortran-@SONAME_HL_F@t64 (= ${binary:Version}),293 libhdf5-openmpi-hl-fortran-@SONAME_HL_F@t64 (= ${binary:Version}),
294 libhdf5-openmpi-cpp-@SONAME_CXX@@EXT@ (= ${binary:Version}),294 libhdf5-openmpi-cpp-@SONAME_CXX@@EXT@t64 (= ${binary:Version}),
295 libhdf5-openmpi-hl-cpp-@SONAME_HL_CXX@t64 (= ${binary:Version}),295 libhdf5-openmpi-hl-cpp-@SONAME_HL_CXX@t64 (= ${binary:Version}),
296 zlib1g-dev,296 zlib1g-dev,
297 libaec-dev,297 libaec-dev,
@@ -431,11 +431,11 @@ Description: HDF5 High Level C++ runtime files - MPICH2 version - unsupported
431Package: libhdf5-mpich-dev431Package: libhdf5-mpich-dev
432Architecture: @MPICHARCHS@432Architecture: @MPICHARCHS@
433Section: libdevel433Section: libdevel
434Depends: libhdf5-mpich-@SONAME@@EXT@ (= ${binary:Version}),434Depends: libhdf5-mpich-@SONAME@@EXT@t64 (= ${binary:Version}),
435 libhdf5-mpich-fortran-@SONAME_F@t64 (= ${binary:Version}),435 libhdf5-mpich-fortran-@SONAME_F@t64 (= ${binary:Version}),
436 libhdf5-mpich-hl-@SONAME_HL@t64 (= ${binary:Version}),436 libhdf5-mpich-hl-@SONAME_HL@t64 (= ${binary:Version}),
437 libhdf5-mpich-hl-fortran-@SONAME_HL_F@t64 (= ${binary:Version}),437 libhdf5-mpich-hl-fortran-@SONAME_HL_F@t64 (= ${binary:Version}),
438 libhdf5-mpich-cpp-@SONAME_CXX@@EXT@ (= ${binary:Version}),438 libhdf5-mpich-cpp-@SONAME_CXX@@EXT@t64 (= ${binary:Version}),
439 libhdf5-mpich-hl-cpp-@SONAME_HL_CXX@t64 (= ${binary:Version}),439 libhdf5-mpich-hl-cpp-@SONAME_HL_CXX@t64 (= ${binary:Version}),
440 zlib1g-dev,440 zlib1g-dev,
441 libaec-dev,441 libaec-dev,

Subscribers

People subscribed via source and target branches

to all changes: