Author: ludovicc-guest
Date: 2009-07-06 21:05:32 +0000 (Mon, 06 Jul 2009)
New Revision: 8893
Added:
trunk/plexus-interpolation/debian/build.properties
trunk/plexus-interpolation/debian/libplexus-interpolation-java.poms
trunk/plexus-interpolation/debian/maven.rules
Removed:
trunk/plexus-interpolation/debian/ant.properties
trunk/plexus-interpolation/debian/build.xml
trunk/plexus-interpolation/debian/patches/
Modified:
trunk/plexus-interpolation/debian/changelog
trunk/plexus-interpolation/debian/control
trunk/plexus-interpolation/debian/orig-tar.sh
trunk/plexus-interpolation/debian/rules
Log:
* New version
Deleted: trunk/plexus-interpolation/debian/ant.properties
===================================================================
--- trunk/plexus-interpolation/debian/ant.properties 2009-07-06 21:04:22 UTC
(rev 8892)
+++ trunk/plexus-interpolation/debian/ant.properties 2009-07-06 21:05:32 UTC
(rev 8893)
@@ -1,2 +0,0 @@
-javadoc.dir=build/api
-maven.test.skip=true
Added: trunk/plexus-interpolation/debian/build.properties
===================================================================
--- trunk/plexus-interpolation/debian/build.properties
(rev 0)
+++ trunk/plexus-interpolation/debian/build.properties 2009-07-06 21:05:32 UTC
(rev 8893)
@@ -0,0 +1,2 @@
+javadoc.dir=build/api
+maven.test.skip=true
Deleted: trunk/plexus-interpolation/debian/build.xml
===================================================================
--- trunk/plexus-interpolation/debian/build.xml 2009-07-06 21:04:22 UTC (rev
8892)
+++ trunk/plexus-interpolation/debian/build.xml 2009-07-06 21:05:32 UTC (rev
8893)
@@ -1,41 +0,0 @@
-<?xml version="1.0"?>
-
-<project name="plexus-containers" default="package" basedir="..">
-
- <property file="/usr/share/maven-ant-helper/maven-defaults.properties"/>
-
- <macrodef name="cleanmodule">
- <attribute name="dir"/>
- <sequential>
- <ant target="clean"
- antfile="/usr/share/maven-ant-helper/maven-build.xml" dir="@{dir}"/>
- </sequential>
- </macrodef>
-
- <macrodef name="packagemodule">
- <attribute name="dir"/>
- <attribute name="artifactId"/>
- <sequential>
- <ant target="package"
antfile="/usr/share/maven-ant-helper/maven-build.xml"
- dir="@{dir}">
- <property name="artifactId" value="@{artifactId}"/>
- </ant>
- </sequential>
- </macrodef>
-
- <target name="clean">
- <delete dir="build"/>
- <cleanmodule dir="."/>
- </target>
-
- <target name="package">
- <packagemodule dir="." artifactId="plexus-interpolation"/>
- </target>
-
- <target name="javadoc">
- <javadoc destdir="${javadoc.dir}">
- <packageset dir="src/main/java/"/>
- </javadoc>
- </target>
-
-</project>
Modified: trunk/plexus-interpolation/debian/changelog
===================================================================
--- trunk/plexus-interpolation/debian/changelog 2009-07-06 21:04:22 UTC (rev
8892)
+++ trunk/plexus-interpolation/debian/changelog 2009-07-06 21:05:32 UTC (rev
8893)
@@ -1,3 +1,17 @@
+plexus-interpolation (1.11-1) unstable; urgency=low
+
+ * New upstream release, 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
+ ro the Maven repository
+ * Remove Depends on any Java runtime for the library package
+ * Remove the patch for the POM as it's no longer needed, as well as
+ the dependency on Quilt
+
+ -- Ludovic Claude <ludovic.cla...@laposte.net> Tue, 24 Mar 2009 12:13:31
+0000
+
plexus-interpolation (1.7-2) unstable; urgency=low
* Change Depends: default-jre (instead of default-java).
Modified: trunk/plexus-interpolation/debian/control
===================================================================
--- trunk/plexus-interpolation/debian/control 2009-07-06 21:04:22 UTC (rev
8892)
+++ trunk/plexus-interpolation/debian/control 2009-07-06 21:05:32 UTC (rev
8893)
@@ -1,18 +1,18 @@
Source: plexus-interpolation
-Section: libs
+Section: java
Priority: optional
Maintainer: Debian Java Maintainers
<pkg-java-maintain...@lists.alioth.debian.org>
-Uploaders: Torsten Werner <twer...@debian.org>
-Build-Depends: ant, debhelper (>= 5), cdbs (>= 0.4.5.3), default-jdk,
maven-ant-helper,
- quilt
-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
+Standards-Version: 3.8.1
Vcs-Svn: svn://svn.debian.org/svn/pkg-java/trunk/plexus-interpolation
Vcs-Browser: http://svn.debian.org/wsvn/pkg-java/trunk/plexus-interpolation/
Homepage: http://plexus.codehaus.org/plexus-components/plexus-interpolation/
Package: libplexus-interpolation-java
Architecture: all
-Depends: ${misc:Depends}, default-jre | java2-runtime
+Depends: ${misc:Depends}
Description: Plexus Interpolation API
The Plexus project provides a full software stack for creating and executing
software projects. Based on the Plexus container, the applications can
Added: trunk/plexus-interpolation/debian/libplexus-interpolation-java.poms
===================================================================
--- trunk/plexus-interpolation/debian/libplexus-interpolation-java.poms
(rev 0)
+++ trunk/plexus-interpolation/debian/libplexus-interpolation-java.poms
2009-07-06 21:05:32 UTC (rev 8893)
@@ -0,0 +1 @@
+pom.xml --no-parent
Added: trunk/plexus-interpolation/debian/maven.rules
===================================================================
--- trunk/plexus-interpolation/debian/maven.rules
(rev 0)
+++ trunk/plexus-interpolation/debian/maven.rules 2009-07-06 21:05:32 UTC
(rev 8893)
@@ -0,0 +1,2 @@
+junit junit jar s/3\..*/3.x/
+
Property changes on: trunk/plexus-interpolation/debian/orig-tar.sh
___________________________________________________________________
Modified: svn:executable
-
+ *
Modified: trunk/plexus-interpolation/debian/rules
===================================================================
--- trunk/plexus-interpolation/debian/rules 2009-07-06 21:04:22 UTC (rev
8892)
+++ trunk/plexus-interpolation/debian/rules 2009-07-06 21:05:32 UTC (rev
8893)
@@ -2,25 +2,22 @@
include /usr/share/cdbs/1/rules/debhelper.mk
include /usr/share/cdbs/1/class/ant.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")
+PACKAGE := $(DEB_SOURCE_PACKAGE)
+VERSION := $(DEB_UPSTREAM_VERSION)
JAVA_HOME := /usr/lib/jvm/default-java
-DEB_JARS :=
+DEB_JARS := ant-nodeps
DEB_ANT_BUILD_TARGET := package #javadoc
-DEB_ANT_BUILDFILE := debian/build.xml
-DEB_ANT_ARGS := -Dversion=$(VERSION)
+DEB_ANT_BUILDFILE := /usr/share/maven-ant-helper/maven-build.xml
+DEB_ANT_ARGS := -Dbasedir=$(realpath .) -Dpackage=$(PACKAGE)
-Dversion=$(VERSION)
API_DOCS := build/api
get-orig-source:
- uscan --force-download --rename
+ uscan --download-version $(VERSION) --force-download --rename
-REPO := /usr/share/maven-repo
-DEST := $(REPO)/org/codehaus/plexus
-
binary-post-install/lib$(PACKAGE)-java::
- dh_install build/*.jar $(DEST)/$(PACKAGE)/$(VERSION)/
- install -m644 pom.xml
$(DEB_DESTDIR)$(DEST)/$(PACKAGE)/$(VERSION)/$(PACKAGE)-$(VERSION).pom
- dh_link $(DEST)/$(PACKAGE)/$(VERSION)/$(PACKAGE)-$(VERSION).jar
/usr/share/java/$(PACKAGE).jar
- dh_link $(DEST)/$(PACKAGE)/$(VERSION)/$(PACKAGE)-$(VERSION).jar
/usr/share/maven2/lib/$(PACKAGE).jar
+ mh_installpoms -plib$(PACKAGE)-java
+ mh_installjar -plib$(PACKAGE)-java -l pom.xml
build/$(PACKAGE)-$(VERSION).jar
+
+clean::
+ -rm -rf debian/tmp
Property changes on: trunk/plexus-interpolation/debian/rules
___________________________________________________________________
Modified: svn:executable
-
+ *
_______________________________________________
pkg-java-commits mailing list
pkg-java-commits@lists.alioth.debian.org
http://lists.alioth.debian.org/mailman/listinfo/pkg-java-commits
