[pkg-java] r15572 - in trunk/libhamcrest-java/debian: . patches
Steffen Möller
moeller at alioth.debian.org
Wed Dec 21 22:00:10 UTC 2011
Author: moeller
Date: 2011-12-21 22:00:10 +0000 (Wed, 21 Dec 2011)
New Revision: 15572
Modified:
trunk/libhamcrest-java/debian/changelog
trunk/libhamcrest-java/debian/control
trunk/libhamcrest-java/debian/copyright
trunk/libhamcrest-java/debian/patches/001-build.patch
trunk/libhamcrest-java/debian/rules
Log:
Update for libhamcrest 1.2.
Modified: trunk/libhamcrest-java/debian/changelog
===================================================================
--- trunk/libhamcrest-java/debian/changelog 2011-12-21 21:39:20 UTC (rev 15571)
+++ trunk/libhamcrest-java/debian/changelog 2011-12-21 22:00:10 UTC (rev 15572)
@@ -1,3 +1,10 @@
+libhamcrest-java (1.2-1) UNRELEASED; urgency=low
+
+ * New upstream release
+ * Bumped Standards-Version to 3.9.2 (no changes)
+
+ -- 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.
Modified: trunk/libhamcrest-java/debian/control
===================================================================
--- trunk/libhamcrest-java/debian/control 2011-12-21 21:39:20 UTC (rev 15571)
+++ trunk/libhamcrest-java/debian/control 2011-12-21 22:00:10 UTC (rev 15572)
@@ -7,7 +7,7 @@
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.8.4
+Standards-Version: 3.9.2
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
Modified: trunk/libhamcrest-java/debian/copyright
===================================================================
--- trunk/libhamcrest-java/debian/copyright 2011-12-21 21:39:20 UTC (rev 15571)
+++ trunk/libhamcrest-java/debian/copyright 2011-12-21 22:00:10 UTC (rev 15572)
@@ -1,22 +1,39 @@
-Format-Specification: http://dep.debian.net/deps/dep5/
-Name: Hamcrest - library of matchers for building test expressions
-Maintainer: Hamcrest Developers <http://groups.google.com/group/hamcrest-dev>
+Format: http://dep.debian.net/deps/dep5/
Source: http://code.google.com/p/hamcrest/
+Files: *
Copyright: 2000-2006, www.hamcrest.org
License: BSD
- On Debian systems, the complete text of the BSD License can be
- found in `/usr/share/common-licenses/BSD'.
+ Copyright (c) The Regents of the University of California.
+ All rights reserved.
+ .
+ Redistribution and use in source and binary forms, with or without
+ modification, are permitted provided that the following conditions
+ are met:
+ 1. Redistributions of source code must retain the above copyright
+ notice, this list of conditions and the following disclaimer.
+ 2. Redistributions in binary form must reproduce the above copyright
+ notice, this list of conditions and the following disclaimer in the
+ documentation and/or other materials provided with the distribution.
+ 3. Neither the name of the University nor the names of its contributors
+ may be used to endorse or promote products derived from this software
+ without specific prior written permission.
+ .
+ THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
+ ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
+ FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+ OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ 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 OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ SUCH DAMAGE.
+
Files: debian/*
Copyright: 2008, Varun Hiremath <varun at debian.org>
License: GPL
On Debian systems, the complete text of the GPL License can be
found in `/usr/share/common-licenses/GPL'.
-
-Files: debian/poms/*
-Copyright: 2000-2006, www.hamcrest.org
-License: BSD
- On Debian systems, the complete text of the BSD License can be
- found in `/usr/share/common-licenses/BSD'.
-
Modified: trunk/libhamcrest-java/debian/patches/001-build.patch
===================================================================
--- trunk/libhamcrest-java/debian/patches/001-build.patch 2011-12-21 21:39:20 UTC (rev 15571)
+++ trunk/libhamcrest-java/debian/patches/001-build.patch 2011-12-21 22:00:10 UTC (rev 15572)
@@ -2,135 +2,76 @@
installed javadocs.
Author: Ludovic Claude <ludovic.claude at laposte.net>
---- a/build.xml
-+++ b/build.xml
+--- libhamcrest-java-1.2.orig/build.xml
++++ libhamcrest-java-1.2/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>
+ <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,6 +94,18 @@
+ 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="integration"
+ depends="core, library"
+ description="Build integration with external tools">
+@@ -196,19 +208,27 @@
+
+ <target name="javadoc" depends="library">
+ <mkdir dir="build/javadoc"/>
+- <javadoc destdir="build/javadoc" source="1.5" failonerror="yes"
+- overview="overview.html">
++ <javadoc destdir="build/javadoc" source="1.5" failonerror="no"
++ overview="build/javadoc/overview-summary.html">
+
+ <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>
+ </classpath>
+
+ <packageset dir="hamcrest-core/src/main/java"/>
+ <packageset dir="hamcrest-library/src/main/java" excludes="org/hamcrest/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.*"/>
Modified: trunk/libhamcrest-java/debian/rules
===================================================================
--- trunk/libhamcrest-java/debian/rules 2011-12-21 21:39:20 UTC (rev 15571)
+++ trunk/libhamcrest-java/debian/rules 2011-12-21 22:00:10 UTC (rev 15572)
@@ -5,7 +5,7 @@
JAVA_HOME := /usr/lib/jvm/default-java
DEB_ANT_BUILDFILE := build.xml
-DEB_ANT_BUILD_TARGET := core generator integration library text javadoc
+DEB_ANT_BUILD_TARGET := core generator integration library 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
@@ -23,15 +23,14 @@
pomfile=debian/poms/$$pom.xml; \
mh_installpom -o -e$(DEB_UPSTREAM_VERSION) \
-plibhamcrest-java $$pomfile; \
- mh_installjar -l -e$(DEB_UPSTREAM_VERSION) -i$(DEB_UPSTREAM_VERSION) \
+ mh_installjar -l -e$(DEB_UPSTREAM_VERSION) -j$(DEB_UPSTREAM_VERSION) \
-plibhamcrest-java $$pomfile build/hamcrest-$$pom-$(DEB_UPSTREAM_VERSION).jar; \
done
- install -m 644 -D build/hamcrest-text-$(DEB_UPSTREAM_VERSION).jar \
- $(DEST_DIR)/hamcrest-text-$(DEB_UPSTREAM_VERSION).jar
- ln -s hamcrest-text-$(DEB_UPSTREAM_VERSION).jar $(DEST_DIR)/hamcrest-text.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