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
1diff --git a/debian/changelog b/debian/changelog
2index 1216133..bf167c0 100644
3--- a/debian/changelog
4+++ b/debian/changelog
5@@ -1,3 +1,10 @@
6+hdf5 (1.10.10+repack-3.1ubuntu2) noble; urgency=medium
7+
8+ * Rename previously missed libraries for 64-bit time_t transition.
9+ (LP: #2057741)
10+
11+ -- Zixing Liu <zixing.liu@canonical.com> Tue, 12 Mar 2024 23:42:20 -0600
12+
13 hdf5 (1.10.10+repack-3.1ubuntu1) noble; urgency=medium
14
15 * Merge with Debian; remaining changes:
16diff --git a/debian/control b/debian/control
17index 1ddd6d0..8a86652 100644
18--- a/debian/control
19+++ b/debian/control
20@@ -141,11 +141,11 @@ Description: HDF5 High Level C++ runtime files - serial version
21 Package: libhdf5-dev
22 Architecture: any
23 Section: libdevel
24-Depends: libhdf5-103-1 (= ${binary:Version}),
25+Depends: libhdf5-103-1t64 (= ${binary:Version}),
26 libhdf5-fortran-102t64 (= ${binary:Version}),
27 libhdf5-hl-100t64 (= ${binary:Version}),
28 libhdf5-hl-fortran-100t64 (= ${binary:Version}),
29- libhdf5-cpp-103-1 (= ${binary:Version}),
30+ libhdf5-cpp-103-1t64 (= ${binary:Version}),
31 libhdf5-hl-cpp-100t64 (= ${binary:Version}),
32 zlib1g-dev,
33 libjpeg-dev,
34@@ -287,11 +287,11 @@ Description: HDF5 High Level C++ runtime files - OpenMPI version - unsupported
35 Package: libhdf5-openmpi-dev
36 Architecture: any
37 Section: libdevel
38-Depends: libhdf5-openmpi-103-1 (= ${binary:Version}),
39+Depends: libhdf5-openmpi-103-1t64 (= ${binary:Version}),
40 libhdf5-openmpi-fortran-102t64 (= ${binary:Version}),
41 libhdf5-openmpi-hl-100t64 (= ${binary:Version}),
42 libhdf5-openmpi-hl-fortran-100t64 (= ${binary:Version}),
43- libhdf5-openmpi-cpp-103-1 (= ${binary:Version}),
44+ libhdf5-openmpi-cpp-103-1t64 (= ${binary:Version}),
45 libhdf5-openmpi-hl-cpp-100t64 (= ${binary:Version}),
46 zlib1g-dev,
47 libaec-dev,
48@@ -431,11 +431,11 @@ Description: HDF5 High Level C++ runtime files - MPICH2 version - unsupported
49 Package: libhdf5-mpich-dev
50 Architecture: any
51 Section: libdevel
52-Depends: libhdf5-mpich-103-1 (= ${binary:Version}),
53+Depends: libhdf5-mpich-103-1t64 (= ${binary:Version}),
54 libhdf5-mpich-fortran-102t64 (= ${binary:Version}),
55 libhdf5-mpich-hl-100t64 (= ${binary:Version}),
56 libhdf5-mpich-hl-fortran-100t64 (= ${binary:Version}),
57- libhdf5-mpich-cpp-103-1 (= ${binary:Version}),
58+ libhdf5-mpich-cpp-103-1t64 (= ${binary:Version}),
59 libhdf5-mpich-hl-cpp-100t64 (= ${binary:Version}),
60 zlib1g-dev,
61 libaec-dev,
62diff --git a/debian/control.in b/debian/control.in
63index b9f211f..da5cb4d 100644
64--- a/debian/control.in
65+++ b/debian/control.in
66@@ -141,11 +141,11 @@ Description: HDF5 High Level C++ runtime files - serial version
67 Package: libhdf5-dev
68 Architecture: any
69 Section: libdevel
70-Depends: libhdf5-@SONAME@@EXT@ (= ${binary:Version}),
71+Depends: libhdf5-@SONAME@@EXT@t64 (= ${binary:Version}),
72 libhdf5-fortran-@SONAME_F@t64 (= ${binary:Version}),
73 libhdf5-hl-@SONAME_HL@t64 (= ${binary:Version}),
74 libhdf5-hl-fortran-@SONAME_HL_F@t64 (= ${binary:Version}),
75- libhdf5-cpp-@SONAME_CXX@@EXT@ (= ${binary:Version}),
76+ libhdf5-cpp-@SONAME_CXX@@EXT@t64 (= ${binary:Version}),
77 libhdf5-hl-cpp-@SONAME_HL_CXX@t64 (= ${binary:Version}),
78 zlib1g-dev,
79 libjpeg-dev,
80@@ -287,11 +287,11 @@ Description: HDF5 High Level C++ runtime files - OpenMPI version - unsupported
81 Package: libhdf5-openmpi-dev
82 Architecture: @OMPIARCHS@
83 Section: libdevel
84-Depends: libhdf5-openmpi-@SONAME@@EXT@ (= ${binary:Version}),
85+Depends: libhdf5-openmpi-@SONAME@@EXT@t64 (= ${binary:Version}),
86 libhdf5-openmpi-fortran-@SONAME_F@t64 (= ${binary:Version}),
87 libhdf5-openmpi-hl-@SONAME_HL@t64 (= ${binary:Version}),
88 libhdf5-openmpi-hl-fortran-@SONAME_HL_F@t64 (= ${binary:Version}),
89- libhdf5-openmpi-cpp-@SONAME_CXX@@EXT@ (= ${binary:Version}),
90+ libhdf5-openmpi-cpp-@SONAME_CXX@@EXT@t64 (= ${binary:Version}),
91 libhdf5-openmpi-hl-cpp-@SONAME_HL_CXX@t64 (= ${binary:Version}),
92 zlib1g-dev,
93 libaec-dev,
94@@ -431,11 +431,11 @@ Description: HDF5 High Level C++ runtime files - MPICH2 version - unsupported
95 Package: libhdf5-mpich-dev
96 Architecture: @MPICHARCHS@
97 Section: libdevel
98-Depends: libhdf5-mpich-@SONAME@@EXT@ (= ${binary:Version}),
99+Depends: libhdf5-mpich-@SONAME@@EXT@t64 (= ${binary:Version}),
100 libhdf5-mpich-fortran-@SONAME_F@t64 (= ${binary:Version}),
101 libhdf5-mpich-hl-@SONAME_HL@t64 (= ${binary:Version}),
102 libhdf5-mpich-hl-fortran-@SONAME_HL_F@t64 (= ${binary:Version}),
103- libhdf5-mpich-cpp-@SONAME_CXX@@EXT@ (= ${binary:Version}),
104+ libhdf5-mpich-cpp-@SONAME_CXX@@EXT@t64 (= ${binary:Version}),
105 libhdf5-mpich-hl-cpp-@SONAME_HL_CXX@t64 (= ${binary:Version}),
106 zlib1g-dev,
107 libaec-dev,

Subscribers

People subscribed via source and target branches

to all changes: