[pkg-java] r8935 - trunk/maven-shared-io/debian

Ludovic Claude ludovicc-guest at alioth.debian.org
Tue Jul 7 23:41:52 UTC 2009 

Author: ludovicc-guest
Date: 2009-07-07 23:41:51 +0000 (Tue, 07 Jul 2009)
New Revision: 8935

Added:
   trunk/maven-shared-io/debian/components.xml
   trunk/maven-shared-io/debian/libmaven-shared-io-java.poms
   trunk/maven-shared-io/debian/maven.rules
Removed:
   trunk/maven-shared-io/debian/build.xml
Modified:
   trunk/maven-shared-io/debian/build.properties
   trunk/maven-shared-io/debian/changelog
   trunk/maven-shared-io/debian/control
   trunk/maven-shared-io/debian/copyright
   trunk/maven-shared-io/debian/orig-tar.sh
   trunk/maven-shared-io/debian/rules
Log:
* New version

Modified: trunk/maven-shared-io/debian/build.properties
===================================================================
--- trunk/maven-shared-io/debian/build.properties	2009-07-07 23:14:56 UTC (rev 8934)
+++ trunk/maven-shared-io/debian/build.properties	2009-07-07 23:41:51 UTC (rev 8935)
@@ -1,3 +1,3 @@
-javadoc.dir=build/api
+javadoc.dir=target/api
 build.directory=target
-build.outputDirectory=target/classes
+maven.test.skip=true

Deleted: trunk/maven-shared-io/debian/build.xml
===================================================================
--- trunk/maven-shared-io/debian/build.xml	2009-07-07 23:14:56 UTC (rev 8934)
+++ trunk/maven-shared-io/debian/build.xml	2009-07-07 23:41:51 UTC (rev 8935)
@@ -1,26 +0,0 @@
-<?xml version="1.0"?>
-
-<project name="pkg-java" default="package" basedir="..">
-
-    <property file="debian/build.properties"/>
-    <property name="maven.test.skip" value="true"/>
-    <property name="maven.build.xml" value="/usr/share/maven-ant-helper/maven-build.xml"/>
-    <property file="/usr/share/maven-ant-helper/maven-defaults.properties"/>
-
-    <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="maven-shared-io"/>
-        </ant>
-    </target>
-
-    <target name="javadoc">
-        <javadoc destdir="${javadoc.dir}">
-            <packageset dir="src/main/java/"/>
-        </javadoc>
-    </target>
-
-</project>

