This is an automated email from the git hooks/post-receive script. ebourg-guest pushed a commit to branch master in repository plexus-i18n.
commit 40b5da1fa37a86c2185d5ec4e87469e29d5c3de4 Author: Ludovic Claude <[email protected]> Date: Sun Jul 5 19:40:37 2009 +0000 * New version --- debian/build.properties | 5 +++-- debian/build.xml | 23 ----------------------- debian/changelog | 17 +++++++++++++++++ debian/control | 20 +++++++++++--------- debian/libplexus-i18n-java.poms | 1 + debian/orig-tar.sh | 19 +++++++++++++++++++ debian/rules | 39 +++++++++++++-------------------------- debian/watch | 5 +++-- 8 files changed, 67 insertions(+), 62 deletions(-) diff --git a/debian/build.properties b/debian/build.properties index 5ee44f8..6b8a4ef 100644 --- a/debian/build.properties +++ b/debian/build.properties @@ -1,2 +1,3 @@ -classpath.compile=/usr/share/java/plexus-container-default.jar:\ - /usr/share/java/plexus-utils.jar +javadoc.dir=build/api +maven.test.skip=true +build.javaVersion=1.5 diff --git a/debian/build.xml b/debian/build.xml deleted file mode 100644 index f13a297..0000000 --- a/debian/build.xml +++ /dev/null @@ -1,23 +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.test.exclude" value=""/> - <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 58a3d99..de80d1a 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,20 @@ +plexus-i18n (1.0-beta-10-1) unstable; urgency=low + + * New upstream version + * Added myself to Uploaders. + * Add the Maven POM to the package + * Add a Build-Depends-Indep dependency on maven-repo-helper + * Use mh_installpom and mh_installjar to install the POM and the jar to the + Maven repository + * Update the watch file to reflect changes on the web site, use + SVN to download the sources + * Add maven-build.xml to debian/ in order to support compilation with Java 1.5 + * Change the dependency on libplexus-container-default-java to + libplexus-containers-java + * Use the default JDK instead of gcj for building the package + + -- Ludovic Claude <[email protected]> Sun, 05 Jul 2009 20:39:18 +0100 + plexus-i18n (1.0-beta-7+svn6675-3) unstable; urgency=low * Update Standards-Version: 3.8.2. diff --git a/debian/control b/debian/control index 6d4ce87..2133580 100644 --- a/debian/control +++ b/debian/control @@ -2,17 +2,20 @@ Source: plexus-i18n Section: java Priority: optional Maintainer: Debian Java Maintainers <[email protected]> -Uploaders: Trygve Laugstol <[email protected]>, Paul Cager <[email protected]>, Torsten Werner <[email protected]> -Build-Depends-Indep: java-gcj-compat-dev (>=1.0.65), ant-optional, libxalan2-java, junit, maven-ant-helper (>= 3), libplexus-container-default-java (>= 1.0-alpha-9-stable-1), libplexus-utils-java (>= 1:1.4.1) -Build-Depends: ant, debhelper (>= 5), cdbs (>= 0.4.5.3) -Standards-Version: 3.8.2 +Uploaders: Trygve Laugstol <[email protected]>, Paul Cager <[email protected]>, + Torsten Werner <[email protected]>, Ludovic Claude <[email protected]> +Build-Depends-Indep: maven-repo-helper, maven-ant-helper (>> 4), ant, ant-optional, + libxalan2-java, libplexus-utils-java (>= 1:1.4.5), libplexus-containers-java +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-i18n +Vcs-Browser: http://svn.debian.org/wsvn/pkg-java/trunk/plexus-i18n/ Homepage: http://plexus.codehaus.org/ -Vcs-Svn: svn+ssh://svn.debian.org/svn/pkg-java/trunk/plexus-i18n -Vcs-Browser: http://svn.debian.org/svn/pkg-java/trunk/plexus-i18n/ Package: libplexus-i18n-java Architecture: all -Depends: libplexus-container-default-java, libplexus-utils-java, ${misc:Depends} +Section: java +Depends: ${misc:Depends}, libplexus-utils-java, libplexus-containers-java Suggests: libplexus-i18n-java-doc Description: a component to support internationalization of applications using Plexus Plexus I18n is a set of Plexus-components supporting internationalization of @@ -21,8 +24,7 @@ Description: a component to support internationalization of applications using P Package: libplexus-i18n-java-doc Architecture: all Section: doc -Depends: classpath-doc, libplexus-container-default-java-doc, libplexus-utils-java-doc, - ${misc:Depends} +Depends: ${misc:Depends}, classpath-doc, libplexus-containers-java-doc, libplexus-utils-java-doc Suggests: libplexus-i18n-java Description: API Documentation for plexus-i18n Plexus I18n is a set of Plexus-components supporting internationalization of diff --git a/debian/libplexus-i18n-java.poms b/debian/libplexus-i18n-java.poms new file mode 100644 index 0000000..43e746b --- /dev/null +++ b/debian/libplexus-i18n-java.poms @@ -0,0 +1 @@ +pom.xml --no-parent diff --git a/debian/orig-tar.sh b/debian/orig-tar.sh new file mode 100755 index 0000000..11e04eb --- /dev/null +++ b/debian/orig-tar.sh @@ -0,0 +1,19 @@ +#!/bin/sh -e + +# $2 = version + +TAR=../plexus-i18n_$2.orig.tar.gz +DIR=plexus-i18n-$2 +TAG=plexus-i18n-$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 5732619..fad959e 100755 --- a/debian/rules +++ b/debian/rules @@ -2,43 +2,30 @@ 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") -PLAIN_VERSION := $(shell echo $(VERSION) | sed 's/+svn.*//') -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 xalan2 \ - plexus-container-default.jar \ - plexus-utils.jar \ - junit.jar \ - ant-junit.jar +PACKAGE := $(DEB_SOURCE_PACKAGE) +VERSION := $(DEB_UPSTREAM_VERSION) +JAVA_HOME := /usr/lib/jvm/default-java +DEB_JARS := ant-nodeps plexus-container-default \ + plexus-utils junit ant-junit DEB_ANT_BUILD_TARGET := package javadoc -DEB_ANT_BUILDFILE := ./debian/build.xml -DEB_ANT_ARGS := -DartfiactId=$(PACKAGE) -Dpackage=$(PACKAGE) -Dversion=$(PLAIN_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/tags/plexus-i18n-$(VERSION) -SVN_REV := $(shell dpkg-parsechangelog | egrep '^Version:' | sed 's/.*+svn//' | sed 's/-.*//') -SVN := http://svn.codehaus.org/plexus/plexus-components/trunk/$(PACKAGE) -r $(SVN_REV) makebuilddir/lib$(PACKAGE)-java:: install -d build/classes/META-INF/plexus/ install -m644 debian/components.xml build/classes/META-INF/plexus/ get-orig-source: - echo "Getting version $(VERSION) from $(SVN)" - rm -rf orig_tmp - 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)-$(PLAIN_VERSION).jar usr/share/java - dh_link -plib$(PACKAGE)-java usr/share/java/$(PACKAGE)-$(PLAIN_VERSION).jar usr/share/java/$(PACKAGE).jar + mh_installpoms -plib$(PACKAGE)-java + mh_installjar -plib$(PACKAGE)-java pom.xml -l build/$(PACKAGE)-$(VERSION).jar 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 + +clean:: + -rm -rf debian/tmp diff --git a/debian/watch b/debian/watch index f7c41b9..7c19baf 100644 --- a/debian/watch +++ b/debian/watch @@ -1,3 +1,4 @@ version=3 -opts=dversionmangle=s/\+svn\d*// \ -http://repository.codehaus.org/org/codehaus/plexus/plexus-i18n/ (\d.*)/ +http://svn.codehaus.org/plexus/plexus-components/tags/ \ + plexus-i18n-(.*)/ debian debian/orig-tar.sh + -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/plexus-i18n.git _______________________________________________ pkg-java-commits mailing list [email protected] http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-commits
