Source: libpwiz
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 libpwiz-3.0.18342/debian/changelog libpwiz-3.0.18342/debian/changelog
--- libpwiz-3.0.18342/debian/changelog  2020-09-27 08:55:38.000000000 +0000
+++ libpwiz-3.0.18342/debian/changelog  2024-02-28 16:35:13.000000000 +0000
@@ -1,3 +1,10 @@
+libpwiz (3.0.18342-4.1) unstable; urgency=medium
+
+  * Non-maintainer upload.
+  * Rename libraries for 64-bit time_t transition.  Closes: #1062580
+
+ -- Benjamin Drung <bdr...@debian.org>  Wed, 28 Feb 2024 16:35:13 +0000
+
 libpwiz (3.0.18342-4) unstable; urgency=low
 
   * Fix FTCBFS: Pass --host to configure (Closes: #970872). Thanks to Helmut
diff -Nru libpwiz-3.0.18342/debian/control libpwiz-3.0.18342/debian/control
--- libpwiz-3.0.18342/debian/control    2020-06-11 22:51:28.000000000 +0000
+++ libpwiz-3.0.18342/debian/control    2024-02-28 16:35:13.000000000 +0000
@@ -2,7 +2,7 @@
 Priority: optional
 Maintainer: The Debichem Group <debichem-de...@lists.alioth.debian.org>
 Uploaders: Filippo Rusconi <lopi...@debian.org>
-Build-Depends: debhelper-compat (= 12),
+Build-Depends: dpkg-dev (>= 1.22.5), debhelper-compat (= 12),
                dpkg-dev (>= 1.16.1~),
                chrpath (>= 0.13),
                libboost-tools-dev,
@@ -32,7 +32,7 @@
 Architecture: any
 Depends: ${shlibs:Depends},
          ${misc:Depends},
-         libpwiz3 (= ${binary:Version})
+         libpwiz3t64 (= ${binary:Version})
 Suggests: libpwiz-doc
 Description: library to perform proteomics data analyses (devel files)
  The libpwiz library from the ProteoWizard project provides a modular
@@ -50,7 +50,10 @@
  .
  This package ships the library development files.
 
-Package: libpwiz3
+Package: libpwiz3t64
+Provides: ${t64:Provides}
+Replaces: libpwiz3
+Breaks: libpwiz3 (<< ${source:Version})
 Architecture: any
 Depends: ${shlibs:Depends}, ${misc:Depends}
 Suggests: libpwiz-doc
@@ -71,7 +74,7 @@
 Package: libpwiz-tools
 Section: science
 Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}, libpwiz3 (= ${binary:Version})
+Depends: ${shlibs:Depends}, ${misc:Depends}, libpwiz3t64 (= ${binary:Version})
 Suggests: libpwiz-doc
 Description: ProteoWizard command line tools
  The libpwiz library from the ProteoWizard project provides a modular
