Merge ~zhsj/ubuntu/+source/libcupsfilters:time_t into ubuntu/+source/libcupsfilters:ubuntu/devel

Proposed by Shengjing Zhu
Status: Merged
Merged at revision: 398b89137c5f14718524afb2ccf92fee1b26066c
Proposed branch: ~zhsj/ubuntu/+source/libcupsfilters:time_t
Merge into: ubuntu/+source/libcupsfilters:ubuntu/devel
Diff against target: 77 lines (+14/-4)
4 files modified
debian/changelog (+6/-0)
debian/control (+6/-3)
debian/libcupsfilters2t64.lintian-overrides (+1/-0)
debian/libcupsfilters2t64.symbols (+1/-1)
Reviewer Review Type Date Requested Status
Benjamin Drung (community) Approve
Review via email: mp+462933@code.launchpad.net
To post a comment you must log in.
Revision history for this message
Shengjing Zhu (zhsj) wrote :

Corresponding Debian bug https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=1061916, which is for cups. But cups in Ubuntu is newer and the library is split to separated package.

PPA for testing: https://launchpad.net/~zhsj/+archive/ubuntu/libcupsfilters/+packages

Revision history for this message
Benjamin Drung (bdrung) wrote :

Sponsored

review: Approve

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 53af3a7..becf814 100644
3--- a/debian/changelog
4+++ b/debian/changelog
5@@ -1,3 +1,9 @@
6+libcupsfilters (2.0.0-0ubuntu6) noble; urgency=medium
7+
8+ * Rename libraries for 64-bit time_t transition
9+
10+ -- Shengjing Zhu <shengjing.zhu@canonical.com> Fri, 22 Mar 2024 17:08:47 +0800
11+
12 libcupsfilters (2.0.0-0ubuntu5) noble; urgency=medium
13
14 * No-change rebuild against libpoppler-cpp0t64
15diff --git a/debian/control b/debian/control
16index 913298e..cf785d5 100644
17--- a/debian/control
18+++ b/debian/control
19@@ -38,7 +38,10 @@ Vcs-Git: https://salsa.debian.org/printing-team/libcupsfilters.git
20 Homepage: http://www.openprinting.org/
21 Rules-Requires-Root: no
22
23-Package: libcupsfilters2
24+Package: libcupsfilters2t64
25+Provides: ${t64:Provides}
26+Replaces: libcupsfilters2
27+Breaks: libcupsfilters2 (<< ${source:Version})
28 Architecture: any
29 Multi-Arch: same
30 Section: libs
31@@ -59,7 +62,7 @@ Package: libcupsfilters2-common
32 Architecture: all
33 Section: libs
34 Depends: ${misc:Depends}
35-Recommends: libcupsfilters2 (>= ${source:Version})
36+Recommends: libcupsfilters2t64 (>= ${source:Version})
37 Breaks: cups-filters (<< 2.0~)
38 Replaces: cups-filters (<< 2.0~)
39 Description: OpenPrinting libcupsfilters - Auxiliary files
40@@ -73,7 +76,7 @@ Architecture: any
41 Multi-Arch: same
42 Section: libdevel
43 Depends:
44- libcupsfilters2 (= ${binary:Version}),
45+ libcupsfilters2t64 (= ${binary:Version}),
46 ${misc:Depends},
47 ${shlibs:Depends},
48 Description: OpenPrinting libcupsfilters - Development files for the library
49diff --git a/debian/libcupsfilters2.docs b/debian/libcupsfilters2t64.docs
50similarity index 100%
51rename from debian/libcupsfilters2.docs
52rename to debian/libcupsfilters2t64.docs
53diff --git a/debian/libcupsfilters2.install b/debian/libcupsfilters2t64.install
54similarity index 100%
55rename from debian/libcupsfilters2.install
56rename to debian/libcupsfilters2t64.install
57diff --git a/debian/libcupsfilters2t64.lintian-overrides b/debian/libcupsfilters2t64.lintian-overrides
58new file mode 100644
59index 0000000..ad3dbd9
60--- /dev/null
61+++ b/debian/libcupsfilters2t64.lintian-overrides
62@@ -0,0 +1 @@
63+libcupsfilters2t64: package-name-doesnt-match-sonames libcupsfilters2
64diff --git a/debian/libcupsfilters2.symbols b/debian/libcupsfilters2t64.symbols
65similarity index 99%
66rename from debian/libcupsfilters2.symbols
67rename to debian/libcupsfilters2t64.symbols
68index 524d927..f01dc90 100644
69--- a/debian/libcupsfilters2.symbols
70+++ b/debian/libcupsfilters2t64.symbols
71@@ -1,5 +1,5 @@
72 # SymbolsHelper-Confirmed: 2.0~rc1 amd64 arm64 armhf ppc64el s390x
73-libcupsfilters.so.2 libcupsfilters2 #MINVER#
74+libcupsfilters.so.2 libcupsfilters2t64 #MINVER#
75 * Build-Depends-Package: libcupsfilters-dev
76 Floyd16x16@Base 2.0~b4-0ubuntu1
77 Floyd4x4@Base 2.0~b4-0ubuntu1

Subscribers

People subscribed via source and target branches