This is an automated email from the git hooks/post-receive script. ebourg-guest pushed a commit to branch master in repository maven-jar-plugin.
commit 96905c524eff1a720db7dd13b47ce8a666de2248 Author: Ludovic Claude <[email protected]> Date: Thu Jul 9 00:01:45 2009 +0000 * Change section to java, bump up Standards-Version to 3.8.1 * Bump up debhelper to 6 * Add a Build-Depends-Indep dependency on maven-repo-helper * Use mh_installpom and mh_installjar to install the POM and the jar to the Maven repository * Remove the patch for the POM as it's no longer needed, as well as the dependency on Quilt * Remove Depends on Java runtimes as it is a library --- debian/ant.properties | 4 -- debian/build.properties | 4 ++ debian/build.xml | 34 ----------- debian/changelog | 13 +++++ debian/compat | 2 +- debian/control | 19 +++--- debian/copyright | 44 ++++++-------- debian/libmaven-jar-plugin-java.poms | 1 + debian/maven.rules | 4 ++ debian/patches/pom.diff | 109 ----------------------------------- debian/patches/series | 1 - debian/rules | 29 +++++----- 12 files changed, 63 insertions(+), 201 deletions(-) diff --git a/debian/ant.properties b/debian/ant.properties deleted file mode 100644 index bcb4166..0000000 --- a/debian/ant.properties +++ /dev/null @@ -1,4 +0,0 @@ -javadoc.dir=build/api -build.directory=target -build.outputDirectory=target/classes -maven.test.skip=true diff --git a/debian/build.properties b/debian/build.properties new file mode 100644 index 0000000..087f536 --- /dev/null +++ b/debian/build.properties @@ -0,0 +1,4 @@ +javadoc.dir=target/api +build.directory=target +maven.test.skip=true +maven.generate.target=plugin:descriptor diff --git a/debian/build.xml b/debian/build.xml deleted file mode 100644 index b6fef4f..0000000 --- a/debian/build.xml +++ /dev/null @@ -1,34 +0,0 @@ -<?xml version="1.0"?> - -<project name="pkg-java" default="package" basedir=".."> - - <property name="maven.build.xml" value="/usr/share/maven-ant-helper/maven-build.xml"/> - <property file="/usr/share/maven-ant-helper/maven-defaults.properties"/> - - <target name="clean"> - <ant target="clean" antfile="${maven.build.xml}" dir="."/> - </target> - - <target name="package"> - <java classname="org.codehaus.classworlds.Launcher" - classpath="/usr/share/maven2/boot/classworlds.jar" - failonerror="true" fork="true"> - <sysproperty key="classworlds.conf" value="/etc/maven2/m2.conf"/> - <sysproperty key="maven.home" value="/usr/share/maven2"/> - <arg value="-Dmaven.test.skip"/> - <arg value="-s${basedir}/debian/maven-settings.xml"/> - <arg value="plugin:descriptor"/> - <arg value="-e"/> - </java> - <ant target="package" antfile="${maven.build.xml}" dir="."> - <property name="artifactId" value="maven-jar-plugin"/> - </ant> - </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 7d96157..727b655 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,16 @@ +maven-jar-plugin (2.2-2) unstable; urgency=low + + * Change section to java, bump up Standards-Version to 3.8.1 + * Bump up debhelper to 6 + * Add a Build-Depends-Indep dependency on maven-repo-helper + * Use mh_installpom and mh_installjar to install the POM and the jar to the + Maven repository + * Remove the patch for the POM as it's no longer needed, as well as + the dependency on Quilt + * Remove Depends on Java runtimes as it is a library + + -- Ludovic Claude <[email protected]> Tue, 19 May 2009 17:38:18 +0100 + maven-jar-plugin (2.2-1) unstable; urgency=low * Initial release. (Closes: #508316) diff --git a/debian/compat b/debian/compat index 7ed6ff8..1e8b314 100644 --- a/debian/compat +++ b/debian/compat @@ -1 +1 @@ -5 +6 diff --git a/debian/control b/debian/control index 86cb321..6922b47 100644 --- a/debian/control +++ b/debian/control @@ -1,23 +1,22 @@ Source: maven-jar-plugin -Section: devel +Section: java Priority: optional Maintainer: Debian Java Maintainers <[email protected]> Uploaders: Torsten Werner <[email protected]> -Build-Depends: openjdk-6-jdk, ant, debhelper (>= 5), cdbs, quilt, maven-ant-helper, - maven2, libmaven-archiver-java, libplexus-archiver-java, libplexus-utils-java, - libcommons-lang-java, libplexus-containers-java, libmaven-plugin-tools-java, - libplexus-interpolation-java -Standards-Version: 3.8.0 +Build-Depends: default-jdk, debhelper (>= 6), cdbs +Build-Depends-Indep: maven-repo-helper, maven-ant-helper (>> 4), ant, ant-optional, + junit, libmaven-plugin-tools-java, libplexus-velocity-java, velocity, + libmaven2-core-java, libmaven-archiver-java, + libplexus-archiver-java, libplexus-io-java, libplexus-utils-java, libcommons-lang-java +Standards-Version: 3.8.1 Vcs-Svn: svn://svn.debian.org/svn/pkg-java/trunk/maven-jar-plugin Vcs-Browser: http://svn.debian.org/wsvn/pkg-java/trunk/maven-jar-plugin/ Homepage: http://maven.apache.org/plugins/maven-jar-plugin/ Package: libmaven-jar-plugin-java Architecture: all -Section: devel -Depends: ${misc:Depends}, default-jre | java2-runtime, maven2, libmaven-archiver-java, - libplexus-archiver-java, libplexus-utils-java, libcommons-lang-java, - libplexus-containers-java +Depends: ${misc:Depends}, libmaven2-core-java, libmaven-archiver-java, + libplexus-archiver-java, libplexus-io-java, libplexus-utils-java, libcommons-lang-java Description: Maven Jar plugin Maven is a software project management and comprehension tool. Based on the concept of a project object model (POM), Maven can manage a project's build, diff --git a/debian/copyright b/debian/copyright index 674f6cc..f3b1562 100644 --- a/debian/copyright +++ b/debian/copyright @@ -1,32 +1,22 @@ -This package was debianized by Torsten Werner <[email protected]>. +Format-Specification: http://dep.debian.net/deps/dep5/ +Name: Maven Jar Plugin +Maintainer: Apache Maven team +Source: http://maven.apache.org/ -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'. +Files: * +Copyright: 2001-2009, The Apache Software Foundation. +License: Apache-2.0 -The package was downloaded from <http://maven.apache.org>. +Files: debian/* +Copyright: 2008, Torsten Werner <[email protected]>. +License: GPL-3+ -Copyright: 2005-2008 The Apache Software Foundation. +License: Apache-2.0 + On Debian GNU/Linux system you can find the complete text of the + Apache 2.0 license in '/usr/share/common-licenses/Apache-2.0'. -License: +License: GPL-3 + On Debian GNU/Linux system you can find the complete text of the + GNU General Public License version 3 license in + '/usr/share/common-licenses/GPL-3'. - Licensed to the Apache Software Foundation (ASF) under one - or more contributor license agreements. See the NOTICE file - distributed with this work for additional information - regarding copyright ownership. The ASF licenses this file - to you 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-licenes/Apache-2.0'. diff --git a/debian/libmaven-jar-plugin-java.poms b/debian/libmaven-jar-plugin-java.poms new file mode 100644 index 0000000..43e746b --- /dev/null +++ b/debian/libmaven-jar-plugin-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..370cd94 --- /dev/null +++ b/debian/maven.rules @@ -0,0 +1,4 @@ +# keep the version for all Maven plugins as versionless plugins don't work +* * maven-plugin * +org.codehaus.plexus plexus-container-default jar s/1\.0-alpha.*/1.0-alpha/ +junit junit jar s/3\..*/3.x/ diff --git a/debian/patches/pom.diff b/debian/patches/pom.diff deleted file mode 100644 index 859db6f..0000000 --- a/debian/patches/pom.diff +++ /dev/null @@ -1,109 +0,0 @@ -Index: maven-jar-plugin-2.2/pom.xml -=================================================================== ---- maven-jar-plugin-2.2.orig/pom.xml 2008-12-09 22:47:31.000000000 +0100 -+++ maven-jar-plugin-2.2/pom.xml 2008-12-09 22:19:48.000000000 +0100 -@@ -18,11 +18,14 @@ - under the License. - --> - <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>maven-plugins</artifactId> - <groupId>org.apache.maven.plugins</groupId> - <version>10</version> - </parent> -+ --> -+ <groupId>org.apache.maven.plugins</groupId> - <modelVersion>4.0.0</modelVersion> - <artifactId>maven-jar-plugin</artifactId> - <packaging>maven-plugin</packaging> -@@ -59,18 +62,23 @@ - <dependency> - <groupId>org.apache.maven</groupId> - <artifactId>maven-plugin-api</artifactId> -- <version>2.0.6</version> -+ <version>2.0.9</version> -+ <scope>system</scope> -+ <systemPath>/usr/share/java/maven2.jar</systemPath> - </dependency> -+ <!-- - <dependency> - <groupId>org.apache.maven</groupId> - <artifactId>maven-project</artifactId> - <version>2.0.7</version> - </dependency> -+ --> - <dependency> - <groupId>org.apache.maven</groupId> - <artifactId>maven-archiver</artifactId> - <version>2.3</version> - </dependency> -+ <!-- - <dependency> - <groupId>org.codehaus.plexus</groupId> - <artifactId>plexus-archiver</artifactId> -@@ -101,15 +109,20 @@ - </exclusion> - </exclusions> - </dependency> -+ --> - <dependency> - <groupId>commons-lang</groupId> - <artifactId>commons-lang</artifactId> - <version>2.1</version> -+ <scope>system</scope> -+ <systemPath>/usr/share/java/commons-lang.jar</systemPath> - </dependency> - <dependency> - <groupId>org.codehaus.plexus</groupId> - <artifactId>plexus-utils</artifactId> - <version>1.4.9</version> -+ <scope>system</scope> -+ <systemPath>/usr/share/java/plexus-utils.jar</systemPath> - </dependency> - <dependency> - <groupId>org.apache.maven.shared</groupId> -@@ -120,7 +133,22 @@ - </dependencies> - - <build> -+ <pluginManagement> -+ <plugins> -+ <plugin> -+ <groupId>org.apache.maven.plugins</groupId> -+ <artifactId>maven-plugin-plugin</artifactId> -+ <version>2.4.3</version> -+ </plugin> -+ <plugin> -+ <groupId>org.apache.maven.plugins</groupId> -+ <artifactId>maven-resources-plugin</artifactId> -+ <version>2.3</version> -+ </plugin> -+ </plugins> -+ </pluginManagement> - <plugins> -+ <!-- - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-surefire-plugin</artifactId> -@@ -153,9 +181,11 @@ - </configuration> - </execution> - </executions> -- </plugin> -+ </plugin> -+ --> - - <!-- Testing the result of the it pom.xml --> -+ <!-- - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-surefire-plugin</artifactId> -@@ -166,6 +196,7 @@ - </excludes> - </configuration> - </plugin> -+ --> - </plugins> - </build> - <profiles> 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 198d456..299ff61 100755 --- a/debian/rules +++ b/debian/rules @@ -2,24 +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 := $(shell dpkg-parsechangelog | egrep '^Source:' | cut -f2 -d' ') -VERSION := $(shell dpkg-parsechangelog | egrep '^Version:' | sed 's/Version: \(.*\)-.*/\1/') -JAVA_HOME := /usr/lib/jvm/java-6-openjdk -DEB_JARS := maven2 maven-archiver plexus-archiver plexus-utils \ - commons-lang plexus-container-default-1.0 +PACKAGE := $(DEB_SOURCE_PACKAGE) +VERSION := $(DEB_UPSTREAM_VERSION) +JAVA_HOME := /usr/lib/jvm/default-java +DEB_JARS := ant-nodeps maven-core maven-model maven-plugin-api maven-project maven-artifact maven-artifact-manager \ + maven-archiver plexus-archiver plexus-io plexus-utils commons-lang plexus-container-default-alpha DEB_ANT_BUILD_TARGET := package #javadoc -DEB_ANT_BUILDFILE := debian/build.xml -DEB_ANT_ARGS := -Dversion=$(VERSION) -API_DOCS := build/api +DEB_ANT_BUILDFILE := /usr/share/maven-ant-helper/maven-build.xml +DEB_ANT_ARGS := -Dbasedir=$(realpath .) -Dpackage=$(PACKAGE) -Dversion=$(VERSION) +API_DOCS := target/api get-orig-source: - uscan --force-download - -REPO := /usr/share/maven-repo -PLUGINS := $(REPO)/org/apache/maven/plugins + -uscan --download-version $(DEB_UPSTREAM_VERSION) --force-download --rename binary-post-install/lib$(PACKAGE)-java:: - dh_install target/*.jar $(PLUGINS)/$(PACKAGE)/$(VERSION)/ - install -m644 pom.xml $(DEB_DESTDIR)$(PLUGINS)/$(PACKAGE)/$(VERSION)/$(PACKAGE)-$(VERSION).pom + mh_installpoms -plib$(PACKAGE)-java + mh_installjar -plib$(PACKAGE)-java -l pom.xml target/$(PACKAGE)-$(VERSION).jar + +clean:: + -rm -rf debian/tmp -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/maven-jar-plugin.git _______________________________________________ pkg-java-commits mailing list [email protected] http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-commits
