Merge ~nacc/ubuntu/+source/junit4:merge into ~ubuntu-server-dev/ubuntu/+source/junit4:ubuntu/devel

[Nish Aravamudan]

junit4 (4.12-4ubuntu1) xenial; urgency=medium

  * Merge from Debian unstable. Remaining changes:
    - 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.

 -- Nishanth Aravamudan <email address hidden> Wed, 17 Feb 2016 17:01:38 -0800

junit4 (4.12-4) unstable; urgency=medium

  * Team upload.
  * Override dh_install and execute jh_manifest after the installation took
    place. This ensures that debian/junit4.manifest is really installed into
    the jar file. Remove the old jh_manifest override instead.
    Thanks to Rene Engelhard for the report. (Closes: #808736)

 -- Markus Koschany <email address hidden> Tue, 22 Dec 2015 18:40:50 +0100

junit4 (4.12-3) unstable; urgency=medium

  * Team upload.
  * maven.ignoreRules: Ignore maven replacer plugin to prevent a FTBFS.
    (Closes: #808494)
  * Add Version.java.patch as a replacement for the replacer plugin.
  * Do not remove Version.java in clean target.
  * Switch from cdbs to dh sequencer.
  * Vcs-Browser: Use https.
  * Install all API documentation with junit4-doc.install.
  * Add privacy-breach-logo.patch and fit the Lintian error of the same name.

 -- Markus Koschany <email address hidden> Sun, 20 Dec 2015 21:57:58 +0100

Unmerged commits

aed1fef... by Nish Aravamudan on 2016-02-18

update-maintainer

4556a45... by Nish Aravamudan on 2016-02-18

changelog

5308eb3... by Nish Aravamudan on 2016-02-18

reconstruct-changelog

c30be5b... by Nish Aravamudan on 2016-02-18

merge-changelogs

6604eb4... by Nish Aravamudan on 2016-02-18

    - 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.

1c2ff11... by Nish Aravamudan on 2016-02-18

    - d/build.xml,d/junit-pom-template.xml: Pick ant build components
      from 4.11 and adapt for new location and version.

ed17ec0... by Nish Aravamudan on 2016-02-18

  * Merge from Debian unstable. Remaining changes:
    - d/*: Re-use 4.11-3 packaging to avoid the switch.

4e625ef... by Robie Basak on 2016-02-18

Import version 4.12-4

Imported using git-dsc-commit.

diff --git a/debian/changelog b/debian/changelog
index a17cfc0..bc38c85 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,42 @@
+<<<<<<< debian/changelog
+=======
+junit4 (4.12-4ubuntu1) xenial; urgency=medium
+
+  * Merge from Debian unstable.  Remaining changes:
+    - 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.
+
+ -- Nishanth Aravamudan <[e-mail]>  Wed, 17 Feb 2016 17:01:38 -0800
+
+junit4 (4.12-4) unstable; urgency=medium
+
+  * Team upload.
+  * Override dh_install and execute jh_manifest after the installation took
+    place. This ensures that debian/junit4.manifest is really installed into
+    the jar file. Remove the old jh_manifest override instead.
+    Thanks to Rene Engelhard for the report. (Closes: #808736)
+
+ -- Markus Koschany <[e-mail]>  Tue, 22 Dec 2015 18:40:50 +0100
+
+junit4 (4.12-3) unstable; urgency=medium
+
+  * Team upload.
+  * maven.ignoreRules: Ignore maven replacer plugin to prevent a FTBFS.
+    (Closes: #808494)
+  * Add Version.java.patch as a replacement for the replacer plugin.
+  * Do not remove Version.java in clean target.
+  * Switch from cdbs to dh sequencer.
+  * Vcs-Browser: Use https.
+  * Install all API documentation with junit4-doc.install.
+  * Add privacy-breach-logo.patch and fit the Lintian error of the same name.
+
+ -- Markus Koschany <[e-mail]>  Sun, 20 Dec 2015 21:57:58 +0100
+
+>>>>>>> debian/changelog
 junit4 (4.12-2ubuntu1) wily; urgency=medium
 
   * Update for Ubuntu to avoid Maven in main:
@@ -59,7 +98,7 @@ junit4 (4.11-1) experimental; urgency=low
   [ Tony Mancill ]
   * Update watchfile to fix Github breakage.  (Closes: #693524)
     - Update unused debug line in orig-tar.sh too.
-    - Thank you to Jonathan McCrohan <[e-mail]> 
+    - Thank you to Jonathan McCrohan <[e-mail]>
 
  -- Emmanuel Bourg <[e-mail]>  Thu, 11 Apr 2013 16:14:44 +0200
 
@@ -219,7 +258,7 @@ junit4 (4.6-1) unstable; urgency=low
    - Move "org" and "junit" packages as subdir of "build-src"
      to get right package placement for Javadoc generation
    - Don't include ant.properties (already included by default
-     by CDBS ant-vars.mk) 
+     by CDBS ant-vars.mk)
   * debian/copyright:
    - Update upstream source location (come back on SF.net)
 
diff --git a/debian/control b/debian/control
index 09e87af..47651fc 100644
--- a/debian/control
+++ b/debian/control
@@ -14,9 +14,15 @@ Build-Depends-Indep: default-jdk-doc,
                      libhamcrest-java (>= 1.3),
                      libhamcrest-java-doc,
                      maven-repo-helper
+<<<<<<< debian/control
 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/
+=======
+Standards-Version: 3.9.6
+Vcs-Git: git://anonscm.debian.org/pkg-java/junit4.git
+Vcs-Browser: https://anonscm.debian.org/cgit/pkg-java/junit4.git
+>>>>>>> debian/control
 Homepage: http://www.junit.org
 
 Package: junit4
diff --git a/debian/patches/Version.java.patch b/debian/patches/Version.java.patch
 new file mode 100644
index 0000000..2752379
--- /dev/null
+++ b/debian/patches/Version.java.patch
@@ -0,0 +1,26 @@
+From: Markus Koschany <[e-mail]>
+Date: Wed, 16 Dec 2015 23:07:09 +0100
+Subject: Version.java
+
+Work around to avoid the build-depends on the maven replacer plugin which
+causes a FTBFS for unknown reasons.
+
+Bug: https://bugs.debian.org/808494
+Forwarded: not-needed
+---
+ src/main/java/junit/runner/Version.java | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/main/java/junit/runner/Version.java b/src/main/java/junit/runner/Version.java
+index eaf3db7..d4e2515 100644
+--- a/src/main/java/junit/runner/Version.java
++++ b/src/main/java/junit/runner/Version.java
+@@ -9,7 +9,7 @@ public class Version {
+ 	}
+ 
+ 	public static String id() {
+-		return "4.12-SNAPSHOT";
++		return "4.12";
+ 	}
+ 	
+ 	public static void main(String[] args) {
diff --git a/debian/patches/privacy-breach-logo.patch b/debian/patches/privacy-breach-logo.patch
 new file mode 100644
index 0000000..a3e838f
--- /dev/null
+++ b/debian/patches/privacy-breach-logo.patch
@@ -0,0 +1,25 @@
+From: Markus Koschany <[e-mail]>
+Date: Sun, 20 Dec 2015 21:54:06 +0100
+Subject: privacy breach logo
+
+Fix Lintian error:
+https://lintian.debian.org/tags/privacy-breach-logo.html
+
+Forwarded: not-needed
+---
+ doc/homepage.html | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/doc/homepage.html b/doc/homepage.html
+index 69c6248..7384208 100644
+--- a/doc/homepage.html
++++ b/doc/homepage.html
+@@ -108,7 +108,7 @@ There are three junit mailing lists:
+ 
+ <hr WIDTH="100%">
+ <font size="1">
+-hosted by </font> <A href="http://sourceforge.net"><IMG src="http://sourceforge.net/sflogo.php?group_id=15278" width="88" height="31"
++hosted by </font> <A href="http://sourceforge.net"><IMG src="" width="88" height="31"
+ border="0" alt="SourceForge Logo"></A>
+ </font>
+ 
diff --git a/debian/patches/series b/debian/patches/series
index b8e9017..86f99df 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1 +1,6 @@
+<<<<<<< debian/patches/series
+=======
+Version.java.patch
+privacy-breach-logo.patch
+>>>>>>> debian/patches/series
 tweak-resulttest.patch
diff --git a/debian/rules b/debian/rules
index 8b71763..32e364b 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,4 +1,5 @@
 #!/usr/bin/make -f
+export JAVA_HOME=/usr/lib/jvm/default-java
 
 include /usr/share/cdbs/1/class/ant.mk
 include /usr/share/cdbs/1/rules/debhelper.mk