[plexus-interpolation] 07/14: * New version
Emmanuel Bourg
ebourg-guest at moszumanska.debian.org
Wed Jul 8 22:38:22 UTC 2015
This is an automated email from the git hooks/post-receive script.
ebourg-guest pushed a commit to branch master
in repository plexus-interpolation.
commit c05086050639ceca95b0f315f671b676cdfdffe9
Author: Ludovic Claude <ludovic.claude at laposte.net>
Date: Mon Jul 6 21:05:32 2009 +0000
* New version
---
debian/{ant.properties => build.properties} | 0
debian/build.xml | 41 -----------------------------
debian/changelog | 14 ++++++++++
debian/control | 12 ++++-----
debian/libplexus-interpolation-java.poms | 1 +
debian/maven.rules | 2 ++
debian/patches/pom.diff | 27 -------------------
debian/patches/series | 1 -
debian/rules | 25 ++++++++----------
9 files changed, 34 insertions(+), 89 deletions(-)
diff --git a/debian/ant.properties b/debian/build.properties
similarity index 100%
rename from debian/ant.properties
rename to debian/build.properties
diff --git a/debian/build.xml b/debian/build.xml
deleted file mode 100644
index 158a219..0000000
--- a/debian/build.xml
+++ /dev/null
@@ -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>
diff --git a/debian/changelog b/debian/changelog
index dcbc715..c26ba33 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -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.claude at 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).
diff --git a/debian/control b/debian/control
index 07081c8..fc1be90 100644
--- a/debian/control
+++ b/debian/control
@@ -1,18 +1,18 @@
Source: plexus-interpolation
-Section: libs
+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: ant, debhelper (>= 5), cdbs (>= 0.4.5.3), default-jdk, maven-ant-helper,
- quilt
-Standards-Version: 3.8.0
+Uploaders: Torsten Werner <twerner at debian.org>, Ludovic Claude <ludovic.claude at 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
diff --git a/debian/libplexus-interpolation-java.poms b/debian/libplexus-interpolation-java.poms
new file mode 100644
index 0000000..43e746b
--- /dev/null
+++ b/debian/libplexus-interpolation-java.poms
@@ -0,0 +1 @@
+pom.xml --no-parent
diff --git a/debian/maven.rules b/debian/maven.rules
new file mode 100644
index 0000000..8486979
--- /dev/null
+++ b/debian/maven.rules
@@ -0,0 +1,2 @@
+junit junit jar s/3\..*/3.x/
+
diff --git a/debian/patches/pom.diff b/debian/patches/pom.diff
deleted file mode 100644
index 87a005a..0000000
--- a/debian/patches/pom.diff
+++ /dev/null
@@ -1,27 +0,0 @@
-Index: plexus-interpolation-1.7/pom.xml
-===================================================================
---- plexus-interpolation-1.7.orig/pom.xml 2008-12-07 21:25:09.000000000 +0100
-+++ plexus-interpolation-1.7/pom.xml 2008-12-07 21:04:45.000000000 +0100
-@@ -1,12 +1,15 @@
- <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
- <modelVersion>4.0.0</modelVersion>
-+ <!--
- <parent>
- <groupId>org.codehaus.plexus</groupId>
- <artifactId>plexus</artifactId>
- <version>1.0.11</version>
- </parent>
-+ -->
-
- <artifactId>plexus-interpolation</artifactId>
-+ <groupId>org.codehaus.plexus</groupId>
- <version>1.7</version>
-
- <name>Plexus Interpolation API</name>
-@@ -94,4 +97,4 @@
- </profile>
- </profiles>
-
--</project>
-\ No newline at end of file
-+</project>
diff --git a/debian/patches/series b/debian/patches/series
deleted file mode 100644
index 7740e23..0000000
--- a/debian/patches/series
+++ /dev/null
@@ -1 +0,0 @@
-pom.diff
diff --git a/debian/rules b/debian/rules
index 01a36d4..6e58322 100755
--- a/debian/rules
+++ b/debian/rules
@@ -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
-
-REPO := /usr/share/maven-repo
-DEST := $(REPO)/org/codehaus/plexus
+ uscan --download-version $(VERSION) --force-download --rename
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
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/plexus-interpolation.git
More information about the pkg-java-commits
mailing list