[pkg-java] r7609 - in trunk/plexus-io/debian: . patches
twerner at alioth.debian.org
twerner at alioth.debian.org
Tue Dec 9 19:40:54 UTC 2008
Author: twerner
Date: 2008-12-09 19:40:54 +0000 (Tue, 09 Dec 2008)
New Revision: 7609
Added:
trunk/plexus-io/debian/ant.properties
trunk/plexus-io/debian/patches/
trunk/plexus-io/debian/patches/pom.diff
trunk/plexus-io/debian/patches/series
Modified:
trunk/plexus-io/debian/
trunk/plexus-io/debian/build.xml
trunk/plexus-io/debian/changelog
trunk/plexus-io/debian/compat
trunk/plexus-io/debian/control
trunk/plexus-io/debian/copyright
trunk/plexus-io/debian/orig-tar.sh
trunk/plexus-io/debian/rules
trunk/plexus-io/debian/watch
Log:
some fixes
Property changes on: trunk/plexus-io/debian
___________________________________________________________________
Name: mergeWithUpstream
+ 1
Added: trunk/plexus-io/debian/ant.properties
===================================================================
--- trunk/plexus-io/debian/ant.properties (rev 0)
+++ trunk/plexus-io/debian/ant.properties 2008-12-09 19:40:54 UTC (rev 7609)
@@ -0,0 +1,2 @@
+javadoc.dir=build/api
+maven.test.skip=true
Modified: trunk/plexus-io/debian/build.xml
===================================================================
--- trunk/plexus-io/debian/build.xml 2008-12-09 18:14:49 UTC (rev 7608)
+++ trunk/plexus-io/debian/build.xml 2008-12-09 19:40:54 UTC (rev 7609)
@@ -1,33 +1,41 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version="1.0"?>
+
+<project name="plexus-containers" default="package" basedir="..">
+
+ <property file="/usr/share/maven-ant-helper/maven-defaults.properties"/>
-<project default="jar" name="${component}" basedir="..">
+ <macrodef name="cleanmodule">
+ <attribute name="dir"/>
+ <sequential>
+ <ant target="clean"
+ antfile="/usr/share/maven-ant-helper/maven-build.xml" dir="@{dir}"/>
+ </sequential>
+ </macrodef>
- <target name="init">
- <property name="jar.name" value="${component}-${version}.jar" />
- <property name="classes.dir" value="classes" />
- <property name="source.dir" value="." />
+ <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="clean" depends="init">
- <delete dir="${classes.dir}" quiet="true"/>
- <delete file="${jar.name}" quiet="true"/>
+ <target name="package">
+ <packagemodule dir="." artifactId="plexus-interpolation"/>
</target>
- <target name="compile" depends="init">
- <mkdir dir="${classes.dir}"/>
- <javac srcdir="${source.dir}" destdir="${classes.dir}"
- debug="true" source="1.5" excludes="**/*Test.java" />
+ <target name="javadoc">
+ <javadoc destdir="${javadoc.dir}">
+ <packageset dir="src/main/java/"/>
+ </javadoc>
</target>
- <target name="jar" description="o Create the jar" depends="compile">
- <echo message="Building jar ${jar.name}" />
- <copy todir="${classes.dir}/META-INF">
- <fileset dir="src/main/resources/META-INF"/>
- </copy>
- <jar jarfile="${jar.name}">
- <fileset dir="${classes.dir}">
- <include name="**"/>
- </fileset>
- </jar>
- </target>
</project>
Modified: trunk/plexus-io/debian/changelog
===================================================================
--- trunk/plexus-io/debian/changelog 2008-12-09 18:14:49 UTC (rev 7608)
+++ trunk/plexus-io/debian/changelog 2008-12-09 19:40:54 UTC (rev 7609)
@@ -1,6 +1,6 @@
-plexus-io (1.0-alpha-2-1) UNRELEASED; urgency=low
+plexus-io (1.0~alpha2-1) unstable; urgency=low
- * Initial release.
- (Closes: xxxx).
+ UNRELEASED
+ * Initial release. (Closes: #475726)
- -- Paul Cager <paul-debian at home.paulcager.org> Mon, 07 Apr 2008 00:01:02 +0100
+ -- Torsten Werner <twerner at debian.org> Tue, 09 Dec 2008 20:13:45 +0100
Modified: trunk/plexus-io/debian/compat
===================================================================
--- trunk/plexus-io/debian/compat 2008-12-09 18:14:49 UTC (rev 7608)
+++ trunk/plexus-io/debian/compat 2008-12-09 19:40:54 UTC (rev 7609)
@@ -1 +1 @@
-6
+5
Modified: trunk/plexus-io/debian/control
===================================================================
--- trunk/plexus-io/debian/control 2008-12-09 18:14:49 UTC (rev 7608)
+++ trunk/plexus-io/debian/control 2008-12-09 19:40:54 UTC (rev 7609)
@@ -2,21 +2,23 @@
Section: libs
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: cdbs, debhelper (>= 6), ant
-Build-Depends-Indep: java-gcj-compat-dev, libplexus-container-default-java, libplexus-utils-java
-Standards-Version: 3.7.3
-Homepage: http://plexus.codehaus.org
+Uploaders: Torsten Werner <twerner at debian.org>
+Build-Depends: ant, debhelper (>= 5), cdbs (>= 0.4.5.3), default-jdk, maven-ant-helper,
+ quilt, libplexus-utils-java
+Standards-Version: 3.8.0
Vcs-Svn: svn://svn.debian.org/svn/pkg-java/trunk/plexus-io
-Vcs-Browser: http://svn.debian.org/wsvn/pkg-java/trunk/plexus-io
+Vcs-Browser: http://svn.debian.org/wsvn/pkg-java/trunk/plexus-io/
+Homepage: http://plexus.codehaus.org/plexus-components/plexus-io/
Package: libplexus-io-java
Architecture: all
-Depends: ${shlibs:Depends}, ${misc:Depends}, libplexus-container-default-java, libplexus-utils-java
-Description: IO utilities for the Plexus system
- The Plexus project provides a full software stack for creating and
- executing software projects. Based on the Plexus container, the applications
- can utilise component-oriented programming to build modular, reusable
- components that can easily be assembled and reused.
+Depends: ${misc:Depends}, default-java | java2-runtime, libplexus-utils-java
+Description: Plexus IO Components
+ Plexus IO is a set of plexus components, which are designed for use in I/O
+ operations. These I/O operations are doing nothing spectacular. For example,
+ Apache Commons IO is a much more powerful library in the same area. However,
+ the implementation as a plexus component allows reuse in Maven.
.
- This package provides IO utilities for Plexus.
+ The following component groups are currently available:
+ * File Mappers
+ * File Selectors
Modified: trunk/plexus-io/debian/copyright
===================================================================
--- trunk/plexus-io/debian/copyright 2008-12-09 18:14:49 UTC (rev 7608)
+++ trunk/plexus-io/debian/copyright 2008-12-09 19:40:54 UTC (rev 7609)
@@ -1,16 +1,25 @@
-This package was debianized by Paul Cager <paul-debian at home.paulcager.org>
-Sun, 13 Apr 2008 17:44:08 +0100.
+This package was debianized by Torsten Werner<twerner at debian.org>
+Sat Nov 29 17:33:45 CET 2008
-It was downloaded from http://repository.codehaus.org/org/codehaus/plexus/plexus-io/
+plexus-io was downloaded from
+http://plexus.codehaus.org/plexus-components/plexus-io/
-Copyright:
- Unknown.
+Copyright: 2007-2008 The Codehaus Foundation
-Authors:
- Unknown.
-
License:
- No license found - see upstream bug http://jira.codehaus.org/browse/PLXCOMP-110
-The Debian packaging is (C) 2008, Paul Cager <paul-debian at home.paulcager.org>
-and is licensed under the Apache License version 2.
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+
+The full text of the license can be found in
+'/usr/share/common-licenses/Apache-2.0'.
+
Modified: trunk/plexus-io/debian/orig-tar.sh
===================================================================
--- trunk/plexus-io/debian/orig-tar.sh 2008-12-09 18:14:49 UTC (rev 7608)
+++ trunk/plexus-io/debian/orig-tar.sh 2008-12-09 19:40:54 UTC (rev 7609)
@@ -1,18 +1,16 @@
#!/bin/sh -e
-# $1 = version
+TAR=../plexus-io_$2.orig.tar.gz
+DIR=plexus-io-$2
+TAG=$(echo plexus-io-$2 | sed 's,~alpha,-alpha-,')
-TAG=https://svn.codehaus.org/plexus/plexus-components/tags/plexus-io-$1
+svn export http://svn.codehaus.org/plexus/plexus-components/tags/$TAG $DIR
+tar -c -z -f $TAR $DIR
+rm -rf $DIR ../$TAG
-SOURCE=plexus-io-$1
-mkdir $SOURCE
-cd $SOURCE || exit 2
-svn export $TAG
-
-GZIP=--best tar czf ../plexus-io_$1.orig.tar.gz $SOURCE || exit 2
-
-
-cd ..
-rm -rf $SOURCE
-
-
+# move to directory 'tarballs'
+if [ -r .svn/deb-layout ]; then
+ . .svn/deb-layout
+ mv $TAR $origDir
+ echo "moved $TAR to $origDir"
+fi
Added: trunk/plexus-io/debian/patches/pom.diff
===================================================================
--- trunk/plexus-io/debian/patches/pom.diff (rev 0)
+++ trunk/plexus-io/debian/patches/pom.diff 2008-12-09 19:40:54 UTC (rev 7609)
@@ -0,0 +1,51 @@
+Index: plexus-io-1.0~alpha2/pom.xml
+===================================================================
+--- plexus-io-1.0~alpha2.orig/pom.xml 2008-12-09 20:33:16.000000000 +0100
++++ plexus-io-1.0~alpha2/pom.xml 2008-12-08 23:00:27.000000000 +0100
+@@ -1,10 +1,13 @@
+ <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">
++ <!--
+ <parent>
+ <artifactId>plexus-components</artifactId>
+ <groupId>org.codehaus.plexus</groupId>
+ <version>1.1.9</version>
+ </parent>
++ -->
+ <modelVersion>4.0.0</modelVersion>
++ <groupId>org.codehaus.plexus</groupId>
+ <artifactId>plexus-io</artifactId>
+ <name>Plexus IO Components</name>
+ <version>1.0-alpha-2</version>
+@@ -13,6 +16,8 @@
+ <groupId>org.codehaus.plexus</groupId>
+ <artifactId>plexus-utils</artifactId>
+ <version>1.2</version>
++ <scope>system</scope>
++ <systemPath>/usr/share/java/plexus-utils.jar</systemPath>
+ </dependency>
+ <dependency>
+ <groupId>org.codehaus.plexus</groupId>
+@@ -37,9 +42,21 @@
+ </plugins>
+ </reporting>
+
++ <build>
++ <pluginManagement>
++ <plugins>
++ <plugin>
++ <groupId>org.apache.maven.plugins</groupId>
++ <artifactId>maven-resources-plugin</artifactId>
++ <version>2.3</version>
++ </plugin>
++ </plugins>
++ </pluginManagement>
++ </build>
++
+ <scm>
+ <connection>scm:svn:http://svn.codehaus.org/plexus/plexus-components/tags/plexus-io-1.0-alpha-2</connection>
+ <developerConnection>scm:svn:https://svn.codehaus.org/plexus/plexus-components/tags/plexus-io-1.0-alpha-2</developerConnection>
+ <url>http://fisheye.codehaus.org/browse/plexus/plexus-components/tags/plexus-io-1.0-alpha-2</url>
+ </scm>
+-</project>
+\ No newline at end of file
++</project>
Added: trunk/plexus-io/debian/patches/series
===================================================================
--- trunk/plexus-io/debian/patches/series (rev 0)
+++ trunk/plexus-io/debian/patches/series 2008-12-09 19:40:54 UTC (rev 7609)
@@ -0,0 +1 @@
+pom.diff
Modified: trunk/plexus-io/debian/rules
===================================================================
--- trunk/plexus-io/debian/rules 2008-12-09 18:14:49 UTC (rev 7608)
+++ trunk/plexus-io/debian/rules 2008-12-09 19:40:54 UTC (rev 7609)
@@ -1,17 +1,26 @@
#!/usr/bin/make -f
+include /usr/share/cdbs/1/rules/debhelper.mk
include /usr/share/cdbs/1/class/ant.mk
-include /usr/share/cdbs/1/rules/debhelper.mk
+include /usr/share/cdbs/1/rules/patchsys-quilt.mk
-JAVA_HOME := /usr/lib/jvm/java-gcj
-DEB_ANT_BUILD_TARGET := jar
-DEB_ANT_BUILDFILE := debian/build.xml
-DEB_JARS := plexus-container-default plexus-utils
-ANT_OPTS := -Dversion=$(DEB_UPSTREAM_VERSION) -Dcomponent=$(DEB_SOURCE_PACKAGE)
+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/default-java
+DEB_JARS := plexus-utils
+DEB_ANT_BUILD_TARGET := package #javadoc
+DEB_ANT_BUILDFILE := debian/build.xml
+DEB_ANT_ARGS := -Dversion=$(VERSION)
+API_DOCS := build/api
-install/lib$(DEB_SOURCE_PACKAGE)-java::
- dh_install $(DEB_SOURCE_PACKAGE)-$(DEB_UPSTREAM_VERSION).jar usr/share/java
- dh_link /usr/share/java/$(DEB_SOURCE_PACKAGE)-$(DEB_UPSTREAM_VERSION).jar /usr/share/java/$(DEB_SOURCE_PACKAGE).jar
+get-orig-source:
+ uscan --force-download --rename
-get-orig-source:
- -uscan --upstream-version 0
+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
Modified: trunk/plexus-io/debian/watch
===================================================================
--- trunk/plexus-io/debian/watch 2008-12-09 18:14:49 UTC (rev 7608)
+++ trunk/plexus-io/debian/watch 2008-12-09 19:40:54 UTC (rev 7609)
@@ -1,2 +1,4 @@
version=3
-http://repository.codehaus.org/org/codehaus/plexus/plexus-io ([0-9].*)/ debian debian/orig-tar.sh
+opts=uversionmangle=s{-alpha-}{~alpha} \
+ http://svn.codehaus.org/plexus/plexus-components/tags/ \
+ plexus-io-(.*)/ debian debian/orig-tar.sh
More information about the pkg-java-commits
mailing list