[pkg-java] r15831 - in tags/junit4: . 4.10-1/debian

Damien Raude-Morvan drazzib at alioth.debian.org
Wed Mar 7 22:36:31 UTC 2012


Author: drazzib
Date: 2012-03-07 22:36:31 +0000 (Wed, 07 Mar 2012)
New Revision: 15831

Added:
   tags/junit4/4.10-1/
   tags/junit4/4.10-1/debian/ant.properties
   tags/junit4/4.10-1/debian/changelog
   tags/junit4/4.10-1/debian/control
   tags/junit4/4.10-1/debian/copyright
   tags/junit4/4.10-1/debian/junit4.poms
   tags/junit4/4.10-1/debian/patches/
   tags/junit4/4.10-1/debian/rules
   tags/junit4/4.10-1/debian/watch
Removed:
   tags/junit4/4.10-1/debian/build.properties
   tags/junit4/4.10-1/debian/build.xml
   tags/junit4/4.10-1/debian/changelog
   tags/junit4/4.10-1/debian/control
   tags/junit4/4.10-1/debian/copyright
   tags/junit4/4.10-1/debian/junit4-doc.install
   tags/junit4/4.10-1/debian/junit4.poms
   tags/junit4/4.10-1/debian/rules
   tags/junit4/4.10-1/debian/watch
Log:
[svn-buildpackage] Tagging junit4 4.10-1

Copied: tags/junit4/4.10-1/debian/ant.properties (from rev 15830, trunk/junit4/debian/ant.properties)
===================================================================
--- tags/junit4/4.10-1/debian/ant.properties	                        (rev 0)
+++ tags/junit4/4.10-1/debian/ant.properties	2012-03-07 22:36:31 UTC (rev 15831)
@@ -0,0 +1,2 @@
+hamcrestlib=/usr/share/java/hamcrest-core.jar
+manifest=debian/MANIFEST.MF

Deleted: tags/junit4/4.10-1/debian/build.properties
===================================================================
--- trunk/junit4/debian/build.properties	2012-03-02 05:35:10 UTC (rev 15806)
+++ tags/junit4/4.10-1/debian/build.properties	2012-03-07 22:36:31 UTC (rev 15831)
@@ -1,4 +0,0 @@
-artifactId=junit
-dependency=hamcrest
-build.javaVersion=1.5
-manifest=debian/MANIFEST.MF

Deleted: tags/junit4/4.10-1/debian/build.xml
===================================================================
--- trunk/junit4/debian/build.xml	2012-03-02 05:35:10 UTC (rev 15806)
+++ tags/junit4/4.10-1/debian/build.xml	2012-03-07 22:36:31 UTC (rev 15831)
@@ -1,25 +0,0 @@
-<project name="junit" default="javadoc" basedir="..">
-
-	<property name="src" value="src/main/java" />
-	<property name="javadocdir" location="build/docs/api" />
-	
-	<target name="javadoc">
-		<javadoc destdir="${javadocdir}"
-		         author="false"
-		         version="false"
-		         use="false"
-		         windowtitle="JUnit API"
-		         stylesheetfile="stylesheet.css"
-		>
-			<excludepackage name="junit.*" />
-			<excludepackage name="org.junit.internal.*" />
-			<excludepackage name="org.junit.experimental.theories.internal.*" />
-			
-			<sourcepath location="${src}" />
-			<classpath location="/usr/share/java/hamcrest-core.jar" />
-			<link href="file:///usr/share/doc/libhamcrest-java/api" />
-			<link href="file:///usr/share/doc/default-jdk/api" />
-		</javadoc>
-	</target>
-
-</project>

Deleted: tags/junit4/4.10-1/debian/changelog
===================================================================
--- trunk/junit4/debian/changelog	2012-03-02 05:35:10 UTC (rev 15806)
+++ tags/junit4/4.10-1/debian/changelog	2012-03-07 22:36:31 UTC (rev 15831)
@@ -1,185 +0,0 @@
-junit4 (4.8.2-2) unstable; urgency=low
-
-  * Team upload.
-  * Add Class-Path: hamcrest-core.jar to MANIFEST. (Closes: #527308, #587135)
-  * Remove debian/libjunit4-java.poms because there is no such package.
-  * Remove get-orig-pom target because upstream provides a pom.xml now.
-  * Set property bin.package to junit4.
-
- -- Torsten Werner <twerner at debian.org>  Fri, 25 Jun 2010 15:35:10 +0200
-
-junit4 (4.8.2-1) unstable; urgency=low
-
-  [Ludovic Claude]
-  * Add myself to Uploaders
-  * New upstream version
-  * Update debian/watch and get the original tarball from GitHub
-  * Use the tarball that contains the full project files, including pom.xml
-    and documentation
-  * Add Build-Depends-Indep on maven-ant-helper
-  * Changed the build to use maven-ant-helper. Deleted debian/build.xml
-    and reorganized debian/rules, javadoc is now linked to hamcrest docs.
-  * Add Build-Depends-Indep and Depends for the junit4-doc package on
-    libhamcrest-java-doc and default-jdk-doc
-  * Install the site docs in addition to the javadocs.
-  * Run unit tests during the build, add Build-Depends-Indep on
-    junit and ant-optional
-  * Use upstream pom.xml
-
-  [Varun Hiremath]
-  * Set java source/target in d/ant.properties instead of d/rules
-
- -- Ludovic Claude <ludovic.claude at laposte.net>  Wed, 26 May 2010 22:10:17 +0200
-
-junit4 (4.8.1-3) unstable; urgency=low
-
-  * Install Javadoc inside /usr/share/doc/junit4/ instead of
-    /usr/share/java/junit4/.
-  * Register Javadoc with doc-base.
-
- -- Damien Raude-Morvan <drazzib at debian.org>  Sat, 13 Mar 2010 22:30:55 +0100
-
-junit4 (4.8.1-2) unstable; urgency=low
-
-  [ Ludovic Claude ]
-  * Update version number of junit in debian/pom.xml (Closes: #573581)
-  * Added target get-orig-pom to debian/rules.
-    Maintainer should run 'debian/rules get-orig-pom'
-    to update the POM file on a new upstream version, or
-    at least update the version manually in debian/pom.xml
-
-  [ Varun Hiremath ]
-  * Switch to source format 3.0
-  * Bump Standards-Version to 3.8.4
-
- -- Varun Hiremath <varun at debian.org>  Sat, 13 Mar 2010 01:03:15 -0500
-
-junit4 (4.8.1-1) unstable; urgency=low
-
-  * New upstream release
-
- -- Damien Raude-Morvan <drazzib at debian.org>  Sat, 12 Dec 2009 20:06:05 +0100
-
-junit4 (4.7-3) unstable; urgency=low
-
-  [ Thierry Carrez ]
-  * Minimal dependency on default-jre-headless | java5-runtime-headless, since
-    java5 code is produced and junit4 doesn't require full JRE.
-
-  [ Damien Raude-Morvan ]
-  * Update my email address
-  * Bump debhelper version to >= 7
-  * Add OSGi metadata to junit4.jar (Closes: #558186)
-
- -- Damien Raude-Morvan <drazzib at debian.org>  Sun, 29 Nov 2009 01:06:09 +0100
-
-junit4 (4.7-2) unstable; urgency=low
-
-  * NEWS.Debian and README.Debian: explain usage of JUnit4 with Ant.
-    Thanks for Antti-Juhani Kaijanaho <ajk at debian.org> for spotting this
-    (Closes: #543327).
-
- -- Damien Raude-Morvan <drazzib at drazzib.com>  Mon, 24 Aug 2009 23:32:31 +0200
-
-junit4 (4.7-1) unstable; urgency=low
-
-  * New upstream release.
-  * Bump Standards-Version to 3.8.3: no changes needed
-  * Remove versionned B-D on cdbs: even oldstable has this release
-  * Use default-jdk/jre:
-    - Build-Depends on default-jdk
-    - Use /usr/lib/jvm/default-java as JAVA_HOME
-  * Maven POMs:
-    - Create basic Maven POM in debian/pom.xml
-    - Add a Build-Depends-Indep dependency on maven-repo-helper
-    - Use mh_installpom and mh_installjar to install the POM and the jar to the
-      Maven repository
-  * Move ant and default-jdk to B-D-I (needed for clean target)
-  * Split Javadoc API in a -doc package
-
- -- Damien Raude-Morvan <drazzib at drazzib.com>  Sun, 23 Aug 2009 15:44:11 +0200
-
-junit4 (4.6-2) unstable; urgency=low
-
-  * debian/build.xml:
-    Add hamcrest-core.jar in Class-Path using junit4.jar Manifest file.
-    Thanks to Florian Weimer. (Closes: #527308)
-  * Remove NEWS.Debian as migration from 4.3 does not require user action.
-  * debian/copyright: include copyright assignment before licence
-  * Bump Standards-Version to 3.8.2: no changes needed
-
- -- Damien Raude-Morvan <drazzib at drazzib.com>  Mon, 22 Jun 2009 22:25:36 +0200
-
-junit4 (4.6-1) unstable; urgency=low
-
-  [ Damien Raude-Morvan ]
-  * New upstream release
-    - Upload to unstable (Closes: #521111, #526286)
-    - Depends on libhamcrest-java (see NEWS.Debian)
-  * debian/control:
-   - Add myself to Uploaders
-   - Add ${misc:Depends} in Depends of junit4
-   - Add libhamcrest-java in Depends of junit4
-   - Updated Standards-Version to 3.8.1
-  * debian/build.xml:
-   - 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) 
-  * debian/copyright:
-   - Update upstream source location (come back on SF.net)
-
-  [ Varun Hiremath ]
-  * Add junit4 link in ant's lib directory (Closes: #512530)
-
- -- Varun Hiremath <varun at debian.org>  Tue, 05 May 2009 20:37:46 -0400
-
-junit4 (4.5-1) experimental; urgency=low
-
-  * New upstream release (Closes: #446464)
-  * Switch to openjdk
-  * Remove old patches, no longer used
-  * Rename debian/junit4.install to debian/docs
-  * Add debian/build.xml and debian/ant.properties to build sources
-  * Add orig-tar.sh script to generate source tarball
-  * Clean up debian/rules file and add get-orig-source target
-  * Update watch file
-
- -- Varun Hiremath <varun at debian.org>  Sat, 06 Dec 2008 18:54:44 -0500
-
-junit4 (4.3.1-4) unstable; urgency=low
-
-  * Fix junit4.jar symlink (Closes: #470451)
-  * Fixed symlink also fixes FTBFS bugs (Closes: #470353, #470331)
-  * Add patches/source_version.diff to set source version to 1.5
-  * Add patches/disable_test.diff to disable one failing test
-  * Add myself to Uploaders
-
- -- Varun Hiremath <varun at debian.org>  Tue, 11 Mar 2008 23:13:44 +0530
-
-junit4 (4.3.1-3) unstable; urgency=low
-
-  * Added Depends on java-gcj-compat | java1-runtime | java2-runtime to
-    junit4. Closes: #457254.
-  * Made Debian Java Maintainers the Maintainer of this package, moved Florian
-    to Uploaders and added myself too.
-  * Removed "-1" in versioned build-dependency on java-gcj-compat-dev.
-  * Added Homepage, Vcs-Browser and Vcs-Svn fields.
-  * Updated Standards-Version to 3.7.3.
-  * Added watch file.
-
- -- Michael Koch <konqueror at gmx.de>  Mon, 03 Mar 2008 00:12:54 +0100
-
-junit4 (4.3.1-2) unstable; urgency=low
-
-  * Change section to main.
-
- -- Florian Weimer <fw at deneb.enyo.de>  Mon, 03 Sep 2007 08:14:52 +0200
-
-junit4 (4.3.1-1) unstable; urgency=low
-
-  * Initial package version.  Closes: #420793.
-  * Change test case to accept a class name variant generated by GNU
-    Classpath.
-
- -- Florian Weimer <fw at deneb.enyo.de>  Sun, 02 Sep 2007 16:09:59 +0200

Copied: tags/junit4/4.10-1/debian/changelog (from rev 15830, trunk/junit4/debian/changelog)
===================================================================
--- tags/junit4/4.10-1/debian/changelog	                        (rev 0)
+++ tags/junit4/4.10-1/debian/changelog	2012-03-07 22:36:31 UTC (rev 15831)
@@ -0,0 +1,198 @@
+junit4 (4.10-1) unstable; urgency=low
+
+  * New upstream release (Closes: #650662).
+  * Fix FTBFS with workaround_typing_bug.diff (Closes: #662807).
+  * d/control: Bump to 3.9.3.1 Standards-Version: no changes needed.
+  * d/control: Remove Michael Koch from Uploaders list (Closes: #654042).
+  * d/watch: Get new github tags, thanks to David Paleino
+    (Closes: #653597).
+  * d/control: Wrap-and-sort.
+  * d/control: Don't use maven-ant-helper anymore for build.
+
+ -- Damien Raude-Morvan <drazzib at debian.org>  Wed, 07 Mar 2012 22:56:14 +0100
+
+junit4 (4.8.2-2) unstable; urgency=low
+
+  * Team upload.
+  * Add Class-Path: hamcrest-core.jar to MANIFEST. (Closes: #527308, #587135)
+  * Remove debian/libjunit4-java.poms because there is no such package.
+  * Remove get-orig-pom target because upstream provides a pom.xml now.
+  * Set property bin.package to junit4.
+
+ -- Torsten Werner <twerner at debian.org>  Fri, 25 Jun 2010 15:35:10 +0200
+
+junit4 (4.8.2-1) unstable; urgency=low
+
+  [Ludovic Claude]
+  * Add myself to Uploaders
+  * New upstream version
+  * Update debian/watch and get the original tarball from GitHub
+  * Use the tarball that contains the full project files, including pom.xml
+    and documentation
+  * Add Build-Depends-Indep on maven-ant-helper
+  * Changed the build to use maven-ant-helper. Deleted debian/build.xml
+    and reorganized debian/rules, javadoc is now linked to hamcrest docs.
+  * Add Build-Depends-Indep and Depends for the junit4-doc package on
+    libhamcrest-java-doc and default-jdk-doc
+  * Install the site docs in addition to the javadocs.
+  * Run unit tests during the build, add Build-Depends-Indep on
+    junit and ant-optional
+  * Use upstream pom.xml
+
+  [Varun Hiremath]
+  * Set java source/target in d/ant.properties instead of d/rules
+
+ -- Ludovic Claude <ludovic.claude at laposte.net>  Wed, 26 May 2010 22:10:17 +0200
+
+junit4 (4.8.1-3) unstable; urgency=low
+
+  * Install Javadoc inside /usr/share/doc/junit4/ instead of
+    /usr/share/java/junit4/.
+  * Register Javadoc with doc-base.
+
+ -- Damien Raude-Morvan <drazzib at debian.org>  Sat, 13 Mar 2010 22:30:55 +0100
+
+junit4 (4.8.1-2) unstable; urgency=low
+
+  [ Ludovic Claude ]
+  * Update version number of junit in debian/pom.xml (Closes: #573581)
+  * Added target get-orig-pom to debian/rules.
+    Maintainer should run 'debian/rules get-orig-pom'
+    to update the POM file on a new upstream version, or
+    at least update the version manually in debian/pom.xml
+
+  [ Varun Hiremath ]
+  * Switch to source format 3.0
+  * Bump Standards-Version to 3.8.4
+
+ -- Varun Hiremath <varun at debian.org>  Sat, 13 Mar 2010 01:03:15 -0500
+
+junit4 (4.8.1-1) unstable; urgency=low
+
+  * New upstream release
+
+ -- Damien Raude-Morvan <drazzib at debian.org>  Sat, 12 Dec 2009 20:06:05 +0100
+
+junit4 (4.7-3) unstable; urgency=low
+
+  [ Thierry Carrez ]
+  * Minimal dependency on default-jre-headless | java5-runtime-headless, since
+    java5 code is produced and junit4 doesn't require full JRE.
+
+  [ Damien Raude-Morvan ]
+  * Update my email address
+  * Bump debhelper version to >= 7
+  * Add OSGi metadata to junit4.jar (Closes: #558186)
+
+ -- Damien Raude-Morvan <drazzib at debian.org>  Sun, 29 Nov 2009 01:06:09 +0100
+
+junit4 (4.7-2) unstable; urgency=low
+
+  * NEWS.Debian and README.Debian: explain usage of JUnit4 with Ant.
+    Thanks for Antti-Juhani Kaijanaho <ajk at debian.org> for spotting this
+    (Closes: #543327).
+
+ -- Damien Raude-Morvan <drazzib at drazzib.com>  Mon, 24 Aug 2009 23:32:31 +0200
+
+junit4 (4.7-1) unstable; urgency=low
+
+  * New upstream release.
+  * Bump Standards-Version to 3.8.3: no changes needed
+  * Remove versionned B-D on cdbs: even oldstable has this release
+  * Use default-jdk/jre:
+    - Build-Depends on default-jdk
+    - Use /usr/lib/jvm/default-java as JAVA_HOME
+  * Maven POMs:
+    - Create basic Maven POM in debian/pom.xml
+    - Add a Build-Depends-Indep dependency on maven-repo-helper
+    - Use mh_installpom and mh_installjar to install the POM and the jar to the
+      Maven repository
+  * Move ant and default-jdk to B-D-I (needed for clean target)
+  * Split Javadoc API in a -doc package
+
+ -- Damien Raude-Morvan <drazzib at drazzib.com>  Sun, 23 Aug 2009 15:44:11 +0200
+
+junit4 (4.6-2) unstable; urgency=low
+
+  * debian/build.xml:
+    Add hamcrest-core.jar in Class-Path using junit4.jar Manifest file.
+    Thanks to Florian Weimer. (Closes: #527308)
+  * Remove NEWS.Debian as migration from 4.3 does not require user action.
+  * debian/copyright: include copyright assignment before licence
+  * Bump Standards-Version to 3.8.2: no changes needed
+
+ -- Damien Raude-Morvan <drazzib at drazzib.com>  Mon, 22 Jun 2009 22:25:36 +0200
+
+junit4 (4.6-1) unstable; urgency=low
+
+  [ Damien Raude-Morvan ]
+  * New upstream release
+    - Upload to unstable (Closes: #521111, #526286)
+    - Depends on libhamcrest-java (see NEWS.Debian)
+  * debian/control:
+   - Add myself to Uploaders
+   - Add ${misc:Depends} in Depends of junit4
+   - Add libhamcrest-java in Depends of junit4
+   - Updated Standards-Version to 3.8.1
+  * debian/build.xml:
+   - 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) 
+  * debian/copyright:
+   - Update upstream source location (come back on SF.net)
+
+  [ Varun Hiremath ]
+  * Add junit4 link in ant's lib directory (Closes: #512530)
+
+ -- Varun Hiremath <varun at debian.org>  Tue, 05 May 2009 20:37:46 -0400
+
+junit4 (4.5-1) experimental; urgency=low
+
+  * New upstream release (Closes: #446464)
+  * Switch to openjdk
+  * Remove old patches, no longer used
+  * Rename debian/junit4.install to debian/docs
+  * Add debian/build.xml and debian/ant.properties to build sources
+  * Add orig-tar.sh script to generate source tarball
+  * Clean up debian/rules file and add get-orig-source target
+  * Update watch file
+
+ -- Varun Hiremath <varun at debian.org>  Sat, 06 Dec 2008 18:54:44 -0500
+
+junit4 (4.3.1-4) unstable; urgency=low
+
+  * Fix junit4.jar symlink (Closes: #470451)
+  * Fixed symlink also fixes FTBFS bugs (Closes: #470353, #470331)
+  * Add patches/source_version.diff to set source version to 1.5
+  * Add patches/disable_test.diff to disable one failing test
+  * Add myself to Uploaders
+
+ -- Varun Hiremath <varun at debian.org>  Tue, 11 Mar 2008 23:13:44 +0530
+
+junit4 (4.3.1-3) unstable; urgency=low
+
+  * Added Depends on java-gcj-compat | java1-runtime | java2-runtime to
+    junit4. Closes: #457254.
+  * Made Debian Java Maintainers the Maintainer of this package, moved Florian
+    to Uploaders and added myself too.
+  * Removed "-1" in versioned build-dependency on java-gcj-compat-dev.
+  * Added Homepage, Vcs-Browser and Vcs-Svn fields.
+  * Updated Standards-Version to 3.7.3.
+  * Added watch file.
+
+ -- Michael Koch <konqueror at gmx.de>  Mon, 03 Mar 2008 00:12:54 +0100
+
+junit4 (4.3.1-2) unstable; urgency=low
+
+  * Change section to main.
+
+ -- Florian Weimer <fw at deneb.enyo.de>  Mon, 03 Sep 2007 08:14:52 +0200
+
+junit4 (4.3.1-1) unstable; urgency=low
+
+  * Initial package version.  Closes: #420793.
+  * Change test case to accept a class name variant generated by GNU
+    Classpath.
+
+ -- Florian Weimer <fw at deneb.enyo.de>  Sun, 02 Sep 2007 16:09:59 +0200

Deleted: tags/junit4/4.10-1/debian/control
===================================================================
--- trunk/junit4/debian/control	2012-03-02 05:35:10 UTC (rev 15806)
+++ tags/junit4/4.10-1/debian/control	2012-03-07 22:36:31 UTC (rev 15831)
@@ -1,40 +0,0 @@
-Source: junit4
-Section: java
-Maintainer: Debian Java Maintainers <pkg-java-maintainers at lists.alioth.debian.org>
-Uploaders: Florian Weimer <fw at deneb.enyo.de>, Michael Koch <konqueror at gmx.de>, 
- Varun Hiremath <varun at debian.org>, Damien Raude-Morvan <drazzib at debian.org>, Ludovic Claude <ludovic.claude at laposte.net>
-Priority: optional
-Build-Depends: cdbs, debhelper (>= 7), ant, default-jdk
-Build-Depends-Indep: libhamcrest-java (>> 1.1-6), maven-repo-helper, maven-ant-helper,
- libhamcrest-java-doc, default-jdk-doc, ant-optional, junit
-Standards-Version: 3.8.4
-Vcs-Svn: svn://svn.debian.org/svn/pkg-java/trunk/junit4/
-Vcs-Browser: http://svn.debian.org/wsvn/pkg-java/trunk/junit4/
-Homepage: http://www.junit.org/
-
-Package: junit4
-Architecture: all
-Depends: ${misc:Depends}, default-jre-headless | java5-runtime-headless, libhamcrest-java
-Description: JUnit regression test framework for Java
- JUnit is a simple framework to write repeatable tests. It is an
- instance of the xUnit architecture for unit testing frameworks.
- .
- JUnit 4 uses Java 5 features such as generics and annotations.  If
- you need compatibility with previous Java versions, you should use
- the junit package (version 3) instead.
-
-Package: junit4-doc
-Architecture: all
-Section: doc
-Depends: ${misc:Depends}
-Recommends: libhamcrest-java-doc, default-jdk-doc
-Suggests: junit4
-Description: JUnit regression test framework for Java - documentation
- JUnit is a simple framework to write repeatable tests. It is an
- instance of the xUnit architecture for unit testing frameworks.
- .
- JUnit 4 uses Java 5 features such as generics and annotations.  If
- you need compatibility with previous Java versions, you should use
- the junit package (version 3) instead.
- .
- This package contains Javadoc API documentation of JUnit 4.

Copied: tags/junit4/4.10-1/debian/control (from rev 15830, trunk/junit4/debian/control)
===================================================================
--- tags/junit4/4.10-1/debian/control	                        (rev 0)
+++ tags/junit4/4.10-1/debian/control	2012-03-07 22:36:31 UTC (rev 15831)
@@ -0,0 +1,46 @@
+Source: junit4
+Section: java
+Maintainer: Debian Java Maintainers <pkg-java-maintainers at lists.alioth.debian.org>
+Uploaders: Florian Weimer <fw at deneb.enyo.de>,
+           Varun Hiremath <varun at debian.org>,
+           Damien Raude-Morvan <drazzib at debian.org>,
+           Ludovic Claude <ludovic.claude at laposte.net>
+Priority: optional
+Build-Depends: ant, cdbs, debhelper (>= 7), default-jdk
+Build-Depends-Indep: default-jdk-doc,
+                     libhamcrest-java (>> 1.1-6),
+                     libhamcrest-java-doc,
+                     maven-repo-helper
+Standards-Version: 3.9.3.1
+Vcs-Svn: svn://svn.debian.org/svn/pkg-java/trunk/junit4/
+Vcs-Browser: http://svn.debian.org/wsvn/pkg-java/trunk/junit4/
+Homepage: http://www.junit.org/
+
+Package: junit4
+Architecture: all
+Depends: default-jre-headless | java5-runtime-headless,
+         libhamcrest-java,
+         ${misc:Depends}
+Description: JUnit regression test framework for Java
+ JUnit is a simple framework to write repeatable tests. It is an
+ instance of the xUnit architecture for unit testing frameworks.
+ .
+ JUnit 4 uses Java 5 features such as generics and annotations.  If
+ you need compatibility with previous Java versions, you should use
+ the junit package (version 3) instead.
+
+Package: junit4-doc
+Architecture: all
+Section: doc
+Depends: ${misc:Depends}
+Recommends: default-jdk-doc, libhamcrest-java-doc
+Suggests: junit4
+Description: JUnit regression test framework for Java - documentation
+ JUnit is a simple framework to write repeatable tests. It is an
+ instance of the xUnit architecture for unit testing frameworks.
+ .
+ JUnit 4 uses Java 5 features such as generics and annotations.  If
+ you need compatibility with previous Java versions, you should use
+ the junit package (version 3) instead.
+ .
+ This package contains Javadoc API documentation of JUnit 4.

Deleted: tags/junit4/4.10-1/debian/copyright
===================================================================
--- trunk/junit4/debian/copyright	2012-03-02 05:35:10 UTC (rev 15806)
+++ tags/junit4/4.10-1/debian/copyright	2012-03-07 22:36:31 UTC (rev 15831)
@@ -1,231 +0,0 @@
-This is Debian's junit4 package, initially packaged by Florian Weimer
-<fw at deneb.enyo.de> on 2007-04-24.
-
-The sources JAR has been downloaded from http://prdownloads.sourceforge.net/junit/
-
-Copyright 2001-2009 Kent Beck <kent at threeriversinstitute.org>
-Copyright 2000-2009 Erich Gamma <erich_gamma at acm.org>
-Copyright 2006-2009 David Saff <david at saff.net>
-
-JUnit 4 is covered by the IBM Common Public License, as reproduced
-below.
-
-                         Common Public License - v 1.0
-
-THE ACCOMPANYING PROGRAM IS PROVIDED UNDER THE TERMS OF THIS COMMON PUBLIC
-LICENSE ("AGREEMENT"). ANY USE, REPRODUCTION OR DISTRIBUTION OF THE PROGRAM
-CONSTITUTES RECIPIENT'S ACCEPTANCE OF THIS AGREEMENT.
-
-1. DEFINITIONS
-
-"Contribution" means:
-
-    a) in the case of the initial Contributor, the initial code and
-    documentation distributed under this Agreement, and
-    b) in the case of each subsequent Contributor:
-
-    i) changes to the Program, and
-
-    ii) additions to the Program;
-
-    where such changes and/or additions to the Program originate from and are
-    distributed by that particular Contributor. A Contribution 'originates'
-    from a Contributor if it was added to the Program by such Contributor
-    itself or anyone acting on such Contributor's behalf. Contributions do not
-    include additions to the Program which: (i) are separate modules of
-    software distributed in conjunction with the Program under their own
-    license agreement, and (ii) are not derivative works of the Program.
-
-"Contributor" means any person or entity that distributes the Program.
-
-"Licensed Patents " mean patent claims licensable by a Contributor which are
-necessarily infringed by the use or sale of its Contribution alone or when
-combined with the Program.
-
-"Program" means the Contributions distributed in accordance with this
-Agreement.
-
-"Recipient" means anyone who receives the Program under this Agreement,
-including all Contributors.
-
-2. GRANT OF RIGHTS
-
-    a) Subject to the terms of this Agreement, each Contributor hereby grants
-    Recipient a non-exclusive, worldwide, royalty-free copyright license to
-    reproduce, prepare derivative works of, publicly display, publicly perform,
-    distribute and sublicense the Contribution of such Contributor, if any, and
-    such derivative works, in source code and object code form.
-
-    b) Subject to the terms of this Agreement, each Contributor hereby grants
-    Recipient a non-exclusive, worldwide, royalty-free patent license under
-    Licensed Patents to make, use, sell, offer to sell, import and otherwise
-    transfer the Contribution of such Contributor, if any, in source code and
-    object code form. This patent license shall apply to the combination of the
-    Contribution and the Program if, at the time the Contribution is added by
-    the Contributor, such addition of the Contribution causes such combination
-    to be covered by the Licensed Patents. The patent license shall not apply
-    to any other combinations which include the Contribution. No hardware per
-    se is licensed hereunder.
-
-    c) Recipient understands that although each Contributor grants the licenses
-    to its Contributions set forth herein, no assurances are provided by any
-    Contributor that the Program does not infringe the patent or other
-    intellectual property rights of any other entity. Each Contributor
-    disclaims any liability to Recipient for claims brought by any other entity
-    based on infringement of intellectual property rights or otherwise. As a
-    condition to exercising the rights and licenses granted hereunder, each
-    Recipient hereby assumes sole responsibility to secure any other
-    intellectual property rights needed, if any. For example, if a third party
-    patent license is required to allow Recipient to distribute the Program, it
-    is Recipient's responsibility to acquire that license before distributing
-    the Program.
-
-    d) Each Contributor represents that to its knowledge it has sufficient
-    copyright rights in its Contribution, if any, to grant the copyright
-    license set forth in this Agreement.
-
-3. REQUIREMENTS
-
-A Contributor may choose to distribute the Program in object code form under
-its own license agreement, provided that:
-
-    a) it complies with the terms and conditions of this Agreement; and
-
-    b) its license agreement:
-
-    i) effectively disclaims on behalf of all Contributors all warranties and
-    conditions, express and implied, including warranties or conditions of
-    title and non-infringement, and implied warranties or conditions of
-    merchantability and fitness for a particular purpose;
-
-    ii) effectively excludes on behalf of all Contributors all liability for
-    damages, including direct, indirect, special, incidental and consequential
-    damages, such as lost profits;
-
-    iii) states that any provisions which differ from this Agreement are
-    offered by that Contributor alone and not by any other party; and
-
-    iv) states that source code for the Program is available from such
-    Contributor, and informs licensees how to obtain it in a reasonable manner
-    on or through a medium customarily used for software exchange.
-
-When the Program is made available in source code form:
-
-    a) it must be made available under this Agreement; and
-
-    b) a copy of this Agreement must be included with each copy of the Program.
-
-[S::S]
-
-[S::S]Contributors may not remove or alter any copyright notices contained
-within the Program.
-
-Each Contributor must identify itself as the originator of its Contribution, if
-any, in a manner that reasonably allows subsequent Recipients to identify the
-originator of the Contribution.
-
-4. COMMERCIAL DISTRIBUTION
-
-Commercial distributors of software may accept certain responsibilities with
-respect to end users, business partners and the like. While this license is
-intended to facilitate the commercial use of the Program, the Contributor who
-includes the Program in a commercial product offering should do so in a manner
-which does not create potential liability for other Contributors. Therefore, if
-a Contributor includes the Program in a commercial product offering, such
-Contributor ("Commercial Contributor") hereby agrees to defend and indemnify
-every other Contributor ("Indemnified Contributor") against any losses, damages
-and costs (collectively "Losses") arising from claims, lawsuits and other legal
-actions brought by a third party against the Indemnified Contributor to the
-extent caused by the acts or omissions of such Commercial Contributor in
-connection with its distribution of the Program in a commercial product
-offering. The obligations in this section do not apply to any claims or Losses
-relating to any actual or alleged intellectual property infringement. In order
-to qualify, an Indemnified Contributor must: a) promptly notify the Commercial
-Contributor in writing of such claim, and b) allow the Commercial Contributor
-to control, and cooperate with the Commercial Contributor in, the defense and
-any related settlement negotiations. The Indemnified Contributor may
-participate in any such claim at its own expense.
-
-For example, a Contributor might include the Program in a commercial product
-offering, Product X. That Contributor is then a Commercial Contributor. If that
-Commercial Contributor then makes performance claims, or offers warranties
-related to Product X, those performance claims and warranties are such
-Commercial Contributor's responsibility alone. Under this section, the
-Commercial Contributor would have to defend claims against the other
-Contributors related to those performance claims and warranties, and if a court
-requires any other Contributor to pay any damages as a result, the Commercial
-Contributor must pay those damages.
-
-5. NO WARRANTY
-
-EXCEPT AS EXPRESSLY SET FORTH IN THIS AGREEMENT, THE PROGRAM IS PROVIDED ON AN
-"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, EITHER EXPRESS OR
-IMPLIED INCLUDING, WITHOUT LIMITATION, ANY WARRANTIES OR CONDITIONS OF TITLE,
-NON-INFRINGEMENT, MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE. Each
-Recipient is solely responsible for determining the appropriateness of using
-and distributing the Program and assumes all risks associated with its exercise
-of rights under this Agreement, including but not limited to the risks and
-costs of program errors, compliance with applicable laws, damage to or loss of
-data, programs or equipment, and unavailability or interruption of operations.
-
-6. DISCLAIMER OF LIABILITY
-
-EXCEPT AS EXPRESSLY SET FORTH IN THIS AGREEMENT, NEITHER RECIPIENT NOR ANY
-CONTRIBUTORS SHALL HAVE ANY LIABILITY FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING WITHOUT LIMITATION LOST
-PROFITS), HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
-STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY
-WAY OUT OF THE USE OR DISTRIBUTION OF THE PROGRAM OR THE EXERCISE OF ANY RIGHTS
-GRANTED HEREUNDER, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
-
-7. GENERAL
-
-If any provision of this Agreement is invalid or unenforceable under applicable
-law, it shall not affect the validity or enforceability of the remainder of the
-terms of this Agreement, and without further action by the parties hereto, such
-provision shall be reformed to the minimum extent necessary to make such
-provision valid and enforceable.
-
-If Recipient institutes patent litigation against a Contributor with respect to
-a patent applicable to software (including a cross-claim or counterclaim in a
-lawsuit), then any patent licenses granted by that Contributor to such
-Recipient under this Agreement shall terminate as of the date such litigation
-is filed. In addition, if Recipient institutes patent litigation against any
-entity (including a cross-claim or counterclaim in a lawsuit) alleging that the
-Program itself (excluding combinations of the Program with other software or
-hardware) infringes such Recipient's patent(s), then such Recipient's rights
-granted under Section 2(b) shall terminate as of the date such litigation is
-filed.
-
-All Recipient's rights under this Agreement shall terminate if it fails to
-comply with any of the material terms or conditions of this Agreement and does
-not cure such failure in a reasonable period of time after becoming aware of
-such noncompliance. If all Recipient's rights under this Agreement terminate,
-Recipient agrees to cease use and distribution of the Program as soon as
-reasonably practicable. However, Recipient's obligations under this Agreement
-and any licenses granted by Recipient relating to the Program shall continue
-and survive.
-
-Everyone is permitted to copy and distribute copies of this Agreement, but in
-order to avoid inconsistency the Agreement is copyrighted and may only be
-modified in the following manner. The Agreement Steward reserves the right to
-publish new versions (including revisions) of this Agreement from time to time.
-No one other than the Agreement Steward has the right to modify this Agreement.
-IBM is the initial Agreement Steward. IBM may assign the responsibility to
-serve as the Agreement Steward to a suitable separate entity. Each new version
-of the Agreement will be given a distinguishing version number. The Program
-(including Contributions) may always be distributed subject to the version of
-the Agreement under which it was received. In addition, after a new version of
-the Agreement is published, Contributor may elect to distribute the Program
-(including its Contributions) under the new version. Except as expressly stated
-in Sections 2(a) and 2(b) above, Recipient receives no rights or licenses to
-the intellectual property of any Contributor under this Agreement, whether
-expressly, by implication, estoppel or otherwise. All rights in the Program not
-expressly granted under this Agreement are reserved.
-
-This Agreement is governed by the laws of the State of New York and the
-intellectual property laws of the United States of America. No party to this
-Agreement will bring a legal action under this Agreement more than one year
-after the cause of action arose. Each party waives its rights to a jury trial
-in any resulting litigation.
-

Copied: tags/junit4/4.10-1/debian/copyright (from rev 15830, trunk/junit4/debian/copyright)
===================================================================
--- tags/junit4/4.10-1/debian/copyright	                        (rev 0)
+++ tags/junit4/4.10-1/debian/copyright	2012-03-07 22:36:31 UTC (rev 15831)
@@ -0,0 +1,230 @@
+This is Debian's junit4 package, initially packaged by Florian Weimer
+<fw at deneb.enyo.de> on 2007-04-24.
+
+The sources JAR has been downloaded from http://prdownloads.sourceforge.net/junit/
+
+Copyright 2001-2009 Kent Beck <kent at threeriversinstitute.org>
+Copyright 2000-2009 Erich Gamma <erich_gamma at acm.org>
+Copyright 2006-2009 David Saff <david at saff.net>
+
+JUnit 4 is covered by the IBM Common Public License, as reproduced
+below.
+
+                         Common Public License - v 1.0
+
+THE ACCOMPANYING PROGRAM IS PROVIDED UNDER THE TERMS OF THIS COMMON PUBLIC
+LICENSE ("AGREEMENT"). ANY USE, REPRODUCTION OR DISTRIBUTION OF THE PROGRAM
+CONSTITUTES RECIPIENT'S ACCEPTANCE OF THIS AGREEMENT.
+
+1. DEFINITIONS
+
+"Contribution" means:
+
+    a) in the case of the initial Contributor, the initial code and
+    documentation distributed under this Agreement, and
+    b) in the case of each subsequent Contributor:
+
+    i) changes to the Program, and
+
+    ii) additions to the Program;
+
+    where such changes and/or additions to the Program originate from and are
+    distributed by that particular Contributor. A Contribution 'originates'
+    from a Contributor if it was added to the Program by such Contributor
+    itself or anyone acting on such Contributor's behalf. Contributions do not
+    include additions to the Program which: (i) are separate modules of
+    software distributed in conjunction with the Program under their own
+    license agreement, and (ii) are not derivative works of the Program.
+
+"Contributor" means any person or entity that distributes the Program.
+
+"Licensed Patents " mean patent claims licensable by a Contributor which are
+necessarily infringed by the use or sale of its Contribution alone or when
+combined with the Program.
+
+"Program" means the Contributions distributed in accordance with this
+Agreement.
+
+"Recipient" means anyone who receives the Program under this Agreement,
+including all Contributors.
+
+2. GRANT OF RIGHTS
+
+    a) Subject to the terms of this Agreement, each Contributor hereby grants
+    Recipient a non-exclusive, worldwide, royalty-free copyright license to
+    reproduce, prepare derivative works of, publicly display, publicly perform,
+    distribute and sublicense the Contribution of such Contributor, if any, and
+    such derivative works, in source code and object code form.
+
+    b) Subject to the terms of this Agreement, each Contributor hereby grants
+    Recipient a non-exclusive, worldwide, royalty-free patent license under
+    Licensed Patents to make, use, sell, offer to sell, import and otherwise
+    transfer the Contribution of such Contributor, if any, in source code and
+    object code form. This patent license shall apply to the combination of the
+    Contribution and the Program if, at the time the Contribution is added by
+    the Contributor, such addition of the Contribution causes such combination
+    to be covered by the Licensed Patents. The patent license shall not apply
+    to any other combinations which include the Contribution. No hardware per
+    se is licensed hereunder.
+
+    c) Recipient understands that although each Contributor grants the licenses
+    to its Contributions set forth herein, no assurances are provided by any
+    Contributor that the Program does not infringe the patent or other
+    intellectual property rights of any other entity. Each Contributor
+    disclaims any liability to Recipient for claims brought by any other entity
+    based on infringement of intellectual property rights or otherwise. As a
+    condition to exercising the rights and licenses granted hereunder, each
+    Recipient hereby assumes sole responsibility to secure any other
+    intellectual property rights needed, if any. For example, if a third party
+    patent license is required to allow Recipient to distribute the Program, it
+    is Recipient's responsibility to acquire that license before distributing
+    the Program.
+
+    d) Each Contributor represents that to its knowledge it has sufficient
+    copyright rights in its Contribution, if any, to grant the copyright
+    license set forth in this Agreement.
+
+3. REQUIREMENTS
+
+A Contributor may choose to distribute the Program in object code form under
+its own license agreement, provided that:
+
+    a) it complies with the terms and conditions of this Agreement; and
+
+    b) its license agreement:
+
+    i) effectively disclaims on behalf of all Contributors all warranties and
+    conditions, express and implied, including warranties or conditions of
+    title and non-infringement, and implied warranties or conditions of
+    merchantability and fitness for a particular purpose;
+
+    ii) effectively excludes on behalf of all Contributors all liability for
+    damages, including direct, indirect, special, incidental and consequential
+    damages, such as lost profits;
+
+    iii) states that any provisions which differ from this Agreement are
+    offered by that Contributor alone and not by any other party; and
+
+    iv) states that source code for the Program is available from such
+    Contributor, and informs licensees how to obtain it in a reasonable manner
+    on or through a medium customarily used for software exchange.
+
+When the Program is made available in source code form:
+
+    a) it must be made available under this Agreement; and
+
+    b) a copy of this Agreement must be included with each copy of the Program.
+
+[S::S]
+
+[S::S]Contributors may not remove or alter any copyright notices contained
+within the Program.
+
+Each Contributor must identify itself as the originator of its Contribution, if
+any, in a manner that reasonably allows subsequent Recipients to identify the
+originator of the Contribution.
+
+4. COMMERCIAL DISTRIBUTION
+
+Commercial distributors of software may accept certain responsibilities with
+respect to end users, business partners and the like. While this license is
+intended to facilitate the commercial use of the Program, the Contributor who
+includes the Program in a commercial product offering should do so in a manner
+which does not create potential liability for other Contributors. Therefore, if
+a Contributor includes the Program in a commercial product offering, such
+Contributor ("Commercial Contributor") hereby agrees to defend and indemnify
+every other Contributor ("Indemnified Contributor") against any losses, damages
+and costs (collectively "Losses") arising from claims, lawsuits and other legal
+actions brought by a third party against the Indemnified Contributor to the
+extent caused by the acts or omissions of such Commercial Contributor in
+connection with its distribution of the Program in a commercial product
+offering. The obligations in this section do not apply to any claims or Losses
+relating to any actual or alleged intellectual property infringement. In order
+to qualify, an Indemnified Contributor must: a) promptly notify the Commercial
+Contributor in writing of such claim, and b) allow the Commercial Contributor
+to control, and cooperate with the Commercial Contributor in, the defense and
+any related settlement negotiations. The Indemnified Contributor may
+participate in any such claim at its own expense.
+
+For example, a Contributor might include the Program in a commercial product
+offering, Product X. That Contributor is then a Commercial Contributor. If that
+Commercial Contributor then makes performance claims, or offers warranties
+related to Product X, those performance claims and warranties are such
+Commercial Contributor's responsibility alone. Under this section, the
+Commercial Contributor would have to defend claims against the other
+Contributors related to those performance claims and warranties, and if a court
+requires any other Contributor to pay any damages as a result, the Commercial
+Contributor must pay those damages.
+
+5. NO WARRANTY
+
+EXCEPT AS EXPRESSLY SET FORTH IN THIS AGREEMENT, THE PROGRAM IS PROVIDED ON AN
+"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, EITHER EXPRESS OR
+IMPLIED INCLUDING, WITHOUT LIMITATION, ANY WARRANTIES OR CONDITIONS OF TITLE,
+NON-INFRINGEMENT, MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE. Each
+Recipient is solely responsible for determining the appropriateness of using
+and distributing the Program and assumes all risks associated with its exercise
+of rights under this Agreement, including but not limited to the risks and
+costs of program errors, compliance with applicable laws, damage to or loss of
+data, programs or equipment, and unavailability or interruption of operations.
+
+6. DISCLAIMER OF LIABILITY
+
+EXCEPT AS EXPRESSLY SET FORTH IN THIS AGREEMENT, NEITHER RECIPIENT NOR ANY
+CONTRIBUTORS SHALL HAVE ANY LIABILITY FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING WITHOUT LIMITATION LOST
+PROFITS), HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
+STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY
+WAY OUT OF THE USE OR DISTRIBUTION OF THE PROGRAM OR THE EXERCISE OF ANY RIGHTS
+GRANTED HEREUNDER, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
+
+7. GENERAL
+
+If any provision of this Agreement is invalid or unenforceable under applicable
+law, it shall not affect the validity or enforceability of the remainder of the
+terms of this Agreement, and without further action by the parties hereto, such
+provision shall be reformed to the minimum extent necessary to make such
+provision valid and enforceable.
+
+If Recipient institutes patent litigation against a Contributor with respect to
+a patent applicable to software (including a cross-claim or counterclaim in a
+lawsuit), then any patent licenses granted by that Contributor to such
+Recipient under this Agreement shall terminate as of the date such litigation
+is filed. In addition, if Recipient institutes patent litigation against any
+entity (including a cross-claim or counterclaim in a lawsuit) alleging that the
+Program itself (excluding combinations of the Program with other software or
+hardware) infringes such Recipient's patent(s), then such Recipient's rights
+granted under Section 2(b) shall terminate as of the date such litigation is
+filed.
+
+All Recipient's rights under this Agreement shall terminate if it fails to
+comply with any of the material terms or conditions of this Agreement and does
+not cure such failure in a reasonable period of time after becoming aware of
+such noncompliance. If all Recipient's rights under this Agreement terminate,
+Recipient agrees to cease use and distribution of the Program as soon as
+reasonably practicable. However, Recipient's obligations under this Agreement
+and any licenses granted by Recipient relating to the Program shall continue
+and survive.
+
+Everyone is permitted to copy and distribute copies of this Agreement, but in
+order to avoid inconsistency the Agreement is copyrighted and may only be
+modified in the following manner. The Agreement Steward reserves the right to
+publish new versions (including revisions) of this Agreement from time to time.
+No one other than the Agreement Steward has the right to modify this Agreement.
+IBM is the initial Agreement Steward. IBM may assign the responsibility to
+serve as the Agreement Steward to a suitable separate entity. Each new version
+of the Agreement will be given a distinguishing version number. The Program
+(including Contributions) may always be distributed subject to the version of
+the Agreement under which it was received. In addition, after a new version of
+the Agreement is published, Contributor may elect to distribute the Program
+(including its Contributions) under the new version. Except as expressly stated
+in Sections 2(a) and 2(b) above, Recipient receives no rights or licenses to
+the intellectual property of any Contributor under this Agreement, whether
+expressly, by implication, estoppel or otherwise. All rights in the Program not
+expressly granted under this Agreement are reserved.
+
+This Agreement is governed by the laws of the State of New York and the
+intellectual property laws of the United States of America. No party to this
+Agreement will bring a legal action under this Agreement more than one year
+after the cause of action arose. Each party waives its rights to a jury trial
+in any resulting litigation.

