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

Proposed by Alexandre Ghiti
Status: Needs review
Proposed branch: ~alexghiti/ubuntu/+source/libisofs:int/alex/remove_libjte_dependency
Merge into: ubuntu/+source/libisofs:ubuntu/devel
Diff against target: 50 lines (+13/-3)
3 files modified
debian/changelog (+7/-0)
debian/control (+3/-3)
debian/rules (+3/-0)
Reviewer Review Type Date Requested Status
Lukas Märdian (community) Approve
git-ubuntu import Pending
Review via email: mp+427474@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 to be used by git-ubuntu (for easier future rebases/merges):
- removal of dependency
- update-maintainer
- 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

96be000... by Alexandre Ghiti

Remove dependency to libjte

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 4f93e45..6434815 100644
3--- a/debian/changelog
4+++ b/debian/changelog
5@@ -1,3 +1,10 @@
6+libisofs (1.5.4-1ubuntu1) 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> Fri, 22 Jul 2022 14:04:06 +0200
12+
13 libisofs (1.5.4-1) unstable; urgency=low
14
15 [ Debian Janitor ]
16diff --git a/debian/control b/debian/control
17index 5d815be..f385cf1 100644
18--- a/debian/control
19+++ b/debian/control
20@@ -1,5 +1,6 @@
21 Source: libisofs
22-Maintainer: Debian Libburnia packagers <pkg-libburnia-devel@lists.alioth.debian.org>
23+Maintainer: Ubuntu Developers <ubuntu-devel-discuss@lists.ubuntu.com>
24+XSBC-Original-Maintainer: Debian Libburnia packagers <pkg-libburnia-devel@lists.alioth.debian.org>
25 Uploaders: George Danchev <danchev@spnet.net>,
26 Mario Danic <mario.danic@gmail.com>,
27 Thomas Schmitt <scdbackup@gmx.net>
28@@ -7,8 +8,7 @@ Section: libs
29 Priority: optional
30 Build-Depends: debhelper-compat (= 12),
31 zlib1g-dev,
32- libacl1-dev,
33- libjte-dev (>= 1.22)
34+ libacl1-dev
35 Standards-Version: 4.5.0
36 Vcs-Browser: https://salsa.debian.org/optical-media-team/libisofs/tree/master
37 Vcs-Git: https://salsa.debian.org/optical-media-team/libisofs.git -b master
38diff --git a/debian/rules b/debian/rules
39index 2e4a70f..5cb7839 100755
40--- a/debian/rules
41+++ b/debian/rules
42@@ -14,6 +14,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