This is an automated email from the git hooks/post-receive script.
ebourg-guest pushed a commit to branch master-1.0
in repository plexus-containers.
commit fee64f3e320a8f87c847fc69946c5fc1f4ee8c6b
Author: Ludovic Claude <ludovic.cla...@laposte.net>
Date: Sat Jul 4 15:04:43 2009 +0000
* New version
---
debian/{ant.properties => build.properties} | 1 +
debian/build.xml | 35 ++++-----
debian/changelog | 13 ++++
debian/control | 16 ++--
debian/libplexus-containers-java.poms | 5 ++
debian/maven-build.xml | 117 ----------------------------
debian/maven.rules | 4 +
debian/orig-tar.sh | 4 +-
debian/rules | 17 ++--
debian/watch | 2 +-
10 files changed, 59 insertions(+), 155 deletions(-)
diff --git a/debian/ant.properties b/debian/build.properties
similarity index 66%
rename from debian/ant.properties
rename to debian/build.properties
index e2ae10b..6b8a4ef 100644
--- a/debian/ant.properties
+++ b/debian/build.properties
@@ -1,2 +1,3 @@
javadoc.dir=build/api
maven.test.skip=true
+build.javaVersion=1.5
diff --git a/debian/build.xml b/debian/build.xml
index cb83d8c..3f5b4d7 100644
--- a/debian/build.xml
+++ b/debian/build.xml
@@ -2,22 +2,26 @@
<project name="plexus-containers" default="package" basedir="..">
+ <property file="debian/build.properties"/>
+ <property name="maven.build"
value="/usr/share/maven-ant-helper/maven-build.xml"/>
<property file="/usr/share/maven-ant-helper/maven-defaults.properties"/>
<macrodef name="cleanmodule">
<attribute name="dir"/>
<sequential>
- <ant target="clean"
- antfile="${basedir}/debian/maven-build.xml" dir="@{dir}"/>
+ <ant target="clean" antfile="${maven.build}" dir="@{dir}">
+ <property name="debian.dir" location="debian" />
+ <property name="project.dir" value="@{dir}" />
+ </ant>
</sequential>
</macrodef>
<macrodef name="packagemodule">
<attribute name="dir"/>
- <attribute name="artifactId"/>
<sequential>
- <ant target="package" antfile="${basedir}/debian/maven-build.xml"
dir="@{dir}">
- <property name="artifactId" value="@{artifactId}"/>
+ <ant target="package" antfile="${maven.build}" dir="@{dir}">
+ <property name="debian.dir" location="debian" />
+ <property name="project.dir" value="@{dir}" />
</ant>
</sequential>
</macrodef>
@@ -27,23 +31,13 @@
<cleanmodule dir="plexus-container-default"/>
<cleanmodule dir="plexus-component-annotations"/>
<cleanmodule dir="plexus-component-javadoc"/>
- <cleanmodule dir="plexus-component-metadata"/>
</target>
<target name="package">
- <packagemodule dir="plexus-container-default"
- artifactId="plexus-container-default"/>
- <packagemodule dir="plexus-component-annotations"
- artifactId="plexus-component-annotations"/>
- <packagemodule dir="plexus-component-javadoc"
- artifactId="plexus-component-javadoc"/>
- <!--
- does not build yet because
- http://svn.codehaus.org/plexus/plexus-components/trunk/plexus-cli/
- is not packaged yet
- <packagemodule dir="plexus-component-metadata"
- artifactId="plexus-component-metadata"/>
- -->
+ <packagemodule dir=""/>
+ <packagemodule dir="plexus-container-default"/>
+ <packagemodule dir="plexus-component-annotations"/>
+ <packagemodule dir="plexus-component-javadoc"/>
</target>
<target name="javadoc">
@@ -51,9 +45,6 @@
<packageset dir="plexus-container-default/src/main/java/"/>
<packageset dir="plexus-component-annotations/src/main/java/"/>
<packageset dir="plexus-component-javadoc/src/main/java/"/>
- <!--
- <packageset dir="plexus-component-metadata/src/main/java/"/>
- -->
</javadoc>
</target>
diff --git a/debian/changelog b/debian/changelog
index 1688380..a96ad9b 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,16 @@
+plexus-containers (1.0~beta3.0.7-1) unstable; urgency=low
+
+ * New upstream version, add myself to Uploaders.
+ * Change section to java, bump 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
+ * Fix Lintian warning: Add ${misc:Depend} to libplexus-containers-java-doc
+ * Remove Depends on Java runtimes as it is a library
+
+ -- Ludovic Claude <ludovic.cla...@laposte.net> Tue, 24 Mar 2009 00:33:14
+0000
+
plexus-containers (1.0~beta2-2) unstable; urgency=low
* Add missing Depends.
diff --git a/debian/control b/debian/control
index 079f843..86d6d7b 100644
--- a/debian/control
+++ b/debian/control
@@ -1,19 +1,20 @@
Source: plexus-containers
-Section: libs
+Section: java
Priority: optional
Maintainer: Debian Java Maintainers
<pkg-java-maintainers@lists.alioth.debian.org>
-Uploaders: Torsten Werner <twer...@debian.org>
-Build-Depends: ant, debhelper (>= 5), cdbs (>= 0.4.5.3), ant-optional,
default-jdk,
- maven-ant-helper, libgoogle-collections-java, libplexus-classworlds-java,
- libplexus-utils-java, libxbean-java, junit
-Standards-Version: 3.8.0
+Uploaders: Torsten Werner <twer...@debian.org>, Ludovic Claude
<ludovic.cla...@laposte.net>
+Build-Depends: debhelper (>= 5), cdbs (>= 0.4.5.3), default-jdk-builddep
+Build-Depends-Indep: maven-repo-helper, maven-ant-helper (>> 4), ant,
ant-optional,
+ libgoogle-collections-java, libplexus-classworlds-java, libplexus-utils-java,
+ libxbean-java, junit
+Standards-Version: 3.8.1
Vcs-Svn: svn://svn.debian.org/svn/pkg-java/trunk/plexus-containers
Vcs-Browser: http://svn.debian.org/wsvn/pkg-java/trunk/plexus-containers/
Homepage: http://plexus.codehaus.org
Package: libplexus-containers-java
Architecture: all
-Depends: ${misc:Depends}, default-jre | java2-runtime,
libgoogle-collections-java,
+Depends: ${misc:Depends}, libgoogle-collections-java,
libplexus-classworlds-java, libplexus-utils-java, libxbean-java
Description: utilities for the Plexus framework
The Plexus project provides a full software stack for creating and executing
@@ -39,6 +40,7 @@ Description: utilities for the Plexus framework
Package: libplexus-containers-java-doc
Architecture: all
Section: doc
+Depends: ${misc:Depends}
Suggests: libplexus-containers-java
Description: API Documentation for plexus-container-default
The Plexus project provides a full software stack for creating and executing
diff --git a/debian/libplexus-containers-java.poms
b/debian/libplexus-containers-java.poms
new file mode 100644
index 0000000..377dc3c
--- /dev/null
+++ b/debian/libplexus-containers-java.poms
@@ -0,0 +1,5 @@
+pom.xml --no-parent
+plexus-container-default/pom.xml
+plexus-component-javadoc/pom.xml
+plexus-component-annotations/pom.xml
+
diff --git a/debian/maven-build.xml b/debian/maven-build.xml
deleted file mode 100644
index f8a30db..0000000
--- a/debian/maven-build.xml
+++ /dev/null
@@ -1,117 +0,0 @@
-<?xml version="1.0"?>
-
-<project name="pkg-java" default="package" basedir="..">
-
- <target name="init">
- <available property="available.resources" file="src/main/resources"/>
-
- <fail unless="artifactId" message="Missing required property:
artifactId"/>
- <fail unless="version" message="Missing required property: version"/>
- <fail unless="basedir" message="Missing required property: basedir"/>
-
- <echo message="Compile classpath: ${classpath.full.compile}"/>
- <echo message="Test classpath: ${classpath.full.test}"/>
- </target>
-
- <!--
- | LIFECYCLE: Clean
- |-->
-
- <target name="clean">
- <delete dir="${build.directory}"/>
- </target>
-
- <!--
- | LIFECYCLE: jar
- |
- | This mimics the default Maven build life-cycle:
http://maven.apache.org/guides/introduction/introduction-to-the-lifecycle.html
- |-->
-
- <target name="process-resources" depends="init" if="available.resources">
- <mkdir dir="${build.outputDirectory}"/>
- <copy todir="${build.outputDirectory}">
- <fileset dir="src/main/resources"/>
- </copy>
- </target>
-
- <target name="compile" depends="process-resources">
- <mkdir dir="${build.outputDirectory}"/>
- <mkdir dir="${build.directory}/generated-sources"/>
- <javac
- destdir="${build.outputDirectory}"
- classpath="${classpath.compile}"
- nowarn="true"
- source="1.5" target="1.5"
- debug="on">
- <src path="${build.sourceDirectory}"/>
- <src path="${build.directory}/generated-sources"/>
- </javac>
- </target>
-
- <target name="process-test-resources" depends="compile"
unless="maven.test.skip">
- <mkdir dir="${build.testOutputDirectory}"/>
- <copy todir="${build.testOutputDirectory}">
- <fileset dir="src/test/resources"/>
- </copy>
- </target>
-
- <target name="test-compile" depends="process-test-resources"
unless="maven.test.skip">
- <mkdir dir="${build.testOutputDirectory}"/>
- <javac
- destdir="${build.testOutputDirectory}"
- classpath="${classpath.full.test}"
- nowarn="true"
- source="1.5" target="1.5"
- debug="on">
- <src path="${build.testSourceDirectory}"/>
- </javac>
- </target>
-
- <target name="test" depends="test-compile" unless="maven.test.skip">
- <mkdir dir="${build.directory}/test-output"/>
- <junit printsummary="yes" haltonfailure="no"> <!-- fork="yes"
forkmode="once" -->
- <sysproperty key="basedir" value="${basedir}"/>
- <classpath>
- <pathelement path="${classpath.full.test}"/>
- </classpath>
-
- <formatter type="plain"/>
- <batchtest todir="${build.directory}/test-output">
- <fileset dir="${build.testSourceDirectory}">
- <include name="**/*Test.java"/>
- <exclude name="**/Abstract*"/>
- <exclude name="${maven.test.exclude}"/>
- </fileset>
- </batchtest>
- </junit>
- </target>
-
- <target name="package" depends="test">
-<!--
- <delete file="${jar}"/>
-
- <mkdir
dir="${build.directory}/META-INF/maven/org.codehaus.modello/modello-core" />
- <copy file="./modello-core/pom.xml"
todir="${build.directory}/META-INF/maven/org.codehaus.modello/modello-core" />
--->
- <jar jarfile="${build.directory}/${artifactId}-${version}.jar"
- basedir="${build.outputDirectory}"/>
- </target>
-
- <!--
- | Javadoc
- |-->
-
- <target name="javadoc">
- <mkdir dir="${javadoc.dir}"/>
- <javadoc
- packagenames="org.codehaus.*"
- sourcepath="${build.sourceDirectory}"
- destdir="${javadoc.dir}"
- author="true"
- version="true"
- windowtitle="${package} API"
- doctitle="${package} - ${version}"
- classpath="${classpath.full.compile}" >
- </javadoc>
- </target>
-</project>
diff --git a/debian/maven.rules b/debian/maven.rules
new file mode 100644
index 0000000..817b4a1
--- /dev/null
+++ b/debian/maven.rules
@@ -0,0 +1,4 @@
+s/com.google.code.google-collections/com.google.collections/
s/google-collect/google-collections/ jar s/.*/debian/
+s/jdom/org.jdom/ jdom jar s/1\..*/debian/
+junit junit jar s/3\..*/3.x/
+
diff --git a/debian/orig-tar.sh b/debian/orig-tar.sh
index f20bf3f..c59f1b0 100755
--- a/debian/orig-tar.sh
+++ b/debian/orig-tar.sh
@@ -2,9 +2,11 @@
TAR=../plexus-containers_$2.orig.tar.gz
DIR=plexus-containers-$2
-TAG=$(echo plexus-containers-$2 | sed 's,~\(alpha\|beta\),-\1-,')
+TAG=$(echo plexus-containers-$2 | sed 's/~\(alpha\|beta\)/-\1-/')
svn export http://svn.codehaus.org/plexus/plexus-containers/tags/$TAG $DIR
+# remove as it's packaged elsewhere
+rm -r $DIR/plexus-component-metadata
tar -c -z -f $TAR $DIR
rm -rf $DIR ../$TAG
diff --git a/debian/rules b/debian/rules
index d66100b..12f96e7 100755
--- a/debian/rules
+++ b/debian/rules
@@ -3,25 +3,28 @@
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,g")
+PACKAGE := $(DEB_SOURCE_PACKAGE)
+VERSION := $(DEB_UPSTREAM_VERSION)
JAVA_HOME := /usr/lib/jvm/default-java
-DEB_JARS := commons-cli google-collect maven2 plexus-classworlds
junit \
+DEB_JARS := ant-nodeps commons-cli google-collections maven2
plexus-classworlds junit \
plexus-utils xbean-reflect
DEB_ANT_BUILD_TARGET := package javadoc
DEB_ANT_BUILDFILE := debian/build.xml
-DEB_ANT_ARGS := -Dversion=$(VERSION)
+DEB_ANT_ARGS := -Dpackage=$(PACKAGE) -Dversion=$(VERSION)
API_DOCS := build/api
MODULES := container-default component-annotations
component-javadoc
get-orig-source:
- uscan --force-download --rename
+ uscan --download-version $(VERSION) --force-download --rename
binary-post-install/lib$(PACKAGE)-java::
+ mh_installpoms -plib$(PACKAGE)-java
set -e; for MODULE in $(MODULES); do \
- dh_install -plib$(PACKAGE)-java
plexus-$$MODULE/build/plexus-$$MODULE-$(VERSION).jar usr/share/java; \
- dh_link -plib$(PACKAGE)-java
usr/share/java/plexus-$$MODULE-$(VERSION).jar
usr/share/java/plexus-$$MODULE-1.0.jar; \
+ mh_installjar -plib$(PACKAGE)-java -l --usj-name=plexus-$$MODULE
plexus-$$MODULE/pom.xml plexus-$$MODULE/build/plexus-$$MODULE-$(VERSION).jar; \
done
binary-post-install/lib$(PACKAGE)-java-doc::
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 2da38e0..de97f9d 100644
--- a/debian/watch
+++ b/debian/watch
@@ -1,4 +1,4 @@
version=3
-opts=uversionmangle=s{-(alpha|beta)-}{~$1} \
+opts=uversionmangle=s/-(alpha|beta)-/~$1/ \
http://svn.codehaus.org/plexus/plexus-containers/tags/ \
plexus-containers-(1\.0-.*)/ debian debian/orig-tar.sh
--
Alioth's /usr/local/bin/git-commit-notice on
/srv/git.debian.org/git/pkg-java/plexus-containers.git
_______________________________________________
pkg-java-commits mailing list
pkg-java-comm...@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-commits