Deleted: tags/junit4/4.10-1/debian/junit4-doc.install
===================================================================
--- trunk/junit4/debian/junit4-doc.install	2012-03-02 05:35:10 UTC (rev 15806)
+++ tags/junit4/4.10-1/debian/junit4-doc.install	2012-03-07 22:36:31 UTC (rev 15831)
@@ -1 +0,0 @@
-build/docs/api /usr/share/doc/junit4/

Deleted: tags/junit4/4.10-1/debian/junit4.poms
===================================================================
--- trunk/junit4/debian/junit4.poms	2012-03-02 05:35:10 UTC (rev 15806)
+++ tags/junit4/4.10-1/debian/junit4.poms	2012-03-07 22:36:31 UTC (rev 15831)
@@ -1 +0,0 @@
-pom.xml --no-parent

Copied: tags/junit4/4.10-1/debian/junit4.poms (from rev 15830, trunk/junit4/debian/junit4.poms)
===================================================================
--- tags/junit4/4.10-1/debian/junit4.poms	                        (rev 0)
+++ tags/junit4/4.10-1/debian/junit4.poms	2012-03-07 22:36:31 UTC (rev 15831)
@@ -0,0 +1 @@
+debian/pom.xml --no-parent

Deleted: tags/junit4/4.10-1/debian/rules
===================================================================
--- trunk/junit4/debian/rules	2012-03-02 05:35:10 UTC (rev 15806)
+++ tags/junit4/4.10-1/debian/rules	2012-03-07 22:36:31 UTC (rev 15831)
@@ -1,35 +0,0 @@
-#!/usr/bin/make -f
-
-include /usr/share/cdbs/1/class/ant.mk
-include /usr/share/cdbs/1/rules/debhelper.mk
-
-PACKAGE              := $(DEB_SOURCE_PACKAGE)
-VERSION              := $(DEB_UPSTREAM_VERSION)
-JAVA_HOME	     := /usr/lib/jvm/default-java
-DEB_ANT_BUILDFILE    := /usr/share/maven-ant-helper/maven-build.xml
-DEB_ANT_BUILD_TARGET := package
-DEB_JARS	     := ant-nodeps hamcrest-core ant-junit junit
-DEB_ANT_ARGS         := -Dbasedir=$(realpath .) -Dpackage=$(PACKAGE) \
-  -Dversion=$(VERSION) -DbuildVersion=$(BUILD_VERSION) -Dbin.package=$(PACKAGE)
-API_DOCS             := build/docs/api
-
-common-build-arch common-build-indep:: build-javadoc
-build-javadoc: DEB_ANT_BUILDFILE := debian/build.xml
-build-javadoc:
-	$(DEB_ANT_INVOKE) javadoc
-
-binary-post-install/junit4::
-	mh_installpoms -pjunit4
-	mh_installjar -pjunit4 -njunit4 -l pom.xml build/junit-$(VERSION).jar 
-
-clean::
-	-rm -rf debian/tmp
-
-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
-

