Merge ~alexghiti/ubuntu/+source/libisoburn:int/alex/remove_libjte_dependency into ubuntu/+source/libisoburn:ubuntu/devel

Proposed by Alexandre Ghiti
Status: Needs review
Proposed branch: ~alexghiti/ubuntu/+source/libisoburn:int/alex/remove_libjte_dependency
Merge into: ubuntu/+source/libisoburn:ubuntu/devel
Diff against target: 50 lines (+11/-3)
3 files modified
debian/changelog (+7/-0)
debian/control (+1/-3)
debian/rules (+3/-0)
Reviewer Review Type Date Requested Status
Lukas Märdian (community) Approve
git-ubuntu import Pending
Review via email: mp+427475@code.launchpad.net
To post a comment you must log in.
Revision history for this message
Lukas Märdian (slyon) wrote :

Thanks, LGTM. All I did is splitting up the git commit history a bit, to have logical separated hunks:
- removal of dependency
- changelog update

Also, I mentioned the jigit MIR bug (LP: #1978066) in the changelog, without closing it, as this is the reason for this removal.

review: Approve

Unmerged commits

0b4ec94... by Alexandre Ghiti

Remove dependency to libjte

c2a8ba1... by Alexandre Ghiti

1:1.5.4-2ubuntu2 (patches unapplied)

Imported using git-ubuntu import.

57c1a1c... by Alexandre Ghiti

1:1.5.4-2ubuntu1 (patches unapplied)

Imported using git-ubuntu import.

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 5504a45..d60087f 100644
3--- a/debian/changelog
4+++ b/debian/changelog
5@@ -1,3 +1,10 @@
6+libisoburn (1:1.5.4-2ubuntu3) kinetic; urgency=medium
7+
8+ * d/rules: Do not build against libjte anymore as jigit can't get into main
9+ (LP: #1981359)
10+
11+ -- Alexandre Ghiti <alexandre.ghiti@canonical.com> Mon, 25 Jul 2022 13:55:49 +0200
12+
13 libisoburn (1:1.5.4-2ubuntu2) kinetic; urgency=medium
14
15 * d/tests: Fix autopkgtests by adding the missing dependencies (LP: #1979314)
16diff --git a/debian/control b/debian/control
17index 067df6a..0552585 100644
18--- a/debian/control
19+++ b/debian/control
20@@ -10,8 +10,7 @@ Build-Depends: pkg-config,
21 debhelper-compat (= 12),
22 libburn-dev (>= 1.5.4),
23 libisofs-dev (>= 1.5.4),
24- libreadline-dev,
25- libjte-dev (>= 1.22)
26+ libreadline-dev
27 Standards-Version: 4.5.1
28 Vcs-Browser: https://salsa.debian.org/optical-media-team/libisoburn
29 Vcs-Git: https://salsa.debian.org/optical-media-team/libisoburn.git
30@@ -80,7 +79,6 @@ Depends: ${shlibs:Depends},
31 libburn4 (>= 1.4.8),
32 libisofs6 (>= 1.4.8)
33 Suggests: xorriso-tcltk,
34- jigit,
35 cdck [!kfreebsd-any]
36 Description: command line ISO-9660 and Rock Ridge manipulation tool
37 xorriso is a command line and dialog application, which creates, loads,
38diff --git a/debian/rules b/debian/rules
39index 7a7a3a0..4f56f23 100755
40--- a/debian/rules
41+++ b/debian/rules
42@@ -13,6 +13,9 @@ export DEB_BUILD_MAINT_OPTIONS = hardening=+all
43 %:
44 dh $@ --exclude=.la
45
46+override_dh_auto_configure:
47+ dh_auto_configure -- --disable-libjte
48+
49 override_dh_autoreconf:
50 AUTOMAKE='automake --foreign' dh_autoreconf
51

Subscribers

People subscribed via source and target branches