Ubuntu
libarchive package

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

  1. Git
  2. lp:~mkukri/ubuntu/+source/libarchive
  3. merge
  4. Merge into debian/sid
Proposed by Mate Kukri
Status: Merged
Merge reported by: Mate Kukri
Merged at revision: 14dc8214ef16ba63f24e3710025196838aba83db
Proposed branch: ~mkukri/ubuntu/+source/libarchive:merge
Merge into: ubuntu/+source/libarchive:debian/sid
Diff against target: 61 lines (+23/-2)
3 files modified
debian/changelog (+20/-0)
debian/control (+2/-1)
debian/rules (+1/-1)
Reviewer Review Type Date Requested Status
Simon Quigley (community) Approve
Review via email: mp+455777@code.launchpad.net

Commit message

Merge libarchive with Debian unstable.

To post a comment you must log in.
Revision history for this message
Simon Quigley (tsimonq2) wrote :

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

review: Approve
~mkukri/ubuntu/+source/libarchive:merge updated
14dc821... by Mate Kukri

rebuild

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1diff --git a/debian/changelog b/debian/changelog
2index a7fe6a3..89784fc 100644
3--- a/debian/changelog
4+++ b/debian/changelog
5@@ -1,3 +1,16 @@
6+libarchive (3.7.2-1ubuntu2) noble; urgency=medium
7+
8+ * armhf (-fstack-clash-protection) breakage rebuild
9+
10+ -- Mate Kukri <mate.kukri@canonical.com> Thu, 23 Nov 2023 15:10:55 +0000
11+
12+libarchive (3.7.2-1ubuntu1) noble; urgency=medium
13+
14+ * Merge with Debian unstable. Remaining changes:
15+ - Run dh_auto_test by default
16+
17+ -- Mate Kukri <mate.kukri@canonical.com> Fri, 17 Nov 2023 10:54:19 +0000
18+
19 libarchive (3.7.2-1) unstable; urgency=medium
20
21 * Add the iso9660-hash patch to fix file ordering. Closes: #1051322
22@@ -15,6 +28,13 @@ libarchive (3.7.2-1) unstable; urgency=medium
23
24 -- Peter Pentchev <roam@debian.org> Sat, 14 Oct 2023 18:28:55 +0300
25
26+libarchive (3.6.2-1ubuntu1) lunar; urgency=medium
27+
28+ * Sync with Debian. Remaining change:
29+ - Run dh_auto_test by default
30+
31+ -- Jeremy Bicha <jbicha@ubuntu.com> Wed, 04 Jan 2023 15:32:25 -0500
32+
33 libarchive (3.6.2-1) unstable; urgency=medium
34
35 [ Debian Janitor ]
36diff --git a/debian/control b/debian/control
37index c63d427..35fbbd2 100644
38--- a/debian/control
39+++ b/debian/control
40@@ -1,6 +1,7 @@
41 Source: libarchive
42 Priority: optional
43-Maintainer: Peter Pentchev <roam@debian.org>
44+Maintainer: Ubuntu Developers <ubuntu-devel-discuss@lists.ubuntu.com>
45+XSBC-Original-Maintainer: Peter Pentchev <roam@debian.org>
46 Build-Depends: debhelper-compat (= 13),
47 dpkg-build-api (= 1),
48 dh-package-notes,
49diff --git a/debian/rules b/debian/rules
50index 239e6a3..6e52d12 100755
51--- a/debian/rules
52+++ b/debian/rules
53@@ -26,7 +26,7 @@ execute_before_dh_install:
54 find debian -name '*.la' -delete
55
56 override_dh_auto_test:
57-ifneq (,$(filter check,$(DEB_BUILD_OPTIONS)))
58+ifeq (,$(findstring nocheck, $(DEB_BUILD_OPTIONS)))
59 ifneq (,$(shell locale -a | grep en_US.utf8))
60 _VERBOSITY_LEVEL=1 dh_auto_test --parallel
61 else

Subscribers

People subscribed via source and target branches