[Date Prev][Date Next] [Thread Prev][Thread Next] [Date Index] [Thread Index]

Bug#1062609: librime: NMU diff for 64-bit time_t transition



Source: librime
Dear maintainer,

Please find attached a final version of this patch for the time_t
transition.  This patch is being uploaded to unstable.

Note that this adds a versioned build-dependency on dpkg-dev, to guard
against accidental backports with a wrong ABI.

Thanks!


-- System Information:
Debian Release: trixie/sid
  APT prefers unstable
  APT policy: (500, 'unstable'), (1, 'experimental')
Architecture: amd64 (x86_64)

Kernel: Linux 6.5.0-21-generic (SMP w/16 CPU threads; PREEMPT)
Kernel taint flags: TAINT_PROPRIETARY_MODULE, TAINT_OOT_MODULE, TAINT_UNSIGNED_MODULE
Locale: LANG=C, LC_CTYPE=C.UTF-8 (charmap=UTF-8), LANGUAGE not set
Shell: /bin/sh linked to /usr/bin/dash
Init: unable to detect
diff -Nru librime-1.10.0+dfsg1/debian/changelog librime-1.10.0+dfsg1/debian/changelog
--- librime-1.10.0+dfsg1/debian/changelog	2024-02-10 22:22:10.000000000 +0000
+++ librime-1.10.0+dfsg1/debian/changelog	2024-02-28 17:18:54.000000000 +0000
@@ -1,3 +1,10 @@
+librime (1.10.0+dfsg1-1.1) unstable; urgency=medium
+
+  * Non-maintainer upload.
+  * Rename libraries for 64-bit time_t transition.  Closes: #1062609
+
+ -- Benjamin Drung <bdrung@debian.org>  Wed, 28 Feb 2024 17:18:54 +0000
+
 librime (1.10.0+dfsg1-1) unstable; urgency=medium
 
   * New upstream release.
diff -Nru librime-1.10.0+dfsg1/debian/control librime-1.10.0+dfsg1/debian/control
--- librime-1.10.0+dfsg1/debian/control	2024-02-10 22:19:55.000000000 +0000
+++ librime-1.10.0+dfsg1/debian/control	2024-02-28 17:18:54.000000000 +0000
@@ -9,7 +9,7 @@
  Osamu Aoki <osamu@debian.org>,
  Guo Yixuan (郭溢譞) <culu.gyx@gmail.com>,
  Boyuan Yang <byang@debian.org>,
-Build-Depends:
+Build-Depends: dpkg-dev (>= 1.22.5),
  capnproto,
  cmake (>= 3.10),
  darts,
@@ -39,7 +39,7 @@
 Package: librime-bin
 Architecture: any
 Depends:
- librime1 (= ${binary:Version}),
+ librime1t64 (= ${binary:Version}),
  ${misc:Depends},
  ${shlibs:Depends},
 Recommends:
@@ -61,8 +61,8 @@
 Architecture: any
 Section: libdevel
 Depends:
- librime1 (<< ${source:Upstream-Version}.0~),
- librime1 (>= ${source:Version}),
+ librime1t64 (<< ${source:Upstream-Version}.0~),
+ librime1t64 (>= ${source:Version}),
  ${misc:Depends},
 Provides:
  librime1-dev,
@@ -146,7 +146,10 @@
  This package provides octagram plugin for RIME. It provides extra functionality
  in grammar checking.
 
-Package: librime1
+Package: librime1t64
+Provides: ${t64:Provides}
+Replaces: librime1
+Breaks: librime1 (<< ${source:Version})
 Architecture: any
 Depends:
  ${misc:Depends},
diff -Nru librime-1.10.0+dfsg1/debian/librime1.install librime-1.10.0+dfsg1/debian/librime1.install
--- librime-1.10.0+dfsg1/debian/librime1.install	2024-02-10 22:06:52.000000000 +0000
+++ librime-1.10.0+dfsg1/debian/librime1.install	1970-01-01 00:00:00.000000000 +0000
@@ -1 +0,0 @@
-usr/lib/*/librime.so.*
diff -Nru librime-1.10.0+dfsg1/debian/librime1.lintian-overrides librime-1.10.0+dfsg1/debian/librime1.lintian-overrides
--- librime-1.10.0+dfsg1/debian/librime1.lintian-overrides	2024-02-10 22:06:52.000000000 +0000
+++ librime-1.10.0+dfsg1/debian/librime1.lintian-overrides	1970-01-01 00:00:00.000000000 +0000
@@ -1 +0,0 @@
-librime1: no-symbols-control-file
diff -Nru librime-1.10.0+dfsg1/debian/librime1.shlibs librime-1.10.0+dfsg1/debian/librime1.shlibs
--- librime-1.10.0+dfsg1/debian/librime1.shlibs	2024-02-10 22:09:07.000000000 +0000
+++ librime-1.10.0+dfsg1/debian/librime1.shlibs	1970-01-01 00:00:00.000000000 +0000
@@ -1 +0,0 @@
-librime 1 librime1 (>= 1.10.0)
diff -Nru librime-1.10.0+dfsg1/debian/librime1t64.install librime-1.10.0+dfsg1/debian/librime1t64.install
--- librime-1.10.0+dfsg1/debian/librime1t64.install	1970-01-01 00:00:00.000000000 +0000
+++ librime-1.10.0+dfsg1/debian/librime1t64.install	2024-02-10 22:06:52.000000000 +0000
@@ -0,0 +1 @@
+usr/lib/*/librime.so.*
diff -Nru librime-1.10.0+dfsg1/debian/librime1t64.lintian-overrides librime-1.10.0+dfsg1/debian/librime1t64.lintian-overrides
--- librime-1.10.0+dfsg1/debian/librime1t64.lintian-overrides	1970-01-01 00:00:00.000000000 +0000
+++ librime-1.10.0+dfsg1/debian/librime1t64.lintian-overrides	2024-02-28 17:18:45.000000000 +0000
@@ -0,0 +1,2 @@
+librime1t64: no-symbols-control-file
+librime1t64: package-name-doesnt-match-sonames librime1
diff -Nru librime-1.10.0+dfsg1/debian/librime1t64.shlibs librime-1.10.0+dfsg1/debian/librime1t64.shlibs
--- librime-1.10.0+dfsg1/debian/librime1t64.shlibs	1970-01-01 00:00:00.000000000 +0000
+++ librime-1.10.0+dfsg1/debian/librime1t64.shlibs	2024-02-28 17:18:45.000000000 +0000
@@ -0,0 +1 @@
+librime 1 librime1t64 (>= 1.10.0)

Reply to: