diff -Nru junit4-4.12/debian/ant.properties junit4-4.12/debian/ant.properties
--- junit4-4.12/debian/ant.properties	1970-01-01 00:00:00.000000000 +0000
+++ junit4-4.12/debian/ant.properties	2015-06-19 14:36:25.000000000 +0000
@@ -0,0 +1,3 @@
+hamcrestlib=/usr/share/java/hamcrest-core.jar
+manifest=debian/MANIFEST.MF
+version-status=
diff -Nru junit4-4.12/debian/build.xml junit4-4.12/debian/build.xml
--- junit4-4.12/debian/build.xml	1970-01-01 00:00:00.000000000 +0000
+++ junit4-4.12/debian/build.xml	2015-06-19 14:54:05.000000000 +0000
@@ -0,0 +1,373 @@
+<project name="junit" default="dist" basedir=".."
+         xmlns:artifact="antlib:org.apache.maven.artifact.ant">
+  <tstamp />
+  <taskdef resource="net/sf/antcontrib/antcontrib.properties"/>
+
+  <property file="${user.home}/.junit.properties" />
+  <property name="src" value="src/main/java" />
+  <property name="target" location="target" />
+  <property name="bin" location="${target}/main" />
+  <property name="version-base" value="4.12" />
+  <property name="version-status" value="-SNAPSHOT" />
+  <property name="version" value="${version-base}${version-status}" />
+  <property name="dist" value="junit${version}" />
+  <property name="versionfile" value="${src}/junit/runner/Version.java" />
+  <property name="zipfile"  value="${dist}/${dist}.zip" />
+  <property name="testsrc" location="src/test/java" />
+  <property name="testbin" location="${target}/test/java" />
+  <property name="unjarred" 
+            value="**/*.jar, ${testfiles}, doc/**, README.html, .classpath, .project, cpl-v10.html" />
+
+  <property name="binjar" value="junit-${version}.jar" />
+  <property name="srcjar" value="junit-${version}-src.jar" />
+  <property name="docjar" value="junit-${version}-javadoc.jar" />
+
+  <property name="depjar" value="junit-dep-${version}.jar" />
+  <property name="depsrcjar" value="junit-dep-${version}-src.jar" />
+  <property name="depdocjar" value="junit-dep-${version}-javadoc.jar" />
+
+  <property name="javadocdir" location="${dist}/javadoc" />
+  <property name="javadoczip" location="${dist}-javadoc.zip" />
+  <property name="hamcrestlib" location="lib/hamcrest-core-1.3.jar" />
+  <property name="hamcrestlibsources" location="lib/hamcrest-core-1.3-sources.jar" />
+  <property name="hamcrestsrc" location="${dist}/temp.hamcrest.source" />
+
+  <property name="maven.deploy.goal" value="org.apache.maven.plugins:maven-gpg-plugin:1.1:sign-and-deploy-file" />
+
+  <target name="init">
+    <tstamp/>
+  </target>
+
+  <target name="versiontag" depends="init">
+    <filter token="version" value="${version}" />
+  
+    <copy 
+        file="${versionfile}.template" 
+        tofile="${versionfile}" 
+        filtering="on"
+        overwrite="true"
+        />
+  </target>
+
+  <target name="clean">
+    <!-- If two builds are made within a minute -->
+    <delete dir="${dist}" quiet="true" />
+    <!-- Delete all previous temporary build artifacts -->
+    <delete dir="${target}" quiet="true" />
+    
+    <delete file="${zipfile}" quiet="true"/>
+    <delete file="${javadoczip}" />
+  </target>
+
+  <macrodef name="junit_compilation">
+    <attribute name="srcdir"/>
+    <attribute name="destdir"/>
+    <attribute name="classpath"/>
+    <sequential>
+      <mkdir dir="@{destdir}"/>
+      <javac 
+          srcdir="@{srcdir}"
+          destdir="@{destdir}"
+          debug="on"
+          classpath="@{classpath}"
+          includeantruntime="false"
+          source="1.5"
+          target="1.5"
+          >
+        <compilerarg value="-Xlint:unchecked" />
+      </javac>
+    </sequential>
+  </macrodef>
+  
+  <target name="build" depends="versiontag">
+    <junit_compilation srcdir="${src}" destdir="${bin}" classpath="${hamcrestlib}"/>
+    <unjar src="${hamcrestlib}" dest="${bin}" />
+    <junit_compilation srcdir="${testsrc}" destdir="${testbin}" classpath="${hamcrestlib};${bin}"/>
+  </target>
+
+  <target name="jars" depends="build">
+    <mkdir dir="${dist}" />
+    <jar 
+        jarfile="${dist}/${srcjar}"
+        basedir="${src}"
+        excludes="${unjarred}, **/*.class"
+        />
+    <jar 
+        jarfile="${dist}/${binjar}"
+        basedir="${bin}"
+        excludes="${unjarred}, **/*.java, build.xml"
+	manifest="${manifest}"
+        />
+    <jar 
+        jarfile="${dist}/${depjar}" 
+        basedir="${bin}" 
+        excludes="${unjarred}, org/hamcrest/**, **/*.java, build.xml" 
+	manifest="${manifest}"
+        />
+  </target>
+
+  <target name="all.maven.jars" depends="jars,javadoc">
+    <mkdir dir="${dist}" />
+    <jar 
+        jarfile="${dist}/${depsrcjar}"
+        basedir="${src}"
+        excludes="${unjarred}, **/*.class"
+        />
+    <jar 
+        jarfile="${dist}/${depdocjar}"
+        basedir="${javadocdir}"
+        excludes="${unjarred}, org/hamcrest/**"
+        />
+  </target>
+
+  <target name="samples-and-tests">
+    <copy todir="${dist}">
+      <fileset dir="${testbin}" />
+      <fileset dir="${testsrc}" />
+    </copy>
+  </target>
+
+  <target name="unjar.hamcrest">
+    <unjar src="${hamcrestlibsources}" dest="${hamcrestsrc}" />
+  </target>
+  
+  <target name="release-notes"/>
+  
+  <target name="javadoc">
+    <javadoc destdir="${javadocdir}"
+             author="false"
+             version="false"
+             use="false"
+             windowtitle="JUnit ${version} API"
+             doctitle="JUnit ${version} API"
+             >
+      <excludepackage name="junit.*" />
+      <excludepackage name="org.junit.internal.*" />
+      <excludepackage name="org.junit.experimental.theories.internal.*" />
+      
+      <sourcepath location="${src}" />
+      <classpath path="${hamcrestlib}"/>
+      <link href="/usr/share/doc/default-jre/api" />
+      <link href="/usr/share/doc/libhamcrest-java/api" />
+    </javadoc>
+  </target>
+
+  <target name="javadoczip">
+    <delete file="${javadoczip}" />
+    <antcall target="javadoc" />
+    <zip basedir="${javadocdir}" file="${javadoczip}" />
+  </target>
+
+  <target name="populate-dist" 
+          depends="clean, build, jars, samples-and-tests, javadoc, release-notes"
+          >
+    <copy todir="${dist}/doc">
+      <fileset dir="doc"/>
+    </copy>
+    <copy file="BUILDING" tofile="${dist}/BUILDING" />
+    <copy file="epl-v10.html" tofile="${dist}/epl-v10.html" />
+  </target>
+
+  <macrodef name="run-dist-tests">
+    <!-- Runs the tests against the built jar files -->
+    <element name="extra-args" implicit="yes" />
+    <sequential>
+      <java classname="org.junit.runner.JUnitCore" fork="yes" failonerror="true">
+        <extra-args />  
+        <arg value="org.junit.tests.AllTests"/>
+        <classpath>
+          <pathelement location="${dist}" />
+          <pathelement location="${dist}/${binjar}" />
+        </classpath>
+      </java>    
+    </sequential>
+  </macrodef>
+
+  <macrodef name="run-local-tests">
+    <!-- Runs the tests against the local class files -->
+    <sequential>
+      <java classname="org.junit.runner.JUnitCore" fork="yes" failonerror="true">
+        <arg value="org.junit.tests.AllTests"/>
+        <classpath>
+          <pathelement location="${bin}" />
+          <pathelement location="${testbin}" />
+          <pathelement location="${hamcrestlib}" />
+        </classpath>
+      </java>    
+    </sequential>
+  </macrodef>
+
+  <target name="test" depends="build">
+    <run-local-tests />
+  </target>
+
+  <target name="dist" depends="populate-dist">
+    <run-dist-tests>
+      <jvmarg value="-Dignore.this=ignored"/>
+    </run-dist-tests>
+  </target>
+
+  <target name="profile" depends="populate-dist">
+    <run-dist-tests>
+      <jvmarg value="-agentlib:hprof=cpu=samples"/>
+    </run-dist-tests>
+  </target>
+
+  <target name="zip" depends="dist">
+    <zip zipfile="${zipfile}" basedir="." includes="${dist}/**" />
+  </target>
+
+  <target name="upload.to.sourceforge" depends="zip">
+    <ftp server="upload.sourceforge.net"
+         userid="anonymous"
+         password="saff@mit.edu"
+         remotedir="incoming"
+         >
+      <fileset dir="${dist}" includes="*.jar" />
+      <fileset file="${zipfile}" />
+    </ftp>
+    <echo message="To upload docs, use build/upload_docs.sh" />
+  </target>
+
+  <!-- to do automatic build upload, you need the maven ant tasks jar. -->
+  <!-- therefore, you must run ant as ant -lib build/lib stage.maven -->
+  <macrodef name="push.maven.artifact">
+    <attribute name="file" />
+    <attribute name="pom" />
+    <attribute name="packaging" />
+    <attribute name="url" />
+    <attribute name="repo.id" />
+    <element name="artifact.args" implicit="true" optional="true" />
+    <sequential>
+      <artifact:mvn failonerror="true">
+        <arg value="${maven.deploy.goal}" />
+        <arg value="-Durl=@{url}" />
+        <arg value="-DrepositoryId=@{repo.id}" />
+        <arg value="-DpomFile=@{pom}" />
+        <arg value="-Dfile=@{file}" />
+        <arg value="-Dpackaging=@{packaging}" />
+        <artifact.args />
+        <arg value="-Pgpg" />
+      </artifact:mvn>
+    </sequential>
+  </macrodef>
+
+  <macrodef name="push.maven.jar">
+    <attribute name="jar" />
+    <attribute name="pom" />
+    <attribute name="url" />
+    <attribute name="repo.id" />
+    <element name="artifact.args" implicit="true" optional="true" />
+    <sequential>
+      <echo message="Pushing JAR to Maven: @{jar} -> @{url}" />
+      <push.maven.artifact file="@{jar}" pom="@{pom}" packaging="jar"
+                           url="@{url}" repo.id="@{repo.id}">
+      	<artifact.args />
+      </push.maven.artifact>
+    </sequential>
+  </macrodef>
+
+  <macrodef name="push.maven.pom">
+    <attribute name="pom" />
+    <attribute name="url" />
+    <attribute name="repo.id" />
+    <element name="artifact.args" implicit="true" optional="true" />
+    <sequential>
+      <echo message="Pushing POM to Maven: @{pom} -> @{url}" />
+      <push.maven.artifact file="@{pom}" pom="@{pom}" packaging="pom"
+                           url="@{url}" repo.id="@{repo.id}">
+      	<artifact.args />
+      </push.maven.artifact>
+    </sequential>
+  </macrodef>
+	
+  <macrodef name="push.junit.maven.artifact">
+    <attribute name="url" />
+    <attribute name="repo.id" />
+    <attribute name="is.snapshot" default="true" />
+    <sequential>
+      <local name="m.prefix" />
+      <property name="m.prefix" value="${dist}/junit-dep-${version}" />
+      <local name="m.jar" />
+      <property name="m.jar" value="${m.prefix}.jar" />
+      <local name="m.sources.jar" />
+      <property name="m.sources.jar" value="${m.prefix}-src.jar" />
+      <local name="m.javadoc.jar" />
+      <property name="m.javadoc.jar" value="${m.prefix}-javadoc.jar" />
+      <local name="m.pom" />
+      <property name="m.pom" value="${dist}/pom-junit.xml" />
+
+      <filter token="version" value="${version}" />
+      <copy 
+          file="build/maven/junit-pom-template.xml" 
+          tofile="${m.pom}" 
+          filtering="on"
+          overwrite="true"
+          />
+
+      <push.maven.jar jar="${m.jar}" pom="${m.pom}" 
+                      url="@{url}" repo.id="@{repo.id}" />
+      
+      <if>
+        <equals arg1="@{is.snapshot}" arg2="false" />
+        <then>
+          <push.maven.jar jar="${m.sources.jar}" pom="${m.pom}"
+                          url="@{url}" repo.id="@{repo.id}">
+            <arg value="-Dclassifier=sources" />
+          </push.maven.jar>
+          <push.maven.jar jar="${m.javadoc.jar}" pom="${m.pom}"
+                          url="@{url}" repo.id="@{repo.id}">
+            <arg value="-Dclassifier=javadoc" />
+          </push.maven.jar>
+        </then>
+      </if>
+    </sequential>
+  </macrodef>
+
+  <macrodef name="push.junit-dep.maven.artifact">
+    <attribute name="url" />
+    <attribute name="repo.id" />
+    <sequential>
+      <local name="m.pom" />
+      <property name="m.pom" value="${dist}/pom-junit-dep.xml" />
+
+      <filter token="version" value="${version}" />
+      <copy 
+          file="build/maven/junit-dep-pom-template.xml" 
+          tofile="${m.pom}" 
+          filtering="on"
+          overwrite="true"
+          />
+
+      <push.maven.pom pom="${m.pom}" 
+                      url="@{url}" repo.id="@{repo.id}" />
+    </sequential>
+  </macrodef>
+
+  <target name="stage.maven" depends="all.maven.jars">
+    <property name="stage.url" 
+              value="https://oss.sonatype.org/service/local/staging/deploy/maven2/" />
+    <property name="stage.repo.id" value="sonatype-nexus-staging" />
+    
+    <push.junit.maven.artifact url="${stage.url}"
+                               repo.id="${stage.repo.id}" 
+                               is.snapshot="false" />
+    <push.junit-dep.maven.artifact url="${stage.url}"
+                                   repo.id="${stage.repo.id}" />
+  </target>
+
+  <target name="snapshot.maven" depends="all.maven.jars">
+    <property name="snapshot.url" 
+              value="https://oss.sonatype.org/content/repositories/snapshots/" />
+    <property name="snapshot.repo.id" value="sonatype-nexus-snapshots" />
+    
+    <push.junit.maven.artifact url="${snapshot.url}"
+                               repo.id="${snapshot.repo.id}" />
+    <push.junit-dep.maven.artifact url="${snapshot.url}"
+                                   repo.id="${snapshot.repo.id}" />
+  </target>
+
+  <target name="print.version">
+    <echo message="${version}" />
+  </target>
+</project>
diff -Nru junit4-4.12/debian/changelog junit4-4.12/debian/changelog
--- junit4-4.12/debian/changelog	2015-04-28 16:00:19.000000000 +0000
+++ junit4-4.12/debian/changelog	2015-06-22 07:52:25.000000000 +0000
@@ -1,3 +1,15 @@
+junit4 (4.12-2ubuntu1) wily; urgency=medium
+
+  * Update for Ubuntu to avoid Maven in main:
+    - d/*: Re-use 4.11-3 packaging to avoid the switch.
+    - d/build.xml,d/junit-pom-template.xml: Pick ant build components
+      from 4.11 and adapt for new location and version.
+    - d/tweak-resulttest.patch: Strip out failing part of ResultTest
+      test case due to differences in the way classes are loaded using
+      ant for the package build.
+
+ -- James Page <james.page@ubuntu.com>  Mon, 22 Jun 2015 08:52:01 +0100
+
 junit4 (4.12-2) unstable; urgency=medium
 
   * Restored the Class-Path and the OSGi entries in the manifest
diff -Nru junit4-4.12/debian/control junit4-4.12/debian/control
--- junit4-4.12/debian/control	2015-04-28 15:57:58.000000000 +0000
+++ junit4-4.12/debian/control	2015-06-19 14:36:25.000000000 +0000
@@ -1,6 +1,7 @@
 Source: junit4
 Section: java
-Maintainer: Debian Java Maintainers <pkg-java-maintainers@lists.alioth.debian.org>
+Maintainer: Ubuntu Developers <ubuntu-devel-discuss@lists.ubuntu.com>
+XSBC-Original-Maintainer: Debian Java Maintainers <pkg-java-maintainers@lists.alioth.debian.org>
 Uploaders: Florian Weimer <fw@deneb.enyo.de>,
            Varun Hiremath <varun@debian.org>,
            Damien Raude-Morvan <drazzib@debian.org>,
@@ -8,17 +9,14 @@
            Jakub Adam <jakub.adam@ktknet.cz>,
            Emmanuel Bourg <ebourg@apache.org>
 Priority: optional
-Build-Depends: cdbs, debhelper (>= 9), default-jdk, javahelper
+Build-Depends: ant, cdbs, debhelper (>= 9), default-jdk
 Build-Depends-Indep: default-jdk-doc,
                      libhamcrest-java (>= 1.3),
                      libhamcrest-java-doc,
-                     libmaven-enforcer-plugin-java,
-                     libmaven-javadoc-plugin-java,
-                     libreplacer-java,
-                     maven-debian-helper
-Standards-Version: 3.9.6
-Vcs-Git: git://anonscm.debian.org/pkg-java/junit4.git
-Vcs-Browser: http://anonscm.debian.org/cgit/pkg-java/junit4.git
+                     maven-repo-helper
+Standards-Version: 3.9.5
+Vcs-Svn: svn://anonscm.debian.org/pkg-java/trunk/junit4/
+Vcs-Browser: http://anonscm.debian.org/viewvc/pkg-java/trunk/junit4/
 Homepage: http://www.junit.org
 
 Package: junit4
diff -Nru junit4-4.12/debian/junit4.manifest junit4-4.12/debian/junit4.manifest
--- junit4-4.12/debian/junit4.manifest	2015-04-28 15:49:17.000000000 +0000
+++ junit4-4.12/debian/junit4.manifest	1970-01-01 00:00:00.000000000 +0000
@@ -1,9 +0,0 @@
-usr/share/java/junit4.jar:
- Class-Path: hamcrest-core.jar
- Bundle-Vendor: JUnit
- Bundle-Version: 4.12
- Bundle-Name: JUnit Testing Framework
- Bundle-ManifestVersion: 2
- Bundle-SymbolicName: org.junit
- Export-Package: org.junit.experimental.theories.suppliers;uses:="org.junit.experimental.theories";version="4.12",org.junit.experimental.theories;uses:="org.junit.experimental.theories.internal,org.junit.internal,org.junit.runners.model,org.junit.runners,org.junit";version="4.12",org.junit.experimental.theories.internal;uses:="org.junit.experimental.theories,org.junit.runners.model";version="4.12",org.junit.internal.runners;uses:="org.junit.runner,org.junit.internal,org.junit.runner.notification,org.junit.runners.model,junit.framework,org.junit.runner.manipulation,junit.extensions,org.junit";version="4.12",org.junit.internal;uses:="org.hamcrest,org.junit,org.junit.runners,org.junit.runner,org.junit.runner.notification";version="4.12",org.junit.internal.runners.model;uses:="org.junit.internal,org.junit.runner,org.junit.runners.model,org.junit.runner.notification";version="4.12",org.junit.experimental.categories;uses:="org.junit.runner.manipulation,org.junit.runner,org.junit.runners,org.junit.runners.model";version="4.12",org.junit.runner.manipulation;uses:="org.junit.runner";version="4.12",org.junit.rules;uses:="org.hamcrest,org.junit,org.junit.runners.model,org.junit.internal,org.junit.internal.matchers,org.junit.runner,org.junit.matchers,org.junit.internal.runners.statements";version="4.12",org.junit.runner;uses:="org.junit.runners.model,org.junit.runners,junit.framework,org.junit.internal.runners,org.junit.internal,junit.runner,org.junit.runner.notification,org.junit.runner.manipulation,org.junit.internal.requests,org.junit.internal.builders";version="4.12",org.junit.runners;uses:="org.junit.internal.runners,org.junit.runners.model,org.junit.internal.runners.model,org.junit.internal.runners.rules,org.junit.rules,org.junit.runner,org.junit.runner.notification,org.junit.internal.runners.statements,org.junit,org.junit.internal,org.junit.runner.manipulation,org.junit.internal.builders";version="4.12",org.junit.matchers;uses:="org.junit.internal.matchers,org.hamcrest.core,org.hamcrest";version="4.12",org.junit.runner.notification;uses:="org.junit.runner";version="4.12",org.junit.experimental.results;uses:="org.junit.runner,org.junit.runner.notification,org.junit.internal,org.hamcrest";version="4.12",org.junit.experimental.max;uses:="org.junit.runner,org.junit.runners,org.junit.internal.runners,org.junit.runners.model,org.junit.internal.requests,junit.framework,org.junit.runner.notification";version="4.12",org.junit.internal.builders;uses:="org.junit.runner,org.junit.runners.model,org.junit,org.junit.runner.notification,junit.framework,org.junit.internal.runners,org.junit.runners";version="4.12",org.junit;uses:="org.junit.internal,org.hamcrest,org.junit.runners";version="4.12",org.junit.experimental.runners;uses:="org.junit.runners,org.junit.runners.model";version="4.12",org.junit.internal.runners.rules;uses:="org.junit.rules,org.junit.runners.model,org.junit";version="4.12",org.junit.internal.matchers;uses:="org.hamcrest,org.junit.internal";version="4.12",org.junit.internal.requests;uses:="org.junit.runner,org.junit.internal.builders,org.junit.runner.manipulation,org.junit.internal.runners";version="4.12",org.junit.experimental;uses:="org.junit.runner,org.junit.runners.model,org.junit.runners";version="4.12",org.junit.runners.model;uses:="org.junit.internal.runners.model,org.junit.internal.runners,org.junit.runner,org.junit.internal,org.junit";version="4.12",org.junit.internal.runners.statements;uses:="org.junit.internal,org.junit.runners.model";version="4.12",junit.runner;uses:="junit.framework";version="4.12",junit.textui;uses:="junit.framework,junit.runner";version="4.12",junit.extensions;uses:="junit.framework";version="4.12",junit.framework;uses:="org.junit.runner.manipulation,org.junit.runner,org.junit.runner.notification,org.junit,org.junit.internal";version="4.12"
- Import-Package: org.hamcrest;version="1.3",org.hamcrest.core;version="1. 3"
diff -Nru junit4-4.12/debian/junit4.poms junit4-4.12/debian/junit4.poms
--- junit4-4.12/debian/junit4.poms	2015-04-28 14:31:53.000000000 +0000
+++ junit4-4.12/debian/junit4.poms	2015-06-19 14:36:25.000000000 +0000
@@ -1 +1 @@
-pom.xml --no-parent --java-lib --has-package-version --usj-name=junit4
+debian/pom.xml --no-parent
diff -Nru junit4-4.12/debian/junit-pom-template.xml junit4-4.12/debian/junit-pom-template.xml
--- junit4-4.12/debian/junit-pom-template.xml	1970-01-01 00:00:00.000000000 +0000
+++ junit4-4.12/debian/junit-pom-template.xml	2015-06-19 15:09:44.000000000 +0000
@@ -0,0 +1,68 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd ">
+    <modelVersion>4.0.0</modelVersion>
+    <groupId>junit</groupId>
+    <artifactId>junit</artifactId>
+    <version>@version@</version>
+    <name>JUnit</name>
+    <url>http://junit.org</url>
+    <description>
+        JUnit is a regression testing framework written by Erich Gamma and Kent Beck.
+        It is used by the developer who implements unit tests in Java.
+    </description>
+    <organization>
+        <name>JUnit</name>
+        <url>http://www.junit.org</url>
+    </organization>
+    <mailingLists>
+        <mailingList>
+            <name>JUnit Mailing List</name>
+            <post>junit@yahoogroups.com</post>
+            <archive>
+                http://tech.groups.yahoo.com/group/junit/
+            </archive>
+        </mailingList>
+    </mailingLists>
+    <licenses>
+        <license>
+            <name>Common Public License Version 1.0</name>
+            <url>http://www.opensource.org/licenses/cpl1.0.txt</url>
+        </license>
+    </licenses>
+    <scm>
+        <connection>scm:git:git://github.com/KentBeck/junit.git</connection>
+        <developerConnection>scm:git:git@github.com:KentBeck/junit.git</developerConnection>
+        <url>http://github.com/KentBeck/junit/tree/master</url>
+    </scm>
+    <developers>
+      <developer>
+        <id>dsaff</id>
+        <name>David Saff</name>
+        <email>david@saff.net</email>
+      </developer>
+    </developers>
+    <build>
+        <plugins>
+            <plugin>
+                <artifactId>maven-compiler-plugin</artifactId>
+                <configuration>
+                    <encoding>ISO-8859-1</encoding>
+                    <source>${jdk.version}</source>
+                    <target>${jdk.version}</target>
+                </configuration>
+            </plugin>
+        </plugins>
+    </build>
+    <dependencies>
+        <dependency>
+          <groupId>org.hamcrest</groupId>
+          <artifactId>hamcrest-core</artifactId>
+          <version>1.3</version>
+          <scope>compile</scope>
+        </dependency>
+    </dependencies>
+    <properties>
+         <jdk.version>1.5</jdk.version>
+    </properties>
+</project>
\ No newline at end of file
diff -Nru junit4-4.12/debian/MANIFEST.MF junit4-4.12/debian/MANIFEST.MF
--- junit4-4.12/debian/MANIFEST.MF	1970-01-01 00:00:00.000000000 +0000
+++ junit4-4.12/debian/MANIFEST.MF	2015-06-19 14:36:25.000000000 +0000
@@ -0,0 +1,64 @@
+Manifest-Version: 1.0
+Class-Path: hamcrest-core.jar
+Bundle-Vendor: JUnit
+Bundle-Version: 4.11
+Bundle-Name: JUnit Testing Framework
+Bundle-ManifestVersion: 2
+Bundle-SymbolicName: org.junit
+Export-Package: org.junit.experimental.theories.suppliers;uses:="org.jun
+ it.experimental.theories";version="4.11",org.junit.experimental.theorie
+ s;uses:="org.junit.experimental.theories.internal,org.junit.internal,or
+ g.junit.runners.model,org.junit.runners,org.junit";version="4.11",org.j
+ unit.experimental.theories.internal;uses:="org.junit.experimental.theor
+ ies,org.junit.runners.model";version="4.11",org.junit.internal.runners;
+ uses:="org.junit.runner,org.junit.internal,org.junit.runner.notificatio
+ n,org.junit.runners.model,junit.framework,org.junit.runner.manipulation
+ ,junit.extensions,org.junit";version="4.11",org.junit.internal;uses:="o
+ rg.hamcrest,org.junit,org.junit.runners,org.junit.runner,org.junit.runn
+ er.notification";version="4.11",org.junit.internal.runners.model;uses:=
+ "org.junit.internal,org.junit.runner,org.junit.runners.model,org.junit.
+ runner.notification";version="4.11",org.junit.experimental.categories;u
+ ses:="org.junit.runner.manipulation,org.junit.runner,org.junit.runners,
+ org.junit.runners.model";version="4.11",org.junit.runner.manipulation;u
+ ses:="org.junit.runner";version="4.11",org.junit.rules;uses:="org.hamcr
+ est,org.junit,org.junit.runners.model,org.junit.internal,org.junit.inte
+ rnal.matchers,org.junit.runner,org.junit.matchers,org.junit.internal.ru
+ nners.statements";version="4.11",org.junit.runner;uses:="org.junit.runn
+ ers.model,org.junit.runners,junit.framework,org.junit.internal.runners,
+ org.junit.internal,junit.runner,org.junit.runner.notification,org.junit
+ .runner.manipulation,org.junit.internal.requests,org.junit.internal.bui
+ lders";version="4.11",org.junit.runners;uses:="org.junit.internal.runne
+ rs,org.junit.runners.model,org.junit.internal.runners.model,org.junit.i
+ nternal.runners.rules,org.junit.rules,org.junit.runner,org.junit.runner
+ .notification,org.junit.internal.runners.statements,org.junit,org.junit
+ .internal,org.junit.runner.manipulation,org.junit.internal.builders";ve
+ rsion="4.11",org.junit.matchers;uses:="org.junit.internal.matchers,org.
+ hamcrest.core,org.hamcrest";version="4.11",org.junit.runner.notificatio
+ n;uses:="org.junit.runner";version="4.11",org.junit.experimental.result
+ s;uses:="org.junit.runner,org.junit.runner.notification,org.junit.inter
+ nal,org.hamcrest";version="4.11",org.junit.experimental.max;uses:="org.
+ junit.runner,org.junit.runners,org.junit.internal.runners,org.junit.run
+ ners.model,org.junit.internal.requests,junit.framework,org.junit.runner
+ .notification";version="4.11",org.junit.internal.builders;uses:="org.ju
+ nit.runner,org.junit.runners.model,org.junit,org.junit.runner.notificat
+ ion,junit.framework,org.junit.internal.runners,org.junit.runners";versi
+ on="4.11",org.junit;uses:="org.junit.internal,org.hamcrest,org.junit.ru
+ nners";version="4.11",org.junit.experimental.runners;uses:="org.junit.r
+ unners,org.junit.runners.model";version="4.11",org.junit.internal.runne
+ rs.rules;uses:="org.junit.rules,org.junit.runners.model,org.junit";vers
+ ion="4.11",org.junit.internal.matchers;uses:="org.hamcrest,org.junit.in
+ ternal";version="4.11",org.junit.internal.requests;uses:="org.junit.run
+ ner,org.junit.internal.builders,org.junit.runner.manipulation,org.junit
+ .internal.runners";version="4.11",org.junit.experimental;uses:="org.jun
+ it.runner,org.junit.runners.model,org.junit.runners";version="4.11",org
+ .junit.runners.model;uses:="org.junit.internal.runners.model,org.junit.
+ internal.runners,org.junit.runner,org.junit.internal,org.junit";version
+ ="4.11",org.junit.internal.runners.statements;uses:="org.junit.internal
+ ,org.junit.runners.model";version="4.11",junit.runner;uses:="junit.fram
+ ework";version="4.11",junit.textui;uses:="junit.framework,junit.runner"
+ ;version="4.11",junit.extensions;uses:="junit.framework";version="4.11"
+ ,junit.framework;uses:="org.junit.runner.manipulation,org.junit.runner,
+ org.junit.runner.notification,org.junit,org.junit.internal";version="4.
+ 11"
+Import-Package: org.hamcrest;version="1.3",org.hamcrest.core;version="1.
+ 3"
diff -Nru junit4-4.12/debian/maven.ignoreRules junit4-4.12/debian/maven.ignoreRules
--- junit4-4.12/debian/maven.ignoreRules	2015-04-28 14:31:53.000000000 +0000
+++ junit4-4.12/debian/maven.ignoreRules	1970-01-01 00:00:00.000000000 +0000
@@ -1,3 +0,0 @@
-org.apache.maven.plugins maven-release-plugin * * * *
-org.apache.maven.plugins maven-source-plugin * * * *
-org.codehaus.mojo animal-sniffer-maven-plugin * * * *
diff -Nru junit4-4.12/debian/orig-tar.exclude junit4-4.12/debian/orig-tar.exclude
--- junit4-4.12/debian/orig-tar.exclude	2015-04-28 14:31:53.000000000 +0000
+++ junit4-4.12/debian/orig-tar.exclude	2015-06-19 14:36:25.000000000 +0000
@@ -1,8 +1,5 @@
 *.jar
 *.zip
 apache-maven
-hopscotch-*.min.js
-.classpath
-.project
-.settings
-.travis.yml
+
+
diff -Nru junit4-4.12/debian/orig-tar.sh junit4-4.12/debian/orig-tar.sh
--- junit4-4.12/debian/orig-tar.sh	2015-04-28 14:31:53.000000000 +0000
+++ junit4-4.12/debian/orig-tar.sh	2015-06-19 14:36:25.000000000 +0000
@@ -3,7 +3,7 @@
 # called by uscan with '--upstream-version' <version> <file>
 VERSION=$2
 DIR=junit4-$VERSION
-TAR=../junit4_$VERSION.orig.tar.xz
+TAR=../junit4_$VERSION.orig.tar.gz
 ORIG_TAR=$3
 
 #rm -f $3
@@ -14,7 +14,7 @@
 tar -x -v -z -f $ORIG_TAR
 rm $ORIG_TAR
 find . -maxdepth 2 -wholename "./junit-*/*" -exec mv '{}' $DIR \;
