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

Subscribers

People subscribed via source and target branches