[pkg-java] r8896 - trunk/plexus-velocity/debian
Ludovic Claude
ludovicc-guest at alioth.debian.org
Mon Jul 6 21:09:21 UTC 2009
Author: ludovicc-guest
Date: 2009-07-06 21:09:21 +0000 (Mon, 06 Jul 2009)
New Revision: 8896
Added:
trunk/plexus-velocity/debian/libplexus-velocity-java.poms
trunk/plexus-velocity/debian/maven.rules
trunk/plexus-velocity/debian/orig-tar.sh
Removed:
trunk/plexus-velocity/debian/build.xml
Modified:
trunk/plexus-velocity/debian/
trunk/plexus-velocity/debian/build.properties
trunk/plexus-velocity/debian/changelog
trunk/plexus-velocity/debian/control
trunk/plexus-velocity/debian/rules
trunk/plexus-velocity/debian/watch
Log:
* New version
Property changes on: trunk/plexus-velocity/debian
___________________________________________________________________
Added: mergeWithUpstream
+ 1
Modified: trunk/plexus-velocity/debian/build.properties
===================================================================
--- trunk/plexus-velocity/debian/build.properties 2009-07-06 21:08:33 UTC (rev 8895)
+++ trunk/plexus-velocity/debian/build.properties 2009-07-06 21:09:21 UTC (rev 8896)
@@ -1,4 +1,2 @@
-classpath.compile=\
- /usr/share/java/commons-collections.jar:\
- /usr/share/java/plexus-container-default.jar:\
- /usr/share/java/velocity.jar
+javadoc.dir=build/api
+maven.test.skip=true
Deleted: trunk/plexus-velocity/debian/build.xml
===================================================================
--- trunk/plexus-velocity/debian/build.xml 2009-07-06 21:08:33 UTC (rev 8895)
+++ trunk/plexus-velocity/debian/build.xml 2009-07-06 21:09:21 UTC (rev 8896)
@@ -1,22 +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.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>
- </target>
-
- <target name="javadoc">
- <ant target="javadoc" antfile="${maven.build.xml}" dir="."/>
- </target>
-</project>
Modified: trunk/plexus-velocity/debian/changelog
===================================================================
--- trunk/plexus-velocity/debian/changelog 2009-07-06 21:08:33 UTC (rev 8895)
+++ trunk/plexus-velocity/debian/changelog 2009-07-06 21:09:21 UTC (rev 8896)
@@ -1,11 +1,22 @@
-plexus-velocity (1.1.6-2) UNRELEASED; urgency=low
+plexus-velocity (1.1.7-1) unstable; urgency=low
+ [ Ludovic Claude ]
+ * New upstream version, added 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
+ * Replace build dependency on java-gcj-compat-dev by default-jdk
+ * Use mh_installpom and mh_installjar to install the POM and the jar to the
+ Maven repository
+ * Add libcommons-collections-java, libplexus-containers-java, velocity
+ to Depends: for the binary package
+
+ [ Michael Koch ]
* Added watch file.
* Added myself to Uploaders.
* Added Homepage, Vcs-Svn and Vcs-Browser fields.
- * Updated Standards-Version to 3.7.3.
- -- Michael Koch <konqueror at gmx.de> Sat, 19 Apr 2008 09:35:18 +0200
+ -- Ludovic Claude <ludovic.claude at laposte.net> Tue, 24 Mar 2009 23:43:12 +0000
plexus-velocity (1.1.6-1) unstable; urgency=low
Modified: trunk/plexus-velocity/debian/control
===================================================================
--- trunk/plexus-velocity/debian/control 2009-07-06 21:08:33 UTC (rev 8895)
+++ trunk/plexus-velocity/debian/control 2009-07-06 21:09:21 UTC (rev 8896)
@@ -1,21 +1,23 @@
Source: plexus-velocity
-Section: libs
+Section: java
Priority: optional
Maintainer: Debian Java Maintainers <pkg-java-maintainers at lists.alioth.debian.org>
-Uploaders: Trygve Laugstol <trygvis at inamo.no>, Paul Cager <paul-debian at home.paulcager.org>, Michael Koch <konqueror at gmx.de>
-Build-Depends-Indep: java-gcj-compat-dev (>=1.0.65), ant-optional, libcommons-collections-java,
- libplexus-container-default-java, velocity, junit, junit-doc,
- maven-ant-helper
-Build-Depends: ant, debhelper (>= 5), cdbs (>= 0.4.5.3)
-Standards-Version: 3.7.3
+Uploaders: Trygve Laugstol <trygvis at inamo.no>, Paul Cager <paul-debian at home.paulcager.org>,
+ Michael Koch <konqueror at gmx.de>, Ludovic Claude <ludovic.claude at laposte.net>
+Build-Depends-Indep: maven-repo-helper, maven-ant-helper (>> 4), ant, ant-optional,
+ libcommons-collections-java,
+ libplexus-containers-java, velocity, junit, junit-doc
+Build-Depends: debhelper (>= 5), cdbs (>= 0.4.5.3), default-jdk-builddep
+Standards-Version: 3.8.1
Vcs-Svn: svn://svn.debian.org/svn/pkg-java/trunk/plexus-velocity
Vcs-Browser: http://svn.debian.org/wsvn/pkg-java/trunk/plexus-velocity
Homepage: http://plexus.codehaus.org/
Package: libplexus-velocity-java
Architecture: all
-Section: libs
-Depends:
+Section: java
+Depends: ${misc:Depends}, libcommons-collections-java,
+ libplexus-containers-java, velocity
Suggests: libplexus-velocity-java-doc
Description: Plexus component interface to velocity
The Plexus project provides a full software stack for creating and executing
@@ -40,7 +42,7 @@
Package: libplexus-velocity-java-doc
Architecture: all
Section: doc
-Depends: classpath-doc
+Depends: ${misc:Depends}, classpath-doc
Suggests: libplexus-velocity-java
Description: API Documentation for plexus-velocity
The Plexus project provides a full software stack for creating and executing
Added: trunk/plexus-velocity/debian/libplexus-velocity-java.poms
===================================================================
--- trunk/plexus-velocity/debian/libplexus-velocity-java.poms (rev 0)
+++ trunk/plexus-velocity/debian/libplexus-velocity-java.poms 2009-07-06 21:09:21 UTC (rev 8896)
@@ -0,0 +1 @@
+pom.xml --no-parent
Added: trunk/plexus-velocity/debian/maven.rules
===================================================================
--- trunk/plexus-velocity/debian/maven.rules (rev 0)
+++ trunk/plexus-velocity/debian/maven.rules 2009-07-06 21:09:21 UTC (rev 8896)
@@ -0,0 +1,4 @@
+s/velocity/org.apache.velocity/ * * s/.*/debian/
+commons-collections commons-collections jar s/2\..*/2.x/
+commons-collections commons-collections jar s/3\..*/3.x/
+junit junit jar s/3\..*/3.x/
Added: trunk/plexus-velocity/debian/orig-tar.sh
===================================================================
--- trunk/plexus-velocity/debian/orig-tar.sh (rev 0)
+++ trunk/plexus-velocity/debian/orig-tar.sh 2009-07-06 21:09:21 UTC (rev 8896)
@@ -0,0 +1,19 @@
+#!/bin/sh -e
+
+# $2 = version
+
+TAR=../plexus-velocity_$2.orig.tar.gz
+DIR=plexus-velocity-$2
+TAG=plexus-velocity-$2
+
+svn export http://svn.codehaus.org/plexus/plexus-components/tags/$TAG/ $DIR
+tar -c -z -f $TAR $DIR
+rm -rf $DIR ../$TAG
+
+# move to directory 'tarballs'
+if [ -r .svn/deb-layout ]; then
+ . .svn/deb-layout
+ mv $TAR $origDir
+ echo "moved $TAR to $origDir"
+fi
+
Property changes on: trunk/plexus-velocity/debian/orig-tar.sh
___________________________________________________________________
Added: svn:executable
+ *
Modified: trunk/plexus-velocity/debian/rules
===================================================================
--- trunk/plexus-velocity/debian/rules 2009-07-06 21:08:33 UTC (rev 8895)
+++ trunk/plexus-velocity/debian/rules 2009-07-06 21:09:21 UTC (rev 8896)
@@ -2,34 +2,26 @@
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
-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 \
- junit.jar
+PACKAGE := $(DEB_SOURCE_PACKAGE)
+VERSION := $(DEB_UPSTREAM_VERSION)
+JAVA_HOME := /usr/lib/jvm/default-java
+DEB_JARS := ant-nodeps ant-trax ant-junit junit \
+ commons-collections plexus-container-default velocity
DEB_ANT_BUILD_TARGET := package javadoc
-DEB_ANT_BUILDFILE := ./debian/build.xml
-DEB_ANT_ARGS := -Dpackage=$(PACKAGE) -DartifactId=$(PACKAGE) -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
-#SVN := http://svn.codehaus.org/plexus/plexus-components/tags/$(PACKAGE)-$(VERSION)
-# Following revision is really 1.6.1, but with missing license information corrected.
-SVN := http://svn.codehaus.org/plexus/plexus-components/trunk/$(PACKAGE) -r 6624
get-orig-source:
- echo "Getting version $(VERSION) from $(SVN)"
- mkdir orig_tmp
- cd orig_tmp && \
- svn export -q $(SVN) $(PACKAGE) && \
- tar czf ../../$(PACKAGE)_$(VERSION).orig.tar.gz $(PACKAGE)
- rm -rf orig_tmp
+ uscan --download-version $(VERSION) --force-download --rename
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 pom.xml build/$(PACKAGE)-$(VERSION).jar
+clean::
+ -rm -rf debian/tmp
+
binary-post-install/lib$(PACKAGE)-java-doc::
- mv build/javadoc build/api
dh_install -plib$(PACKAGE)-java-doc $(API_DOCS) usr/share/doc/lib$(PACKAGE)-java
Modified: trunk/plexus-velocity/debian/watch
===================================================================
--- trunk/plexus-velocity/debian/watch 2009-07-06 21:08:33 UTC (rev 8895)
+++ trunk/plexus-velocity/debian/watch 2009-07-06 21:09:21 UTC (rev 8896)
@@ -1,2 +1,4 @@
version=3
-http://repository.codehaus.org/org/codehaus/plexus/plexus-velocity/ (\d.*)/
+http://svn.codehaus.org/plexus/plexus-components/tags/ \
+ plexus-velocity-(.*)/ debian debian/orig-tar.sh
+
More information about the pkg-java-commits
mailing list