diff -Nru libpwiz-3.0.18342/debian/libpwiz3.dirs 
libpwiz-3.0.18342/debian/libpwiz3.dirs
--- libpwiz-3.0.18342/debian/libpwiz3.dirs      2020-01-17 14:45:17.000000000 
+0000
+++ libpwiz-3.0.18342/debian/libpwiz3.dirs      1970-01-01 00:00:00.000000000 
+0000
@@ -1,2 +0,0 @@
-usr/lib
-usr/lib/libpwiz3/example-files
diff -Nru libpwiz-3.0.18342/debian/libpwiz3.install 
libpwiz-3.0.18342/debian/libpwiz3.install
--- libpwiz-3.0.18342/debian/libpwiz3.install   2020-01-17 14:45:17.000000000 
+0000
+++ libpwiz-3.0.18342/debian/libpwiz3.install   1970-01-01 00:00:00.000000000 
+0000
@@ -1,4 +0,0 @@
-debian/build/usr/lib/libpwiz.so.3.0.0 usr/lib
-
-# The example source code files.
-pwiz_tools/examples/*.cpp       usr/share/doc/libpwiz3/example-files
diff -Nru libpwiz-3.0.18342/debian/libpwiz3.links 
libpwiz-3.0.18342/debian/libpwiz3.links
--- libpwiz-3.0.18342/debian/libpwiz3.links     2020-01-17 14:45:17.000000000 
+0000
+++ libpwiz-3.0.18342/debian/libpwiz3.links     1970-01-01 00:00:00.000000000 
+0000
@@ -1,2 +0,0 @@
-usr/lib/libpwiz.so.3.0.0      usr/lib/libpwiz.so.3
-
diff -Nru libpwiz-3.0.18342/debian/libpwiz3.manpages 
libpwiz-3.0.18342/debian/libpwiz3.manpages
--- libpwiz-3.0.18342/debian/libpwiz3.manpages  2020-01-17 14:45:17.000000000 
+0000
+++ libpwiz-3.0.18342/debian/libpwiz3.manpages  1970-01-01 00:00:00.000000000 
+0000
@@ -1 +0,0 @@
-debian/libpwiz.3
diff -Nru libpwiz-3.0.18342/debian/libpwiz3t64.dirs 
libpwiz-3.0.18342/debian/libpwiz3t64.dirs
--- libpwiz-3.0.18342/debian/libpwiz3t64.dirs   1970-01-01 00:00:00.000000000 
+0000
+++ libpwiz-3.0.18342/debian/libpwiz3t64.dirs   2020-01-17 14:45:17.000000000 
+0000
@@ -0,0 +1,2 @@
+usr/lib
+usr/lib/libpwiz3/example-files
diff -Nru libpwiz-3.0.18342/debian/libpwiz3t64.install 
libpwiz-3.0.18342/debian/libpwiz3t64.install
--- libpwiz-3.0.18342/debian/libpwiz3t64.install        1970-01-01 
00:00:00.000000000 +0000
+++ libpwiz-3.0.18342/debian/libpwiz3t64.install        2020-01-17 
14:45:17.000000000 +0000
@@ -0,0 +1,4 @@
+debian/build/usr/lib/libpwiz.so.3.0.0 usr/lib
+
+# The example source code files.
+pwiz_tools/examples/*.cpp       usr/share/doc/libpwiz3/example-files
diff -Nru libpwiz-3.0.18342/debian/libpwiz3t64.links 
libpwiz-3.0.18342/debian/libpwiz3t64.links
--- libpwiz-3.0.18342/debian/libpwiz3t64.links  1970-01-01 00:00:00.000000000 
+0000
+++ libpwiz-3.0.18342/debian/libpwiz3t64.links  2020-01-17 14:45:17.000000000 
+0000
@@ -0,0 +1,2 @@
+usr/lib/libpwiz.so.3.0.0      usr/lib/libpwiz.so.3
+
diff -Nru libpwiz-3.0.18342/debian/libpwiz3t64.lintian-overrides 
libpwiz-3.0.18342/debian/libpwiz3t64.lintian-overrides
--- libpwiz-3.0.18342/debian/libpwiz3t64.lintian-overrides      1970-01-01 
00:00:00.000000000 +0000
+++ libpwiz-3.0.18342/debian/libpwiz3t64.lintian-overrides      2024-02-28 
16:33:51.000000000 +0000
@@ -0,0 +1 @@
+libpwiz3t64: package-name-doesnt-match-sonames libpwiz3
diff -Nru libpwiz-3.0.18342/debian/libpwiz3t64.manpages 
libpwiz-3.0.18342/debian/libpwiz3t64.manpages
--- libpwiz-3.0.18342/debian/libpwiz3t64.manpages       1970-01-01 
00:00:00.000000000 +0000
+++ libpwiz-3.0.18342/debian/libpwiz3t64.manpages       2020-01-17 
14:45:17.000000000 +0000
@@ -0,0 +1 @@
+debian/libpwiz.3
diff -Nru libpwiz-3.0.18342/debian/rules libpwiz-3.0.18342/debian/rules
--- libpwiz-3.0.18342/debian/rules      2020-09-27 08:55:24.000000000 +0000
+++ libpwiz-3.0.18342/debian/rules      2024-02-28 16:35:10.000000000 +0000
@@ -14,7 +14,7 @@
 export PATH := $(BUILD_DIR)/bin:$(CURDIR)/tools:$(PATH)
 export LD_LIBRARY_PATH := $(BUILD_DIR)/lib/:$(LD_LIBRARY_PATH)
 
-PROTEOWIZ_LIB_PACKAGE = libpwiz3
+PROTEOWIZ_LIB_PACKAGE = libpwiz3t64
 PROTEOWIZ_LIB_VERSION = 3.0.0
 PROTEOWIZ_SOFT_VERSION = 3.0.9393
 PROTEOWIZ_PACK_VERSION = $(PROTEOWIZ_SOFT_VERSION)-1
@@ -214,7 +214,7 @@
        -O$(DEBIAN_DIR)/$(PROTEOWIZ_LIB_PACKAGE)/DEBIAN/symbols
 
 # Send the proper shared libs details for the library:
-       echo "libpwiz 3 libpwiz3 (>= $(PROTEOWIZ_PACK_VERSION))" > \
+       echo "libpwiz 3 libpwiz3t64 (>= $(PROTEOWIZ_PACK_VERSION))" > \
        $(DEBIAN_DIR)/$(PROTEOWIZ_LIB_PACKAGE)/DEBIAN/shlibs
 
 # Run the fixperms after generating the symbols and shlibs files so

Reply via email to