[pkg-java] r16518 - in trunk/libhamcrest-java/debian: . manifest patches
Emmanuel Bourg
ebourg-guest at alioth.debian.org
Wed Apr 10 12:56:04 UTC 2013
Author: ebourg-guest
Date: 2013-04-10 12:56:04 +0000 (Wed, 10 Apr 2013)
New Revision: 16518
Removed:
trunk/libhamcrest-java/debian/manifest/text.mf
trunk/libhamcrest-java/debian/poms/
Modified:
trunk/libhamcrest-java/debian/changelog
trunk/libhamcrest-java/debian/control
trunk/libhamcrest-java/debian/copyright
trunk/libhamcrest-java/debian/libhamcrest-java-doc.install
trunk/libhamcrest-java/debian/manifest/core.mf
trunk/libhamcrest-java/debian/manifest/generator.mf
trunk/libhamcrest-java/debian/manifest/integration.mf
trunk/libhamcrest-java/debian/manifest/library.mf
trunk/libhamcrest-java/debian/patches/001-build.patch
trunk/libhamcrest-java/debian/rules
trunk/libhamcrest-java/debian/watch
Log:
New upstream release (1.3)
Modified: trunk/libhamcrest-java/debian/changelog
===================================================================
--- trunk/libhamcrest-java/debian/changelog 2013-04-10 09:06:40 UTC (rev 16517)
+++ trunk/libhamcrest-java/debian/changelog 2013-04-10 12:56:04 UTC (rev 16518)
@@ -1,3 +1,20 @@
+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 ]
Modified: trunk/libhamcrest-java/debian/control
===================================================================
--- trunk/libhamcrest-java/debian/control 2013-04-10 09:06:40 UTC (rev 16517)
+++ trunk/libhamcrest-java/debian/control 2013-04-10 12:56:04 UTC (rev 16518)
@@ -4,15 +4,15 @@
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>
+ 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.2
-Homepage: http://code.google.com/p/hamcrest/
+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
-DM-Upload-Allowed: yes
Package: libhamcrest-java
Architecture: all
Modified: trunk/libhamcrest-java/debian/copyright
===================================================================
--- trunk/libhamcrest-java/debian/copyright 2013-04-10 09:06:40 UTC (rev 16517)
+++ trunk/libhamcrest-java/debian/copyright 2013-04-10 12:56:04 UTC (rev 16518)
@@ -1,4 +1,4 @@
-Format: http://dep.debian.net/deps/dep5/
+Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
Source: http://code.google.com/p/hamcrest/
Files: *
Modified: trunk/libhamcrest-java/debian/libhamcrest-java-doc.install
===================================================================
--- trunk/libhamcrest-java/debian/libhamcrest-java-doc.install 2013-04-10 09:06:40 UTC (rev 16517)
+++ trunk/libhamcrest-java/debian/libhamcrest-java-doc.install 2013-04-10 12:56:04 UTC (rev 16518)
@@ -1 +1 @@
-build/javadoc/* /usr/share/doc/libhamcrest-java/api/
+build/temp/hamcrest-all-1.3-javadoc.jar.contents/* /usr/share/doc/libhamcrest-java/api/
Modified: trunk/libhamcrest-java/debian/manifest/core.mf
===================================================================
--- trunk/libhamcrest-java/debian/manifest/core.mf 2013-04-10 09:06:40 UTC (rev 16517)
+++ trunk/libhamcrest-java/debian/manifest/core.mf 2013-04-10 12:56:04 UTC (rev 16518)
@@ -5,9 +5,8 @@
Bundle-RequiredExecutionEnvironment: J2SE-1.5
Bundle-Name: Hamcrest Core
Bundle-SymbolicName: org.hamcrest.core
-Export-Package: org.hamcrest;version="1.1.0";core=split;mandatory:=cor
- e,org.hamcrest.core;version="1.1.0",org.hamcrest.internal;version="1.
- 1.0";x-internal:=true
-Bundle-Version: 1.1.0
+Export-Package: org.hamcrest;version="1.3.0";core=split;mandatory:=cor
+ e,org.hamcrest.core;version="1.3.0",org.hamcrest.internal;version="1.
+ 3.0";x-internal:=true
+Bundle-Version: 1.3.0
Bundle-ManifestVersion: 2
-
Modified: trunk/libhamcrest-java/debian/manifest/generator.mf
===================================================================
--- trunk/libhamcrest-java/debian/manifest/generator.mf 2013-04-10 09:06:40 UTC (rev 16517)
+++ trunk/libhamcrest-java/debian/manifest/generator.mf 2013-04-10 12:56:04 UTC (rev 16518)
@@ -5,14 +5,14 @@
Bundle-RequiredExecutionEnvironment: J2SE-1.5
Bundle-Name: Hamcrest Generator
Bundle-SymbolicName: org.hamcrest.generator
-Export-Package: org.hamcrest.generator;version="1.1.0",org.hamcrest.ge
- nerator.config;version="1.1.0"
-Bundle-Version: 1.1.0
+Export-Package: org.hamcrest.generator;version="1.3.0",org.hamcrest.ge
+ nerator.config;version="1.3.0"
+Bundle-Version: 1.3.0
Bundle-ManifestVersion: 2
-Import-Package: com.thoughtworks.qdox;version="1.6.3",com.thoughtworks
- .qdox.ant;version="1.6.3",com.thoughtworks.qdox.directorywalker;versi
- on="1.6.3",com.thoughtworks.qdox.junit;version="1.6.3",com.thoughtwor
- ks.qdox.model;version="1.6.3",com.thoughtworks.qdox.model.util;versio
- n="1.6.3",com.thoughtworks.qdox.parser;version="1.6.3",com.thoughtwor
- ks.qdox.parser.impl;version="1.6.3",com.thoughtworks.qdox.parser.stru
- cts;version="1.6.3",com.thoughtworks.qdox.tools;version="1.6.3"
+Import-Package: com.thoughtworks.qdox;version="1.12",com.thoughtworks.
+ qdox.ant;version="1.12",com.thoughtworks.qdox.directorywalker;version
+ ="1.12",com.thoughtworks.qdox.junit;version="1.12",com.thoughtworks.q
+ dox.model;version="1.12",com.thoughtworks.qdox.model.util;versio n="1
+ .12",com.thoughtworks.qdox.parser;version="1.12",com.thoughtworks.qdo
+ x.parser.impl;version="1.12",com.thoughtworks.qdox.parser.structs;ver
+ sion="1.12",com.thoughtworks.qdox.tools;version="1.12"
Modified: trunk/libhamcrest-java/debian/manifest/integration.mf
===================================================================
--- trunk/libhamcrest-java/debian/manifest/integration.mf 2013-04-10 09:06:40 UTC (rev 16517)
+++ trunk/libhamcrest-java/debian/manifest/integration.mf 2013-04-10 12:56:04 UTC (rev 16518)
@@ -5,10 +5,10 @@
Bundle-RequiredExecutionEnvironment: J2SE-1.5
Bundle-Name: Hamcrest Integration
Bundle-SymbolicName: org.hamcrest.integration
-Require-Bundle: org.hamcrest.core;bundle-version="1.1.0"
+Require-Bundle: org.hamcrest.core;bundle-version="1.3.0"
Export-Package: org.hamcrest;integration=split;mandatory:=integration;
- version="1.1.0",org.hamcrest.integration;version="1.1.0"
-Bundle-Version: 1.1.0
+ version="1.3.0",org.hamcrest.integration;version="1.3.0"
+Bundle-Version: 1.3.0
Bundle-ManifestVersion: 2
Import-Package: org.easymock;version="2.4.0";resolution:=optional,org.
jmock.core;version="1.10";resolution:=optional
Modified: trunk/libhamcrest-java/debian/manifest/library.mf
===================================================================
--- trunk/libhamcrest-java/debian/manifest/library.mf 2013-04-10 09:06:40 UTC (rev 16517)
+++ trunk/libhamcrest-java/debian/manifest/library.mf 2013-04-10 12:56:04 UTC (rev 16518)
@@ -5,11 +5,11 @@
Bundle-RequiredExecutionEnvironment: J2SE-1.5
Bundle-Name: Hamcrest Library
Bundle-SymbolicName: org.hamcrest.library
-Require-Bundle: org.hamcrest.core;bundle-version="1.1.0"
-Export-Package: org.hamcrest;version="1.1.0";library=split;mandatory:=
- library,org.hamcrest.beans;version="1.1.0",org.hamcrest.collection;ve
- rsion="1.1.0",org.hamcrest.number;version="1.1.0",org.hamcrest.object
- ;version="1.1.0",org.hamcrest.text;version="1.1.0",org.hamcrest.xml;v
- ersion="1.1.0"
-Bundle-Version: 1.1.0
+Require-Bundle: org.hamcrest.core;bundle-version="1.3.0"
+Export-Package: org.hamcrest;version="1.3.0";library=split;mandatory:=
+ library,org.hamcrest.beans;version="1.3.0",org.hamcrest.collection;ve
+ rsion="1.3.0",org.hamcrest.number;version="1.3.0",org.hamcrest.object
+ ;version="1.3.0",org.hamcrest.text;version="1.3.0",org.hamcrest.xml;v
+ ersion="1.3.0"
+Bundle-Version: 1.3.0
Bundle-ManifestVersion: 2
Deleted: trunk/libhamcrest-java/debian/manifest/text.mf
===================================================================
--- trunk/libhamcrest-java/debian/manifest/text.mf 2013-04-10 09:06:40 UTC (rev 16517)
+++ trunk/libhamcrest-java/debian/manifest/text.mf 2013-04-10 12:56:04 UTC (rev 16518)
@@ -1,15 +0,0 @@
-Manifest-Version: 1.0
-Bundle-Vendor: Hamcrest
-Bundle-ActivationPolicy: lazy
-Bundle-Localization: plugin
-Bundle-RequiredExecutionEnvironment: J2SE-1.5
-Bundle-Name: Hamcrest Text
-Bundle-SymbolicName: org.hamcrest.text
-Require-Bundle: org.hamcrest.core;bundle-version="1.1.0",org.hamcrest.
- library;bundle-version="1.1.0"
-Export-Package: org.hamcrest.text.pattern;version="1.1.0",org.hamcrest
- .text.pattern.internal.ast;version="1.1.0";x-internal:=true,org.hamcr
- est.text.pattern.internal.naming;version="1.1.0";x-internal:=true
-Bundle-Version: 1.1.0
-Bundle-ManifestVersion: 2
-
Modified: trunk/libhamcrest-java/debian/patches/001-build.patch
===================================================================
--- trunk/libhamcrest-java/debian/patches/001-build.patch 2013-04-10 09:06:40 UTC (rev 16517)
+++ trunk/libhamcrest-java/debian/patches/001-build.patch 2013-04-10 12:56:04 UTC (rev 16518)
@@ -1,77 +1,92 @@
Description: Fixes some classpaths and makes the javadoc link against system
installed javadocs.
Author: Ludovic Claude <ludovic.claude at laposte.net>
-
---- 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,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.*"/>
+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"/>
Modified: trunk/libhamcrest-java/debian/rules
===================================================================
--- trunk/libhamcrest-java/debian/rules 2013-04-10 09:06:40 UTC (rev 16517)
+++ trunk/libhamcrest-java/debian/rules 2013-04-10 12:56:04 UTC (rev 16518)
@@ -5,10 +5,10 @@
JAVA_HOME := /usr/lib/jvm/default-java
DEB_ANT_BUILDFILE := build.xml
-DEB_ANT_BUILD_TARGET := core generator integration library javadoc
+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
+POMS := core generator integration library all
DEST_DIR = $(DEB_DESTDIR)/usr/share/java
@@ -17,16 +17,16 @@
# This is needed for eclipse.
for manifest in debian/manifest/*.mf ; do \
base=`basename $$manifest .mf` ; \
- f=`ls build/hamcrest-$$base-*.jar` ; \
+ 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-*.jar' existing." ; \
+ echo "No file like 'build/hamcrest-$$base-$(DEB_UPSTREAM_VERSION).jar' existing." ; \
fi ; \
done
for pom in $(POMS); do \
- pomfile=debian/poms/$$pom.xml; \
+ 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) \
Modified: trunk/libhamcrest-java/debian/watch
===================================================================
--- trunk/libhamcrest-java/debian/watch 2013-04-10 09:06:40 UTC (rev 16517)
+++ trunk/libhamcrest-java/debian/watch 2013-04-10 12:56:04 UTC (rev 16518)
@@ -1,3 +1,3 @@
version=3
opts="downloadurlmangle=s|.*(hamcrest-.*\.tgz).*|http://hamcrest.googlecode.com/files/$1|,filenamemangle=s/.*=(.*)/$1/" \
- http://code.google.com/p/hamcrest/downloads/list .*?name=hamcrest-(.*).tgz&.* debian debian/orig-tar.sh
+ http://code.google.com/p/hamcrest/downloads/list .*?name=hamcrest-([\d\.]+).tgz&.* debian debian/orig-tar.sh
More information about the pkg-java-commits
mailing list