[pkg-java] r9020 - trunk/maven-jar-plugin/debian

Ludovic Claude ludovicc-guest at alioth.debian.org
Thu Jul 9 00:01:48 UTC 2009 

Author: ludovicc-guest
Date: 2009-07-09 00:01:45 +0000 (Thu, 09 Jul 2009)
New Revision: 9020

Added:
   trunk/maven-jar-plugin/debian/build.properties
   trunk/maven-jar-plugin/debian/libmaven-jar-plugin-java.poms
   trunk/maven-jar-plugin/debian/maven.rules
Removed:
   trunk/maven-jar-plugin/debian/ant.properties
   trunk/maven-jar-plugin/debian/build.xml
   trunk/maven-jar-plugin/debian/patches/
Modified:
   trunk/maven-jar-plugin/debian/changelog
   trunk/maven-jar-plugin/debian/compat
   trunk/maven-jar-plugin/debian/control
   trunk/maven-jar-plugin/debian/copyright
   trunk/maven-jar-plugin/debian/orig-tar.sh
   trunk/maven-jar-plugin/debian/rules
Log:
* 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

Deleted: trunk/maven-jar-plugin/debian/ant.properties
===================================================================
--- trunk/maven-jar-plugin/debian/ant.properties	2009-07-08 23:59:46 UTC (rev 9019)
+++ trunk/maven-jar-plugin/debian/ant.properties	2009-07-09 00:01:45 UTC (rev 9020)
@@ -1,4 +0,0 @@
-javadoc.dir=build/api
-build.directory=target
-build.outputDirectory=target/classes
-maven.test.skip=true

Added: trunk/maven-jar-plugin/debian/build.properties
===================================================================
--- trunk/maven-jar-plugin/debian/build.properties	                        (rev 0)
+++ trunk/maven-jar-plugin/debian/build.properties	2009-07-09 00:01:45 UTC (rev 9020)
@@ -0,0 +1,4 @@
+javadoc.dir=target/api
+build.directory=target
+maven.test.skip=true
+maven.generate.target=plugin:descriptor

Deleted: trunk/maven-jar-plugin/debian/build.xml
===================================================================
--- trunk/maven-jar-plugin/debian/build.xml	2009-07-08 23:59:46 UTC (rev 9019)
+++ trunk/maven-jar-plugin/debian/build.xml	2009-07-09 00:01:45 UTC (rev 9020)
@@ -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>

Modified: trunk/maven-jar-plugin/debian/changelog
===================================================================
--- trunk/maven-jar-plugin/debian/changelog	2009-07-08 23:59:46 UTC (rev 9019)
+++ trunk/maven-jar-plugin/debian/changelog	2009-07-09 00:01:45 UTC (rev 9020)
@@ -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 <ludovic.claude at laposte.net>  Tue, 19 May 2009 17:38:18 +0100
+
 maven-jar-plugin (2.2-1) unstable; urgency=low
 
   * Initial release. (Closes: #508316)

Modified: trunk/maven-jar-plugin/debian/compat
===================================================================
--- trunk/maven-jar-plugin/debian/compat	2009-07-08 23:59:46 UTC (rev 9019)
+++ trunk/maven-jar-plugin/debian/compat	2009-07-09 00:01:45 UTC (rev 9020)
@@ -1 +1 @@
-5
+6

Modified: trunk/maven-jar-plugin/debian/control
===================================================================
--- trunk/maven-jar-plugin/debian/control	2009-07-08 23:59:46 UTC (rev 9019)
+++ trunk/maven-jar-plugin/debian/control	2009-07-09 00:01:45 UTC (rev 9020)
@@ -1,23 +1,22 @@
 Source: maven-jar-plugin
-Section: devel
+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: 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,

Modified: trunk/maven-jar-plugin/debian/copyright
===================================================================
--- trunk/maven-jar-plugin/debian/copyright	2009-07-08 23:59:46 UTC (rev 9019)
+++ trunk/maven-jar-plugin/debian/copyright	2009-07-09 00:01:45 UTC (rev 9020)
@@ -1,32 +1,22 @@
-This package was debianized by Torsten Werner <twerner at debian.org>.
+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 <twerner at debian.org>.
+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'.

Added: trunk/maven-jar-plugin/debian/libmaven-jar-plugin-java.poms
===================================================================
--- trunk/maven-jar-plugin/debian/libmaven-jar-plugin-java.poms	                        (rev 0)
+++ trunk/maven-jar-plugin/debian/libmaven-jar-plugin-java.poms	2009-07-09 00:01:45 UTC (rev 9020)
@@ -0,0 +1 @@
+pom.xml --no-parent

Added: trunk/maven-jar-plugin/debian/maven.rules
===================================================================
--- trunk/maven-jar-plugin/debian/maven.rules	                        (rev 0)
+++ trunk/maven-jar-plugin/debian/maven.rules	2009-07-09 00:01:45 UTC (rev 9020)
@@ -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/


Property changes on: trunk/maven-jar-plugin/debian/orig-tar.sh
___________________________________________________________________
Modified: svn:executable
   - 
   + *

Modified: trunk/maven-jar-plugin/debian/rules
===================================================================
--- trunk/maven-jar-plugin/debian/rules	2009-07-08 23:59:46 UTC (rev 9019)
+++ trunk/maven-jar-plugin/debian/rules	2009-07-09 00:01:45 UTC (rev 9020)
@@ -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
+	-uscan --download-version $(DEB_UPSTREAM_VERSION) --force-download --rename
 
-REPO    := /usr/share/maven-repo
-PLUGINS := $(REPO)/org/apache/maven/plugins
-
 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


Property changes on: trunk/maven-jar-plugin/debian/rules
___________________________________________________________________
Modified: svn:executable
   - 
   + *

More information about the pkg-java-commits mailing list