This is an automated email from the git hooks/post-receive script. apo-guest pushed a commit to branch master in repository easymock.
commit 1d210f8bad85b01a84eca97b8137cfe8ae6578ef Author: Jan-Pascal van Best <[email protected]> Date: Tue Sep 11 15:41:43 2007 +0000 Split off -doc package --- build.xml | 27 +++++++++++++-------------- debian/changelog | 6 ++++++ debian/control | 15 +++++++++++++++ debian/libeasymock-java.dirs | 1 - debian/rules | 12 +++++------- 5 files changed, 39 insertions(+), 22 deletions(-) diff --git a/build.xml b/build.xml index a6ef900..1088f58 100644 --- a/build.xml +++ b/build.xml @@ -7,7 +7,7 @@ <property name="dist" location="dist"/> <property name="build" location="build"/> <property name="build.test" location="tests-build"/> - <property name="javadoc" location="javadoc"/> + <property name="javadoc" location="api"/> <property name="jarfile" location="${dist}/easymock-2.3.jar"/> <target name="init"> @@ -21,28 +21,17 @@ <target name="compile" depends="init" description="compile the source" > <!-- Compile the java code from ${src} into ${build} --> - <javac srcdir="${src}" destdir="${build}" source="1.5" target="1.5"/> + <javac srcdir="${src}" destdir="${build}"/> </target> <target name="compile-tests" depends="init,compile" description="compile the unit tests" > - <javac srcdir="tests" destdir="${build.test}" source="1.5" target="1.5" - classpath="${build}"/> - </target> - - <target name="javadoc" depends="init" description="generate api docs"> - <javadoc destdir="${javadoc}"> - <fileset dir="${src}" defaultexcludes="yes"> - <include name="org/easymock/**"/> - <exclude name="org/easymock/LogicalOperator.java"/> - </fileset> - </javadoc> + <javac srcdir="tests" destdir="${build.test}" classpath="${build}"/> </target> <target name="test" depends="init,compile,compile-tests" description="run unit tests"> <junit printsummary="yes" haltonfailure="yes" haltonerror="yes"> <classpath> - <pathelement location="/usr/share/java/junit.jar"/> <pathelement location="${build}"/> <pathelement location="${build.test}"/> </classpath> @@ -58,6 +47,16 @@ </junit> </target> + <target name="javadoc" depends="init" description="generate api docs"> + <!-- gjdoc does not support source=1.5 --> + <javadoc destdir="${javadoc}" source="1.4"> + <fileset dir="${src}" defaultexcludes="yes"> + <!-- gjdoc barfs on the following class --> + <exclude name="org/easymock/LogicalOperator.java"/> + </fileset> + </javadoc> + </target> + <target name="jar" depends="compile" description="generate the jarfile" > diff --git a/debian/changelog b/debian/changelog index 2433f1f..f4c73f5 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +easymock (2.3+ds1-1~pre2) unstable; urgency=low + + * Split off libeasymock-java-doc package. + + -- Jan-Pascal van Best <[email protected]> Tue, 11 Sep 2007 16:45:57 +0200 + easymock (2.3+ds1-1~pre1) unstable; urgency=low * Initial release. (Closes: #441839) diff --git a/debian/control b/debian/control index 9e755c0..4bdecfa 100644 --- a/debian/control +++ b/debian/control @@ -21,3 +21,18 @@ Description: Java library to generate Mock Objects for given interfaces by simulating their collaborators with Mock Objects. . Homepage: http://www.easymock.org + +Package: libeasymock-java-doc +Architecture: all +Section: doc +Suggests: libeasymock-java +Description: Java library to generate Mock Objects for given interfaces (documentation) + EasyMock 2 is a library that provides an easy way to use Mock Objects for given + interfaces. Mock Objects simulate parts of the behavior of domain code, + and are able to check whether they are used as defined. + Domain classes can be tested in isolation + by simulating their collaborators with Mock Objects. + . + This package contains the documentation for the Mock Objects library. + . + Homepage: http://www.easymock.org diff --git a/debian/libeasymock-java.dirs b/debian/libeasymock-java.dirs index 501aeb0..b67bc01 100644 --- a/debian/libeasymock-java.dirs +++ b/debian/libeasymock-java.dirs @@ -1,2 +1 @@ /usr/share/java -/usr/share/doc/libeasymock-java/html diff --git a/debian/rules b/debian/rules index eb7f124..d7432af 100755 --- a/debian/rules +++ b/debian/rules @@ -15,7 +15,6 @@ UPSTREAM_BASENAME = easymock-$(UPSTREAM_VERSION) CHANGESFILE = ../easymock_$(DEB_VERSION)_$(DEB_BUILD_ARCH).changes INSTDIR=$(CURDIR)/debian/libeasymock-java -DOCDIR=$(INSTDIR)/usr/share/doc/libeasymock-java JAVADIR=$(INSTDIR)/usr/share/java # Explicitly build with gcj @@ -28,10 +27,10 @@ DEB_ANT_BUILD_TARGET = jar javadoc DEB_ANT_CHECK_TARGET = test DEB_JARS = ant-junit junit4 -DEB_INSTALL_CHANGELOGS_solr-common := CHANGES.txt +DEB_INSTALL_DOCS_libeasymock-java-doc := api Documentation*.html easymock.css -cleanbuilddir:: build.xml -build.xml: +cleanbuilddir:: src +src: debian/rules restore-from-source clean:: @@ -39,8 +38,6 @@ clean:: install/libeasymock-java:: install -m 0644 dist/easymock-$(UPSTREAM_VERSION).jar $(JAVADIR)/ ln -s easymock-$(UPSTREAM_VERSION).jar $(JAVADIR)/easymock.jar - - install -m 0644 Documentation*.html easymock.css $(DOCDIR)/html remove-source: rm -rf src tests samples @@ -62,7 +59,8 @@ check: lintian -i $(CHANGESFILE) linda -i $(CHANGESFILE) zgrep "^---" ../easymock_$(DEB_VERSION).diff.gz | grep -v "debian\|build.xml" ; [ $$? != 0 ] - ( dpkg --contents ../libeasymock-java_$(DEB_VERSION)_all.deb ) | less + ( dpkg --contents ../libeasymock-java_$(DEB_VERSION)_all.deb ; \ + dpkg --contents ../libeasymock-java-doc_$(DEB_VERSION)_all.deb ) | less upload: dupload -t mentors $(CHANGESFILE) -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/easymock.git _______________________________________________ pkg-java-commits mailing list [email protected] http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-commits
