[pkg-java] r8875 - trunk/plexus-digest/debian

Ludovic Claude ludovicc-guest at alioth.debian.org
Sun Jul 5 19:37:36 UTC 2009


Author: ludovicc-guest
Date: 2009-07-05 19:37:34 +0000 (Sun, 05 Jul 2009)
New Revision: 8875

Added:
   trunk/plexus-digest/debian/components.xml
   trunk/plexus-digest/debian/libplexus-digest-java.poms
Modified:
   trunk/plexus-digest/debian/
   trunk/plexus-digest/debian/build.xml
   trunk/plexus-digest/debian/changelog
   trunk/plexus-digest/debian/control
   trunk/plexus-digest/debian/orig-tar.sh
   trunk/plexus-digest/debian/rules
Log:
* New version


Property changes on: trunk/plexus-digest/debian
___________________________________________________________________
Added: mergeWithUpstream
   + 1

Modified: trunk/plexus-digest/debian/build.xml
===================================================================
--- trunk/plexus-digest/debian/build.xml	2009-07-05 19:37:00 UTC (rev 8874)
+++ trunk/plexus-digest/debian/build.xml	2009-07-05 19:37:34 UTC (rev 8875)
@@ -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>

Modified: trunk/plexus-digest/debian/changelog
===================================================================
--- trunk/plexus-digest/debian/changelog	2009-07-05 19:37:00 UTC (rev 8874)
+++ trunk/plexus-digest/debian/changelog	2009-07-05 19:37:34 UTC (rev 8875)
@@ -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).
 
- -- Paul Cager <paul-debian at home.paulcager.org>  Mon, 07 Apr 2008 00:01:02 +0100
+ -- Ludovic Claude <ludovic.claude at laposte.net>  Thu, 09 Apr 2009 13:15:53 +0000
+

Added: trunk/plexus-digest/debian/components.xml
===================================================================
--- trunk/plexus-digest/debian/components.xml	                        (rev 0)
+++ trunk/plexus-digest/debian/components.xml	2009-07-05 19:37:34 UTC (rev 8875)
@@ -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>

Modified: trunk/plexus-digest/debian/control
===================================================================
--- trunk/plexus-digest/debian/control	2009-07-05 19:37:00 UTC (rev 8874)
+++ trunk/plexus-digest/debian/control	2009-07-05 19:37:34 UTC (rev 8875)
@@ -1,18 +1,18 @@
 Source: plexus-digest
-Section: libs
+Section: java
 Priority: optional
 Maintainer: Debian Java Maintainers <pkg-java-maintainers at lists.alioth.debian.org>
 Uploaders: Paul Cager <paul-debian at home.paulcager.org>
-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

Added: trunk/plexus-digest/debian/libplexus-digest-java.poms
===================================================================
--- trunk/plexus-digest/debian/libplexus-digest-java.poms	                        (rev 0)
+++ trunk/plexus-digest/debian/libplexus-digest-java.poms	2009-07-05 19:37:34 UTC (rev 8875)
@@ -0,0 +1 @@
+pom.xml --no-parent


Property changes on: trunk/plexus-digest/debian/orig-tar.sh
___________________________________________________________________
Modified: svn:executable
   - 
   + *

Modified: trunk/plexus-digest/debian/rules
===================================================================
--- trunk/plexus-digest/debian/rules	2009-07-05 19:37:00 UTC (rev 8874)
+++ trunk/plexus-digest/debian/rules	2009-07-05 19:37:34 UTC (rev 8875)
@@ -1,17 +1,27 @@
 #!/usr/bin/make -f
 
+include /usr/share/cdbs/1/rules/debhelper.mk
 include /usr/share/cdbs/1/class/ant.mk
-include /usr/share/cdbs/1/rules/debhelper.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)
 
-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
+makebuilddir/lib$(PACKAGE)-java::
+	install -d classes/META-INF/plexus/
+	install -m644 debian/components.xml classes/META-INF/plexus/
 
+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
+


Property changes on: trunk/plexus-digest/debian/rules
___________________________________________________________________
Modified: svn:executable
   - 
   + *




More information about the pkg-java-commits mailing list