[pkg-java] r17607 - in tags/libhamcrest-java: . 1.3-4/debian 1.3-4/debian/patches
Emmanuel Bourg
ebourg-guest at moszumanska.debian.org
Mon Dec 23 23:48:56 UTC 2013
Author: ebourg-guest
Date: 2013-12-23 23:48:55 +0000 (Mon, 23 Dec 2013)
New Revision: 17607
Added:
tags/libhamcrest-java/1.3-4/
tags/libhamcrest-java/1.3-4/debian/ant.properties
tags/libhamcrest-java/1.3-4/debian/changelog
tags/libhamcrest-java/1.3-4/debian/compat
tags/libhamcrest-java/1.3-4/debian/control
tags/libhamcrest-java/1.3-4/debian/patches/001-build.patch
tags/libhamcrest-java/1.3-4/debian/rules
Removed:
tags/libhamcrest-java/1.3-4/debian/ant.properties
tags/libhamcrest-java/1.3-4/debian/changelog
tags/libhamcrest-java/1.3-4/debian/compat
tags/libhamcrest-java/1.3-4/debian/control
tags/libhamcrest-java/1.3-4/debian/patches/001-build.patch
tags/libhamcrest-java/1.3-4/debian/rules
Log:
[svn-buildpackage] Tagging libhamcrest-java 1.3-4
Deleted: tags/libhamcrest-java/1.3-4/debian/ant.properties
===================================================================
--- trunk/libhamcrest-java/debian/ant.properties 2013-10-16 07:00:29 UTC (rev 17332)
+++ tags/libhamcrest-java/1.3-4/debian/ant.properties 2013-12-23 23:48:55 UTC (rev 17607)
@@ -1,17 +0,0 @@
-project.name=libhamcrest-java
-class.dir=classes
-source.dir=src/main/java
-
-hamcrest-core.dir=hamcrest-core
-hamcrest-integration.dir=hamcrest-integration
-hamcrest-generator.dir=hamcrest-generator
-hamcrest-library.dir=hamcrest-library
-hamcrest-text.dir=hamcrest-text
-
-hamcrest-core.jar=hamcrest-core.jar
-hamcrest-integration.jar=hamcrest-integration.jar
-hamcrest-generator.jar=hamcrest-generator.jar
-hamcrest-library.jar=hamcrest-library.jar
-hamcrest-text.jar=hamcrest-text.jar
-
-qdox.jar=/usr/share/java/qdox.jar
Copied: tags/libhamcrest-java/1.3-4/debian/ant.properties (from rev 17334, trunk/libhamcrest-java/debian/ant.properties)
===================================================================
--- tags/libhamcrest-java/1.3-4/debian/ant.properties (rev 0)
+++ tags/libhamcrest-java/1.3-4/debian/ant.properties 2013-12-23 23:48:55 UTC (rev 17607)
@@ -0,0 +1,19 @@
+project.name=libhamcrest-java
+class.dir=classes
+source.dir=src/main/java
+
+haltonfailure=false
+
+hamcrest-core.dir=hamcrest-core
+hamcrest-integration.dir=hamcrest-integration
+hamcrest-generator.dir=hamcrest-generator
+hamcrest-library.dir=hamcrest-library
+hamcrest-text.dir=hamcrest-text
+
+hamcrest-core.jar=hamcrest-core.jar
+hamcrest-integration.jar=hamcrest-integration.jar
+hamcrest-generator.jar=hamcrest-generator.jar
+hamcrest-library.jar=hamcrest-library.jar
+hamcrest-text.jar=hamcrest-text.jar
+
+qdox.jar=/usr/share/java/qdox.jar
Deleted: tags/libhamcrest-java/1.3-4/debian/changelog
===================================================================
--- trunk/libhamcrest-java/debian/changelog 2013-10-16 07:00:29 UTC (rev 17332)
+++ tags/libhamcrest-java/1.3-4/debian/changelog 2013-12-23 23:48:55 UTC (rev 17607)
@@ -1,126 +0,0 @@
-libhamcrest-java (1.3-2) unstable; urgency=low
-
- * Team upload.
- * Upload to unstable.
-
- -- tony mancill <tmancill at debian.org> Wed, 22 May 2013 22:14:58 -0700
-
-libhamcrest-java (1.3-1) experimental; urgency=low
-
- * Team upload.
- * New upstream release
- * Refreshed the patch
- * The poms from the original source are used instead of those in debian/poms
- * Added the hamcrest-all.jar to the jars deployed in /usr/share/java
- * Removed the manifest for the hamcrest-text.jar (no longer used since 1.1)
- * Updated the OSGi metadata
- * debian/control: Updated the homepage
- * debian/control: Removed the deprecated DMUA flag
- * debian/control: Bumped Standards-Version to 3.9.4 (no changes)
- * debian/watch: Fixed the version pattern to exclude the PHP versions
- * debian/copyright: Updated the format URI to the 1.0 version
-
- -- Emmanuel Bourg <ebourg at apache.org> Wed, 10 Apr 2013 14:46:32 +0200
-
-libhamcrest-java (1.2-2) unstable; urgency=low
-
- [ by sponsor Steffen Moeller ]
- * Transition from eperimental (two months with no complaint) to unstable
- (Closes: #548144).
- * Removed Michael Koch from uploaders (Closes: #654068)
-
- -- Brian Thomason <brian.thomason at gmail.com> Sat, 04 Feb 2012 14:36:14 +0100
-
-libhamcrest-java (1.2-1) experimental; urgency=low
-
- * New upstream release
- * Bumped Standards-Version to 3.9.2 (no changes)
- [ by sponsor Steffen Moeller ]
- * Added Brian to uploaders.
- * Added DMUA flag.
- * Added test on existance of file prior to jar generation.
-
- -- Brian Thomason <brian.thomason at gmail.com> Fri, 02 Dec 2011 17:55:55 +0000
-
-libhamcrest-java (1.1-8) unstable; urgency=low
-
- * Team upload.
- * Re-added OSGi-metadata to the jar files.
- * Removed depends on JRE; which is no longer needed per the Java Policy.
- * Removed some B-D-I that appeared twice.
- * Added missing description to a patch.
- * Fixed clean target - it forgot to remvoe some maven-helper files.
-
- -- Niels Thykier <niels at thykier.net> Sun, 27 Jun 2010 17:29:24 +0200
-
-libhamcrest-java (1.1-7) unstable; urgency=low
-
- * Update watch file
- * Use upstream build.xml with necessary patches for the build,
- delete debian/build.xml
- * Add Build-Depends on libjarjar-java, default-jdk-doc, junit-doc
- junit4-doc, junit, junit4, libeasymock-java, libjmock-java, testng
- * Add documentation package containing the javadoc for the package
-
- -- Ludovic Claude <ludovic.claude at laposte.net> Fri, 28 May 2010 23:34:45 +0200
-
-libhamcrest-java (1.1-6) unstable; urgency=low
-
- [ Gabriele Giacone ]
- * Added Maven support.
- - added poms taken from upstream svn trunk
- - added d/copyright section for debian/poms
- - added maven-repo-helper to Build-Depends
-
- [ Damien Raude-Morvan ]
- * Upload to unstable
-
- -- Damien Raude-Morvan <drazzib at debian.org> Fri, 19 Mar 2010 22:42:34 +0100
-
-libhamcrest-java (1.1-5) unstable; urgency=low
-
- [ Gabriele Giacone ]
- * Added generation of one class with all static imports (Matchers.class).
- * Standards-Version to 3.8.4.
- * Source format 3.0 (quilt).
- * d/copyright converted to DEP-5 format.
- * Repackaging info moved from d/copyright to d/README.source
-
- [ Damien Raude-Morvan ]
- * Upload to unstable
-
- -- Damien Raude-Morvan <drazzib at debian.org> Sun, 14 Mar 2010 22:18:34 +0100
-
-libhamcrest-java (1.1-4) unstable; urgency=low
-
- [ Thierry Carrez ]
- * Set minimal dependency to java5-runtime-headless since we build Java5 code
-
- [ Damien Raude-Morvan ]
- * Add myself to Uploaders
- * Add debian/manifest/*.mf for OSGi metadata (Closes: #558185)
-
- -- Damien Raude-Morvan <drazzib at debian.org> Sun, 29 Nov 2009 01:07:12 +0100
-
-libhamcrest-java (1.1-3) unstable; urgency=low
-
- * (Build-)Depends on default-jdk.
- * Build-Depends on debhelper >= 7.
- * Put package into section 'java'.
- * Added Depends ${misc:Depends}.
- * Added myself to Uploaders.
- * Updated Standards-Version to 3.8.3.
-
- -- Michael Koch <konqueror at gmx.de> Thu, 24 Sep 2009 08:04:44 +0200
-
-libhamcrest-java (1.1-2) unstable; urgency=low
-
- * Fix java bytecode / java runtime version mismatch (Closes: #503799)
-
- -- Varun Hiremath <varun at debian.org> Sat, 01 Nov 2008 03:21:49 -0400
-
-libhamcrest-java (1.1-1) unstable; urgency=low
-
- * Initial release (Closes: #470523)
-
- -- Varun Hiremath <varun at debian.org> Tue, 15 Jul 2008 22:24:09 +0530
Copied: tags/libhamcrest-java/1.3-4/debian/changelog (from rev 17606, trunk/libhamcrest-java/debian/changelog)
===================================================================
--- tags/libhamcrest-java/1.3-4/debian/changelog (rev 0)
+++ tags/libhamcrest-java/1.3-4/debian/changelog 2013-12-23 23:48:55 UTC (rev 17607)
@@ -0,0 +1,141 @@
+libhamcrest-java (1.3-4) unstable; urgency=medium
+
+ * Removed the unused build dependency on testng
+ * Standards-Version updated to 3.9.5 (no changes)
+ * Switch to debhelper level 9
+
+ -- Emmanuel Bourg <ebourg at apache.org> Tue, 24 Dec 2013 00:06:49 +0100
+
+libhamcrest-java (1.3-3) unstable; urgency=low
+
+ * Install hamcrest-unit-test.jar in /usr/share/java (Closes: #724950)
+ * Use canonical URLs for the Vcs-* fields
+
+ -- Emmanuel Bourg <ebourg at apache.org> Wed, 16 Oct 2013 13:05:07 +0200
+
+libhamcrest-java (1.3-2) unstable; urgency=low
+
+ * Team upload.
+ * Upload to unstable.
+
+ -- tony mancill <tmancill at debian.org> Wed, 22 May 2013 22:14:58 -0700
+
+libhamcrest-java (1.3-1) experimental; urgency=low
+
+ * Team upload.
+ * New upstream release
+ * Refreshed the patch
+ * The poms from the original source are used instead of those in debian/poms
+ * Added the hamcrest-all.jar to the jars deployed in /usr/share/java
+ * Removed the manifest for the hamcrest-text.jar (no longer used since 1.1)
+ * Updated the OSGi metadata
+ * debian/control: Updated the homepage
+ * debian/control: Removed the deprecated DMUA flag
+ * debian/control: Bumped Standards-Version to 3.9.4 (no changes)
+ * debian/watch: Fixed the version pattern to exclude the PHP versions
+ * debian/copyright: Updated the format URI to the 1.0 version
+
+ -- Emmanuel Bourg <ebourg at apache.org> Wed, 10 Apr 2013 14:46:32 +0200
+
+libhamcrest-java (1.2-2) unstable; urgency=low
+
+ [ by sponsor Steffen Moeller ]
+ * Transition from eperimental (two months with no complaint) to unstable
+ (Closes: #548144).
+ * Removed Michael Koch from uploaders (Closes: #654068)
+
+ -- Brian Thomason <brian.thomason at gmail.com> Sat, 04 Feb 2012 14:36:14 +0100
+
+libhamcrest-java (1.2-1) experimental; urgency=low
+
+ * New upstream release
+ * Bumped Standards-Version to 3.9.2 (no changes)
+ [ by sponsor Steffen Moeller ]
+ * Added Brian to uploaders.
+ * Added DMUA flag.
+ * Added test on existance of file prior to jar generation.
+
+ -- Brian Thomason <brian.thomason at gmail.com> Fri, 02 Dec 2011 17:55:55 +0000
+
+libhamcrest-java (1.1-8) unstable; urgency=low
+
+ * Team upload.
+ * Re-added OSGi-metadata to the jar files.
+ * Removed depends on JRE; which is no longer needed per the Java Policy.
+ * Removed some B-D-I that appeared twice.
+ * Added missing description to a patch.
+ * Fixed clean target - it forgot to remvoe some maven-helper files.
+
+ -- Niels Thykier <niels at thykier.net> Sun, 27 Jun 2010 17:29:24 +0200
+
+libhamcrest-java (1.1-7) unstable; urgency=low
+
+ * Update watch file
+ * Use upstream build.xml with necessary patches for the build,
+ delete debian/build.xml
+ * Add Build-Depends on libjarjar-java, default-jdk-doc, junit-doc
+ junit4-doc, junit, junit4, libeasymock-java, libjmock-java, testng
+ * Add documentation package containing the javadoc for the package
+
+ -- Ludovic Claude <ludovic.claude at laposte.net> Fri, 28 May 2010 23:34:45 +0200
+
+libhamcrest-java (1.1-6) unstable; urgency=low
+
+ [ Gabriele Giacone ]
+ * Added Maven support.
+ - added poms taken from upstream svn trunk
+ - added d/copyright section for debian/poms
+ - added maven-repo-helper to Build-Depends
+
+ [ Damien Raude-Morvan ]
+ * Upload to unstable
+
+ -- Damien Raude-Morvan <drazzib at debian.org> Fri, 19 Mar 2010 22:42:34 +0100
+
+libhamcrest-java (1.1-5) unstable; urgency=low
+
+ [ Gabriele Giacone ]
+ * Added generation of one class with all static imports (Matchers.class).
+ * Standards-Version to 3.8.4.
+ * Source format 3.0 (quilt).
+ * d/copyright converted to DEP-5 format.
+ * Repackaging info moved from d/copyright to d/README.source
+
+ [ Damien Raude-Morvan ]
+ * Upload to unstable
+
+ -- Damien Raude-Morvan <drazzib at debian.org> Sun, 14 Mar 2010 22:18:34 +0100
+
+libhamcrest-java (1.1-4) unstable; urgency=low
+
+ [ Thierry Carrez ]
+ * Set minimal dependency to java5-runtime-headless since we build Java5 code
+
+ [ Damien Raude-Morvan ]
+ * Add myself to Uploaders
+ * Add debian/manifest/*.mf for OSGi metadata (Closes: #558185)
+
+ -- Damien Raude-Morvan <drazzib at debian.org> Sun, 29 Nov 2009 01:07:12 +0100
+
+libhamcrest-java (1.1-3) unstable; urgency=low
+
+ * (Build-)Depends on default-jdk.
+ * Build-Depends on debhelper >= 7.
+ * Put package into section 'java'.
+ * Added Depends ${misc:Depends}.
+ * Added myself to Uploaders.
+ * Updated Standards-Version to 3.8.3.
+
+ -- Michael Koch <konqueror at gmx.de> Thu, 24 Sep 2009 08:04:44 +0200
+
+libhamcrest-java (1.1-2) unstable; urgency=low
+
+ * Fix java bytecode / java runtime version mismatch (Closes: #503799)
+
+ -- Varun Hiremath <varun at debian.org> Sat, 01 Nov 2008 03:21:49 -0400
+
+libhamcrest-java (1.1-1) unstable; urgency=low
+
+ * Initial release (Closes: #470523)
+
+ -- Varun Hiremath <varun at debian.org> Tue, 15 Jul 2008 22:24:09 +0530
Deleted: tags/libhamcrest-java/1.3-4/debian/compat
===================================================================
--- trunk/libhamcrest-java/debian/compat 2013-10-16 07:00:29 UTC (rev 17332)
+++ tags/libhamcrest-java/1.3-4/debian/compat 2013-12-23 23:48:55 UTC (rev 17607)
@@ -1 +0,0 @@
-7
Copied: tags/libhamcrest-java/1.3-4/debian/compat (from rev 17605, trunk/libhamcrest-java/debian/compat)
===================================================================
--- tags/libhamcrest-java/1.3-4/debian/compat (rev 0)
+++ tags/libhamcrest-java/1.3-4/debian/compat 2013-12-23 23:48:55 UTC (rev 17607)
@@ -0,0 +1 @@
+9
Deleted: tags/libhamcrest-java/1.3-4/debian/control
===================================================================
--- trunk/libhamcrest-java/debian/control 2013-10-16 07:00:29 UTC (rev 17332)
+++ tags/libhamcrest-java/1.3-4/debian/control 2013-12-23 23:48:55 UTC (rev 17607)
@@ -1,39 +0,0 @@
-Source: libhamcrest-java
-Section: java
-Priority: optional
-Maintainer: Debian Java Maintainers <pkg-java-maintainers at lists.alioth.debian.org>
-Uploaders: Varun Hiremath <varun at debian.org>,
- Damien Raude-Morvan <drazzib at debian.org>,
- Brian Thomason <brian.thomason at gmail.com>,
- Emmanuel Bourg <ebourg at apache.org>
-Build-Depends: cdbs, debhelper (>= 7), ant, default-jdk, maven-repo-helper
-Build-Depends-Indep: libqdox-java, libeasymock-java, libjmock-java, libjarjar-java,
- default-jdk-doc, junit-doc, junit4-doc, junit, junit4, testng
-Standards-Version: 3.9.4
-Homepage: http://hamcrest.org
-Vcs-Svn: svn://svn.debian.org/svn/pkg-java/trunk/libhamcrest-java
-Vcs-Browser: http://svn.debian.org/wsvn/pkg-java/trunk/libhamcrest-java
-
-Package: libhamcrest-java
-Architecture: all
-Depends: ${misc:Depends}
-Description: library of matchers for building test expressions
- Provides a library of matcher objects (also known as constraints or
- predicates) allowing 'match' rules to be defined declaratively, to be
- used in other frameworks. Typical scenarios include testing
- frameworks, mocking libraries and UI validation rules.
-
-Package: libhamcrest-java-doc
-Architecture: all
-Section: doc
-Depends: ${misc:Depends}
-Recommends: default-jdk-doc, junit-doc, junit4-doc
-Suggests: libhamcrest-java
-Description: library of matchers for building test expressions - documentation
- Provides a library of matcher objects (also known as constraints or
- predicates) allowing 'match' rules to be defined declaratively, to be
- used in other frameworks. Typical scenarios include testing
- frameworks, mocking libraries and UI validation rules.
- .
- This package contains Javadoc API documentation of Hamcrest.
-
Copied: tags/libhamcrest-java/1.3-4/debian/control (from rev 17606, trunk/libhamcrest-java/debian/control)
===================================================================
--- tags/libhamcrest-java/1.3-4/debian/control (rev 0)
+++ tags/libhamcrest-java/1.3-4/debian/control 2013-12-23 23:48:55 UTC (rev 17607)
@@ -0,0 +1,39 @@
+Source: libhamcrest-java
+Section: java
+Priority: optional
+Maintainer: Debian Java Maintainers <pkg-java-maintainers at lists.alioth.debian.org>
+Uploaders: Varun Hiremath <varun at debian.org>,
+ Damien Raude-Morvan <drazzib at debian.org>,
+ Brian Thomason <brian.thomason at gmail.com>,
+ Emmanuel Bourg <ebourg at apache.org>
+Build-Depends: cdbs, debhelper (>= 9), ant, ant-optional, default-jdk, maven-repo-helper
+Build-Depends-Indep: libqdox-java, libeasymock-java, libjmock-java, libjarjar-java,
+ default-jdk-doc, junit-doc, junit4-doc, junit, junit4
+Standards-Version: 3.9.5
+Vcs-Svn: svn://anonscm.debian.org/pkg-java/trunk/libhamcrest-java
+Vcs-Browser: http://anonscm.debian.org/viewvc/pkg-java/trunk/libhamcrest-java
+Homepage: http://hamcrest.org
+
+Package: libhamcrest-java
+Architecture: all
+Depends: ${misc:Depends}
+Description: library of matchers for building test expressions
+ Provides a library of matcher objects (also known as constraints or
+ predicates) allowing 'match' rules to be defined declaratively, to be
+ used in other frameworks. Typical scenarios include testing
+ frameworks, mocking libraries and UI validation rules.
+
+Package: libhamcrest-java-doc
+Architecture: all
+Section: doc
+Depends: ${misc:Depends}
+Recommends: default-jdk-doc, junit-doc, junit4-doc
+Suggests: libhamcrest-java
+Description: library of matchers for building test expressions - documentation
+ Provides a library of matcher objects (also known as constraints or
+ predicates) allowing 'match' rules to be defined declaratively, to be
+ used in other frameworks. Typical scenarios include testing
+ frameworks, mocking libraries and UI validation rules.
+ .
+ This package contains Javadoc API documentation of Hamcrest.
+
Deleted: tags/libhamcrest-java/1.3-4/debian/patches/001-build.patch
===================================================================
--- trunk/libhamcrest-java/debian/patches/001-build.patch 2013-10-16 07:00:29 UTC (rev 17332)
+++ tags/libhamcrest-java/1.3-4/debian/patches/001-build.patch 2013-12-23 23:48:55 UTC (rev 17607)
@@ -1,92 +0,0 @@
-Description: Fixes some classpaths and makes the javadoc link against system
- installed javadocs.
-Author: Ludovic Claude <ludovic.claude at laposte.net>
-Forwarded: not-needed
---- a/build.xml
-+++ b/build.xml
-@@ -14,13 +14,13 @@
- <target name="generator" description="Build code generator tool">
- <java-to-jar srcdir="hamcrest-generator/src/main/java"
- modulename="hamcrest-generator-nodeps"
-- classpath="lib/generator/qdox-1.12.jar"/>
-+ classpath="/usr/share/java/qdox.jar"/>
-
- <!-- Bundle QDox classes in hamcrest-generator.jar using JarJar to place classes under a different package -->
-- <taskdef name="jarjar" classname="com.tonicsystems.jarjar.JarJarTask" classpath="lib/generator/jarjar-1.3.jar"/>
-+ <taskdef name="jarjar" classname="com.tonicsystems.jarjar.JarJarTask" classpath="/usr/share/java/jarjar.jar"/>
- <jarjar jarfile="build/hamcrest-generator-${version}.jar">
- <zipfileset src="build/hamcrest-generator-nodeps-${version}.jar"/>
-- <zipfileset src="lib/generator/qdox-1.12.jar"/>
-+ <zipfileset src="/usr/share/java/qdox.jar"/>
- <rule pattern="com.thoughtworks.qdox.**" result="org.hamcrest.generator.qdox. at 1"/>
- </jarjar>
- <copy file="build/hamcrest-generator-nodeps-${version}-sources.jar" tofile="build/hamcrest-generator-${version}-sources.jar"/>
-@@ -93,14 +93,18 @@
- <junit printsummary="no" fork="no" haltonfailure="${haltonfailure}">
- <formatter type="brief" usefile="no"/>
- <classpath>
-- <fileset dir="lib/integration">
-- <include name="*.jar"/>
-- </fileset>
- <pathelement path="build/hamcrest-core-${version}.jar"/>
- <pathelement path="build/hamcrest-library-${version}.jar"/>
- <pathelement path="build/hamcrest-integration-${version}.jar"/>
- <pathelement path="build/hamcrest-generator-${version}.jar"/>
- <pathelement path="build/hamcrest-unit-test-${version}.jar"/>
-+ <fileset dir="/usr/share/java">
-+ <include name="junit.jar"/>
-+ <include name="junit4.jar"/>
-+ <include name="testng.jar"/>
-+ <include name="easymock.jar"/>
-+ <include name="jmock.jar"/>
-+ </fileset>
- </classpath>
- <batchtest>
- <fileset dir="hamcrest-unit-test/src/main/java">
-@@ -152,7 +156,7 @@
-
- <javadoc packagenames="org.hamcrest.*" defaultexcludes="yes"
- destdir="build/temp/hamcrest-all-${version}-javadoc.jar.contents" author="true" version="true" use="true"
-- windowtitle="Hamcrest" source="1.6" failonerror="yes" overview="overview.html">
-+ windowtitle="Hamcrest" source="1.6" failonerror="no" overview="overview.html">
- <classpath>
- <fileset dir="lib/integration">
- <include name="*.jar"/>
-@@ -166,8 +170,8 @@
- <group title="Matcher Library" packages="org.hamcrest.*"/>
- <group title="Integration" packages="org.hamcrest.integration, org.hamcrest.integration.*"/>
-
-- <link offline="false" href="http://www.junit.org/junit/javadoc/3.8.1/"/>
-- <link offline="false" href="http://kentbeck.github.com/junit/javadoc/latest/"/>
-+ <link offline="false" href="/usr/share/doc/junit-doc/javadoc/"/>
-+ <link offline="false" href="/usr/share/doc/junit4-doc/javadoc_40/"/>
- </javadoc>
- <jar jarfile="build/hamcrest-all-${version}-javadoc.jar">
- <fileset dir="build/temp/hamcrest-all-${version}-javadoc.jar.contents"/>
-@@ -286,10 +290,14 @@
- <mkdir dir="build/temp/@{modulename}-${version}.jar.contents"/>
- <javac srcdir="@{srcdir}" destdir="build/temp/@{modulename}-${version}.jar.contents" debug="${debug}" target="1.5" includeantruntime="false">
- <classpath>
-- <fileset dir="lib/integration">
-- <include name="*.jar"/>
-- </fileset>
- <pathelement path="@{classpath}"/>
-+ <fileset dir="/usr/share/java">
-+ <include name="junit.jar"/>
-+ <include name="junit4.jar"/>
-+ <include name="testng.jar"/>
-+ <include name="easymock.jar"/>
-+ <include name="jmock.jar"/>
-+ </fileset>
- </classpath>
- </javac>
- <copy file="LICENSE.txt" todir="build/temp/@{modulename}-${version}.jar.contents"/>
-@@ -317,7 +325,7 @@
- <fileset dir="lib/integration">
- <include name="*.jar"/>
- </fileset>
-- <fileset file="lib/generator/qdox-1.12.jar"/>
-+ <fileset file="/usr/share/java/qdox.jar"/>
- <fileset file="build/hamcrest-core-${version}.jar"/>
- <fileset file="build/hamcrest-library-${version}.jar"/>
- <fileset file="build/hamcrest-generator-${version}.jar"/>
Copied: tags/libhamcrest-java/1.3-4/debian/patches/001-build.patch (from rev 17606, trunk/libhamcrest-java/debian/patches/001-build.patch)
===================================================================
--- tags/libhamcrest-java/1.3-4/debian/patches/001-build.patch (rev 0)
+++ tags/libhamcrest-java/1.3-4/debian/patches/001-build.patch 2013-12-23 23:48:55 UTC (rev 17607)
@@ -0,0 +1,90 @@
+Description: Fixes some classpaths and makes the javadoc link against system
+ installed javadocs.
+Author: Ludovic Claude <ludovic.claude at laposte.net>
+Forwarded: not-needed
+--- a/build.xml
++++ b/build.xml
+@@ -14,13 +14,13 @@
+ <target name="generator" description="Build code generator tool">
+ <java-to-jar srcdir="hamcrest-generator/src/main/java"
+ modulename="hamcrest-generator-nodeps"
+- classpath="lib/generator/qdox-1.12.jar"/>
++ classpath="/usr/share/java/qdox.jar"/>
+
+ <!-- Bundle QDox classes in hamcrest-generator.jar using JarJar to place classes under a different package -->
+- <taskdef name="jarjar" classname="com.tonicsystems.jarjar.JarJarTask" classpath="lib/generator/jarjar-1.3.jar"/>
++ <taskdef name="jarjar" classname="com.tonicsystems.jarjar.JarJarTask" classpath="/usr/share/java/jarjar.jar"/>
+ <jarjar jarfile="build/hamcrest-generator-${version}.jar">
+ <zipfileset src="build/hamcrest-generator-nodeps-${version}.jar"/>
+- <zipfileset src="lib/generator/qdox-1.12.jar"/>
++ <zipfileset src="/usr/share/java/qdox.jar"/>
+ <rule pattern="com.thoughtworks.qdox.**" result="org.hamcrest.generator.qdox. at 1"/>
+ </jarjar>
+ <copy file="build/hamcrest-generator-nodeps-${version}-sources.jar" tofile="build/hamcrest-generator-${version}-sources.jar"/>
+@@ -93,14 +93,17 @@
+ <junit printsummary="no" fork="no" haltonfailure="${haltonfailure}">
+ <formatter type="brief" usefile="no"/>
+ <classpath>
+- <fileset dir="lib/integration">
+- <include name="*.jar"/>
+- </fileset>
+ <pathelement path="build/hamcrest-core-${version}.jar"/>
+ <pathelement path="build/hamcrest-library-${version}.jar"/>
+ <pathelement path="build/hamcrest-integration-${version}.jar"/>
+ <pathelement path="build/hamcrest-generator-${version}.jar"/>
+ <pathelement path="build/hamcrest-unit-test-${version}.jar"/>
++ <fileset dir="/usr/share/java">
++ <include name="junit.jar"/>
++ <include name="junit4.jar"/>
++ <include name="easymock.jar"/>
++ <include name="jmock.jar"/>
++ </fileset>
+ </classpath>
+ <batchtest>
+ <fileset dir="hamcrest-unit-test/src/main/java">
+@@ -152,7 +155,7 @@
+
+ <javadoc packagenames="org.hamcrest.*" defaultexcludes="yes"
+ destdir="build/temp/hamcrest-all-${version}-javadoc.jar.contents" author="true" version="true" use="true"
+- windowtitle="Hamcrest" source="1.6" failonerror="yes" overview="overview.html">
++ windowtitle="Hamcrest" source="1.6" failonerror="no" overview="overview.html">
+ <classpath>
+ <fileset dir="lib/integration">
+ <include name="*.jar"/>
+@@ -166,8 +169,8 @@
+ <group title="Matcher Library" packages="org.hamcrest.*"/>
+ <group title="Integration" packages="org.hamcrest.integration, org.hamcrest.integration.*"/>
+
+- <link offline="false" href="http://www.junit.org/junit/javadoc/3.8.1/"/>
+- <link offline="false" href="http://kentbeck.github.com/junit/javadoc/latest/"/>
++ <link offline="false" href="/usr/share/doc/junit-doc/javadoc/"/>
++ <link offline="false" href="/usr/share/doc/junit4-doc/javadoc_40/"/>
+ </javadoc>
+ <jar jarfile="build/hamcrest-all-${version}-javadoc.jar">
+ <fileset dir="build/temp/hamcrest-all-${version}-javadoc.jar.contents"/>
+@@ -286,10 +289,13 @@
+ <mkdir dir="build/temp/@{modulename}-${version}.jar.contents"/>
+ <javac srcdir="@{srcdir}" destdir="build/temp/@{modulename}-${version}.jar.contents" debug="${debug}" target="1.5" includeantruntime="false">
+ <classpath>
+- <fileset dir="lib/integration">
+- <include name="*.jar"/>
+- </fileset>
+ <pathelement path="@{classpath}"/>
++ <fileset dir="/usr/share/java">
++ <include name="junit.jar"/>
++ <include name="junit4.jar"/>
++ <include name="easymock.jar"/>
++ <include name="jmock.jar"/>
++ </fileset>
+ </classpath>
+ </javac>
+ <copy file="LICENSE.txt" todir="build/temp/@{modulename}-${version}.jar.contents"/>
+@@ -317,7 +323,7 @@
+ <fileset dir="lib/integration">
+ <include name="*.jar"/>
+ </fileset>
+- <fileset file="lib/generator/qdox-1.12.jar"/>
++ <fileset file="/usr/share/java/qdox.jar"/>
+ <fileset file="build/hamcrest-core-${version}.jar"/>
+ <fileset file="build/hamcrest-library-${version}.jar"/>
+ <fileset file="build/hamcrest-generator-${version}.jar"/>
Deleted: tags/libhamcrest-java/1.3-4/debian/rules
===================================================================
--- trunk/libhamcrest-java/debian/rules 2013-10-16 07:00:29 UTC (rev 17332)
+++ tags/libhamcrest-java/1.3-4/debian/rules 2013-12-23 23:48:55 UTC (rev 17607)
@@ -1,42 +0,0 @@
-#!/usr/bin/make -f
-
-include /usr/share/cdbs/1/class/ant.mk
-include /usr/share/cdbs/1/rules/debhelper.mk
-
-JAVA_HOME := /usr/lib/jvm/default-java
-DEB_ANT_BUILDFILE := build.xml
-DEB_ANT_BUILD_TARGET := bigjar javadoc
-DEB_JARS := easymock jmock qdox
-ANT_OPTS := -Dant.build.javac.source=1.5 -Dant.build.javac.target=1.5 -Dversion=$(DEB_UPSTREAM_VERSION)
-POMS := core generator integration library all
-
-DEST_DIR = $(DEB_DESTDIR)/usr/share/java
-
-binary-post-install/libhamcrest-java::
- # Add OSGi-metadata to the manifests.
- # This is needed for eclipse.
- for manifest in debian/manifest/*.mf ; do \
- base=`basename $$manifest .mf` ; \
- f=`ls build/hamcrest-$$base-$(DEB_UPSTREAM_VERSION).jar` ; \
- if [ -n "$$f" ]; then \
- echo `basename "$$f"` "[ok]" ; \
- jar umf $$manifest $$f ; \
- else \
- echo "No file like 'build/hamcrest-$$base-$(DEB_UPSTREAM_VERSION).jar' existing." ; \
- fi ; \
- done
- for pom in $(POMS); do \
- pomfile=hamcrest-$$pom-$(DEB_UPSTREAM_VERSION).pom; \
- mh_installpom -o -e$(DEB_UPSTREAM_VERSION) \
- -plibhamcrest-java $$pomfile; \
- mh_installjar -l -e$(DEB_UPSTREAM_VERSION) -j$(DEB_UPSTREAM_VERSION) \
- -plibhamcrest-java $$pomfile build/hamcrest-$$pom-$(DEB_UPSTREAM_VERSION).jar; \
- done
-
-clean::
- rm -fr debian/.mh/
- rm -f *.jar
- mkdir -p lib/integration
-
-get-orig-source:
- -uscan --download-version $(DEB_UPSTREAM_VERSION) --force-download --debug --rename
Copied: tags/libhamcrest-java/1.3-4/debian/rules (from rev 17334, trunk/libhamcrest-java/debian/rules)
===================================================================
--- tags/libhamcrest-java/1.3-4/debian/rules (rev 0)
+++ tags/libhamcrest-java/1.3-4/debian/rules 2013-12-23 23:48:55 UTC (rev 17607)
@@ -0,0 +1,45 @@
+#!/usr/bin/make -f
+
+include /usr/share/cdbs/1/class/ant.mk
+include /usr/share/cdbs/1/rules/debhelper.mk
+
+JAVA_HOME := /usr/lib/jvm/default-java
+DEB_ANT_BUILDFILE := build.xml
+DEB_ANT_BUILD_TARGET := bigjar unit-test javadoc
+DEB_JARS := easymock jmock qdox ant-junit
+ANT_OPTS := -Dant.build.javac.source=1.5 -Dant.build.javac.target=1.5 -Dversion=$(DEB_UPSTREAM_VERSION)
+POMS := core generator integration library all
+
+DEST_DIR = $(DEB_DESTDIR)/usr/share/java
+
+binary-post-install/libhamcrest-java::
+ # Add OSGi-metadata to the manifests.
+ # This is needed for eclipse.
+ for manifest in debian/manifest/*.mf ; do \
+ base=`basename $$manifest .mf` ; \
+ f=`ls build/hamcrest-$$base-$(DEB_UPSTREAM_VERSION).jar` ; \
+ if [ -n "$$f" ]; then \
+ echo `basename "$$f"` "[ok]" ; \
+ jar umf $$manifest $$f ; \
+ else \
+ echo "No file like 'build/hamcrest-$$base-$(DEB_UPSTREAM_VERSION).jar' existing." ; \
+ fi ; \
+ done
+ for pom in $(POMS); do \
+ pomfile=hamcrest-$$pom-$(DEB_UPSTREAM_VERSION).pom; \
+ mh_installpom -o -e$(DEB_UPSTREAM_VERSION) \
+ -plibhamcrest-java $$pomfile; \
+ mh_installjar -l -e$(DEB_UPSTREAM_VERSION) -j$(DEB_UPSTREAM_VERSION) \
+ -plibhamcrest-java $$pomfile build/hamcrest-$$pom-$(DEB_UPSTREAM_VERSION).jar; \
+ done
+
+ dh_install -plibhamcrest-java build/hamcrest-unit-test-$(DEB_UPSTREAM_VERSION).jar usr/share/java
+ dh_link -plibhamcrest-java usr/share/java/hamcrest-unit-test-$(DEB_UPSTREAM_VERSION).jar usr/share/java/hamcrest-unit-test.jar
+
+clean::
+ rm -fr debian/.mh/
+ rm -f *.jar
+ mkdir -p lib/integration
+
+get-orig-source:
+ -uscan --download-version $(DEB_UPSTREAM_VERSION) --force-download --debug --rename
More information about the pkg-java-commits
mailing list