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-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 xgks-2.6.1+dfsg.2/debian/changelog xgks-2.6.1+dfsg.2/debian/changelog
--- xgks-2.6.1+dfsg.2/debian/changelog  2023-12-10 12:35:13.000000000 +0000
+++ xgks-2.6.1+dfsg.2/debian/changelog  2024-02-29 07:32:45.000000000 +0000
@@ -1,3 +1,10 @@
+xgks (2.6.1+dfsg.2-14.1) unstable; urgency=medium
+
+  * Non-maintainer upload.
+  * Rename libraries for 64-bit time_t transition.  Closes: #1063276
+
+ -- Steve Langasek <vor...@debian.org>  Thu, 29 Feb 2024 07:32:45 +0000
+
 xgks (2.6.1+dfsg.2-14) unstable; urgency=medium
 
   * Limit flang-17 B-D to the archs available
diff -Nru xgks-2.6.1+dfsg.2/debian/control xgks-2.6.1+dfsg.2/debian/control
--- xgks-2.6.1+dfsg.2/debian/control    2023-12-10 12:35:13.000000000 +0000
+++ xgks-2.6.1+dfsg.2/debian/control    2024-02-29 07:32:45.000000000 +0000
@@ -2,7 +2,7 @@
 Section:  utils
 Priority: optional
 Maintainer: Alastair McKinstry <mckins...@debian.org>
-Build-Depends: debhelper-compat (= 13), 
+Build-Depends: dpkg-dev (>= 1.22.5), debhelper-compat (= 13), 
  gfortran | fortran-compiler,
  flang-17 [amd64 arm64 ppc64el riscv64 ppc64 sparc64],
  libx11-dev, 
@@ -12,10 +12,12 @@
 Vcs-Browser: https://salsa.debian.org:/science-team/xgks.git
 Vcs-Git: https://salsa.debian.org:/science-team/xkgs.git
 
-Package: libxgks2
+Package: libxgks2t64
+Provides: ${t64:Provides}
+Breaks: libxgks2 (<< ${source:Version})
 Section: libs
 Architecture: any
-Replaces: libxgks2
+Replaces: libxgks2, libxgks2t64
 Multi-Arch: same
 Depends: ${misc:Depends}, ${shlibs:Depends}, libxgks2-data
 Description: X11 Graphical Kernel Subsystem, library.
@@ -36,7 +38,7 @@
 Package: libxgks-dev
 Section: libdevel
 Architecture: any
-Depends: libxgks2 ( = ${binary:Version}), ${misc:Depends}, ${shlibs:Depends}
+Depends: libxgks2t64 ( = ${binary:Version}), ${misc:Depends}, ${shlibs:Depends}
 Recommends: pkg-config
 Description: X11 Graphical Kernel Subsystem, development files
  XGKS is a level 2C implementation of the ANSI Graphical Kernel System (GKS) 
@@ -57,7 +59,7 @@
 Architecture: all
 Multi-Arch: foreign
 Depends: ${misc:Depends}
-Recommends: libxgks2 (= ${binary:Version})
+Recommends: libxgks2t64 (= ${binary:Version})
 Description: Font files for the X11 Graphical Kernel Subsystem
  XGKS is a level 2C implementation of the ANSI Graphical Kernel System (GKS)
  for use in a Unix environment with the X Window System. It supports the
