[Git][java-team/mina][master] 7 commits: Use java_compat_level variable provided by java-common to adjust...

Thu Jul 11 10:11:53 BST 2024


Emmanuel Bourg pushed to branch master at Debian Java Maintainers / mina


Commits:
2ef56755 by Vladimir Petko at 2024-07-11T10:10:24+02:00
Use java_compat_level variable provided by java-common to adjust -source/-target level to the minimum required by the default Java.

- - - - -
046ff870 by Emmanuel Bourg at 2024-07-11T10:11:51+02:00
Removed the -java-doc package

- - - - -
f2274373 by Emmanuel Bourg at 2024-07-11T10:13:58+02:00
Standards-Version updated to 4.7.0

- - - - -
0dd01e94 by Emmanuel Bourg at 2024-07-11T10:17:10+02:00
Updated the watch file

- - - - -
9dcbdd8a by Emmanuel Bourg at 2024-07-11T10:19:01+02:00
Switch to debhelper level 13

- - - - -
f173b6e5 by Emmanuel Bourg at 2024-07-11T10:19:59+02:00
Use a secure Homepage URL

- - - - -
e0b09618 by Emmanuel Bourg at 2024-07-11T10:30:27+02:00
Upload to unstable

- - - - -


7 changed files:

- debian/changelog
- − debian/compat
- debian/control
- − debian/libmina-java-doc.examples
- − debian/libmina-java-doc.javadoc
- debian/rules
- debian/watch


Changes:

=====================================
debian/changelog
=====================================
@@ -1,9 +1,21 @@
-mina (1.1.7.dfsg-14) UNRELEASED; urgency=medium
+mina (1.1.7.dfsg-14) unstable; urgency=medium
 
+  [ Debian Janitor ]
   * Remove constraints unnecessary since buster (oldstable):
     + Build-Depends: Drop versioned constraint on javahelper.
 
