This is an automated email from the git hooks/post-receive script. ebourg-guest pushed a commit to branch master in repository plexus-digest.
commit d3d4ae0e2d3f1cfd8804f83cf562771a5a768dcb Author: Ludovic Claude <[email protected]> Date: Sun Jul 5 19:37:34 2009 +0000 * New version --- debian/build.xml | 17 +++++++++++++-- debian/changelog | 18 +++++++++++++--- debian/components.xml | 45 +++++++++++++++++++++++++++++++++++++++ debian/control | 10 ++++----- debian/libplexus-digest-java.poms | 1 + debian/rules | 26 +++++++++++++++------- 6 files changed, 99 insertions(+), 18 deletions(-) diff --git a/debian/build.xml b/debian/build.xml index 54e9c6e..4d97d88 100644 --- a/debian/build.xml +++ b/debian/build.xml @@ -1,11 +1,13 @@ <?xml version="1.0" encoding="UTF-8"?> -<project default="jar" name="${component}" basedir=".."> +<project default="jar" name="${package}" basedir=".."> <target name="init"> - <property name="jar.name" value="${component}-${version}.jar" /> + <property name="jar.name" value="${package}-${version}.jar" /> <property name="classes.dir" value="classes" /> <property name="source.dir" value="." /> + <property name="artifactId" value="${package}" /> + <property name="groupId" value="org.codehaus.plexus" /> </target> <target name="clean" depends="init"> @@ -15,6 +17,17 @@ <target name="compile" depends="init"> <mkdir dir="${classes.dir}"/> + <java classpath="/usr/share/maven-repo/org/debian/maven/maven-repo-helper/debian/maven-repo-helper-debian.jar" + classname="org.debian.maven.repo.POMCleaner"> + <arg value="-plib${package}-java" /> + <arg value="-rdebian/maven.rules" /> + <arg value="--no-parent" /> + <arg value="--keep-pom-version" /> + <arg value="pom.xml" /> + <arg value="${classes.dir}/META-INF/maven/${groupId}/${artifactId}/pom.xml" /> + <arg value="${classes.dir}/META-INF/maven/${groupId}/${artifactId}/pom.properties" /> + </java> + <copy file="${classes.dir}/META-INF/maven/${groupId}/${artifactId}/pom.xml" tofile="pom.xml" overwrite="true"/> <javac srcdir="${source.dir}" destdir="${classes.dir}" debug="true" source="1.5" excludes="**/*Test.java" /> </target> diff --git a/debian/changelog b/debian/changelog index c063408..3916803 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,6 +1,18 @@ -plexus-digest (1.1-1) UNRELEASED; urgency=low +plexus-digest (1.1-1) unstable; urgency=low + + [Ludovic Claude] + * Change section to java, bump up Standards-Version to 3.8.1 + * 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 watch and orig-tar.sh to reflect changes on the web site + * Remove dependency on libplexus-container-default-java + * Change the build dependency on java-gcj to default-jdk + [Paul Cager] * Initial release. - (Closes: 426228). + (Closes: #426228). + + -- Ludovic Claude <[email protected]> Thu, 09 Apr 2009 13:15:53 +0000 - -- Paul Cager <[email protected]> Mon, 07 Apr 2008 00:01:02 +0100 diff --git a/debian/components.xml b/debian/components.xml new file mode 100644 index 0000000..cf3ff71 --- /dev/null +++ b/debian/components.xml @@ -0,0 +1,45 @@ +<component-set> + <components> + <component> + <role>org.codehaus.plexus.digest.Digester</role> + <role-hint>sha1</role-hint> + <implementation>org.codehaus.plexus.digest.Sha1Digester</implementation> + <description>Digester that does SHA1 Message Digesting Only.</description> + </component> + <component> + <role>org.codehaus.plexus.digest.StreamingDigester</role> + <role-hint>md5</role-hint> + <implementation>org.codehaus.plexus.digest.StreamingMd5Digester</implementation> + <description>An MD5 implementation of the streaming digester.</description> + </component> + <component> + <role>org.codehaus.plexus.digest.Digester</role> + <role-hint>md5</role-hint> + <implementation>org.codehaus.plexus.digest.Md5Digester</implementation> + <description>Digester that does MD5 Message Digesting Only.</description> + </component> + <component> + <role>org.codehaus.plexus.digest.ChecksumFile</role> + <implementation>org.codehaus.plexus.digest.ChecksumFile</implementation> + <description>ChecksumFile</description> + <requirements> + <requirement> + <role>org.codehaus.plexus.digest.Digester</role> + <role-hint>sha1</role-hint> + <field-name>digestSha1</field-name> + </requirement> + <requirement> + <role>org.codehaus.plexus.digest.Digester</role> + <role-hint>md5</role-hint> + <field-name>digestMd5</field-name> + </requirement> + </requirements> + </component> + <component> + <role>org.codehaus.plexus.digest.StreamingDigester</role> + <role-hint>sha1</role-hint> + <implementation>org.codehaus.plexus.digest.StreamingSha1Digester</implementation> + <description>An SHA-1 implementation of the streaming digester.</description> + </component> + </components> +</component-set> diff --git a/debian/control b/debian/control index c9d2543..9c74581 100644 --- a/debian/control +++ b/debian/control @@ -1,18 +1,18 @@ Source: plexus-digest -Section: libs +Section: java Priority: optional Maintainer: Debian Java Maintainers <[email protected]> Uploaders: Paul Cager <[email protected]> -Build-Depends: cdbs, debhelper (>= 6), ant -Build-Depends-Indep: java-gcj-compat-dev, libplexus-container-default-java, libplexus-utils-java -Standards-Version: 3.7.3 +Build-Depends: cdbs, debhelper (>= 6), default-jdk +Build-Depends-Indep: maven-repo-helper, ant, libplexus-utils-java +Standards-Version: 3.8.1 Homepage: http://plexus.codehaus.org Vcs-Svn: svn://svn.debian.org/svn/pkg-java/trunk/plexus-digest Vcs-Browser: http://svn.debian.org/wsvn/pkg-java/trunk/plexus-digest Package: libplexus-digest-java Architecture: all -Depends: ${shlibs:Depends}, ${misc:Depends}, libplexus-container-default-java, libplexus-utils-java +Depends: ${shlibs:Depends}, ${misc:Depends}, libplexus-utils-java Description: Digest utilities for the Plexus system The Plexus project provides a full software stack for creating and executing software projects. Based on the Plexus container, the applications diff --git a/debian/libplexus-digest-java.poms b/debian/libplexus-digest-java.poms new file mode 100644 index 0000000..43e746b --- /dev/null +++ b/debian/libplexus-digest-java.poms @@ -0,0 +1 @@ +pom.xml --no-parent diff --git a/debian/rules b/debian/rules index ca1962f..ff4638f 100755 --- a/debian/rules +++ b/debian/rules @@ -1,17 +1,27 @@ #!/usr/bin/make -f -include /usr/share/cdbs/1/class/ant.mk include /usr/share/cdbs/1/rules/debhelper.mk +include /usr/share/cdbs/1/class/ant.mk -JAVA_HOME := /usr/lib/jvm/java-gcj +PACKAGE := $(DEB_SOURCE_PACKAGE) +VERSION := $(DEB_UPSTREAM_VERSION) +JAVA_HOME := /usr/lib/jvm/default-java DEB_ANT_BUILD_TARGET := jar DEB_ANT_BUILDFILE := debian/build.xml -DEB_JARS := plexus-container-default plexus-utils -ANT_OPTS := -Dversion=$(DEB_UPSTREAM_VERSION) -Dcomponent=$(DEB_SOURCE_PACKAGE) +DEB_JARS := plexus-utils +ANT_OPTS := -Dversion=$(DEB_UPSTREAM_VERSION) -Dpackage=$(DEB_SOURCE_PACKAGE) + +makebuilddir/lib$(PACKAGE)-java:: + install -d classes/META-INF/plexus/ + install -m644 debian/components.xml classes/META-INF/plexus/ -install/lib$(DEB_SOURCE_PACKAGE)-java:: - dh_install $(DEB_SOURCE_PACKAGE)-$(DEB_UPSTREAM_VERSION).jar usr/share/java - dh_link /usr/share/java/$(DEB_SOURCE_PACKAGE)-$(DEB_UPSTREAM_VERSION).jar /usr/share/java/$(DEB_SOURCE_PACKAGE).jar +binary-post-install/lib$(PACKAGE)-java:: + mh_installpoms -plib$(PACKAGE)-java + mh_installjar -plib$(PACKAGE)-java -l pom.xml $(PACKAGE)-$(VERSION).jar + +clean:: + -rm -rf debian/tmp get-orig-source: - -uscan --upstream-version 0 + -uscan --download-version $(DEB_UPSTREAM_VERSION) --force-download --rename + -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/plexus-digest.git _______________________________________________ pkg-java-commits mailing list [email protected] http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-commits
