Author: nomadium-guest Date: 2011-09-13 04:17:35 +0000 (Tue, 13 Sep 2011) New Revision: 14887
Added: trunk/jmock/debian/clean trunk/jmock/debian/jmock-cglib.pom trunk/jmock/debian/jmock.pom trunk/jmock/debian/patches/01_junit3_api.diff Removed: trunk/jmock/debian/README.Debian trunk/jmock/debian/ant.properties trunk/jmock/debian/dirs trunk/jmock/debian/patches/build.patch trunk/jmock/debian/patches/code.patch trunk/jmock/debian/pom.xml Modified: trunk/jmock/debian/changelog trunk/jmock/debian/control trunk/jmock/debian/copyright trunk/jmock/debian/libjmock-java.poms trunk/jmock/debian/orig-tar.sh trunk/jmock/debian/patches/series trunk/jmock/debian/rules trunk/jmock/debian/watch Log: * New upstream release. * Migrate to dh7 + javahelper packaging style. * Bump Standards-Version to 3.9.2. No changes were required. * Add Homepage and Vcs-* fields. * Add dependencies on libcglib-java and provide jmock-cglib jar. * Drop unneeded Build-Depends on ant and ant-optional. * Provide better package descriptions. * Update watch file. * Update maven metadata. * Drop unneeded dirs, README.Debian and ant.properties files. * Drop unneeded patches. * Make copyright file DEP5 compliant. Deleted: trunk/jmock/debian/README.Debian =================================================================== --- trunk/jmock/debian/README.Debian 2011-09-13 03:21:15 UTC (rev 14886) +++ trunk/jmock/debian/README.Debian 2011-09-13 04:17:35 UTC (rev 14887) @@ -1,17 +0,0 @@ -libjmock-java -------------- - -jMock is a library for testing Java code using mock objects. - -Mock objects help you design and test the interactions between the objects in -your programs. - -The jMock package: - * makes it quick and easy to define mock objects, so you don't break the - rhythm of programming. - * lets you define flexible constraints over object interactions, reducing the - brittleness of your tests. - * is easy to extend. - --- -Trygve Laugstøl Deleted: trunk/jmock/debian/ant.properties =================================================================== Modified: trunk/jmock/debian/changelog =================================================================== --- trunk/jmock/debian/changelog 2011-09-13 03:21:15 UTC (rev 14886) +++ trunk/jmock/debian/changelog 2011-09-13 04:17:35 UTC (rev 14887) @@ -1,3 +1,21 @@ +jmock (1.2.0-1) UNRELEASED; urgency=low + + * Team upload. + * New upstream release. + * Migrate to dh7 + javahelper packaging style. + * Bump Standards-Version to 3.9.2. No changes were required. + * Add Homepage and Vcs-* fields. + * Add dependencies on libcglib-java and provide jmock-cglib jar. + * Drop unneeded Build-Depends on ant and ant-optional. + * Provide better package descriptions. + * Update watch file. + * Update maven metadata. + * Drop unneeded dirs, README.Debian and ant.properties files. + * Drop unneeded patches. + * Make copyright file DEP5 compliant. + + -- Miguel Landaeta <mig...@miguel.cc> Mon, 12 Sep 2011 22:45:55 -0430 + jmock (1.0.1-6) unstable; urgency=low * Team upload Added: trunk/jmock/debian/clean =================================================================== --- trunk/jmock/debian/clean (rev 0) +++ trunk/jmock/debian/clean 2011-09-13 04:17:35 UTC (rev 14887) @@ -0,0 +1,2 @@ +jmock.jar +jmock-cglib.jar Modified: trunk/jmock/debian/control =================================================================== --- trunk/jmock/debian/control 2011-09-13 03:21:15 UTC (rev 14886) +++ trunk/jmock/debian/control 2011-09-13 04:17:35 UTC (rev 14887) @@ -3,16 +3,22 @@ Priority: optional Maintainer: Debian Java Maintainers <pkg-java-maintainers@lists.alioth.debian.org> Uploaders: Michael Koch <konque...@gmx.de> -Build-Depends: debhelper (>= 7), default-jdk -Build-Depends-Indep: ant (>= 1.6.5), junit (>= 3.8.1), ant-optional, maven-repo-helper, - libasm-java -Standards-Version: 3.8.3 +Build-Depends: debhelper (>= 7.0.50~), default-jdk, javahelper +Build-Depends-Indep: junit (>= 3.8.2), libcglib-java, maven-repo-helper +Standards-Version: 3.9.2 +Homepage: http://www.jmock.org/ +Vcs-Svn: svn://svn.debian.org/svn/pkg-java/trunk/jmock +Vcs-Browser: http://svn.debian.org/wsvn/pkg-java/trunk/jmock/ Package: libjmock-java Architecture: all Depends: ${misc:Depends} -Suggests: libjmock-java-doc, libasm-java +Recommends: junit (>= 3.8.2) +Suggests: libjmock-java-doc, libasm-java, libcglib-java Description: Java library for testing code with mock objects + JMock is a library that supports test-driven development of Java code + with mock objects. + . Mock objects help you design and test the interactions between the objects in your programs. @@ -20,5 +26,12 @@ Section: doc Architecture: all Depends: ${misc:Depends} +Suggests: default-jdk-doc Description: Java library for testing code with mock objects - documentation - Includes javadoc only. + JMock is a library that supports test-driven development of Java code + with mock objects. + . + Mock objects help you design and test the interactions between the objects in + your programs. + . + This package provides javadocs for JMock library. Modified: trunk/jmock/debian/copyright =================================================================== --- trunk/jmock/debian/copyright 2011-09-13 03:21:15 UTC (rev 14886) +++ trunk/jmock/debian/copyright 2011-09-13 04:17:35 UTC (rev 14887) @@ -1,46 +1,80 @@ -This package was debianized by Trygve Laugstøl <tryg...@inamo.no> on -Mon, 8 Aug 2005 03:29:13 +0200 +Format: http://svn.debian.org/wsvn/dep/web/deps/dep5.mdwn?op=file&rev=173 +Upstream-Name: jMock +Upstream-Contact: jMock.org +Source: http://www.jmock.org +Comment: Upstream authors are: + Steve Freeman <s...@users.sourceforge.net>, + Tim Mackinnon <ma...@users.sourceforge.net>, + Nat Pryce <npr...@users.sourceforge.net>, + Joe Walnes <j...@thoughtworks.net> + . + Contributors: + Chris Cottee, + Aslak Hellesoy, + Martin Kersten, + Jeff Martin, + Vincent Massol, + Dan North, + Geoff Urbach, + Andrew Gray, + Anton Tagunov + . + This package was debianized by Trygve Laugstøl <tryg...@inamo.no> on + Mon, 8 Aug 2005 03:29:13 +0200 -It was downloaded from http://dist.codehaus.org/jmock/distributions/jmock-1.0.1-src.jar +Files: * +Copyright: © 2000-2007, jMock.org +License: other + Redistribution and use in source and binary forms, with or without + modification, are permitted provided that the following conditions are met: + . + Redistributions of source code must retain the above copyright notice, this list of + conditions and the following disclaimer. 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. + . + Neither the name of jMock 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 COPYRIGHT HOLDERS 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 COPYRIGHT OWNER 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. -Upstream Authors: Steve Freeman <s...@users.sourceforge.net> - Tim Mackinnon <ma...@users.sourceforge.net> - Nat Pryce <npr...@users.sourceforge.net> - Joe Walnes <j...@thoughtworks.net> - Contributors: - Chris Cottee - Aslak Hellesoy - Martin Kersten - Jeff Martin - Vincent Massol - Dan North - Geoff Urbach - Andrew Gray - Anton Tagunov - -Copyright: -Copyright (c) 2000-2003, jMock.org -All rights reserved. - -Redistribution and use in source and binary forms, with or without -modification, are permitted provided that the following conditions are met: - -Redistributions of source code must retain the above copyright notice, this list of -conditions and the following disclaimer. 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. - -Neither the name of jMock 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 COPYRIGHT HOLDERS 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 COPYRIGHT OWNER 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: © 2005, Trygve Laugstøl <tryg...@inamo.no>, + © 2005, Wolfgang Baer <wb...@gmx.de>, + © 2009, Ludovic Claude <ludovic.cla...@laposte.net>, + © 2010, Michael Koch <konque...@gmx.de>, + © 2009, 2011, Torsten Werner <twer...@debian.org>, + © 2011, Miguel Landaeta <mig...@miguel.cc> +License: other + Redistribution and use in source and binary forms, with or without + modification, are permitted provided that the following conditions are met: + . + Redistributions of source code must retain the above copyright notice, this list of + conditions and the following disclaimer. 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. + . + Neither the name of jMock 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 COPYRIGHT HOLDERS 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 COPYRIGHT OWNER 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. Deleted: trunk/jmock/debian/dirs =================================================================== --- trunk/jmock/debian/dirs 2011-09-13 03:21:15 UTC (rev 14886) +++ trunk/jmock/debian/dirs 2011-09-13 04:17:35 UTC (rev 14887) @@ -1 +0,0 @@ -usr/share/java Added: trunk/jmock/debian/jmock-cglib.pom =================================================================== --- trunk/jmock/debian/jmock-cglib.pom (rev 0) +++ trunk/jmock/debian/jmock-cglib.pom 2011-09-13 04:17:35 UTC (rev 14887) @@ -0,0 +1,36 @@ +<project> + <modelVersion>4.0.0</modelVersion> + <groupId>jmock</groupId> + <artifactId>jmock-cglib</artifactId> + <version>1.2.0</version> + <packaging>jar</packaging> + <name>jMock CGLIB extension</name> + <url>http://www.jmock.org/</url> + <description>jMock is a library for testing Java code using mock objects. The CGLIB extension allows creating of mock objects for classes.</description> + <licenses> + <license> + <name>BSD</name> + <url>http://www.jmock.org/license.html</url> + <distribution>repo</distribution> + </license> + </licenses> + <scm> + <url>http://cvs.jmock.codehaus.org/browse/jmock/jmock</url> + </scm> + <organization> + <name>jMock.org</name> + <url>http://www.jmock.org/</url> + </organization> + <dependencies> + <dependency> + <groupId>jmock</groupId> + <artifactId>jmock</artifactId> + <version>1.2.0</version> + </dependency> + <dependency> + <groupId>cglib</groupId> + <artifactId>cglib-nodep</artifactId> + <version>2.1_3</version> + </dependency> + </dependencies> +</project> Added: trunk/jmock/debian/jmock.pom =================================================================== --- trunk/jmock/debian/jmock.pom (rev 0) +++ trunk/jmock/debian/jmock.pom 2011-09-13 04:17:35 UTC (rev 14887) @@ -0,0 +1,31 @@ +<project> + <modelVersion>4.0.0</modelVersion> + <groupId>jmock</groupId> + <artifactId>jmock</artifactId> + <version>1.2.0</version> + <packaging>jar</packaging> + <name>jMock</name> + <url>http://www.jmock.org/</url> + <description>jMock is a library for testing Java code using mock objects</description> + <licenses> + <license> + <name>BSD</name> + <url>http://www.jmock.org/license.html</url> + <distribution>repo</distribution> + </license> + </licenses> + <scm> + <url>http://cvs.jmock.codehaus.org/browse/jmock/jmock</url> + </scm> + <organization> + <name>jMock.org</name> + <url>http://www.jmock.org/</url> + </organization> + <dependencies> + <dependency> + <groupId>junit</groupId> + <artifactId>junit</artifactId> + <version>3.8.1</version> + </dependency> + </dependencies> +</project> Modified: trunk/jmock/debian/libjmock-java.poms =================================================================== --- trunk/jmock/debian/libjmock-java.poms 2011-09-13 03:21:15 UTC (rev 14886) +++ trunk/jmock/debian/libjmock-java.poms 2011-09-13 04:17:35 UTC (rev 14887) @@ -1 +1,2 @@ -debian/pom.xml +debian/jmock.pom +debian/jmock-cglib.pom Modified: trunk/jmock/debian/orig-tar.sh =================================================================== --- trunk/jmock/debian/orig-tar.sh 2011-09-13 03:21:15 UTC (rev 14886) +++ trunk/jmock/debian/orig-tar.sh 2011-09-13 04:17:35 UTC (rev 14887) @@ -8,9 +8,14 @@ # clean up the upstream tarball unzip $ZIP -d tmp > /dev/null -mv tmp/jmock-$VERSION $DIR -GZIP=--best tar -c -z -f $TAR --exclude '*.jar' $DIR -rm -rf $DIR tmp +cd tmp && \ + for j in *.jar; do + unzip $j -d $(echo $j | sed -r 's/^(jmock-.*)-.*$/\1/') + done && \ +cd $OLDPWD +mv tmp $DIR +GZIP=--best tar -c -z -f $TAR --exclude '*.jar' --exclude '*.class' $DIR +rm -rf $DIR rm $ZIP # move to directory 'tarballs' Added: trunk/jmock/debian/patches/01_junit3_api.diff =================================================================== --- trunk/jmock/debian/patches/01_junit3_api.diff (rev 0) +++ trunk/jmock/debian/patches/01_junit3_api.diff 2011-09-13 04:17:35 UTC (rev 14887) @@ -0,0 +1,16 @@ +Description: Compatibility with Junit3 +Author: Miguel Landaeta <mig...@miguel.cc> +Forwarded: no +Last-Update: 2011-09-12 + +--- jmock-1.2.0.orig/jmock-core/org/jmock/expectation/AssertMo.java ++++ jmock-1.2.0/jmock-core/org/jmock/expectation/AssertMo.java +@@ -73,7 +73,7 @@ public class AssertMo extends Assert + assertTrue("Should not have verified", threwException); + } + +- static protected void failNotEquals( String message, ++ static public void failNotEquals( String message, + Object expected, + Object actual ) { + String formatted = ""; Deleted: trunk/jmock/debian/patches/build.patch =================================================================== --- trunk/jmock/debian/patches/build.patch 2011-09-13 03:21:15 UTC (rev 14886) +++ trunk/jmock/debian/patches/build.patch 2011-09-13 04:17:35 UTC (rev 14887) @@ -1,122 +0,0 @@ ---- a/build.xml -+++ b/build.xml -@@ -1,5 +1,16 @@ --<project default="jars"> -- <property file="build.properties"/> -+<project default="jars"> -+ <property name="build.javadoc.subdir" value="javadoc"/> -+ -+ <target name="debian-clean" depends="clean"> -+ </target> -+ -+ <target name="debian-build"> -+ </target> -+ -+ <target name="debian-install" depends="core.jar,javadoc"> -+ </target> -+ -+ <property file="build.properties"/> - - <property name="lib.dir" value="lib"/> - <property name="examples.dir" value="examples"/> -@@ -63,26 +74,19 @@ - - <target name="core.compile" depends="core.build.dir"> - <javac srcdir="${core.src.dir}" destdir="${core.build.dir}"> -- <classpath> -- <fileset dir="${lib.dir}"/> -- </classpath> - </javac> - </target> - - <target name="core.atest.compile" depends="core.compile"> - <javac srcdir="${core.atest.dir}" destdir="${core.build.dir}"> -- <classpath> -- <fileset dir="${lib.dir}"/> -- </classpath> - </javac> - </target> - - <target name="core.test.unit" depends="core.compile"> - <!-- Must add lib/junit.jar to the CLASSPATH to run this task --> - <mkdir dir="${report.test.unit.dir}"/> -- <junit printsummary="no" haltonfailure="true" haltonerror="true" fork="true"> -+ <junit printsummary="on" haltonfailure="true" haltonerror="true" fork="true"> - <classpath> -- <fileset dir="${lib.dir}"/> - <pathelement path="${core.build.dir}"/> - </classpath> - <formatter type="plain"/> -@@ -97,17 +101,17 @@ - <mkdir dir="${report.test.acceptance.dir}"/> - <junit printsummary="no"> - <classpath> -- <fileset dir="${lib.dir}"/> - <pathelement path="${core.build.dir}"/> - </classpath> - <formatter type="plain"/> - <batchtest fork="no" todir="${report.test.acceptance.dir}"> -- <fileset dir="${core.atest.dir}" includes="atest/**/*Test.java" excludes="test/**/Abstract*"/> -+ <fileset dir="${core.src.dir}" includes="test/**/*Test.java" excludes="test/**/Abstract*"/> - </batchtest> - </junit> - </target> -- -- <target name="core.jar" depends="core.test.unit"> -+ -+ <!-- skip unit tests --> -+ <target name="core.jar" depends="core.compile"> - <mkdir dir="${build.dist.bin.dir}"/> - <jar basedir="${core.build.dir}" destfile="${core.jar}" excludes="test/**" index="true"/> - </target> -@@ -121,7 +125,6 @@ - <target name="cglib.compile" depends="cglib.build.dir"> - <javac srcdir="${cglib.src.dir}" destdir="${cglib.build.dir}"> - <classpath> -- <fileset dir="${lib.dir}"/> - <pathelement path="${core.build.dir}"/> - </classpath> - </javac> -@@ -130,7 +133,6 @@ - <target name="cglib.atest.compile" depends="cglib.compile"> - <javac srcdir="${cglib.atest.dir}" destdir="${cglib.build.dir}"> - <classpath> -- <fileset dir="${lib.dir}"/> - <pathelement path="${core.build.dir}"/> - </classpath> - </javac> -@@ -141,7 +143,6 @@ - <mkdir dir="${report.test.unit.dir}"/> - <junit printsummary="no" haltonfailure="true" haltonerror="true"> - <classpath> -- <fileset dir="${lib.dir}"/> - <pathelement path="${core.build.dir}"/> - <pathelement path="${cglib.build.dir}"/> - </classpath> -@@ -157,7 +158,6 @@ - <mkdir dir="${report.test.acceptance.dir}"/> - <junit printsummary="no"> - <classpath> -- <fileset dir="${lib.dir}"/> - <pathelement path="${core.build.dir}"/> - <pathelement path="${cglib.build.dir}"/> - </classpath> -@@ -184,7 +184,6 @@ - <include name="${core.dir}/**"/> - <include name="${extensions.dir}/**"/> - <include name="${examples.dir}/**"/> -- <include name="${lib.dir}/**"/> - <include name="build.xml"/> - <include name="README.txt"/> - <include name="LICENSE.txt"/> -@@ -228,10 +227,6 @@ - <path path="${cglib.src.dir}"/> - </sourcepath> - -- <classpath> -- <fileset dir="${lib.dir}"/> -- </classpath> -- - <group title="User API"> - <package name="org.jmock"/> - <package name="org.jmock.builder"/> Deleted: trunk/jmock/debian/patches/code.patch =================================================================== --- trunk/jmock/debian/patches/code.patch 2011-09-13 03:21:15 UTC (rev 14886) +++ trunk/jmock/debian/patches/code.patch 2011-09-13 04:17:35 UTC (rev 14887) @@ -1,29 +0,0 @@ ---- a/core/src/test/jmock/core/testsupport/MethodFactory.java -+++ b/core/src/test/jmock/core/testsupport/MethodFactory.java -@@ -28,11 +28,12 @@ - protected Class findClass( String interfaceName ) { - ClassWriter writer = new ClassWriter(true); - -- writer.visit(Constants.ACC_PUBLIC | Constants.ACC_INTERFACE, -+ // update for asm 1.5 -+ writer.visit(Constants.ACC_PUBLIC, Constants.ACC_INTERFACE, - nameToClassFormat(interfaceName), - "java/lang/Object", -- null, /* interfaces */ -- null /* source file */); -+ new String[0], /* interfaces */ -+ (String)null /* source file */); - - writer.visitMethod(Constants.ACC_PUBLIC | Constants.ACC_ABSTRACT, - methodName, ---- a/core/src/org/jmock/expectation/AssertMo.java -+++ b/core/src/org/jmock/expectation/AssertMo.java -@@ -73,7 +73,7 @@ - assertTrue("Should not have verified", threwException); - } - -- static protected void failNotEquals( String message, -+ public static void failNotEquals( String message, - Object expected, - Object actual ) { - String formatted = ""; Modified: trunk/jmock/debian/patches/series =================================================================== --- trunk/jmock/debian/patches/series 2011-09-13 03:21:15 UTC (rev 14886) +++ trunk/jmock/debian/patches/series 2011-09-13 04:17:35 UTC (rev 14887) @@ -1,2 +1 @@ -build.patch -code.patch +01_junit3_api.diff Deleted: trunk/jmock/debian/pom.xml =================================================================== --- trunk/jmock/debian/pom.xml 2011-09-13 03:21:15 UTC (rev 14886) +++ trunk/jmock/debian/pom.xml 2011-09-13 04:17:35 UTC (rev 14887) @@ -1,13 +0,0 @@ -<project> - <modelVersion>4.0.0</modelVersion> - <groupId>jmock</groupId> - <artifactId>jmock</artifactId> - <version>1.0.1</version> - <dependencies> - <dependency> - <groupId>junit</groupId> - <artifactId>junit</artifactId> - <version>3.8.1</version> - </dependency> - </dependencies> -</project> Modified: trunk/jmock/debian/rules =================================================================== --- trunk/jmock/debian/rules 2011-09-13 03:21:15 UTC (rev 14886) +++ trunk/jmock/debian/rules 2011-09-13 04:17:35 UTC (rev 14887) @@ -1,79 +1,25 @@ #!/usr/bin/make -f +JAVA_HOME := /usr/lib/jvm/default-java -export LANG=C +%: + dh $@ --with javahelper -DEB_VERSION := $(shell dpkg-parsechangelog | egrep '^Version:' | cut -f 2 -d ' ') -DEB_NOEPOCH_VERSION := $(shell echo $(DEB_VERSION) | cut -d: -f2-) -DEB_UPSTREAM_VERSION := $(shell echo $(DEB_NOEPOCH_VERSION) | sed 's/-[^-]*$$//') -JAVA_HOME := /usr/lib/jvm/default-java -JAVACMD := $(JAVA_HOME)/bin/java -ANT_PROPS := debian/ant.properties -ANT_HOME := /usr/share/ant -ANT_CLASSPATH := $(ANT_HOME)/lib/ant.jar:$(ANT_HOME)/lib/ant-launcher.jar:$(ANT_HOME)/lib/ant-junit.jar:/usr/share/java/junit.jar:/usr/share/java/asm.jar:$(JAVA_HOME)/lib/tools.jar -VERBOSE := #-verbose +override_dh_auto_build: + dh_auto_build + CLASSPATH=/usr/share/java/junit.jar jh_build jmock.jar jmock-core + CLASSPATH=jmock.jar:/usr/share/java/cglib.jar \ + jh_build jmock-cglib.jar jmock-cglib -ANT=$(JAVACMD) -classpath $(ANT_CLASSPATH) org.apache.tools.ant.Main $(VERBOSE) -propertyfile $(ANT_PROPS) +override_dh_auto_install: + dh_auto_install + mh_installpoms -plibjmock-java + mh_installjar -plibjmock-java -l debian/jmock.pom jmock.jar + mh_installjar -plibjmock-java -l debian/jmock-cglib.pom jmock-cglib.jar -build: build-stamp - -build-stamp: - dh_testdir - $(ANT) debian-build - touch build-stamp - -clean: - dh_testdir - dh_testroot - rm -f build-stamp configure-stamp install-stamp - rm -rf build - dh_clean +override_dh_auto_clean: + dh_auto_clean mh_clean -install: install-stamp - -install-stamp: build - dh_testdir - dh_testroot - dh_prep - dh_installdirs - $(ANT) debian-install - mh_installpoms -plibjmock-java - mh_installjar -plibjmock-java -l debian/pom.xml build/dist/jars/jmock-$(DEB_UPSTREAM_VERSION).jar - dh_install -plibjmock-java-doc 'build/javadoc/*' usr/share/doc/libjmock-java/api -# mkdir -p $(TEMPDIR)/usr/share/java -# mkdir -p $(TEMPDIR)/usr/share/doc/libowanttasks-java -# install -m 644 output/lib/ow_util_ant_tasks.jar $(TEMPDIR)/usr/share/java -# mv output/docs/api $(TEMPDIR)/usr/share/doc/libowanttasks-java - touch install-stamp - - -# Build architecture-independent files here. -binary-indep: build install - dh_testdir -i - dh_testroot -i - dh_installchangelogs -i - dh_installdocs -i - dh_installexamples -i - dh_installman -i - dh_link -i - dh_strip -i - dh_compress -i - dh_fixperms -i - dh_installdeb -i - dh_shlibdeps -i - dh_gencontrol -i - dh_md5sums -i - dh_builddeb -i - -# Build architecture-dependent files here. -binary-arch: build install - -binary: binary-indep binary-arch - -get-orig-pom: - wget -O debian/pom.xml http://repository.sonatype.org/service/local/repositories/central/content/jmock/jmock/$(DEB_UPSTREAM_VERSION)/jmock-$(DEB_UPSTREAM_VERSION).pom - get-orig-source: - -uscan --download-version $(DEB_UPSTREAM_VERSION) --force-download --rename - + -uscan --download-current-version --force-download --rename Modified: trunk/jmock/debian/watch =================================================================== --- trunk/jmock/debian/watch 2011-09-13 03:21:15 UTC (rev 14886) +++ trunk/jmock/debian/watch 2011-09-13 04:17:35 UTC (rev 14887) @@ -1,2 +1,2 @@ version=3 -http://dist.codehaus.org/jmock/distributions/jmock-([\d.]+)-src\.jar debian debian/orig-tar.sh +http://www.jmock.org/dist/jmock-(1[\d.]+)-jars\.zip debian debian/orig-tar.sh _______________________________________________ pkg-java-commits mailing list pkg-java-comm...@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-commits