[pkg-java] r8838 - in trunk/plexus-container-default/debian: . patches
Ludovic Claude
ludovicc-guest at alioth.debian.org
Sat Jul 4 15:01:30 UTC 2009
Author: ludovicc-guest
Date: 2009-07-04 15:01:29 +0000 (Sat, 04 Jul 2009)
New Revision: 8838
Added:
trunk/plexus-container-default/debian/maven.rules
trunk/plexus-container-default/debian/patches/pom.diff
trunk/plexus-container-default/debian/patches/series
Removed:
trunk/plexus-container-default/debian/build.xml
Modified:
trunk/plexus-container-default/debian/
trunk/plexus-container-default/debian/build.properties
trunk/plexus-container-default/debian/changelog
trunk/plexus-container-default/debian/control
trunk/plexus-container-default/debian/rules
Log:
* New version
Property changes on: trunk/plexus-container-default/debian
___________________________________________________________________
Added: mergeWithUpstream
+ 1
Modified: trunk/plexus-container-default/debian/build.properties
===================================================================
--- trunk/plexus-container-default/debian/build.properties 2009-07-04 14:40:24 UTC (rev 8837)
+++ trunk/plexus-container-default/debian/build.properties 2009-07-04 15:01:29 UTC (rev 8838)
@@ -1,6 +1,2 @@
-classpath.compile=/usr/share/java/classworlds.jar:\
- /usr/share/java/plexus-utils.jar:\
- /usr/share/java/plexus-component-api.jar:\
- /usr/share/java/junit.jar
-classpath.test=
javadoc.dir=build/api
+maven.test.skip=true
Deleted: trunk/plexus-container-default/debian/build.xml
===================================================================
--- trunk/plexus-container-default/debian/build.xml 2009-07-04 14:40:24 UTC (rev 8837)
+++ trunk/plexus-container-default/debian/build.xml 2009-07-04 15:01:29 UTC (rev 8838)
@@ -1,24 +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="**/PlexusHierarchyTest.java"/>
- <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>
- <copy file="build/plexus-container-default-${version}.jar" tofile="build/plexus-container-default-1.0.jar"/>
- </target>
-
- <target name="javadoc">
- <ant target="javadoc" antfile="${maven.build.xml}" dir="."/>
- </target>
-</project>
Modified: trunk/plexus-container-default/debian/changelog
===================================================================
--- trunk/plexus-container-default/debian/changelog 2009-07-04 14:40:24 UTC (rev 8837)
+++ trunk/plexus-container-default/debian/changelog 2009-07-04 15:01:29 UTC (rev 8838)
@@ -1,8 +1,21 @@
-plexus-container-default (1.0-alpha-9-stable-1-3) UNRELEASED; urgency=low
+plexus-container-default (1.0-alpha-9-stable-1-3) unstable; urgency=low
+ [ Ludovic Claude ]
+ * Change section to java
+ * 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
+ * Use mh_mavenrepo to generate the update scripts for the Debian parent POM
+ * Correct Lintian warning: use a Homepage attribute in the control file
+ * Add Vcs-Browser and Vcs-Svn to the control file
+ * Use quilt to patch the POM file as it contains some incorrect information
+ * Change the dependency on java-gcj to default-jdk (Closes: #526293)
+
+ [ Michael Koch ]
* Added watch file.
- -- Michael Koch <konqueror at gmx.de> Sat, 12 Jan 2008 12:27:28 +0100
+ -- Ludovic Claude <ludovic.claude at laposte.net> Mon, 23 Mar 2009 23:31:45 +0000
plexus-container-default (1.0-alpha-9-stable-1-2) unstable; urgency=low
Modified: trunk/plexus-container-default/debian/control
===================================================================
--- trunk/plexus-container-default/debian/control 2009-07-04 14:40:24 UTC (rev 8837)
+++ trunk/plexus-container-default/debian/control 2009-07-04 15:01:29 UTC (rev 8838)
@@ -1,24 +1,25 @@
Source: plexus-container-default
-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-Indep: ant-optional,
- java-gcj-compat-dev (>=1.0.65),
+Build-Depends-Indep: maven-repo-helper, maven-ant-helper (>> 4), ant, ant-optional,
junit,
junit-doc,
libclassworlds-java (>=1.1-alpha-2),
libplexus-utils-java (>=1:1),
libplexus-utils-java-doc (>=1:1),
- libxalan2-java,
- maven-ant-helper (>=3)
-Build-Depends: ant, debhelper (>= 5), cdbs (>= 0.4.5.3)
-Standards-Version: 3.7.2
+ libxalan2-java
+Build-Depends: debhelper (>= 5), cdbs (>= 0.4.5.3), default-jdk, quilt
+Standards-Version: 3.8.1
+Vcs-Svn: svn://svn.debian.org/svn/pkg-java/trunk/plexus-container-default
+Vcs-Browser: http://svn.debian.org/wsvn/pkg-java/trunk/plexus-container-default
+Homepage: http://plexus.codehaus.org/
Package: libplexus-container-default-java
Architecture: all
-Section: libs
-Depends: libplexus-utils-java,
+Section: java
+Depends: ${misc:Depends}, libplexus-utils-java,
libclassworlds-java (>=1.1-alpha-2)
Suggests: libplexus-container-default-java-doc
Description: utilities for the Plexus framework
@@ -42,12 +43,11 @@
.
This package contains the API documentation for plexus-container-default
.
- Homepage: http://plexus.codehaus.org/
Package: libplexus-container-default-java-doc
Architecture: all
Section: doc
-Depends: classpath-doc, libclassworlds-java-doc,
+Depends: ${misc:Depends}, classpath-doc, libclassworlds-java-doc,
libplexus-utils-java-doc
Suggests: libplexus-container-default-java
Description: API Documentation for plexus-container-default
@@ -71,4 +71,4 @@
.
This package contains the API documentation for plexus-container-default
.
- Homepage: http://plexus.codehaus.org/
+
Added: trunk/plexus-container-default/debian/maven.rules
===================================================================
--- trunk/plexus-container-default/debian/maven.rules (rev 0)
+++ trunk/plexus-container-default/debian/maven.rules 2009-07-04 15:01:29 UTC (rev 8838)
@@ -0,0 +1,2 @@
+org.codehaus.plexus plexus-container-default jar s/1\.0-alpha.*/1.0-alpha/
+junit junit jar s/3\..*/3.x/
Added: trunk/plexus-container-default/debian/patches/pom.diff
===================================================================
--- trunk/plexus-container-default/debian/patches/pom.diff (rev 0)
+++ trunk/plexus-container-default/debian/patches/pom.diff 2009-07-04 15:01:29 UTC (rev 8838)
@@ -0,0 +1,11 @@
+--- a/pom.xml
++++ b/pom.xml
+@@ -33,7 +33,7 @@
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ <version>3.8.1</version>
+- <scope>compile</scope>
++ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.codehaus.plexus</groupId>
Added: trunk/plexus-container-default/debian/patches/series
===================================================================
--- trunk/plexus-container-default/debian/patches/series (rev 0)
+++ trunk/plexus-container-default/debian/patches/series 2009-07-04 15:01:29 UTC (rev 8838)
@@ -0,0 +1 @@
+pom.diff
Modified: trunk/plexus-container-default/debian/rules
===================================================================
--- trunk/plexus-container-default/debian/rules 2009-07-04 14:40:24 UTC (rev 8837)
+++ trunk/plexus-container-default/debian/rules 2009-07-04 15:01:29 UTC (rev 8838)
@@ -2,17 +2,15 @@
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
+include /usr/share/cdbs/1/rules/patchsys-quilt.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 /usr/share/java/junit.jar
+PACKAGE := $(DEB_SOURCE_PACKAGE)
+VERSION := $(DEB_UPSTREAM_VERSION)
+JAVA_HOME := /usr/lib/jvm/default-java
+DEB_JARS := ant-trax ant-nodeps xalan2 classworlds plexus-utils junit
DEB_ANT_BUILD_TARGET := package javadoc
-DEB_ANT_BUILDFILE := ./debian/build.xml
-DEB_ANT_ARGS := -DartifactId=$(PACKAGE) -Dversion=$(VERSION)
-#DEB_ANT_INVOKE := ant -verbose -Dpackage=$(PACKAGE) -Dversion=$(VERSION) -f $(BUILD_FILE)
+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-containers/tags/plexus-container-default-$(VERSION)
@@ -25,8 +23,11 @@
rm -rf orig_tmp
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 --usj-name=$(PACKAGE)-alpha pom.xml build/$(PACKAGE)-$(VERSION).jar
+clean::
+ -rm -rf debian/tmp
+
binary-post-install/lib$(PACKAGE)-java-doc::
dh_install -plib$(PACKAGE)-java-doc $(API_DOCS) usr/share/doc/lib$(PACKAGE)-java
Property changes on: trunk/plexus-container-default/debian/rules
___________________________________________________________________
Modified: svn:executable
-
+ *
More information about the pkg-java-commits
mailing list