Copied: tags/junit4/4.10-1/debian/rules (from rev 15830, trunk/junit4/debian/rules)
===================================================================
--- tags/junit4/4.10-1/debian/rules	                        (rev 0)
+++ tags/junit4/4.10-1/debian/rules	2012-03-07 22:36:31 UTC (rev 15831)
@@ -0,0 +1,31 @@
+#!/usr/bin/make -f
+
+include /usr/share/cdbs/1/class/ant.mk
+include /usr/share/cdbs/1/rules/debhelper.mk
+
+PACKAGE              := $(DEB_SOURCE_PACKAGE)
+VERSION              := $(DEB_UPSTREAM_VERSION)
+JAVA_HOME	     := /usr/lib/jvm/default-java
+DEB_ANT_BUILD_TARGET := dist
+DEB_JARS	     := ant-nodeps hamcrest-core
+
+binary-post-install/junit4::
+	sed "s/@artifactId@/junit/;s/@version@/$(VERSION)/" build/maven/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 junit$(VERSION)/javadoc/* /usr/share/doc/junit4/api/
+
+clean::
+	-rm debian/pom.xml
+	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
+

Deleted: tags/junit4/4.10-1/debian/watch
===================================================================
--- trunk/junit4/debian/watch	2012-03-02 05:35:10 UTC (rev 15806)
+++ tags/junit4/4.10-1/debian/watch	2012-03-07 22:36:31 UTC (rev 15831)
@@ -1,3 +0,0 @@
-version=3
-http://github.com/KentBeck/junit/downloads/ /KentBeck/junit/tarball/r([\d\.]*) debian debian/orig-tar.sh
-

Copied: tags/junit4/4.10-1/debian/watch (from rev 15830, trunk/junit4/debian/watch)
===================================================================
--- tags/junit4/4.10-1/debian/watch	                        (rev 0)
+++ tags/junit4/4.10-1/debian/watch	2012-03-07 22:36:31 UTC (rev 15831)
@@ -0,0 +1,3 @@
+version=3
+http://github.com/KentBeck/junit/tags/ /KentBeck/junit/tarball/r([\d\.]*) debian debian/orig-tar.sh
+




More information about the pkg-java-commits mailing list