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')
Architecture: amd64 (x86_64)

Kernel: Linux 6.5.0-14-generic (SMP w/12 CPU threads; PREEMPT)
Kernel taint flags: TAINT_PROPRIETARY_MODULE, TAINT_OOT_MODULE
Locale: LANG=C, LC_CTYPE=C.UTF-8 (charmap=UTF-8), LANGUAGE not set
Shell: /bin/sh linked to /usr/bin/dash
Init: systemd (via /run/systemd/system)
diff -Nru groonga-13.1.1+dfsg/debian/changelog 
groonga-13.1.1+dfsg/debian/changelog
--- groonga-13.1.1+dfsg/debian/changelog        2024-01-20 10:30:17.000000000 
+0000
+++ groonga-13.1.1+dfsg/debian/changelog        2024-02-29 00:35:02.000000000 
+0000
@@ -1,3 +1,10 @@
+groonga (13.1.1+dfsg-1.1) unstable; urgency=medium
+
+  * Non-maintainer upload.
+  * Rename libraries for 64-bit time_t transition.  Closes: #1062131
+
+ -- Steve Langasek <vor...@debian.org>  Thu, 29 Feb 2024 00:35:02 +0000
+
 groonga (13.1.1+dfsg-1) unstable; urgency=medium
 
   * New upstream version 13.1.1+dfsg
diff -Nru groonga-13.1.1+dfsg/debian/control groonga-13.1.1+dfsg/debian/control
--- groonga-13.1.1+dfsg/debian/control  2024-01-20 10:30:17.000000000 +0000
+++ groonga-13.1.1+dfsg/debian/control  2024-02-29 00:35:01.000000000 +0000
@@ -2,7 +2,7 @@
 Section: database
 Priority: optional
 Maintainer: Kentaro Hayashi <ken...@xdump.org>
-Build-Depends:
+Build-Depends: dpkg-dev (>= 1.22.5),
   debhelper-compat (= 13),
   pkg-config,
   liblz4-dev,
@@ -100,19 +100,20 @@
   ${misc:Depends},
   ${shlibs:Depends},
   pkg-config,
-  libgroonga0 (= ${binary:Version})
+  libgroonga0t64 (= ${binary:Version})
 Description: Development files to use Groonga as a library
  Groonga is an open-source fulltext search engine and column store.
  It lets you write high-performance applications that requires fulltext search.
  .
  This package provides header files to use Groonga as a library.
 
-Package: libgroonga0
+Package: libgroonga0t64
+Provides: ${t64:Provides}
 Section: libs
 Architecture: any
 Multi-Arch: same
-Replaces: libgroonga (<< 1.2.0-1)
-Breaks: libgroonga (<< 1.2.0-1)
+Replaces: libgroonga0, libgroonga (<< 1.2.0-1)
+Breaks: libgroonga0 (<< ${source:Version}), libgroonga (<< 1.2.0-1)
 Pre-Depends: ${misc:Pre-Depends}
 Depends:
   ${misc:Depends},
@@ -131,7 +132,7 @@
 Depends:
   ${misc:Depends},
   ${shlibs:Depends},
-  libgroonga0 (= ${binary:Version}),
+  libgroonga0t64 (= ${binary:Version}),
   mecab-naist-jdic | mecab-jumandic-utf8
 Description: MeCab tokenizer for Groonga
  Groonga is an open-source fulltext search engine and column store.
@@ -145,7 +146,7 @@
 Depends:
   ${misc:Depends},
   ${shlibs:Depends},
-  libgroonga0 (= ${binary:Version}),
+  libgroonga0t64 (= ${binary:Version}),
   libstemmer0d
 Multi-Arch: same
 Description: Stemming token filter for Groonga
@@ -164,7 +165,7 @@
 Depends:
   ${misc:Depends},
   ${shlibs:Depends},
-  libgroonga0 (= ${binary:Version})
+  libgroonga0t64 (= ${binary:Version})
 Description: Suggest plugin for Groonga
  Groonga is an open-source fulltext search engine and column store.
  It lets you write high-performance applications that requires fulltext search.
@@ -176,7 +177,7 @@
 Depends:
   ${misc:Depends},
   ${shlibs:Depends},
