[pkg-java] r12629 - in tags/libhamcrest-java: . 1.1-7/debian 1.1-7/debian/patches
Torsten Werner
twerner at alioth.debian.org
Tue Jun 22 12:32:15 UTC 2010
Author: twerner
Date: 2010-06-22 12:32:09 +0000 (Tue, 22 Jun 2010)
New Revision: 12629
Added:
tags/libhamcrest-java/1.1-7/
tags/libhamcrest-java/1.1-7/debian/control
tags/libhamcrest-java/1.1-7/debian/patches/001-build.patch
Removed:
tags/libhamcrest-java/1.1-7/debian/control
tags/libhamcrest-java/1.1-7/debian/patches/001-build.patch
Log:
[svn-buildpackage] Tagging libhamcrest-java 1.1-7
Deleted: tags/libhamcrest-java/1.1-7/debian/control
===================================================================
--- trunk/libhamcrest-java/debian/control 2010-06-22 11:49:29 UTC (rev 12624)
+++ tags/libhamcrest-java/1.1-7/debian/control 2010-06-22 12:32:09 UTC (rev 12629)
@@ -1,37 +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>, Michael Koch <konqueror at gmx.de>,
- Damien Raude-Morvan <drazzib at debian.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, libeasymock-java,
- libjmock-java, testng
-Standards-Version: 3.8.4
-Homepage: http://code.google.com/p/hamcrest/
-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: default-jre-headless | java5-runtime-headless, ${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}, 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.1-7/debian/control (from rev 12628, trunk/libhamcrest-java/debian/control)
===================================================================
--- tags/libhamcrest-java/1.1-7/debian/control (rev 0)
+++ tags/libhamcrest-java/1.1-7/debian/control 2010-06-22 12:32:09 UTC (rev 12629)
@@ -0,0 +1,38 @@
+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>, Michael Koch <konqueror at gmx.de>,
+ Damien Raude-Morvan <drazzib at debian.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, libeasymock-java,
+ libjmock-java, testng
+Standards-Version: 3.8.4
+Homepage: http://code.google.com/p/hamcrest/
+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: default-jre-headless | java5-runtime-headless, ${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.1-7/debian/patches/001-build.patch
===================================================================
--- trunk/libhamcrest-java/debian/patches/001-build.patch 2010-06-22 11:49:29 UTC (rev 12624)
+++ tags/libhamcrest-java/1.1-7/debian/patches/001-build.patch 2010-06-22 12:32:09 UTC (rev 12629)
@@ -1,132 +0,0 @@
---- a/build.xml
-+++ b/build.xml
-@@ -26,17 +26,17 @@
- <java-to-jar srcdir="hamcrest-generator/src/main/java"
- destjar="build/temp/hamcrest-generator-${version}-nodeps.jar"
- classpath="
-- lib/generator/qdox-1.6.1.jar;
-+ /usr/share/java/qdox.jar
- "/>
- <taskdef name="jarjar"
- classname="com.tonicsystems.jarjar.JarJarTask"
-- classpath="lib/generator/jarjar-1.0rc3.jar"/>
-+ classpath="/usr/share/java/jarjar.jar"/>
- <!-- Bundle QDox classes in hamcrest-generator.jar so user doesn't need to care
- about it's existence. Uses JarJar to place classes under a different package
- to prevent conflict. -->
- <jarjar jarfile="build/hamcrest-generator-${version}.jar">
- <zipfileset src="build/temp/hamcrest-generator-${version}-nodeps.jar"/>
-- <zipfileset src="lib/generator/qdox-1.6.1.jar"/>
-+ <zipfileset src="/usr/share/java/qdox.jar"/>
- <rule pattern="com.thoughtworks.qdox.**"
- result="org.hamcrest.generator.qdox. at 1"/>
- </jarjar>
-@@ -94,16 +94,16 @@
- classpath="build/hamcrest-core-${version}.jar"/>
- </target>
-
-- <target name="text"
-- depends="core, library"
-- description="Build text pattern matcher">
-- <java-to-jar srcdir="hamcrest-text/src/main/java"
-- destjar="build/hamcrest-text-${version}.jar"
-- classpath="
-- build/hamcrest-core-${version}.jar;
-- build/hamcrest-library-${version}.jar"/>
-- </target>
--
-+ <target name="text"
-+ depends="core, library"
-+ description="Build text pattern matcher">
-+ <java-to-jar srcdir="hamcrest-text/src/main/java"
-+ destjar="build/hamcrest-text-${version}.jar"
-+ classpath="
-+ build/hamcrest-core-${version}.jar;
-+ build/hamcrest-library-${version}.jar"/>
-+ </target>
-+
- <target name="integration"
- depends="core, library"
- description="Build integration with external tools">
-@@ -121,7 +121,7 @@
- destjar="build/hamcrest-unit-test-${version}.jar"
- classpath="
- build/hamcrest-core-${version}.jar;
-- build/hamcrest-library-${version}.jar;
-+ build/hamcrest-library-${version}.jar;
- build/hamcrest-text-${version}.jar;
- build/hamcrest-integration-${version}.jar;
- build/hamcrest-generator-${version}.jar"/>
-@@ -164,7 +164,7 @@
- <jar jarfile="build/hamcrest-all-${version}.jar" duplicate="preserve">
- <zipfileset src="build/hamcrest-core-${version}.jar"/>
- <zipfileset src="build/hamcrest-library-${version}.jar"/>
-- <zipfileset src="build/hamcrest-text-${version}.jar"/>
-+ <zipfileset src="build/hamcrest-text-${version}.jar"/>
- <zipfileset src="build/hamcrest-generator-${version}.jar"/>
- <zipfileset src="build/hamcrest-integration-${version}.jar"/>
- </jar>
-@@ -211,27 +211,32 @@
- <target name="javadoc" depends="library">
- <mkdir dir="build/javadoc"/>
- <javadoc destdir="build/javadoc" source="1.5" failonerror="yes"
-- overview="overview.html">
-+ >
-
- <classpath>
-- <fileset dir="lib/integration">
-- <include name="*.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>
-
- <packageset dir="hamcrest-core/src/main/java"/>
- <packageset dir="hamcrest-library/src/main/java" excludes="org/hamcrest/internal"/>
-- <packageset dir="hamcrest-text/src/main/java" excludes="**/internal/**"/>
-+ <packageset dir="hamcrest-text/src/main/java" excludes="**/internal/**"/>
- <packageset dir="hamcrest-integration/src/main/java"/>
-- <packageset dir="build/generated-code"/>
-+ <packageset dir="build/temp/hamcrest-core/generated-code"/>
-+ <packageset dir="build/temp/hamcrest-library/generated-code"/>
-
- <group title="Hamcrest API and Utility Classes" packages="org.hamcrest"/>
- <group title="Matcher Library" packages="org.hamcrest.*"/>
- <group title="Integration" packages="org.hamcrest.integration, org.hamcrest.integration.*"/>
-
-- <link offline="false" href="http://java.sun.com/j2se/1.5.0/docs/api/"/>
-- <link offline="false" href="http://www.junit.org/junit/javadoc/3.8.1/"/>
-- <link offline="false" href="http://junit.sourceforge.net/javadoc_40/"/>
-+ <link offline="false" href="file:///usr/share/doc/default-jdk-doc/api"/>
-+ <link offline="false" href="file:///usr/share/doc/junit-doc/doc/api"/>
-+ <link offline="false" href="file:///usr/share/doc/junit4-doc/doc/api"/>
- </javadoc>
- </target>
-
-@@ -244,9 +249,13 @@
- <mkdir dir="build/temp/@{destjar}.contents"/>
- <javac srcdir="@{srcdir}" destdir="build/temp/@{destjar}.contents" debug="${debug}">
- <classpath>
-- <fileset dir="lib/integration">
-- <include name="*.jar"/>
-- </fileset>
-+ <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>
- <pathelement path="@{classpath}"/>
- </classpath>
- </javac>
-@@ -261,4 +270,4 @@
- </sequential>
- </macrodef>
-
--</project>
-+</project>
Copied: tags/libhamcrest-java/1.1-7/debian/patches/001-build.patch (from rev 12626, trunk/libhamcrest-java/debian/patches/001-build.patch)
===================================================================
--- tags/libhamcrest-java/1.1-7/debian/patches/001-build.patch (rev 0)
+++ tags/libhamcrest-java/1.1-7/debian/patches/001-build.patch 2010-06-22 12:32:09 UTC (rev 12629)
@@ -0,0 +1,132 @@
+--- a/build.xml
++++ b/build.xml
+@@ -26,17 +26,17 @@
+ <java-to-jar srcdir="hamcrest-generator/src/main/java"
+ destjar="build/temp/hamcrest-generator-${version}-nodeps.jar"
+ classpath="
+- lib/generator/qdox-1.6.1.jar;
++ /usr/share/java/qdox.jar
+ "/>
+ <taskdef name="jarjar"
+ classname="com.tonicsystems.jarjar.JarJarTask"
+- classpath="lib/generator/jarjar-1.0rc3.jar"/>
++ classpath="/usr/share/java/jarjar.jar"/>
+ <!-- Bundle QDox classes in hamcrest-generator.jar so user doesn't need to care
+ about it's existence. Uses JarJar to place classes under a different package
+ to prevent conflict. -->
+ <jarjar jarfile="build/hamcrest-generator-${version}.jar">
+ <zipfileset src="build/temp/hamcrest-generator-${version}-nodeps.jar"/>
+- <zipfileset src="lib/generator/qdox-1.6.1.jar"/>
++ <zipfileset src="/usr/share/java/qdox.jar"/>
+ <rule pattern="com.thoughtworks.qdox.**"
+ result="org.hamcrest.generator.qdox. at 1"/>
+ </jarjar>
+@@ -94,16 +94,16 @@
+ classpath="build/hamcrest-core-${version}.jar"/>
+ </target>
+
+- <target name="text"
+- depends="core, library"
+- description="Build text pattern matcher">
+- <java-to-jar srcdir="hamcrest-text/src/main/java"
+- destjar="build/hamcrest-text-${version}.jar"
+- classpath="
+- build/hamcrest-core-${version}.jar;
+- build/hamcrest-library-${version}.jar"/>
+- </target>
+-
++ <target name="text"
++ depends="core, library"
++ description="Build text pattern matcher">
++ <java-to-jar srcdir="hamcrest-text/src/main/java"
++ destjar="build/hamcrest-text-${version}.jar"
++ classpath="
++ build/hamcrest-core-${version}.jar;
++ build/hamcrest-library-${version}.jar"/>
++ </target>
++
+ <target name="integration"
+ depends="core, library"
+ description="Build integration with external tools">
+@@ -121,7 +121,7 @@
+ destjar="build/hamcrest-unit-test-${version}.jar"
+ classpath="
+ build/hamcrest-core-${version}.jar;
+- build/hamcrest-library-${version}.jar;
++ build/hamcrest-library-${version}.jar;
+ build/hamcrest-text-${version}.jar;
+ build/hamcrest-integration-${version}.jar;
+ build/hamcrest-generator-${version}.jar"/>
+@@ -164,7 +164,7 @@
+ <jar jarfile="build/hamcrest-all-${version}.jar" duplicate="preserve">
+ <zipfileset src="build/hamcrest-core-${version}.jar"/>
+ <zipfileset src="build/hamcrest-library-${version}.jar"/>
+- <zipfileset src="build/hamcrest-text-${version}.jar"/>
++ <zipfileset src="build/hamcrest-text-${version}.jar"/>
+ <zipfileset src="build/hamcrest-generator-${version}.jar"/>
+ <zipfileset src="build/hamcrest-integration-${version}.jar"/>
+ </jar>
+@@ -211,27 +211,32 @@
+ <target name="javadoc" depends="library">
+ <mkdir dir="build/javadoc"/>
+ <javadoc destdir="build/javadoc" source="1.5" failonerror="yes"
+- overview="overview.html">
++ >
+
+ <classpath>
+- <fileset dir="lib/integration">
+- <include name="*.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>
+
+ <packageset dir="hamcrest-core/src/main/java"/>
+ <packageset dir="hamcrest-library/src/main/java" excludes="org/hamcrest/internal"/>
+- <packageset dir="hamcrest-text/src/main/java" excludes="**/internal/**"/>
++ <packageset dir="hamcrest-text/src/main/java" excludes="**/internal/**"/>
+ <packageset dir="hamcrest-integration/src/main/java"/>
+- <packageset dir="build/generated-code"/>
++ <packageset dir="build/temp/hamcrest-core/generated-code"/>
++ <packageset dir="build/temp/hamcrest-library/generated-code"/>
+
+ <group title="Hamcrest API and Utility Classes" packages="org.hamcrest"/>
+ <group title="Matcher Library" packages="org.hamcrest.*"/>
+ <group title="Integration" packages="org.hamcrest.integration, org.hamcrest.integration.*"/>
+
+- <link offline="false" href="http://java.sun.com/j2se/1.5.0/docs/api/"/>
+- <link offline="false" href="http://www.junit.org/junit/javadoc/3.8.1/"/>
+- <link offline="false" href="http://junit.sourceforge.net/javadoc_40/"/>
++ <link offline="false" href="file:///usr/share/doc/default-jdk-doc/api"/>
++ <link offline="false" href="file:///usr/share/doc/junit-doc/doc/api"/>
++ <link offline="false" href="file:///usr/share/doc/junit4/api"/>
+ </javadoc>
+ </target>
+
+@@ -244,9 +249,13 @@
+ <mkdir dir="build/temp/@{destjar}.contents"/>
+ <javac srcdir="@{srcdir}" destdir="build/temp/@{destjar}.contents" debug="${debug}">
+ <classpath>
+- <fileset dir="lib/integration">
+- <include name="*.jar"/>
+- </fileset>
++ <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>
+ <pathelement path="@{classpath}"/>
+ </classpath>
+ </javac>
+@@ -261,4 +270,4 @@
+ </sequential>
+ </macrodef>
+
+-</project>
++</project>
More information about the pkg-java-commits
mailing list