Lintian Fixes - i2p
Ready changes
Summary
- Trim trailing whitespace. ( trailing-whitespace )
- Drop custom source compression, custom source compression level. ( custom-compression-in-debian-source-options )
- Set Homepage field in Source rather than Binary package. ( homepage-in-binary-package )
- Bump debhelper from deprecated 9 to 13. ( package-uses-deprecated-debhelper-compat-version )
- Set debhelper-compat version in Build-Depends. ( uses-debhelper-compat-file )
- Remove unnecessary get-orig-source-target. ( debian-rules-contains-unnecessary-get-orig-source-target )
- Update standards version to 4.6.2, no changes needed. ( out-of-date-standards-version )
- Remove field Section on binary packages i2p, i2p-router that duplicates source. ( installable-field-mirrors-source )
Failed fixers:
See the worker log for details.
Diff
diff --git a/debian/changelog b/debian/changelog
index fc2e694..fd00463 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+i2p (0.9.48-1.2) UNRELEASED; urgency=medium
+
+ * Trim trailing whitespace.
+
+ -- Debian Janitor <janitor@jelmer.uk> Wed, 31 May 2023 19:10:45 -0000
+
i2p (0.9.48-1.1) unstable; urgency=medium
* Non-maintainer upload.
@@ -1279,4 +1285,3 @@ i2p (0.8.2-1) testing; urgency=low
* Initial packaging
-- Kill Your TV <killyourtv@mail.i2p> Sun, 23 Jan 2011 00:03:31 +0000
-
diff --git a/debian/compat b/debian/compat
deleted file mode 100644
index ec63514..0000000
--- a/debian/compat
+++ /dev/null
@@ -1 +0,0 @@
-9
diff --git a/debian/control b/debian/control
index 0cfbde1..3453dbc 100644
--- a/debian/control
+++ b/debian/control
@@ -1,12 +1,12 @@
Source: i2p
Maintainer: Masayuki Hatta <mhatta@debian.org>
Section: net
-Standards-Version: 4.5.0
+Standards-Version: 4.6.2
Priority: optional
Homepage: https://geti2p.net/
Vcs-Browser: https://salsa.debian.org/debian/i2p
Vcs-Git: https://salsa.debian.org/debian/i2p.git
-Build-Depends: debhelper (>= 9.20160709)
+Build-Depends: debhelper-compat (= 13)
,ant (>= 1.9.8)
,debconf
,default-jdk
@@ -25,7 +25,6 @@ Build-Depends: debhelper (>= 9.20160709)
Package: i2p
Architecture: all
-Section: net
Depends: ${misc:Depends}, ${java:Depends}, ${shlibs:Depends},
adduser,
apparmor,
@@ -48,7 +47,6 @@ Package: libjbigi-jni
Architecture: any
Section: java
Depends: ${misc:Depends}, ${shlibs:Depends}, i2p-router
-Homepage: https://geti2p.net/
Description: Invisible Internet Project (I2P) - libjbigi library
This Package contains the libjbigi JNI library (and on x86 platforms, jcpuid).
.
@@ -72,7 +70,6 @@ Description: Invisible Internet Project (I2P) - developer documentation
Package: i2p-router
Architecture: all
-Section: net
Depends: ${misc:Depends}, ${java:Depends}, ${shlibs:Depends},
openjdk-14-jre-headless | openjdk-13-jre-headless | openjdk-12-jre-headless | openjdk-11-jre-headless | default-jre-headless | java14-runtime-headless | java13-runtime-headless | java12-runtime-headless | java11-runtime-headless,
geoip-database,
diff --git a/debian/rules b/debian/rules
index 255d65a..876f2df 100755
--- a/debian/rules
+++ b/debian/rules
@@ -41,7 +41,7 @@ export BITS := $(shell dpkg-architecture -qDEB_HOST_ARCH_BITS)
#export DEB_HOST_ARCH_CPU := $(shell dpkg-architecture -qDEB_HOST_ARCH_CPU)
%:
- dh $@ --with systemd,bash-completion
+ dh $@ --with bash-completion
clean: createcopyright
@@ -61,7 +61,7 @@ override_dh_auto_clean:
override_dh_auto_build:
-override_dh_systemd_enable:
+override_dh_installsystemd:
# We purposely do not set I2P to start at boot.
# This matches the behavior of the initscript
# and the setting RUN_DAEMON=false in /etc/default/i2p
@@ -176,7 +176,7 @@ override_dh_compress:
dh_compress -X.xsl -X.xml
override_dh_install:
- dh_install --list-missing
+ dh_install
dh_apparmor --profile-name=system_i2p -pi2p
dh_apparmor --profile-name=usr.bin.i2prouter -pi2p
@@ -192,6 +192,3 @@ override_dh_shlibdeps:
#override_dh_installinit:
# dh_installinit -r
-
-get-orig-source:
- uscan --verbose --rename --destdir $(CURDIR)/.. --watchfile debian/watch --force-download
diff --git a/debian/source/options b/debian/source/options
deleted file mode 100644
index dcba720..0000000
--- a/debian/source/options
+++ /dev/null
@@ -1,2 +0,0 @@
-compression="xz"
-compression-level=9