-XZ_OPT=--best tar -c -J -f $TAR -X debian/orig-tar.exclude $DIR
+GZIP=--best tar -c -z -f $TAR -X debian/orig-tar.exclude $DIR
 rm -rf $DIR junit-*
 
 # move to directory 'tarballs'
diff -Nru junit4-4.12/debian/patches/exclude-dependency-sources.patch junit4-4.12/debian/patches/exclude-dependency-sources.patch
--- junit4-4.12/debian/patches/exclude-dependency-sources.patch	2015-04-28 14:31:53.000000000 +0000
+++ junit4-4.12/debian/patches/exclude-dependency-sources.patch	1970-01-01 00:00:00.000000000 +0000
@@ -1,23 +0,0 @@
-Description: Don't include hamcrest in the Javadoc (the source artifact isn't available)
-Author: Emmanuel Bourg <ebourg@apache.org>
-Forwarded: not-needed
---- a/pom.xml
-+++ b/pom.xml
-@@ -303,7 +303,7 @@
-                     <minmemory>32m</minmemory>
-                     <maxmemory>128m</maxmemory>
-                     <failOnError>true</failOnError>
--                    <includeDependencySources>true</includeDependencySources>
-+                    <includeDependencySources>false</includeDependencySources>
-                     <dependencySourceIncludes>
-                         <dependencySourceInclude>org.hamcrest:hamcrest-core:*</dependencySourceInclude>
-                     </dependencySourceIncludes>
-@@ -407,7 +407,7 @@
-                     <minmemory>32m</minmemory>
-                     <maxmemory>128m</maxmemory>
-                     <failOnError>true</failOnError>
--                    <includeDependencySources>true</includeDependencySources>
-+                    <includeDependencySources>false</includeDependencySources>
-                     <dependencySourceIncludes>
-                         <dependencySourceInclude>org.hamcrest:hamcrest-core:*</dependencySourceInclude>
-                     </dependencySourceIncludes>
diff -Nru junit4-4.12/debian/patches/maven2-compatibility.patch junit4-4.12/debian/patches/maven2-compatibility.patch
--- junit4-4.12/debian/patches/maven2-compatibility.patch	2015-04-28 14:31:53.000000000 +0000
+++ junit4-4.12/debian/patches/maven2-compatibility.patch	1970-01-01 00:00:00.000000000 +0000
@@ -1,14 +0,0 @@
-Description: Remove the prerequisite on Maven 3
-Author: Emmanuel Bourg <ebourg@apache.org>
-Forwarded: not-needed
---- a/pom.xml
-+++ b/pom.xml
-@@ -65,7 +65,7 @@
-     </mailingLists>
- 
-     <prerequisites>
--        <maven>3.0.4</maven>
-+        <maven>2.2.1</maven>
-     </prerequisites>
- 
-     <scm>
diff -Nru junit4-4.12/debian/patches/series junit4-4.12/debian/patches/series
--- junit4-4.12/debian/patches/series	2015-04-28 14:31:53.000000000 +0000
+++ junit4-4.12/debian/patches/series	2015-06-19 15:15:23.000000000 +0000
@@ -1,2 +1 @@
-maven2-compatibility.patch
-exclude-dependency-sources.patch
+tweak-resulttest.patch
diff -Nru junit4-4.12/debian/patches/tweak-resulttest.patch junit4-4.12/debian/patches/tweak-resulttest.patch
--- junit4-4.12/debian/patches/tweak-resulttest.patch	1970-01-01 00:00:00.000000000 +0000
+++ junit4-4.12/debian/patches/tweak-resulttest.patch	2015-06-19 15:08:19.000000000 +0000
@@ -0,0 +1,16 @@
+--- a/src/test/java/junit/tests/runner/ResultTest.java
++++ b/src/test/java/junit/tests/runner/ResultTest.java
+@@ -36,13 +36,6 @@ public class ResultTest extends TestCase
+         ObjectInputStream objectInputStream = new ObjectInputStream(new ByteArrayInputStream(bytes));
+         Result fromStream = (Result) objectInputStream.readObject();
+         assertSerializedCorrectly(result, fromStream);
+-
+-        InputStream resource = getClass().getResourceAsStream(getName());
+-        assertNotNull("Could not read resource " + getName(), resource);
+-        objectInputStream = new ObjectInputStream(resource);
+-        fromStream = (Result) objectInputStream.readObject();
+-        
+-        assertSerializedCorrectly(new ResultWithFixedRunTime(result), fromStream);
+     }
+ 
+     /**
diff -Nru junit4-4.12/debian/rules junit4-4.12/debian/rules
--- junit4-4.12/debian/rules	2015-04-28 14:36:19.000000000 +0000
+++ junit4-4.12/debian/rules	2015-06-19 15:10:02.000000000 +0000
@@ -1,20 +1,33 @@
 #!/usr/bin/make -f
 
+include /usr/share/cdbs/1/class/ant.mk
 include /usr/share/cdbs/1/rules/debhelper.mk
-include /usr/share/cdbs/1/class/maven.mk
 
+PACKAGE              := $(DEB_SOURCE_PACKAGE)
+VERSION              := $(DEB_UPSTREAM_VERSION)
 JAVA_HOME	     := /usr/lib/jvm/default-java
+DEB_ANT_BUILD_TARGET := dist
+DEB_ANT_BUILDFILE := debian/build.xml
+DEB_JARS	     := ant-nodeps hamcrest-core
 
 binary-post-install/junit4::
-	jh_manifest -pjunit4
+	sed "s/@artifactId@/junit/;s/@version@/$(VERSION)/" debian/junit-pom-template.xml > debian/pom.xml
+	mh_installpoms -pjunit4
+	mh_installjar -pjunit4 -njunit4 -l debian/pom.xml junit$(VERSION)/junit-dep-$(VERSION).jar
 
 binary-post-install/junit4-doc::
-	dh_install -pjunit4-doc javadoc/latest/* /usr/share/doc/junit4/api/
+	dh_install -pjunit4-doc junit$(VERSION)/javadoc/* /usr/share/doc/junit4/api/
 
 clean::
-	-rm -Rf javadoc
+	-rm debian/pom.xml
 	-rm src/main/java/junit/runner/Version.java
 	mh_clean
 
+upstream-from-git:
+	git-archive --format=tar --prefix=junit4-$(DEB_UPSTREAM_VERSION)/ \
+		v$(DEB_UPSTREAM_VERSION) | gzip -9 \
+		> ../junit4_$(DEB_UPSTREAM_VERSION).orig.tar.gz
+
 get-orig-source:
 	-uscan --upstream-version 0 --rename
+