debian/changelog

-sitemesh (2.4.1+dfsg-7) UNRELEASED; urgency=medium
+sitemesh (2.4.1+dfsg-7) unstable; urgency=medium
 
   * Team upload.
+
+  [ Miguel Landaeta ]
   * Remove myself from uploaders list. (Closes: #871886)
-  * Bump DH compat level to 10.
   * Fix typo in Vcs-Browser field.
   * Wrap and sort dependencies lists.
   * Update copyright info.
 
- -- Miguel Landaeta <nomadium@debian.org>  Wed, 09 Aug 2017 23:15:19 +0100
+  [ Emmanuel Bourg ]
+  * Fixed the build failure with Java 11 (Closes: #911181)
+  * Standards-Version updated to 4.2.1
+  * Switch to debhelper level 11
+  * Use salsa.debian.org Vcs-* URLs
+
+ -- Emmanuel Bourg <ebourg@apache.org>  Wed, 17 Oct 2018 16:45:27 +0200
 
 sitemesh (2.4.1+dfsg-6) unstable; urgency=medium
 

debian/compat

-10
+11

debian/control

@@ -6,7 +6,7 @@ Uploaders: Emmanuel Bourg <ebourg@apache.org>
 Build-Depends:
  ant,
  ant-optional,
- debhelper (>= 10~),
+ debhelper (>= 11),
  default-jdk,
  default-jdk-doc,
  javahelper,
@@ -16,9 +16,9 @@ Build-Depends:
  libservlet3.1-java,
  libvelocity-tools-java,
  velocity
-Standards-Version: 3.9.8
-Vcs-Git: https://anonscm.debian.org/git/pkg-java/sitemesh.git
-Vcs-Browser: https://anonscm.debian.org/cgit/pkg-java/sitemesh.git
+Standards-Version: 4.2.1
+Vcs-Git: https://salsa.debian.org/java-team/sitemesh.git
+Vcs-Browser: https://salsa.debian.org/java-team/sitemesh
 Homepage: http://www.sitemesh.org
 
 Package: libsitemesh-java

debian/patches/java11-compatibility.patch

+Description: Fixes the build failure with Java 11
+Author: Emmanuel Bourg <ebourg@apache.org>
+Bug: https://github.com/sitemesh/sitemesh2/pull/36
+--- a/src/java/com/opensymphony/module/sitemesh/Factory.java
++++ b/src/java/com/opensymphony/module/sitemesh/Factory.java
+@@ -14,7 +14,6 @@
+ import com.opensymphony.module.sitemesh.util.Container;
+ 
+ import javax.naming.InitialContext;
+-import javax.rmi.PortableRemoteObject;
+ import java.lang.reflect.Constructor;
+ import java.lang.reflect.InvocationTargetException;
+ 
+@@ -89,9 +88,8 @@
+             if (Container.get() != Container.JRUN) {
+                 // TODO: JRun really isn't happy with this
+                 InitialContext ctx = new InitialContext();
+-                Object o = ctx.lookup("java:comp/env/" + envEntry);
++                result = (String) ctx.lookup("java:comp/env/" + envEntry);
+                 ctx.close();
+-                result = (String)PortableRemoteObject.narrow(o, String.class); // rmi-iiop friendly.
+             }
+         }
+         catch (Exception e) { } // failed - don't moan, just return default.

debian/patches/series

@@ -7,3 +7,4 @@ add_compatability_with_servlet_2.4.diff
 625764.diff
 link_javadocs_to_system.diff
 add_compatability_with_servlet_3.1.diff
+java11-compatibility.patch

debian/rules

@@ -16,6 +16,3 @@ override_dh_auto_test:
 override_dh_auto_clean:
 	ant clean
 	rm -f docs/api.css
-
-get-orig-source:
-	uscan --verbose --no-symlink --download-current-version --force-download