debian/changelog

+bindex (2.2+svn101-4) unstable; urgency=medium
+
+  * Team upload.
+  * Fixed the build failure with Java 11 (Closes: #913494)
+  * Standards-Version updated to 4.2.1
+  * Switch to debhelper level 11
+  * Use salsa.debian.org Vcs-* URLs
+
+ -- Emmanuel Bourg <ebourg@apache.org>  Fri, 30 Nov 2018 15:52:28 +0100
+
 bindex (2.2+svn101-3) unstable; urgency=medium
 
   * Team upload.

debian/compat

-9
+11

debian/control

@@ -2,32 +2,28 @@ Source: bindex
 Section: java
 Priority: optional
 Maintainer: Debian Java Maintainers <pkg-java-maintainers@lists.alioth.debian.org>
-Uploaders:
- Damien Raude-Morvan <drazzib@debian.org>
+Uploaders: Damien Raude-Morvan <drazzib@debian.org>
 Build-Depends:
- debhelper (>= 9),
- default-jdk,
- javahelper
-Build-Depends-Indep:
  ant,
  bnd (>= 2.1.0),
+ debhelper (>= 11),
+ default-jdk,
+ javahelper,
  junit4,
  libfelix-osgi-obr-java,
  libkxml2-java,
  libosgi-core-java,
  libxpp3-java
-Standards-Version: 3.9.6
+Standards-Version: 4.2.1
+Vcs-Git: https://salsa.debian.org/java-team/bindex.git
+Vcs-Browser: https://salsa.debian.org/java-team/bindex
 Homepage: http://www.osgi.org/Repository/BIndex
-Vcs-Git: git://anonscm.debian.org/pkg-java/bindex.git
-Vcs-Browser: https://anonscm.debian.org/cgit/pkg-java/bindex.git
 
 Package: libbindex-java
 Architecture: all
-Depends:
- ${java:Depends},
- ${misc:Depends}
+Depends: ${misc:Depends}, ${java:Depends}
 Description: OSGi BIndex reader
- BIndex is a small Java progam that implements the manifest header to repository
+ BIndex is a small Java program that implements the manifest header to repository
  format mapping as described in RFC-0112 Bundle Repository. BIndex can recurse
  over a directory structure and just creates a repository.xml file.
  The URLs can be rewritten using a template.

debian/patches/ignore-tests.patch

+Description: Don't build the test into the jar (it FTBFS with Java 11+ anyway)
+Author: Emmanuel Bourg <ebourg@apache.org>
+Forwarded: no
+--- a/src/test/TestVersionImpl.java
++++ /dev/null
+@@ -1,49 +0,0 @@
+-/*
+- * $Header$
+- * 
+- * Copyright (c) OSGi Alliance (2007). All Rights Reserved.
+- * 
+- * Licensed under the Apache License, Version 2.0 (the "License");
+- * you may not use this file except in compliance with the License.
+- * You may obtain a copy of the License at
+- *
+- *      http://www.apache.org/licenses/LICENSE-2.0
+- *
+- * Unless required by applicable law or agreed to in writing, software
+- * distributed under the License is distributed on an "AS IS" BASIS,
+- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+- * See the License for the specific language governing permissions and
+- * limitations under the License.
+- */
+-
+-
+-package test;
+-
+-import junit.framework.*;
+-
+-import org.omg.PortableInterceptor.*;
+-import org.osgi.impl.bundle.obr.resource.*;
+-
+-public class TestVersionImpl extends TestCase {
+-	
+-	public void testVersion() {
+-		tv("[0.0.0,1.1.1]");
+-		tv("(0.0.0,1.1.1)");
+-		tv("[0.0.0,1.1.1)");
+-		tv("(0.0.0,1.1.1]");
+-		tv("(0.0.0,1.1.1]");
+-		try {
+-			tv("(2.0.0,1.1.1]");
+-			fail("Invalid range succeeded");
+-		} catch( IllegalArgumentException e) {
+-			// Ok
+-		}
+-	}
+-
+-	void tv(String string) {
+-		VersionRange v = new VersionRange(string);
+-		String s = v.toString();
+-		assertEquals(string,s);
+-	}
+-
+-}

debian/patches/series

 define_symbolic_name.diff
+ignore-tests.patch