diff -Nru xgks-2.6.1+dfsg.2/debian/libxgks2.shlibs 
xgks-2.6.1+dfsg.2/debian/libxgks2.shlibs
--- xgks-2.6.1+dfsg.2/debian/libxgks2.shlibs    2023-12-10 12:35:13.000000000 
+0000
+++ xgks-2.6.1+dfsg.2/debian/libxgks2.shlibs    1970-01-01 00:00:00.000000000 
+0000
@@ -1,3 +0,0 @@
-libxgks-gfortran 2     libxgks2
-libxgks-flang 2        libxgks2
-libudport 2    libxgks2
diff -Nru xgks-2.6.1+dfsg.2/debian/libxgks2t64.lintian-overrides 
xgks-2.6.1+dfsg.2/debian/libxgks2t64.lintian-overrides
--- xgks-2.6.1+dfsg.2/debian/libxgks2t64.lintian-overrides      1970-01-01 
00:00:00.000000000 +0000
+++ xgks-2.6.1+dfsg.2/debian/libxgks2t64.lintian-overrides      2024-02-29 
07:31:28.000000000 +0000
@@ -0,0 +1 @@
+libxgks2t64: package-name-doesnt-match-sonames libxgks2
diff -Nru xgks-2.6.1+dfsg.2/debian/libxgks2t64.shlibs 
xgks-2.6.1+dfsg.2/debian/libxgks2t64.shlibs
--- xgks-2.6.1+dfsg.2/debian/libxgks2t64.shlibs 1970-01-01 00:00:00.000000000 
+0000
+++ xgks-2.6.1+dfsg.2/debian/libxgks2t64.shlibs 2024-02-29 07:31:28.000000000 
+0000
@@ -0,0 +1,3 @@
+libxgks-gfortran 2     libxgks2t64
+libxgks-flang 2        libxgks2t64
+libudport 2    libxgks2t64
diff -Nru xgks-2.6.1+dfsg.2/debian/rules xgks-2.6.1+dfsg.2/debian/rules
--- xgks-2.6.1+dfsg.2/debian/rules      2023-12-10 12:35:13.000000000 +0000
+++ xgks-2.6.1+dfsg.2/debian/rules      2024-02-29 07:32:42.000000000 +0000
@@ -60,18 +60,18 @@
        $(MAKE) -j1 -C build-gfortran/port/misc install DESTDIR=$(DESTDIR)
        #dh_auto_install
        dh_install -p libxgks-dev debian/xgks.pc $(LIBDIR)/pkgconfig
-       dh_install -p libxgks2 ./build-gfortran/lib/c/libxgks-gfortran.so.2.6 
$(LIBDIR)
-       dh_install -p libxgks2 ./build-gfortran/libudport.so.2.6 $(LIBDIR)
+       dh_install -p libxgks2t64 
./build-gfortran/lib/c/libxgks-gfortran.so.2.6 $(LIBDIR)
+       dh_install -p libxgks2t64 ./build-gfortran/libudport.so.2.6 $(LIBDIR)
        dh_install -p libxgks-dev ./build-gfortran/lib/c/libxgks.a       
$(LIBDIR)/fortran/gfortran
        dh_install -p libxgks-dev ./build-gfortran/libudport.a $(LIBDIR)
-       dh_link -p libxgks2 $(LIBDIR)/libxgks-gfortran.so.2.6  
$(LIBDIR)/libxgks-gfortran.so.2
-       dh_link -p libxgks2 $(LIBDIR)/libudport.so.2.6 $(LIBDIR)/libudport.so.2
+       dh_link -p libxgks2t64 $(LIBDIR)/libxgks-gfortran.so.2.6  
$(LIBDIR)/libxgks-gfortran.so.2
+       dh_link -p libxgks2t64 $(LIBDIR)/libudport.so.2.6 
$(LIBDIR)/libudport.so.2
        dh_link -p libxgks-dev $(LIBDIR)/libxgks-gfortran.so.2.6 
$(LIBDIR)/libxgks-gfortran.so
        dh_link -p libxgks-dev $(LIBDIR)/libxgks-gfortran.so.2.6 
$(LIBDIR)/fortran/gfortran/libxgks.so
        dh_link -p libxgks-dev $(LIBDIR)/libudport.so.2.6 $(LIBDIR)/libudport.so
        $(DO_FLANG) && (  \
-               dh_install -p libxgks2 ./build-flang/lib/c/libxgks-flang.so.2.6 
$(LIBDIR) ; \
-               dh_link -p libxgks2 $(LIBDIR)/libxgks-flang.so.2.6  
$(LIBDIR)/libxgks-flang.so.2 ; \
+               dh_install -p libxgks2t64 
./build-flang/lib/c/libxgks-flang.so.2.6 $(LIBDIR) ; \
+               dh_link -p libxgks2t64 $(LIBDIR)/libxgks-flang.so.2.6  
$(LIBDIR)/libxgks-flang.so.2 ; \
                dh_link -p libxgks-dev $(LIBDIR)/libxgks-flang.so.2.6 
$(LIBDIR)/libxgks-flang.so  ; \
                dh_link -p libxgks-dev $(LIBDIR)/libxgks-flang.so.2.6 
$(LIBDIR)/fortran/flang/libxgks.so ; \
                dh_install -p libxgks-dev ./build-gfortran/lib/c/libxgks.a      
 $(LIBDIR)/fortran/flang ; \

Reply via email to