-  libgroonga0 (= ${binary:Version}),
+  libgroonga0t64 (= ${binary:Version}),
   libjs-jquery,
   libjs-jquery-ui,
   libjs-jquery-flot
diff -Nru groonga-13.1.1+dfsg/debian/libgroonga0.install 
groonga-13.1.1+dfsg/debian/libgroonga0.install
--- groonga-13.1.1+dfsg/debian/libgroonga0.install      2024-01-20 
10:30:17.000000000 +0000
+++ groonga-13.1.1+dfsg/debian/libgroonga0.install      1970-01-01 
00:00:00.000000000 +0000
@@ -1,9 +0,0 @@
-usr/lib/*/libgroonga*.so.*
-usr/lib/*/groonga/plugins/functions/*
-usr/lib/*/groonga/plugins/query_expanders/*
-usr/lib/*/groonga/plugins/token_filters/stop_word*
-usr/lib/*/groonga/plugins/ruby/*
-usr/lib/*/groonga/plugins/sharding.rb
-usr/lib/*/groonga/plugins/sharding/*
-usr/lib/*/groonga/scripts/*
-etc/groonga/synonyms.tsv
diff -Nru groonga-13.1.1+dfsg/debian/libgroonga0.lintian-overrides 
groonga-13.1.1+dfsg/debian/libgroonga0.lintian-overrides
--- groonga-13.1.1+dfsg/debian/libgroonga0.lintian-overrides    2024-01-20 
10:30:17.000000000 +0000
+++ groonga-13.1.1+dfsg/debian/libgroonga0.lintian-overrides    1970-01-01 
00:00:00.000000000 +0000
@@ -1,6 +0,0 @@
-# Build uses -D_FORTIFY_SOURCE=2, but hardening-check reports false positive:
-# % hardening-check -v 
/usr/lib/x86_64-linux-gnu/groonga/plugins/query_expanders/tsv.so
-# Fortify Source functions: no, only unprotected functions found!
-#        unprotected: strncpy
-#        unprotected: memcpy
-libgroonga0: hardening-no-fortify-functions 
[usr/lib/*/groonga/plugins/query_expanders/tsv*]
diff -Nru groonga-13.1.1+dfsg/debian/libgroonga0t64.install 
groonga-13.1.1+dfsg/debian/libgroonga0t64.install
--- groonga-13.1.1+dfsg/debian/libgroonga0t64.install   1970-01-01 
00:00:00.000000000 +0000
+++ groonga-13.1.1+dfsg/debian/libgroonga0t64.install   2024-01-20 
10:30:17.000000000 +0000
@@ -0,0 +1,9 @@
+usr/lib/*/libgroonga*.so.*
+usr/lib/*/groonga/plugins/functions/*
+usr/lib/*/groonga/plugins/query_expanders/*
+usr/lib/*/groonga/plugins/token_filters/stop_word*
+usr/lib/*/groonga/plugins/ruby/*
+usr/lib/*/groonga/plugins/sharding.rb
+usr/lib/*/groonga/plugins/sharding/*
+usr/lib/*/groonga/scripts/*
+etc/groonga/synonyms.tsv
diff -Nru groonga-13.1.1+dfsg/debian/libgroonga0t64.lintian-overrides 
groonga-13.1.1+dfsg/debian/libgroonga0t64.lintian-overrides
--- groonga-13.1.1+dfsg/debian/libgroonga0t64.lintian-overrides 1970-01-01 
00:00:00.000000000 +0000
+++ groonga-13.1.1+dfsg/debian/libgroonga0t64.lintian-overrides 2024-02-29 
00:32:11.000000000 +0000
@@ -0,0 +1,7 @@
+# Build uses -D_FORTIFY_SOURCE=2, but hardening-check reports false positive:
+# % hardening-check -v 
/usr/lib/x86_64-linux-gnu/groonga/plugins/query_expanders/tsv.so
+# Fortify Source functions: no, only unprotected functions found!
+#        unprotected: strncpy
+#        unprotected: memcpy
+libgroonga0t64: hardening-no-fortify-functions 
[usr/lib/*/groonga/plugins/query_expanders/tsv*]
+libgroonga0t64: package-name-doesnt-match-sonames libgroonga0

Reply via email to