From f2ac5e03f50e3e0f7ec95192e63db3df9f81247e Mon Sep 17 00:00:00 2001
From: Daniel Baumann <daniel.baumann@progress-linux.org>
Date: Sat, 13 Apr 2024 12:17:42 +0200
Subject: Merging debian version 2.7.14.

Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>
---
 debian/changelog | 32 ++++++++++++++++++++++++++++++++
 debian/control   |  3 ++-
 2 files changed, 34 insertions(+), 1 deletion(-)

diff --git a/debian/changelog b/debian/changelog
index 8b9bcc0..9e252a8 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,35 @@
+apt (2.7.14) unstable; urgency=medium
+
+  [ Steve Langasek ]
+  * Support building without gnutls
+  * Add an artificial Conflicts: against libnettle8
+    to force upgrades in launchpad buildd chroots
+
+  [ David Kalnischkies ]
+  * Handle EINTR in the static FileFd::Write overload
+  * Remove non-existent Debug::BuildDeps from apt.conf(5)
+  * Parse unsupported != relation in dependencies
+
+  [ Frans Spiesschaert ]
+  * Dutch program translation update (Closes: #1065513)
+  * Dutch manpages translation update (Closes: #1065517)
+
+  [ Wesley Schwengle ]
+  * Update documentation for apt-get upgrade with pkg arg (Closes: #1065831)
+  * Update documentation for apt upgrade with pkg arg (Closes: #1065831)
+  * Include Dutch translation for apt/apt-get upgrade documenation update
+  * Update Graphviz URL to https://graphviz.org/
+  * Update VCG tool URI to new location
+  * s#http://bugs.debian.org/src/#https://bugs.debian.org/src#
+
+  [ Julian Andres Klode ]
+  * pkgTagFile::Jump: Use lookback buffer to rejump to current position
+    (Closes: #1067440)
+  * debrecords: Do not reparse if given same location (Closes: #1067440)
+  * Revert "debrecords: Do not reparse if given same location"
+
+ -- Julian Andres Klode <jak@debian.org>  Fri, 22 Mar 2024 11:11:44 +0100
+
 apt (2.7.13-0.0~progress7.99u1) graograman-backports; urgency=medium
 
   * Uploading to graograman-backports, remaining changes:
diff --git a/debian/control b/debian/control
index 014eb88..bb45bd4 100644
--- a/debian/control
+++ b/debian/control
@@ -53,7 +53,7 @@ Replaces: apt-transport-https (<< 1.5~alpha4~), apt-utils (<< 1.3~exp2~)
 Breaks: apt-transport-https (<< 1.5~alpha4~),
         apt-utils (<< 1.3~exp2~),
         aptitude (<< 0.8.10)
-Conflicts: apt-verify
+Conflicts: apt-verify, libnettle8 (<< 3.9.1-2.2~)
 Provides: apt-transport-https (= ${binary:Version})
 Recommends: ca-certificates
 Suggests: apt-doc,
@@ -84,6 +84,7 @@ Pre-Depends: ${misc:Pre-Depends}
 Depends: ${misc:Depends}, ${shlibs:Depends}
 Breaks: appstream (<< 0.9.0-3~), apt (<< 1.6~), aptitude (<< 0.8.9), libapt-inst1.5 (<< 0.9.9~), dpkg (<< 1.20.8)
 Recommends: apt (>= ${binary:Version})
+Conflicts: libnettle8 (<< 3.9.1-2.2~)
 Section: libs
 Provides: libapt-pkg (= ${binary:Version})
 Description: package management runtime library
-- 
cgit v1.2.3