debian/changelog

+logback (1:1.2.3-3) unstable; urgency=medium
+
+  * Team upload.
+  * Fixed the build failure with Java 11 (Closes: #911183)
+  * Removed Damien Raude-Morvan from the uploaders (Closes: #889387)
+  * Standards-Version updated to 4.2.1
+  * Switch to debhelper level 11
+  * Use salsa.debian.org Vcs-* URLs
+
+ -- Emmanuel Bourg <ebourg@apache.org>  Sun, 11 Nov 2018 01:10:52 +0100
+
 logback (1:1.2.3-2) unstable; urgency=medium
 
   * Team upload.

debian/compat

-10
+11

debian/control

@@ -2,27 +2,27 @@ Source: logback
 Section: java
 Priority: optional
 Maintainer: Debian Java Maintainers <pkg-java-maintainers@lists.alioth.debian.org>
-Uploaders: Damien Raude-Morvan <drazzib@debian.org>,
-           tony mancill <tmancill@debian.org>
-Build-Depends: debhelper (>= 10),
+Uploaders: tony mancill <tmancill@debian.org>
+Build-Depends:
+ debhelper (>= 11),
  default-jdk,
  groovy,
  libgeronimo-jms-1.1-spec-java,
  libgmavenplus-java,
  libjanino-java (>= 2.6.0),
  libjansi-java,
+ libjetty9-java,
  libmail-java,
  libmaven-antrun-plugin-java,
  libmaven-bundle-plugin-java,
  libmaven-javadoc-plugin-java,
  libservlet3.1-java,
  libslf4j-java (>= 1.7.18),
-               libjetty9-java,
  libtomcat8-java,
  maven-debian-helper
-Standards-Version: 4.1.2
-Vcs-Git: https://anonscm.debian.org/git/pkg-java/logback.git
-Vcs-Browser: https://anonscm.debian.org/cgit/pkg-java/logback.git
+Standards-Version: 4.2.1
+Vcs-Git: https://salsa.debian.org/java-team/logback.git
+Vcs-Browser: https://salsa.debian.org/java-team/logback
 Homepage: https://logback.qos.ch
 
 Package: liblogback-java

debian/patches/05-java11-compatibility.patch

+Description: Fixes the compatibility with Java 11
+Origin: backport, https://github.com/qos-ch/logback/commit/e59b6d6b#diff-0108e2118a460318f4aaa75ac3ca7efe
+--- a/logback-classic/src/main/java/ch/qos/logback/classic/spi/PackagingDataCalculator.java
++++ b/logback-classic/src/main/java/ch/qos/logback/classic/spi/PackagingDataCalculator.java
+@@ -17,7 +17,7 @@
+ import java.security.CodeSource;
+ import java.util.HashMap;
+ 
+-import sun.reflect.Reflection;
++//import sun.reflect.Reflection;
+ 
+ // import java.security.AccessControlException; import java.security.AccessController;import java.security.PrivilegedAction;
+ /**
+@@ -42,8 +42,8 @@
+         // sun.reflect.Reflection class. However, this class will *not compile*
+         // on JDKs lacking sun.reflect.Reflection.
+         try {
+-            Reflection.getCallerClass(2);
+-            GET_CALLER_CLASS_METHOD_AVAILABLE = true;
++            //Reflection.getCallerClass(2);
++            //GET_CALLER_CLASS_METHOD_AVAILABLE = true;
+         } catch (NoClassDefFoundError e) {
+         } catch (NoSuchMethodError e) {
+         } catch (UnsupportedOperationException e) {
+@@ -82,7 +82,7 @@
+         for (int i = 0; i < commonFrames; i++) {
+             Class callerClass = null;
+             if (GET_CALLER_CLASS_METHOD_AVAILABLE) {
+-                callerClass = Reflection.getCallerClass(localFirstCommon + i - missfireCount + 1);
++                //callerClass = Reflection.getCallerClass(localFirstCommon + i - missfireCount + 1);
+             }
+             StackTraceElementProxy step = stepArray[stepFirstCommon + i];
+             String stepClassname = step.ste.getClassName();

debian/patches/series

 02-remove-google-ads.patch
 04-privacy-breach.patch
+05-java11-compatibility.patch

debian/rules

 #!/usr/bin/make -f
 
 %:
-	dh $@ --build-system=maven
-
-get-orig-source:
-	uscan --download-current-version --force-download --rename
+	dh $@