This is an automated email from the git hooks/post-receive script. ebourg-guest pushed a commit to branch master in repository plexus-velocity.
commit b164979551d28dac4877b279a87fa85761af82ca Author: Ludovic Claude <[email protected]> Date: Mon Jul 6 21:09:21 2009 +0000 * New version --- debian/build.properties | 6 ++---- debian/build.xml | 22 ---------------------- debian/changelog | 17 ++++++++++++++--- debian/control | 22 ++++++++++++---------- debian/libplexus-velocity-java.poms | 1 + debian/maven.rules | 4 ++++ debian/orig-tar.sh | 19 +++++++++++++++++++ debian/rules | 34 +++++++++++++--------------------- debian/watch | 4 +++- 9 files changed, 68 insertions(+), 61 deletions(-) diff --git a/debian/build.properties b/debian/build.properties index 0a36794..e2ae10b 100644 --- a/debian/build.properties +++ b/debian/build.properties @@ -1,4 +1,2 @@ -classpath.compile=\ - /usr/share/java/commons-collections.jar:\ - /usr/share/java/plexus-container-default.jar:\ - /usr/share/java/velocity.jar +javadoc.dir=build/api +maven.test.skip=true diff --git a/debian/build.xml b/debian/build.xml deleted file mode 100644 index e932d97..0000000 --- a/debian/build.xml +++ /dev/null @@ -1,22 +0,0 @@ -<?xml version="1.0"?> - -<project name="pkg-java" default="package" basedir=".."> - - <property file="debian/build.properties"/> - <property file="/usr/share/maven-ant-helper/maven-defaults.properties"/> - <property name="maven.build.xml" value="/usr/share/maven-ant-helper/maven-build.xml"/> - - <target name="clean"> - <ant target="clean" antfile="${maven.build.xml}" dir="."/> - </target> - - <target name="package"> - <ant target="package" antfile="${maven.build.xml}" dir="."> - <property name="artifactId" value="${artfiactId}"/> - </ant> - </target> - - <target name="javadoc"> - <ant target="javadoc" antfile="${maven.build.xml}" dir="."/> - </target> -</project> diff --git a/debian/changelog b/debian/changelog index 1069908..41d013b 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,11 +1,22 @@ -plexus-velocity (1.1.6-2) UNRELEASED; urgency=low +plexus-velocity (1.1.7-1) unstable; urgency=low + [ Ludovic Claude ] + * New upstream version, added myself to Uploaders. + * Change section to java, bump Standards-Version to 3.8.1 + * Add the Maven POM to the package, + * Add a Build-Depends-Indep dependency on maven-repo-helper + * Replace build dependency on java-gcj-compat-dev by default-jdk + * Use mh_installpom and mh_installjar to install the POM and the jar to the + Maven repository + * Add libcommons-collections-java, libplexus-containers-java, velocity + to Depends: for the binary package + + [ Michael Koch ] * Added watch file. * Added myself to Uploaders. * Added Homepage, Vcs-Svn and Vcs-Browser fields. - * Updated Standards-Version to 3.7.3. - -- Michael Koch <[email protected]> Sat, 19 Apr 2008 09:35:18 +0200 + -- Ludovic Claude <[email protected]> Tue, 24 Mar 2009 23:43:12 +0000 plexus-velocity (1.1.6-1) unstable; urgency=low diff --git a/debian/control b/debian/control index 8ae0078..9f31088 100644 --- a/debian/control +++ b/debian/control @@ -1,21 +1,23 @@ Source: plexus-velocity -Section: libs +Section: java Priority: optional Maintainer: Debian Java Maintainers <[email protected]> -Uploaders: Trygve Laugstol <[email protected]>, Paul Cager <[email protected]>, Michael Koch <[email protected]> -Build-Depends-Indep: java-gcj-compat-dev (>=1.0.65), ant-optional, libcommons-collections-java, - libplexus-container-default-java, velocity, junit, junit-doc, - maven-ant-helper -Build-Depends: ant, debhelper (>= 5), cdbs (>= 0.4.5.3) -Standards-Version: 3.7.3 +Uploaders: Trygve Laugstol <[email protected]>, Paul Cager <[email protected]>, + Michael Koch <[email protected]>, Ludovic Claude <[email protected]> +Build-Depends-Indep: maven-repo-helper, maven-ant-helper (>> 4), ant, ant-optional, + libcommons-collections-java, + libplexus-containers-java, velocity, junit, junit-doc +Build-Depends: debhelper (>= 5), cdbs (>= 0.4.5.3), default-jdk-builddep +Standards-Version: 3.8.1 Vcs-Svn: svn://svn.debian.org/svn/pkg-java/trunk/plexus-velocity Vcs-Browser: http://svn.debian.org/wsvn/pkg-java/trunk/plexus-velocity Homepage: http://plexus.codehaus.org/ Package: libplexus-velocity-java Architecture: all -Section: libs -Depends: +Section: java +Depends: ${misc:Depends}, libcommons-collections-java, + libplexus-containers-java, velocity Suggests: libplexus-velocity-java-doc Description: Plexus component interface to velocity The Plexus project provides a full software stack for creating and executing @@ -40,7 +42,7 @@ Description: Plexus component interface to velocity Package: libplexus-velocity-java-doc Architecture: all Section: doc -Depends: classpath-doc +Depends: ${misc:Depends}, classpath-doc Suggests: libplexus-velocity-java Description: API Documentation for plexus-velocity The Plexus project provides a full software stack for creating and executing diff --git a/debian/libplexus-velocity-java.poms b/debian/libplexus-velocity-java.poms new file mode 100644 index 0000000..43e746b --- /dev/null +++ b/debian/libplexus-velocity-java.poms @@ -0,0 +1 @@ +pom.xml --no-parent diff --git a/debian/maven.rules b/debian/maven.rules new file mode 100644 index 0000000..41f2cc7 --- /dev/null +++ b/debian/maven.rules @@ -0,0 +1,4 @@ +s/velocity/org.apache.velocity/ * * s/.*/debian/ +commons-collections commons-collections jar s/2\..*/2.x/ +commons-collections commons-collections jar s/3\..*/3.x/ +junit junit jar s/3\..*/3.x/ diff --git a/debian/orig-tar.sh b/debian/orig-tar.sh new file mode 100755 index 0000000..d4fa203 --- /dev/null +++ b/debian/orig-tar.sh @@ -0,0 +1,19 @@ +#!/bin/sh -e + +# $2 = version + +TAR=../plexus-velocity_$2.orig.tar.gz +DIR=plexus-velocity-$2 +TAG=plexus-velocity-$2 + +svn export http://svn.codehaus.org/plexus/plexus-components/tags/$TAG/ $DIR +tar -c -z -f $TAR $DIR +rm -rf $DIR ../$TAG + +# move to directory 'tarballs' +if [ -r .svn/deb-layout ]; then + . .svn/deb-layout + mv $TAR $origDir + echo "moved $TAR to $origDir" +fi + diff --git a/debian/rules b/debian/rules index 5b39644..0cc233e 100755 --- a/debian/rules +++ b/debian/rules @@ -2,34 +2,26 @@ include /usr/share/cdbs/1/rules/debhelper.mk include /usr/share/cdbs/1/class/ant.mk -include /usr/share/cdbs/1/rules/simple-patchsys.mk -PACKAGE := $(shell dpkg-parsechangelog | egrep '^Source:' | cut -f2 -d' ') -VERSION := $(shell dpkg-parsechangelog | egrep '^Version:' | sed "s,Version: \(.*\)-.*,\1,g") -JAVA_HOME := /usr/lib/jvm/java-gcj -ANT_HOME := /usr/share/ant -DEB_JARS := $(ANT_HOME)/lib/ant-launcher.jar $(ANT_HOME)/lib/ant-trax.jar $(ANT_HOME)/lib/ant-junit.jar \ - junit.jar +PACKAGE := $(DEB_SOURCE_PACKAGE) +VERSION := $(DEB_UPSTREAM_VERSION) +JAVA_HOME := /usr/lib/jvm/default-java +DEB_JARS := ant-nodeps ant-trax ant-junit junit \ + commons-collections plexus-container-default velocity DEB_ANT_BUILD_TARGET := package javadoc -DEB_ANT_BUILDFILE := ./debian/build.xml -DEB_ANT_ARGS := -Dpackage=$(PACKAGE) -DartifactId=$(PACKAGE) -Dversion=$(VERSION) +DEB_ANT_BUILDFILE := /usr/share/maven-ant-helper/maven-build.xml +DEB_ANT_ARGS := -Dbasedir=$(realpath .) -Dpackage=$(PACKAGE) -Dversion=$(VERSION) API_DOCS := build/api -#SVN := http://svn.codehaus.org/plexus/plexus-components/tags/$(PACKAGE)-$(VERSION) -# Following revision is really 1.6.1, but with missing license information corrected. -SVN := http://svn.codehaus.org/plexus/plexus-components/trunk/$(PACKAGE) -r 6624 get-orig-source: - echo "Getting version $(VERSION) from $(SVN)" - mkdir orig_tmp - cd orig_tmp && \ - svn export -q $(SVN) $(PACKAGE) && \ - tar czf ../../$(PACKAGE)_$(VERSION).orig.tar.gz $(PACKAGE) - rm -rf orig_tmp + uscan --download-version $(VERSION) --force-download --rename binary-post-install/lib$(PACKAGE)-java:: - dh_install -plib$(PACKAGE)-java build/$(PACKAGE)-$(VERSION).jar usr/share/java - dh_link -plib$(PACKAGE)-java usr/share/java/$(PACKAGE)-$(VERSION).jar usr/share/java/$(PACKAGE).jar; + mh_installpoms -plib$(PACKAGE)-java + mh_installjar -plib$(PACKAGE)-java -l pom.xml build/$(PACKAGE)-$(VERSION).jar + +clean:: + -rm -rf debian/tmp binary-post-install/lib$(PACKAGE)-java-doc:: - mv build/javadoc build/api dh_install -plib$(PACKAGE)-java-doc $(API_DOCS) usr/share/doc/lib$(PACKAGE)-java diff --git a/debian/watch b/debian/watch index f33b45e..b65d3e8 100644 --- a/debian/watch +++ b/debian/watch @@ -1,2 +1,4 @@ version=3 -http://repository.codehaus.org/org/codehaus/plexus/plexus-velocity/ (\d.*)/ +http://svn.codehaus.org/plexus/plexus-components/tags/ \ + plexus-velocity-(.*)/ debian debian/orig-tar.sh + -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/plexus-velocity.git _______________________________________________ pkg-java-commits mailing list [email protected] http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-commits
