Merge ~mkukri/ubuntu/+source/libarchive:merge into ubuntu/+source/libarchive:debian/sid

[Mate Kukri]

Merge libarchive with Debian unstable.

[Simon Quigley (tsimonq2)]

 ___________________________.
|;;| |;;||
|[]|---------------------|[]||
|;;| |;;||
|;;| |;;||
|;;| |;;||
|;;| |;;||
|;;| |;;||
|;;| |;;||
|;;|_____________________|;;||
|;;;;;;;;;;;;;;;;;;;;;;;;;;;||
|;;;;;;_______________ ;;;;;||
|;;;;;| ___ |;;;;;||
|;;;;;| |;;;| |;;;;;||
|;;;;;| |;;;| |;;;;;||
|;;;;;| |;;;| |;;;;;||
|;;;;;| |;;;| |;;;;;||
|;;;;;| |___| |;;;;;||
\_____|_______________|_____||

review: Approve

14dc821... by Mate Kukri on 2023-11-23

rebuild

diff --git a/debian/changelog b/debian/changelog
index a7fe6a3..89784fc 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,16 @@
+libarchive (3.7.2-1ubuntu2) noble; urgency=medium
+
+  * armhf (-fstack-clash-protection) breakage rebuild
+
+ -- Mate Kukri <[e-mail]>  Thu, 23 Nov 2023 15:10:55 +0000
+
+libarchive (3.7.2-1ubuntu1) noble; urgency=medium
+
+  * Merge with Debian unstable. Remaining changes:
+    - Run dh_auto_test by default
+
+ -- Mate Kukri <[e-mail]>  Fri, 17 Nov 2023 10:54:19 +0000
+
 libarchive (3.7.2-1) unstable; urgency=medium
 
   * Add the iso9660-hash patch to fix file ordering. Closes: #1051322
@@ -15,6 +28,13 @@ libarchive (3.7.2-1) unstable; urgency=medium
 
  -- Peter Pentchev <[e-mail]>  Sat, 14 Oct 2023 18:28:55 +0300
 
+libarchive (3.6.2-1ubuntu1) lunar; urgency=medium
+
+  * Sync with Debian. Remaining change:
+    - Run dh_auto_test by default
+
+ -- Jeremy Bicha <[e-mail]>  Wed, 04 Jan 2023 15:32:25 -0500
+
 libarchive (3.6.2-1) unstable; urgency=medium
 
   [ Debian Janitor ]
diff --git a/debian/control b/debian/control
index c63d427..35fbbd2 100644
--- a/debian/control
+++ b/debian/control
@@ -1,6 +1,7 @@
 Source: libarchive
 Priority: optional
-Maintainer: Peter Pentchev <[e-mail]>
+Maintainer: Ubuntu Developers <[e-mail]>
+XSBC-Original-Maintainer: Peter Pentchev <[e-mail]>
 Build-Depends: debhelper-compat (= 13),
                dpkg-build-api (= 1),
                dh-package-notes,
diff --git a/debian/rules b/debian/rules
index 239e6a3..6e52d12 100755
--- a/debian/rules
+++ b/debian/rules
@@ -26,7 +26,7 @@ execute_before_dh_install:
 	find debian -name '*.la' -delete
 
 override_dh_auto_test:
-ifneq (,$(filter check,$(DEB_BUILD_OPTIONS)))
+ifeq (,$(findstring nocheck, $(DEB_BUILD_OPTIONS)))
 ifneq (,$(shell locale -a | grep en_US.utf8))
 	_VERBOSITY_LEVEL=1 dh_auto_test --parallel
 else