Author: ludovicc-guest
Date: 2009-07-07 23:41:55 +0000 (Tue, 07 Jul 2009)
New Revision: 8936
Added:
trunk/maven-file-management/debian/libmaven-file-management-java.poms
trunk/maven-file-management/debian/maven.rules
trunk/maven-file-management/debian/patches/
trunk/maven-file-management/debian/patches/mdo_xsd.patch
trunk/maven-file-management/debian/patches/series
Modified:
trunk/maven-file-management/debian/build.properties
trunk/maven-file-management/debian/build.xml
trunk/maven-file-management/debian/changelog
trunk/maven-file-management/debian/control
trunk/maven-file-management/debian/copyright
trunk/maven-file-management/debian/orig-tar.sh
trunk/maven-file-management/debian/rules
Log:
* New version
Modified: trunk/maven-file-management/debian/build.properties
===================================================================
--- trunk/maven-file-management/debian/build.properties 2009-07-07 23:41:51 UTC
(rev 8935)
+++ trunk/maven-file-management/debian/build.properties 2009-07-07 23:41:55 UTC
(rev 8936)
@@ -1,3 +1,14 @@
-javadoc.dir=build/api
+javadoc.dir=target/api
build.directory=target
-build.outputDirectory=target/classes
+maven.test.skip=true
+classpath.compile=\
+ /usr/share/java/plexus-container-default-alpha.jar:\
+ /usr/share/java/plexus-utils.jar:\
+ /usr/share/java/plexus-classworlds.jar:\
+ /usr/share/java/google-collections.jar:\
+ /usr/share/java/xbean-reflect.jar:\
+ /usr/share/java/maven-core.jar:\
+ /usr/share/java/maven-model.jar:\
+ /usr/share/java/maven-shared-io.jar:\
+ /usr/share/java/maven-plugin-api.jar
+
Modified: trunk/maven-file-management/debian/build.xml
===================================================================
--- trunk/maven-file-management/debian/build.xml 2009-07-07 23:41:51 UTC
(rev 8935)
+++ trunk/maven-file-management/debian/build.xml 2009-07-07 23:41:55 UTC
(rev 8936)
@@ -3,32 +3,28 @@
<project name="pkg-java" default="package" basedir="..">
<property file="debian/build.properties"/>
- <property name="maven.test.skip" value="true"/>
- <property name="maven.build.xml"
value="/usr/share/maven-ant-helper/maven-build.xml"/>
<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="."/>
+ <ant target="clean" antfile="${maven.build.xml}" dir=""/>
</target>
<target name="generate-sources">
<taskdef name="modello" classname="ModelloTask"/>
- <modello model="src/main/mdo/fileset.mdo" plugin="xpp3-reader"
output="target/generated-sources" version="1.1.0"/>
- <modello model="src/main/mdo/fileset.mdo" plugin="xpp3-writer"
output="target/generated-sources" version="1.1.0"/>
- <modello model="src/main/mdo/fileset.mdo" plugin="java"
output="target/generated-sources" version="1.1.0"/>
- <modello model="src/main/mdo/fileset.mdo" plugin="xsd"
output="target/generated-sources" version="1.1.0"/>
+ <modello model="src/main/mdo/fileset.mdo" plugin="xpp3-reader"
output="target/generated-sources" version="1.1.0"/>
+ <modello model="src/main/mdo/fileset.mdo" plugin="xpp3-writer"
output="target/generated-sources" version="1.1.0"/>
+ <modello model="src/main/mdo/fileset.mdo" plugin="java"
output="target/generated-sources" version="1.1.0"/>
+ <modello model="src/main/mdo/fileset.mdo" plugin="xsd"
output="target/generated-sources" version="1.1.0"/>
</target>
<target name="package" depends="generate-sources">
- <ant target="package" antfile="${maven.build.xml}" dir=".">
- <property name="artifactId" value="file-management"/>
+ <ant target="package" antfile="${maven.build.xml}" dir="">
+ <property name="classpath.compile" value="${classpath.compile}" />
</ant>
</target>
<target name="javadoc">
- <javadoc destdir="${javadoc.dir}">
- <packageset dir="src/main/java/"/>
- </javadoc>
+ <ant target="javadoc" antfile="${maven.build.xml}" dir=""/>
</target>
-
</project>
Modified: trunk/maven-file-management/debian/changelog
===================================================================
--- trunk/maven-file-management/debian/changelog 2009-07-07 23:41:51 UTC
(rev 8935)
+++ trunk/maven-file-management/debian/changelog 2009-07-07 23:41:55 UTC
(rev 8936)
@@ -1,3 +1,21 @@
+maven-file-management (1.2.1-1) unstable; urgency=low
+
+ * New upstream release, add myself to Uploaders
+ * Change section to java, bump up Standards-Version to 3.8.1
+ * Remove the dependency on default-jre | java2-runtime as this is
+ a library.
+ * Add the Maven POM to the package,
+ * Add a Build-Depends-Indep dependency on maven-repo-helper
+ * Add a Build-Depends on quilt as we need to patch files.mdo to generate
+ the xsd document
+ * Depend on libplexus-container-default-java instead of
+ libplexus-containers-java as the version match
+ * Replace Depend on maven2 by libmaven2-core-java
+ * Use mh_installpom and mh_installjar to install the POM and the jar to the
+ Maven repository
+
+ -- Ludovic Claude <[email protected]> Tue, 12 May 2009 11:28:04
+0100
+
maven-file-management (1.2-1) unstable; urgency=low
* Initial release. (Closes: #508012)
Modified: trunk/maven-file-management/debian/control
===================================================================
--- trunk/maven-file-management/debian/control 2009-07-07 23:41:51 UTC (rev
8935)
+++ trunk/maven-file-management/debian/control 2009-07-07 23:41:55 UTC (rev
8936)
@@ -1,21 +1,21 @@
Source: maven-file-management
-Section: devel
+Section: java
Priority: optional
Maintainer: Debian Java Maintainers
<[email protected]>
-Uploaders: Torsten Werner <[email protected]>
-Build-Depends: ant, debhelper (>= 5), cdbs, default-jdk, maven-ant-helper,
+Uploaders: Torsten Werner <[email protected]>, Ludovic Claude
<[email protected]>
+Build-Depends: debhelper (>= 5), cdbs, quilt, default-jdk
+Build-Depends-Indep: maven-repo-helper, maven-ant-helper (>> 4), ant,
ant-optional,
libmaven-shared-io-java, libplexus-classworlds-java, libmodello-java,
libgoogle-collections-java, libxbean-java, libplexus-utils-java,
- libplexus-containers-java, maven2
-Standards-Version: 3.8.0
+ libplexus-container-default-java, libmaven2-core-java
+Standards-Version: 3.8.1
Vcs-Svn: svn://svn.debian.org/svn/pkg-java/trunk/maven-file-management
Vcs-Browser: http://svn.debian.org/wsvn/pkg-java/trunk/maven-file-management/
Homepage: http://maven.apache.org/shared/file-management/
Package: libmaven-file-management-java
Architecture: all
-Section: devel
-Depends: ${misc:Depends}, default-jre | java2-runtime, libmaven-shared-io-java,
+Depends: ${misc:Depends}, libmaven2-core-java, libmaven-shared-io-java,
libplexus-classworlds-java, libplexus-containers-java
Description: Maven File Management API
Maven is a software project management and comprehension tool. Based on the
Modified: trunk/maven-file-management/debian/copyright
===================================================================
--- trunk/maven-file-management/debian/copyright 2009-07-07 23:41:51 UTC
(rev 8935)
+++ trunk/maven-file-management/debian/copyright 2009-07-07 23:41:55 UTC
(rev 8936)
@@ -3,7 +3,7 @@
The Debian packaging is Copyright (c) 2008 Torsten Werner and is
licensed under the GNU General Public License version 3. On Debian
systems, the complete text of the GNU General Public License can be
-found in '/usr/share/common-licenses/GPL'.
+found in '/usr/share/common-licenses/GPL-3'.
The package was downloaded from <http://maven.apache.org>.
Added: trunk/maven-file-management/debian/libmaven-file-management-java.poms
===================================================================
--- trunk/maven-file-management/debian/libmaven-file-management-java.poms
(rev 0)
+++ trunk/maven-file-management/debian/libmaven-file-management-java.poms
2009-07-07 23:41:55 UTC (rev 8936)
@@ -0,0 +1 @@
+pom.xml --no-parent
Added: trunk/maven-file-management/debian/maven.rules
===================================================================
--- trunk/maven-file-management/debian/maven.rules
(rev 0)
+++ trunk/maven-file-management/debian/maven.rules 2009-07-07 23:41:55 UTC
(rev 8936)
@@ -0,0 +1 @@
+junit junit jar s/3\..*/3.x/
Property changes on: trunk/maven-file-management/debian/orig-tar.sh
___________________________________________________________________
Modified: svn:executable
-
+ *
Added: trunk/maven-file-management/debian/patches/mdo_xsd.patch
===================================================================
--- trunk/maven-file-management/debian/patches/mdo_xsd.patch
(rev 0)
+++ trunk/maven-file-management/debian/patches/mdo_xsd.patch 2009-07-07
23:41:55 UTC (rev 8936)
@@ -0,0 +1,12 @@
+--- a/src/main/mdo/fileset.mdo
++++ b/src/main/mdo/fileset.mdo
+@@ -19,7 +19,8 @@
+ under the License.
+ -->
+
+-<model>
++<model 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/POM/4.0.0.xsd";
++ xml.namespace="http://maven.apache.org/FILE_MANAGEMENT/${version}";>
+ <id>fileset</id>
+ <name>FileSet</name>
+ <description>
Added: trunk/maven-file-management/debian/patches/series
===================================================================
--- trunk/maven-file-management/debian/patches/series
(rev 0)
+++ trunk/maven-file-management/debian/patches/series 2009-07-07 23:41:55 UTC
(rev 8936)
@@ -0,0 +1 @@
+mdo_xsd.patch
Modified: trunk/maven-file-management/debian/rules
===================================================================
--- trunk/maven-file-management/debian/rules 2009-07-07 23:41:51 UTC (rev
8935)
+++ trunk/maven-file-management/debian/rules 2009-07-07 23:41:55 UTC (rev
8936)
@@ -2,20 +2,23 @@
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 := file-management
-VERSION := $(shell dpkg-parsechangelog | egrep '^Version:' | sed
's/Version: \(.*\)-.*/\1/')
+PACKAGE := $(DEB_SOURCE_PACKAGE)
+VERSION := $(DEB_UPSTREAM_VERSION)
JAVA_HOME := /usr/lib/jvm/default-java
-DEB_JARS := maven2 maven-shared-io maven-ant-helper plexus-utils \
- plexus-container-default-1.0 plexus-classworlds google-collect xbean-reflect
+DEB_JARS := ant-nodeps maven-ant-helper
DEB_ANT_BUILD_TARGET := package #javadoc
DEB_ANT_BUILDFILE := debian/build.xml
-DEB_ANT_ARGS := -Dversion=$(VERSION)
+DEB_ANT_ARGS := -Dversion=$(VERSION) -Dpackage=$(PACKAGE)
API_DOCS := build/api
get-orig-source:
- uscan --force-download
+ -uscan --download-version $(DEB_UPSTREAM_VERSION) --force-download
--rename
-binary-post-install/libmaven-$(PACKAGE)-java::
- dh_install -plibmaven-$(PACKAGE)-java target/$(PACKAGE)-$(VERSION).jar
/usr/share/java
- dh_link -plibmaven-$(PACKAGE)-java
/usr/share/java/$(PACKAGE)-$(VERSION).jar /usr/share/java/$(PACKAGE).jar
+binary-post-install/lib$(PACKAGE)-java::
+ mh_installpoms -plib$(PACKAGE)-java
+ mh_installjar -plib$(PACKAGE)-java -l pom.xml
target/file-management-$(VERSION).jar
+
+clean::
+ -rm -rf debian/tmp
Property changes on: trunk/maven-file-management/debian/rules
___________________________________________________________________
Modified: svn:executable
-
+ *
_______________________________________________
pkg-java-commits mailing list
[email protected]
http://lists.alioth.debian.org/mailman/listinfo/pkg-java-commits