- -- Debian Janitor <janitor at jelmer.uk>  Sun, 20 Nov 2022 01:16:51 -0000
+  [ Vladimir Petko ]
+  * d/rules: use java_compat_level variable provided by java-common to
+    adjust -source/-target level to the minimum required by the default
+    Java (Closes: #1053062).
+
+  [ Emmanuel Bourg ]
+  * Removed the -java-doc package
+  * Standards-Version updated to 4.7.0
+  * Switch to debhelper level 13
+  * Updated the watch file
+
+ -- Emmanuel Bourg <ebourg at apache.org>  Thu, 11 Jul 2024 10:25:41 +0200
 
 mina (1.1.7.dfsg-13) unstable; urgency=medium
 


=====================================
debian/compat deleted
=====================================
@@ -1 +0,0 @@
-11


=====================================
debian/control
=====================================
@@ -5,23 +5,23 @@ Maintainer: Debian Java Maintainers <pkg-java-maintainers at lists.alioth.debian.or
 Uploaders:
  Emmanuel Bourg <ebourg at apache.org>
 Build-Depends:
- debhelper (>= 11),
+ debhelper-compat (= 13),
  default-jdk,
  javahelper,
  libjzlib-java,
  libslf4j-java,
  libspring-beans-java,
  maven-repo-helper
-Standards-Version: 4.1.3
+Standards-Version: 4.7.0
 Vcs-Git: https://salsa.debian.org/java-team/mina.git
 Vcs-Browser: https://salsa.debian.org/java-team/mina
-Homepage: http://mina.apache.org
+Homepage: https://mina.apache.org
 
 Package: libmina-java
 Architecture: all
 Depends: libslf4j-java, ${misc:Depends}
 Recommends: libjzlib-java
-Suggests: libmina-java-doc, libspring-beans-java
+Suggests: libspring-beans-java
 Description: Java network application framework
  Apache MINA is a network application framework which helps users develop high
  performance and high scalability network applications easily. It provides an
@@ -40,27 +40,3 @@ Description: Java network application framework
   - Stream-based I/O support via StreamIoHandler
  .
  This package contains Apache Mina 1.X release
-
-Package: libmina-java-doc
-Architecture: all
-Section: doc
-Depends: ${misc:Depends}
-Suggests: libmina-java
-Description: Java network application framework - documentation
- Apache MINA is a network application framework which helps users develop high
- performance and high scalability network applications easily. It provides an
- abstract - event-driven - asynchronous API over various transports such as
- TCP/IP and UDP/IP via Java NIO.
- .
- Some of the features of Apache Mina are:
-  - Unified API for various transport types: TCP/UDP/RS232/In-VM
-  - Filter interface as an extension point; similar to Servlet filters
-  - Low-level and high-level API
-  - Highly customizable thread model
-  - Out-of-the-box SSL / TLS and StartTLS support using Java 5 SSLEngine
-  - Overload shielding & traffic throttling
-  - Unit testability using mock objects
-  - JMX managability
-  - Stream-based I/O support via StreamIoHandler
- .
- This package contains Javadoc API for Apache Mina 1.X release.


=====================================
debian/libmina-java-doc.examples deleted
=====================================
@@ -1 +0,0 @@
-example/*


=====================================
debian/libmina-java-doc.javadoc deleted
=====================================
@@ -1 +0,0 @@
-internal


=====================================
debian/rules
=====================================
@@ -1,5 +1,7 @@
 #!/usr/bin/make -f
 
+include /usr/share/java/java_defaults.mk
+
 # Uncomment this to turn on verbose mode.
 #export DH_VERBOSE=1
 
@@ -10,8 +12,8 @@ JAVA_HOME := /usr/lib/jvm/default-java
 # We need to export JAVA_HOME for jh_build
 export JAVA_HOME
 
-# Force compilation of 1.7 .class format
-JAVA_OPTS := -source 1.7 -target 1.7
+# Target the minimum language level and class format supported by the default JDK
+JAVA_OPTS := -source $(java_compat_level) -target $(java_compat_level)
 
 CORE_JAR  := $(PACKAGE)-core.jar
 CORE_SRC  := core/src/main/java/
@@ -50,10 +52,6 @@ override_dh_auto_clean:
 	rm -f $(CORE_JAR) $(ZLIB_JAR) $(SSL_JAR) $(JMX_JAR) $(SPRING_JAR)
 	mh_clean
 
-override_dh_installexamples:
-	# Don't include META-INF or LICENSE files from examples
-	dh_installexamples -plibmina-java-doc -i -X"META-INF" -X"LICENSE"
-
 override_dh_auto_install:
 	for MYJAR in $(ALL_JARS); do \
 		BASENAME=`basename $$MYJAR .jar`; \
@@ -61,6 +59,3 @@ override_dh_auto_install:
 		mh_installpom -plibmina-java -o $$SUBPATH/pom.xml ; \
 		mh_installjar -plibmina-java -n$$BASENAME -l $$SUBPATH/pom.xml $$MYJAR ; \
 	done
-
-get-orig-source:
-	uscan --force-download --rename


=====================================
debian/watch
=====================================
@@ -1,3 +1,3 @@
-version=3
+version=4
 opts=dversionmangle=s/\.dfsg// \
-  http://archive.apache.org/dist/mina/(1\.[\d.]+)/mina-(1\.[\d.]+)\.tar\.gz debian debian/orig-tar.sh
+  https://archive.apache.org/dist/mina/(1\.[\d.]+)/mina-(1\.[\d.]+)\.tar\.gz debian debian/orig-tar.sh



View it on GitLab: https://salsa.debian.org/java-team/mina/-/compare/e4fd306fa1d3c87d7b98eb9df39d9290419703f9...e0b09618b7bdbb9e90452fca37480e5117194038

-- 
This project does not include diff previews in email notifications.
View it on GitLab: https://salsa.debian.org/java-team/mina/-/compare/e4fd306fa1d3c87d7b98eb9df39d9290419703f9...e0b09618b7bdbb9e90452fca37480e5117194038
You're receiving this email because of your account on salsa.debian.org.


-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://alioth-lists.debian.net/pipermail/pkg-java-commits/attachments/20240711/74a94664/attachment.htm>
