Author: ludovicc-guest Date: 2010-06-02 21:43:07 +0000 (Wed, 02 Jun 2010) New Revision: 12536
Added: trunk/junit4/debian/build.properties trunk/junit4/debian/junit4-doc.doc-base.1 trunk/junit4/debian/junit4-doc.doc-base.2 trunk/junit4/debian/junit4-doc.docs trunk/junit4/debian/junit4-doc.links trunk/junit4/debian/libjunit4-java.poms trunk/junit4/debian/orig-tar.exclude Removed: trunk/junit4/debian/ant.properties trunk/junit4/debian/junit4-doc.doc-base trunk/junit4/debian/pom.xml Modified: trunk/junit4/debian/NEWS trunk/junit4/debian/build.xml trunk/junit4/debian/changelog trunk/junit4/debian/control trunk/junit4/debian/junit4-doc.install trunk/junit4/debian/junit4.poms trunk/junit4/debian/orig-tar.sh trunk/junit4/debian/rules trunk/junit4/debian/watch Log: * Add myself to Uploaders * New upstream version * Update debian/watch and get the original tarball from GitHub * Use the tarball that contains the full project files, including pom.xml and documentation * Add Build-Depends-Indep on maven-ant-helper * Changed the build to use maven-ant-helper. Deleted debian/build.xml and reorganized debian/rules, javadoc is now linked to hamcrest docs. * Add Build-Depends-Indep and Depends for the junit4-doc package on libhamcrest-java-doc and default-jdk-doc * Install the site docs in addition to the javadocs. * Run unit tests during the build, add Build-Depends-Indep on junit and ant-optional * Use upstream pom.xml Modified: trunk/junit4/debian/NEWS =================================================================== --- trunk/junit4/debian/NEWS 2010-06-02 21:32:34 UTC (rev 12535) +++ trunk/junit4/debian/NEWS 2010-06-02 21:43:07 UTC (rev 12536) @@ -7,4 +7,3 @@ For usage of JUnit4 with ant, you should have a look at README.Debian. -- Damien Raude-Morvan <draz...@drazzib.com> Mon, 24 Aug 2009 23:31:40 +0200 - Deleted: trunk/junit4/debian/ant.properties =================================================================== --- trunk/junit4/debian/ant.properties 2010-06-02 21:32:34 UTC (rev 12535) +++ trunk/junit4/debian/ant.properties 2010-06-02 21:43:07 UTC (rev 12536) @@ -1,8 +0,0 @@ -class.dir=build -build-src.dir=build-src -org.dir=org -junit.dir=junit -doc.dir=doc/api -jar.name=junit4.jar -ant.build.javac.source=1.5 -ant.build.javac.target=1.5 Added: trunk/junit4/debian/build.properties =================================================================== --- trunk/junit4/debian/build.properties (rev 0) +++ trunk/junit4/debian/build.properties 2010-06-02 21:43:07 UTC (rev 12536) @@ -0,0 +1,4 @@ +artifactId=junit +dependency=hamcrest +build.javaVersion=1.5 +manifest=debian/MANIFEST.MF Property changes on: trunk/junit4/debian/build.properties ___________________________________________________________________ Added: svn:executable + * Modified: trunk/junit4/debian/build.xml =================================================================== --- trunk/junit4/debian/build.xml 2010-06-02 21:32:34 UTC (rev 12535) +++ trunk/junit4/debian/build.xml 2010-06-02 21:43:07 UTC (rev 12536) @@ -1,39 +1,25 @@ -<?xml version="1.0" encoding="UTF-8"?> +<project name="junit" default="javadoc" basedir=".."> -<project default="jar" name="junit4" basedir=".."> + <property name="src" value="src/main/java" /> + <property name="javadocdir" location="build/docs/api" /> + + <target name="javadoc"> + <javadoc destdir="${javadocdir}" + author="false" + version="false" + use="false" + windowtitle="JUnit API" + stylesheetfile="stylesheet.css" + > + <excludepackage name="junit.*" /> + <excludepackage name="org.junit.internal.*" /> + <excludepackage name="org.junit.experimental.theories.internal.*" /> + + <sourcepath location="${src}" /> + <classpath location="/usr/share/libhamcrest-java.jar" /> + <link href="file:///usr/share/doc/libhamcrest-java/api" /> + <link href="file:///usr/share/doc/default-jdk/api" /> + </javadoc> + </target> - <target name="clean" description="Clean up"> - <delete dir="${class.dir}"/> - <delete dir="${build-src.dir}"/> - <delete file="${jar.name}"/> - </target> - - <target name="compile" description="Compile the sources"> - <mkdir dir="${class.dir}"/> - <mkdir dir="${build-src.dir}"/> - <copy todir="${build-src.dir}/junit"> - <fileset dir="${junit.dir}"/> - </copy> - <copy todir="${build-src.dir}/org"> - <fileset dir="${org.dir}"/> - </copy> - <javac srcdir="${build-src.dir}" destdir="${class.dir}" - deprecation="true" debug="true" optimize="false"/> - </target> - - <target name="javadoc" description="Creates Javadoc documentation"> - <mkdir dir="${doc.dir}"/> - <javadoc packagenames="*" - sourcepath="${build-src.dir}" destdir="${doc.dir}"/> - </target> - - <target name="jar" description="Create the jar" depends="compile"> - <jar jarfile="${jar.name}" basedir="${class.dir}" - manifest="debian/MANIFEST.MF"> - <manifest> - <attribute name="Class-Path" value="hamcrest-core.jar"/> - </manifest> - </jar> - </target> - </project> Modified: trunk/junit4/debian/changelog =================================================================== --- trunk/junit4/debian/changelog 2010-06-02 21:32:34 UTC (rev 12535) +++ trunk/junit4/debian/changelog 2010-06-02 21:43:07 UTC (rev 12536) @@ -1,9 +1,25 @@ -junit4 (4.8.1-4) UNRELEASED; urgency=low +junit4 (4.8.2-1) unstable; urgency=low - * NOT RELEASED YET + [Ludovic Claude] + * Add myself to Uploaders + * New upstream version + * Update debian/watch and get the original tarball from GitHub + * Use the tarball that contains the full project files, including pom.xml + and documentation + * Add Build-Depends-Indep on maven-ant-helper + * Changed the build to use maven-ant-helper. Deleted debian/build.xml + and reorganized debian/rules, javadoc is now linked to hamcrest docs. + * Add Build-Depends-Indep and Depends for the junit4-doc package on + libhamcrest-java-doc and default-jdk-doc + * Install the site docs in addition to the javadocs. + * Run unit tests during the build, add Build-Depends-Indep on + junit and ant-optional + * Use upstream pom.xml + + [Varun Hiremath] * Set java source/target in d/ant.properties instead of d/rules - -- Varun Hiremath <va...@debian.org> Sun, 11 Apr 2010 03:10:31 -0400 + -- Ludovic Claude <ludovic.cla...@laposte.net> Wed, 26 May 2010 22:10:17 +0200 junit4 (4.8.1-3) unstable; urgency=low Modified: trunk/junit4/debian/control =================================================================== --- trunk/junit4/debian/control 2010-06-02 21:32:34 UTC (rev 12535) +++ trunk/junit4/debian/control 2010-06-02 21:43:07 UTC (rev 12536) @@ -1,10 +1,12 @@ Source: junit4 Section: java Maintainer: Debian Java Maintainers <pkg-java-maintainers@lists.alioth.debian.org> -Uploaders: Florian Weimer <f...@deneb.enyo.de>, Michael Koch <konque...@gmx.de>, Varun Hiremath <va...@debian.org>, Damien Raude-Morvan <draz...@debian.org> +Uploaders: Florian Weimer <f...@deneb.enyo.de>, Michael Koch <konque...@gmx.de>, + Varun Hiremath <va...@debian.org>, Damien Raude-Morvan <draz...@debian.org>, Ludovic Claude <ludovic.cla...@laposte.net> Priority: optional Build-Depends: cdbs, debhelper (>= 7), ant, default-jdk -Build-Depends-Indep: libhamcrest-java, maven-repo-helper +Build-Depends-Indep: libhamcrest-java (>> 1.1-6), maven-repo-helper, maven-ant-helper, + libhamcrest-java-doc, default-jdk-doc, ant-optional, junit Standards-Version: 3.8.4 Vcs-Svn: svn://svn.debian.org/svn/pkg-java/trunk/junit4/ Vcs-Browser: http://svn.debian.org/wsvn/pkg-java/trunk/junit4/ @@ -24,7 +26,7 @@ Package: junit4-doc Architecture: all Section: doc -Depends: ${misc:Depends} +Depends: ${misc:Depends}, libhamcrest-java-doc, default-jdk-doc Suggests: junit4 Description: JUnit regression test framework for Java - documentation JUnit is a simple framework to write repeatable tests. It is an Deleted: trunk/junit4/debian/junit4-doc.doc-base =================================================================== --- trunk/junit4/debian/junit4-doc.doc-base 2010-06-02 21:32:34 UTC (rev 12535) +++ trunk/junit4/debian/junit4-doc.doc-base 2010-06-02 21:43:07 UTC (rev 12536) @@ -1,10 +0,0 @@ -Document: junit4-javadoc -Title: API Javadoc for JUnit 4.x -Author: JUnit developers -Abstract: This is the API Javadoc provided by the JUnit library. -Section: Programming - -Format: HTML -Index: /usr/share/doc/junit4/api/index.html -Files: /usr/share/doc/junit4/api/* - Added: trunk/junit4/debian/junit4-doc.doc-base.1 =================================================================== --- trunk/junit4/debian/junit4-doc.doc-base.1 (rev 0) +++ trunk/junit4/debian/junit4-doc.doc-base.1 2010-06-02 21:43:07 UTC (rev 12536) @@ -0,0 +1,10 @@ +Document: junit4-api +Title: API Javadoc for JUnit 4.x +Author: JUnit developers +Abstract: This is the API Javadoc provided by the JUnit library. +Section: Programming + +Format: HTML +Index: /usr/share/doc/junit4/api/index.html +Files: /usr/share/doc/junit4/api/* + Added: trunk/junit4/debian/junit4-doc.doc-base.2 =================================================================== --- trunk/junit4/debian/junit4-doc.doc-base.2 (rev 0) +++ trunk/junit4/debian/junit4-doc.doc-base.2 2010-06-02 21:43:07 UTC (rev 12536) @@ -0,0 +1,11 @@ +Document: junit4-doc +Title: Manual for JUnit 4.x +Author: JUnit developers +Abstract: This is the manual of JUnit 4, a framework + for unit testing on Java 5 and better. +Section: Programming + +Format: HTML +Index: /usr/share/doc/junit4-doc/homepage.html +Files: /usr/share/doc/junit4-doc/* + Added: trunk/junit4/debian/junit4-doc.docs =================================================================== --- trunk/junit4/debian/junit4-doc.docs (rev 0) +++ trunk/junit4/debian/junit4-doc.docs 2010-06-02 21:43:07 UTC (rev 12536) @@ -0,0 +1,6 @@ +doc +doc/homepage.html +*.txt +*.css +*.html + Modified: trunk/junit4/debian/junit4-doc.install =================================================================== --- trunk/junit4/debian/junit4-doc.install 2010-06-02 21:32:34 UTC (rev 12535) +++ trunk/junit4/debian/junit4-doc.install 2010-06-02 21:43:07 UTC (rev 12536) @@ -1 +1 @@ -doc/api/ /usr/share/doc/junit4/ +build/docs/api /usr/share/doc/junit4/ Added: trunk/junit4/debian/junit4-doc.links =================================================================== --- trunk/junit4/debian/junit4-doc.links (rev 0) +++ trunk/junit4/debian/junit4-doc.links 2010-06-02 21:43:07 UTC (rev 12536) @@ -0,0 +1,2 @@ +/usr/share/doc/junit4/api /usr/share/doc/junit4-doc/javadoc_40 +/usr/share/doc/junit4/api /usr/share/doc/junit4-doc/doc/javadoc_40 Modified: trunk/junit4/debian/junit4.poms =================================================================== --- trunk/junit4/debian/junit4.poms 2010-06-02 21:32:34 UTC (rev 12535) +++ trunk/junit4/debian/junit4.poms 2010-06-02 21:43:07 UTC (rev 12536) @@ -1 +1 @@ -debian/pom.xml --no-parent +pom.xml --no-parent Added: trunk/junit4/debian/libjunit4-java.poms =================================================================== --- trunk/junit4/debian/libjunit4-java.poms (rev 0) +++ trunk/junit4/debian/libjunit4-java.poms 2010-06-02 21:43:07 UTC (rev 12536) @@ -0,0 +1 @@ +pom.xml Added: trunk/junit4/debian/orig-tar.exclude =================================================================== --- trunk/junit4/debian/orig-tar.exclude (rev 0) +++ trunk/junit4/debian/orig-tar.exclude 2010-06-02 21:43:07 UTC (rev 12536) @@ -0,0 +1,5 @@ +*.jar +*.zip +apache-maven + + Modified: trunk/junit4/debian/orig-tar.sh =================================================================== --- trunk/junit4/debian/orig-tar.sh 2010-06-02 21:32:34 UTC (rev 12535) +++ trunk/junit4/debian/orig-tar.sh 2010-06-02 21:43:07 UTC (rev 12536) @@ -1,14 +1,21 @@ #!/bin/sh -e # called by uscan with '--upstream-version' <version> <file> -DIR=junit4-$2 -TAR=../junit4_$2.orig.tar.gz +VERSION=$2 +DIR=junit4-$VERSION +TAR=../junit4_$VERSION.orig.tar.gz +ORIG_TAR=$3 +#rm -f $3 +#wget -O $TAR http://github.com/KentBeck/junit/tarball/r$VERSION + # clean up the upstream tarball mkdir $DIR -(cd $DIR; jar xf ../$3) -GZIP=--best tar czf $TAR $DIR -rm -rf $DIR $3 +tar -x -v -z -f $ORIG_TAR +rm $ORIG_TAR +find . -maxdepth 2 -wholename "./KentBeck-junit-*/*" -exec mv '{}' $DIR \; +GZIP=--best tar -c -z -f $TAR -X debian/orig-tar.exclude $DIR +rm -rf $DIR KentBack-junit-* # move to directory 'tarballs' if [ -r .svn/deb-layout ]; then Deleted: trunk/junit4/debian/pom.xml =================================================================== --- trunk/junit4/debian/pom.xml 2010-06-02 21:32:34 UTC (rev 12535) +++ trunk/junit4/debian/pom.xml 2010-06-02 21:43:07 UTC (rev 12536) @@ -1,25 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd "> - <modelVersion>4.0.0</modelVersion> - <groupId>junit</groupId> - <artifactId>junit</artifactId> - <version>4.8.1</version> - <name>JUnit</name> - <url>http://junit.org</url> - <description> - JUnit is a regression testing framework written by Erich Gamma and Kent Beck. It is used by the developer who implements unit tests in Java. - </description> - <organization> - <name>JUnit</name> - <url>http://www.junit.org</url> - </organization> - <licenses> - <license> - <name>Common Public License Version 1.0</name> - <url>http://www.opensource.org/licenses/cpl1.0.txt</url> - </license> - </licenses> - <scm> - <url>http://github.com/KentBeck/junit/tree/master</url> - </scm> -</project> Modified: trunk/junit4/debian/rules =================================================================== --- trunk/junit4/debian/rules 2010-06-02 21:32:34 UTC (rev 12535) +++ trunk/junit4/debian/rules 2010-06-02 21:43:07 UTC (rev 12536) @@ -6,13 +6,20 @@ PACKAGE := $(DEB_SOURCE_PACKAGE) VERSION := $(DEB_UPSTREAM_VERSION) JAVA_HOME := /usr/lib/jvm/default-java -DEB_ANT_BUILDFILE := debian/build.xml -DEB_ANT_BUILD_TARGET := jar javadoc -DEB_JARS := hamcrest-core +DEB_ANT_BUILDFILE := /usr/share/maven-ant-helper/maven-build.xml +DEB_ANT_BUILD_TARGET := package +DEB_JARS := ant-nodeps hamcrest-core ant-junit junit +DEB_ANT_ARGS := -Dbasedir=$(realpath .) -Dpackage=$(PACKAGE) -Dversion=$(VERSION) -DbuildVersion=$(BUILD_VERSION) +API_DOCS := build/docs/api +common-build-arch common-build-indep:: build-javadoc +build-javadoc: DEB_ANT_BUILDFILE := debian/build.xml +build-javadoc: + $(DEB_ANT_INVOKE) javadoc + binary-post-install/junit4:: mh_installpoms -pjunit4 - mh_installjar -pjunit4 -njunit4 -l debian/pom.xml junit4.jar + mh_installjar -pjunit4 -njunit4 -l pom.xml build/junit-$(VERSION).jar clean:: -rm -rf debian/tmp Modified: trunk/junit4/debian/watch =================================================================== --- trunk/junit4/debian/watch 2010-06-02 21:32:34 UTC (rev 12535) +++ trunk/junit4/debian/watch 2010-06-02 21:43:07 UTC (rev 12536) @@ -1,3 +1,3 @@ version=3 -http://sf.net/junit/ junit-([\d\.]*)-src.jar debian debian/orig-tar.sh +http://github.com/KentBeck/junit/downloads/ /KentBeck/junit/tarball/r([\d\.]*) debian debian/orig-tar.sh _______________________________________________ pkg-java-commits mailing list pkg-java-comm...@lists.alioth.debian.org http://lists.alioth.debian.org/mailman/listinfo/pkg-java-commits