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 gretl-2023c/debian/changelog gretl-2023c/debian/changelog
--- gretl-2023c/debian/changelog        2024-02-03 17:33:53.000000000 +0000
+++ gretl-2023c/debian/changelog        2024-02-28 23:38:53.000000000 +0000
@@ -1,3 +1,10 @@
+gretl (2023c-2.1) unstable; urgency=medium
+
+  * Non-maintainer upload.
+  * Rename libraries for 64-bit time_t transition.  Closes: #1063320
+
+ -- Steve Langasek <vor...@debian.org>  Wed, 28 Feb 2024 23:38:53 +0000
+
 gretl (2023c-2) unstable; urgency=medium
 
   * debian/rules: Add '--enable-build-addons' to enable shipping gretl
diff -Nru gretl-2023c/debian/control gretl-2023c/debian/control
--- gretl-2023c/debian/control  2024-02-03 15:13:50.000000000 +0000
+++ gretl-2023c/debian/control  2024-02-28 23:38:53.000000000 +0000
@@ -3,7 +3,7 @@
 Priority: optional
 Maintainer: Dirk Eddelbuettel <e...@debian.org>
 Standards-Version: 4.6.2
-Build-Depends: debhelper-compat (= 13), libgtk-3-dev, libglib2.0-dev, 
libreadline-dev, zlib1g-dev, libxml2-dev, gnuplot-x11, libgmp-dev, 
libfreetype-dev, libpng-dev, libblas-dev, liblapack-dev, libxslt1-dev, 
libmpfr-dev, libfftw3-dev, texlive-base, texlive-latex-base, 
texlive-latex-recommended, texlive-latex-extra, texlive-fonts-recommended, 
texlive-fonts-extra, gfortran, r-base-dev, unixodbc-dev, 
libgtksourceview-3.0-dev, libcurl4-gnutls-dev | libcurl4-dev, libjson-glib-dev, 
mpi-default-dev, mpi-default-bin
+Build-Depends: dpkg-dev (>= 1.22.5), debhelper-compat (= 13), libgtk-3-dev, 
libglib2.0-dev, libreadline-dev, zlib1g-dev, libxml2-dev, gnuplot-x11, 
libgmp-dev, libfreetype-dev, libpng-dev, libblas-dev, liblapack-dev, 
libxslt1-dev, libmpfr-dev, libfftw3-dev, texlive-base, texlive-latex-base, 
texlive-latex-recommended, texlive-latex-extra, texlive-fonts-recommended, 
texlive-fonts-extra, gfortran, r-base-dev, unixodbc-dev, 
libgtksourceview-3.0-dev, libcurl4-gnutls-dev | libcurl4-dev, libjson-glib-dev, 
mpi-default-dev, mpi-default-bin
 Vcs-Browser: https://salsa.debian.org/edd/gretl
 Vcs-Git: https://salsa.debian.org/edd/gretl.git
 Homepage: http://gretl.sourceforge.net/
@@ -21,12 +21,14 @@
  .
  This package provides the GTK+ client and the command-line client.
 
-Package: libgretl1
+Package: libgretl1t64
+Provides: ${t64:Provides}
+Breaks: libgretl1 (<< ${source:Version})
 Section: libs
 Architecture: any
 Depends: ${shlibs:Depends}, ${misc:Depends} 
 Conflicts: libesl0, libgretl0
-Replaces: libesl0, libgretl0
+Replaces: libgretl1, libesl0, libgretl0
 Description: GNU Regression, Econometric & Time-Series Library -- library 
package 
  The GNU Regression, Econometric and Time-Series Library (gretl) is a
  software package for econometric analysis.  The package comprises a
@@ -38,7 +40,7 @@
 Package: libgretl1-dev
 Section: libdevel
 Architecture: any
-Depends: gretl, libgretl1 (= ${binary:Version}), ${misc:Depends}
+Depends: gretl, libgretl1t64 (= ${binary:Version}), ${misc:Depends}
 Conflicts: libesl0-dev, libgretl0-dev
 Replaces: libesl0-dev, libgretl0-dev
 Description: GNU Regression, Econometric & Time-Series Library -- development 