Modified: trunk/maven-shared-io/debian/changelog
===================================================================
--- trunk/maven-shared-io/debian/changelog	2009-07-07 23:14:56 UTC (rev 8934)
+++ trunk/maven-shared-io/debian/changelog	2009-07-07 23:41:51 UTC (rev 8935)
@@ -1,3 +1,16 @@
+maven-shared-io (1.1-2) unstable; urgency=low
+
+  * Change section to java, bump up Standards-Version to 3.8.1
+  * Remove the dependency on default-jre | java2-runtime as this is
+    a library.
+  * Add the Maven POM to the package,
+  * Add a Build-Depends-Indep dependency on maven-repo-helper
+  * Replace Depend on maven2 by libmaven2-core-java
+  * Use mh_installpom and mh_installjar to install the POM and the jar to the
+    Maven repository
+
+ -- Ludovic Claude <ludovic.claude at laposte.net>  Tue, 12 May 2009 14:17:43 +0100
+
 maven-shared-io (1.1-1) unstable; urgency=low
 
   * Initial release. (Closes: #508014)

Added: trunk/maven-shared-io/debian/components.xml
===================================================================
--- trunk/maven-shared-io/debian/components.xml	                        (rev 0)
+++ trunk/maven-shared-io/debian/components.xml	2009-07-07 23:41:51 UTC (rev 8935)
@@ -0,0 +1,14 @@
+<component-set>
+  <components>
+    <component>
+      <role>org.apache.maven.shared.io.download.DownloadManager</role>
+      <role-hint>default</role-hint>
+      <implementation>org.apache.maven.shared.io.download.DefaultDownloadManager</implementation>
+      <requirements>
+        <requirement>
+          <role>org.apache.maven.artifact.manager.WagonManager</role>
+        </requirement>
+      </requirements>
+    </component>
+  </components>
+</component-set>
\ No newline at end of file

Modified: trunk/maven-shared-io/debian/control
===================================================================
--- trunk/maven-shared-io/debian/control	2009-07-07 23:14:56 UTC (rev 8934)
+++ trunk/maven-shared-io/debian/control	2009-07-07 23:41:51 UTC (rev 8935)
@@ -1,19 +1,19 @@
 Source: maven-shared-io
-Section: devel
+Section: java
 Priority: optional
 Maintainer: Debian Java Maintainers <pkg-java-maintainers at lists.alioth.debian.org>
 Uploaders: Torsten Werner <twerner at debian.org>
-Build-Depends: default-jdk, ant, debhelper (>= 5), cdbs, maven2, maven-ant-helper,
- libwagon-java, libplexus-utils-java, libplexus-component-api-java
-Standards-Version: 3.8.0
+Build-Depends: default-jdk, debhelper (>= 5), cdbs
+Build-Depends-Indep: maven-repo-helper, maven-ant-helper (>> 4), ant, ant-optional, 
+ libmaven2-core-java, libwagon-java, libplexus-utils-java, libplexus-component-api-java
+Standards-Version: 3.8.1
 Vcs-Svn: svn://svn.debian.org/svn/pkg-java/trunk/maven-shared-io
 Vcs-Browser: http://svn.debian.org/wsvn/pkg-java/trunk/maven-shared-io/
 Homepage: http://maven.apache.org
 
 Package: libmaven-shared-io-java
 Architecture: all
-Section: devel
-Depends: ${misc:Depends}, default-jre | java2-runtime, maven2, libwagon-java,
+Depends: ${misc:Depends}, libmaven2-core-java, libwagon-java,
  libplexus-utils-java, libplexus-component-api-java
 Description: Maven API for I/O support
  Maven is a software project management and comprehension tool. Based on the

Modified: trunk/maven-shared-io/debian/copyright
===================================================================
--- trunk/maven-shared-io/debian/copyright	2009-07-07 23:14:56 UTC (rev 8934)
+++ trunk/maven-shared-io/debian/copyright	2009-07-07 23:41:51 UTC (rev 8935)
@@ -3,7 +3,7 @@
 The Debian packaging is Copyright (c) 2008 Torsten Werner and is
 licensed under the GNU General Public License version 3. On Debian
 systems, the complete text of the GNU General Public License can be
-found in '/usr/share/common-licenses/GPL'.
+found in '/usr/share/common-licenses/GPL-3'.
 
 The package was downloaded from <http://maven.apache.org>.
 

Added: trunk/maven-shared-io/debian/libmaven-shared-io-java.poms
===================================================================
--- trunk/maven-shared-io/debian/libmaven-shared-io-java.poms	                        (rev 0)
+++ trunk/maven-shared-io/debian/libmaven-shared-io-java.poms	2009-07-07 23:41:51 UTC (rev 8935)
@@ -0,0 +1 @@
+pom.xml --no-parent

Added: trunk/maven-shared-io/debian/maven.rules
===================================================================
--- trunk/maven-shared-io/debian/maven.rules	                        (rev 0)
+++ trunk/maven-shared-io/debian/maven.rules	2009-07-07 23:41:51 UTC (rev 8935)
@@ -0,0 +1,2 @@
+junit junit jar s/3\..*/3.x/
+


Property changes on: trunk/maven-shared-io/debian/orig-tar.sh
___________________________________________________________________
Modified: svn:executable
   - 
   + *

Modified: trunk/maven-shared-io/debian/rules
===================================================================
--- trunk/maven-shared-io/debian/rules	2009-07-07 23:14:56 UTC (rev 8934)
+++ trunk/maven-shared-io/debian/rules	2009-07-07 23:41:51 UTC (rev 8935)
@@ -3,18 +3,25 @@
 include /usr/share/cdbs/1/rules/debhelper.mk
 include /usr/share/cdbs/1/class/ant.mk
 
-PACKAGE              := $(shell dpkg-parsechangelog | egrep '^Source:' | cut -f2 -d' ')
-VERSION              := $(shell dpkg-parsechangelog | egrep '^Version:' | sed 's/Version: \(.*\)-.*/\1/')
+PACKAGE              := $(DEB_SOURCE_PACKAGE)
+VERSION              := $(DEB_UPSTREAM_VERSION)
 JAVA_HOME            := /usr/lib/jvm/default-java
-DEB_JARS             := maven2 wagon-provider-api plexus-utils plexus-component-api
+DEB_JARS             := ant-nodeps maven-artifact maven-artifact-manager maven-core maven-plugin-api wagon-provider-api plexus-utils plexus-component-api
 DEB_ANT_BUILD_TARGET := package #javadoc
-DEB_ANT_BUILDFILE    := debian/build.xml
-DEB_ANT_ARGS         := -Dversion=$(VERSION)
-API_DOCS             := build/api
+DEB_ANT_BUILDFILE    := /usr/share/maven-ant-helper/maven-build.xml
+DEB_ANT_ARGS         := -Dbasedir=$(realpath .) -Dpackage=$(PACKAGE) -Dversion=$(VERSION)
+API_DOCS             := target/api
 
 get-orig-source:
-	uscan --force-download
+	-uscan --download-version $(DEB_UPSTREAM_VERSION) --force-download --rename
 
+makebuilddir/lib$(PACKAGE)-java::
+	install -d target/classes/META-INF/plexus/
+	install -m644 debian/components.xml target/classes/META-INF/plexus/
+
 binary-post-install/lib$(PACKAGE)-java::
-	dh_install -plib$(PACKAGE)-java target/$(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 target/$(PACKAGE)-$(VERSION).jar
+
+clean::
+	-rm -rf debian/tmp


Property changes on: trunk/maven-shared-io/debian/rules
___________________________________________________________________
Modified: svn:executable
   - 
   + *

More information about the pkg-java-commits mailing list