Merge ~maxgmr/ubuntu/+source/libqes:merge-lp2131101-resolute into ubuntu/+source/libqes:debian/sid

[Max Gilmour]

[Max Gilmour (maxgmr)]

PPA: https://launchpad.net/~maxgmr/+archive/ubuntu/libqes-lp2131101/+packages

Package tests:
This package contains no tests.
Installation and upgrade were successfully tested in containers without any issues.

[Skia (skia)]

LGTM!

Sponsored:
$ dput ubuntu ../libqes_0.2.8+ds-2ubuntu1_source.changes
Uploading libqes using ftp to ubuntu (host: upload.ubuntu.com; directory: /ubuntu)
running placeholderbug: Stop if using common placeholder numbers as bug reference.
running check-debs: makes sure the upload contains a binary package
running supported-distribution: check whether the target distribution is currently supported (using distro-info)
{'allowed': ['release', 'proposed', 'backports', 'security'], 'known': ['release', 'proposed', 'updates', 'backports', 'security']}
running ppaforppaonly: Stop uploads to the archive with or to ppa without ~ppa suffix.
running nobug: Stop if uploading without any bug reference.
running updatemaintainer: Stop if ubuntu changes are without ubuntu maintainer.
running badauthor: Stop if uploading with root@ or ubuntu@ email adresses.
running gitubuntu: Warn if uploading without git-ubuntu Vcs-* entries.
running releasemismatch: Warn about mismatching suffixesg e.g. focal with a XX.YY not being 20.04
running suite-mismatch: check the target distribution for common errors
running required-fields: check whether a field is present and non-empty in the changes file
running gpg: check GnuPG signatures before the upload
running checksum: verify checksums before uploading
Uploading libqes_0.2.8+ds-2ubuntu1.dsc
Uploading libqes_0.2.8+ds.orig.tar.xz
Uploading libqes_0.2.8+ds-2ubuntu1.debian.tar.xz
Uploading libqes_0.2.8+ds-2ubuntu1_source.buildinfo
Uploading libqes_0.2.8+ds-2ubuntu1_source.changes

review: Approve

[Max Gilmour (maxgmr)]

review: Approve

diff --git a/debian/changelog b/debian/changelog
index c6d5e6f..24ce2d3 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,13 @@
+libqes (0.2.8+ds-2ubuntu1) resolute; urgency=medium
+
+  * Merge with Debian unstable (LP: #2131101). Remaining changes:
+    - d/control,d/libqes0t64.lintian-overrides: Rename libqes0 package to
+      libqes0t64
+    - d/rules: Update d-shlibmove invocation so that libqes0t64 package
+      actually contains the shared library
+
+ -- Max Gilmour <[e-mail]>  Tue, 11 Nov 2025 12:37:06 -0800
+
 libqes (0.2.8+ds-2) unstable; urgency=medium
 
   * Team upload.
@@ -8,6 +18,21 @@ libqes (0.2.8+ds-2) unstable; urgency=medium
 
  -- Étienne Mollier <[e-mail]>  Thu, 02 Oct 2025 22:13:16 +0200
 
+libqes (0.2.8+ds-1ubuntu2) noble; urgency=medium
+
+  * d/rules: Update d-shlibmove invocation so that libqes0t64 package
+    actually contains the shared library.
+
+ -- Michael Hudson-Doyle <[e-mail]>  Fri, 19 Apr 2024 14:06:50 +1200
+
+libqes (0.2.8+ds-1ubuntu1) noble; urgency=medium
+
+  * Rename libqes0 package as although it is not affected by the time_t
+    transition to 64-bits, it is affected by the LFS migration which is
+    implied by the time_t changes.
+
+ -- Michael Hudson-Doyle <[e-mail]>  Fri, 19 Apr 2024 12:09:01 +1200
+
 libqes (0.2.8+ds-1) unstable; urgency=medium
 
   [ Andreas Tille ]
diff --git a/debian/control b/debian/control
index e6317c3..656c755 100644
--- a/debian/control
+++ b/debian/control
@@ -1,5 +1,6 @@
 Source: libqes
-Maintainer: Debian Med Packaging Team <[e-mail]>
+Maintainer: Ubuntu Developers <[e-mail]>
+XSBC-Original-Maintainer: Debian Med Packaging Team <[e-mail]>
 Uploaders: Kevin Murray <[e-mail]>
 Section: science
 Priority: optional
@@ -15,7 +16,7 @@ Homepage: https://github.com/kdmurray91/libqes
 Package: libqes-dev
 Architecture: any
 Section: libdevel
-Depends: libqes0 (= ${binary:Version}),
+Depends: libqes0t64 (= ${binary:Version}),
          ${misc:Depends},
          zlib1g-dev
 Description: DNA sequence parsing library -- development
@@ -25,7 +26,11 @@ Description: DNA sequence parsing library -- development
  These are the development headers required to use libqes in your own
  applications.
 
-Package: libqes0
+Package: libqes0t64
+Provides: ${t64:Provides}
+Replaces: libqes0
+Breaks: libqes0 (<< ${source:Version})
+Conflicts: libqes0 (<< ${source:Version})
 Architecture: any
 Section: libs
 Depends: ${shlibs:Depends},
diff --git a/debian/libqes0t64.lintian-overrides b/debian/libqes0t64.lintian-overrides
new file mode 100644
index 0000000..7400887
--- /dev/null
+++ b/debian/libqes0t64.lintian-overrides
@@ -0,0 +1 @@
+libqes0t64: package-name-doesnt-match-sonames libqes0
diff --git a/debian/rules b/debian/rules
index b509f8b..837fbc9 100755
--- a/debian/rules
+++ b/debian/rules
@@ -10,6 +10,7 @@ include /usr/share/dpkg/buildflags.mk
 override_dh_install:
 	dh_install
 	d-shlibmove --commit \
+		    --t64 \
 		    --multiarch \
 		    --devunversioned \
 		    --exclude-la \