package
diff -Nru gretl-2023c/debian/libgretl1.files gretl-2023c/debian/libgretl1.files
--- gretl-2023c/debian/libgretl1.files  2018-08-12 21:07:33.000000000 +0000
+++ gretl-2023c/debian/libgretl1.files  1970-01-01 00:00:00.000000000 +0000
@@ -1,2 +0,0 @@
-usr/lib/lib*.so.*
-usr/lib/lib*.la
diff -Nru gretl-2023c/debian/libgretl1.postinst 
gretl-2023c/debian/libgretl1.postinst
--- gretl-2023c/debian/libgretl1.postinst       2018-08-12 21:19:47.000000000 
+0000
+++ gretl-2023c/debian/libgretl1.postinst       1970-01-01 00:00:00.000000000 
+0000
@@ -1,25 +0,0 @@
-#!/bin/sh -e
-#
-# postinst script for the Debian GNU/Linux libgretl1 package
-#
-# Written and GPL'ed by Dirk Eddelbuettel <e...@debian.org>   
-
-#DEBHELPER#
-ldconfig
-
-case "$1" in
-
-    configure)     
-       ;;
-
-    upgrade|abort-upgrade|abort-remove|abort-deconfigure)
-       ;;
-
-    *)
-        echo "postinst called with unknown argument \`$1'" >&2
-        ;;
-
-esac
-
-exit 0                 
-
diff -Nru gretl-2023c/debian/libgretl1.shlibs 
gretl-2023c/debian/libgretl1.shlibs
--- gretl-2023c/debian/libgretl1.shlibs 2023-12-05 23:57:14.000000000 +0000
+++ gretl-2023c/debian/libgretl1.shlibs 1970-01-01 00:00:00.000000000 +0000
@@ -1 +0,0 @@
-libgretl-1.0 46 libgretl1 (>= 2023c)
diff -Nru gretl-2023c/debian/libgretl1t64.files 
gretl-2023c/debian/libgretl1t64.files
--- gretl-2023c/debian/libgretl1t64.files       1970-01-01 00:00:00.000000000 
+0000
+++ gretl-2023c/debian/libgretl1t64.files       2018-08-12 21:07:33.000000000 
+0000
@@ -0,0 +1,2 @@
+usr/lib/lib*.so.*
+usr/lib/lib*.la
diff -Nru gretl-2023c/debian/libgretl1t64.lintian-overrides 
gretl-2023c/debian/libgretl1t64.lintian-overrides
--- gretl-2023c/debian/libgretl1t64.lintian-overrides   1970-01-01 
00:00:00.000000000 +0000
+++ gretl-2023c/debian/libgretl1t64.lintian-overrides   2024-02-28 
23:27:02.000000000 +0000
@@ -0,0 +1 @@
+libgretl1t64: package-name-doesnt-match-sonames libgretl1
diff -Nru gretl-2023c/debian/libgretl1t64.postinst 
gretl-2023c/debian/libgretl1t64.postinst
--- gretl-2023c/debian/libgretl1t64.postinst    1970-01-01 00:00:00.000000000 
+0000
+++ gretl-2023c/debian/libgretl1t64.postinst    2018-08-12 21:19:47.000000000 
+0000
@@ -0,0 +1,25 @@
+#!/bin/sh -e
+#
+# postinst script for the Debian GNU/Linux libgretl1 package
+#
+# Written and GPL'ed by Dirk Eddelbuettel <e...@debian.org>   
+
+#DEBHELPER#
+ldconfig
+
+case "$1" in
+
+    configure)     
+       ;;
+
+    upgrade|abort-upgrade|abort-remove|abort-deconfigure)
+       ;;
+
+    *)
+        echo "postinst called with unknown argument \`$1'" >&2
+        ;;
+
+esac
+
+exit 0                 
+
diff -Nru gretl-2023c/debian/libgretl1t64.shlibs 
gretl-2023c/debian/libgretl1t64.shlibs
--- gretl-2023c/debian/libgretl1t64.shlibs      1970-01-01 00:00:00.000000000 
+0000
+++ gretl-2023c/debian/libgretl1t64.shlibs      2024-02-28 23:27:02.000000000 
+0000
@@ -0,0 +1 @@
+libgretl-1.0 46 libgretl1t64 (>= 2023c)
diff -Nru gretl-2023c/debian/rules gretl-2023c/debian/rules
--- gretl-2023c/debian/rules    2024-02-03 14:13:12.000000000 +0000
+++ gretl-2023c/debian/rules    2024-02-28 23:38:51.000000000 +0000
@@ -5,8 +5,8 @@
 
 package := $(shell head -1 debian/changelog | awk '{print $$1}')
 sonum   := 1
-libpack := libgretl$(sonum)
-devpack := $(libpack)-dev
+libpack := libgretl$(sonum)t64
+devpack := libgretl$(sonum)-dev
 docpack := $(package)-doc
 datpack := $(package)-data
 compack := $(package)-common
@@ -127,7 +127,7 @@
        cp -vax pixmaps/gretl.xpm debian/gretl/usr/share/pixmaps
 
         # move static libs into dev-package  and binaries into bin package
-       dh_movefiles    --sourcedir=debian/$(package) -p$(devpack) 
+       dh_movefiles    --sourcedir=debian/$(package) -p$(devpack)
        dh_movefiles    --sourcedir=debian/$(package) -p$(libpack)
         # move docs
         ## dh_movefiles        --sourcedir=debian/$(package) -p$(docpack)

Reply via email to