Author: ludovicc-guest
Date: 2009-07-08 23:57:02 +0000 (Wed, 08 Jul 2009)
New Revision: 9016
Added:
trunk/maven-clean-plugin/debian/libmaven-clean-plugin-java.poms
trunk/maven-clean-plugin/debian/maven.rules
Removed:
trunk/maven-clean-plugin/debian/build.xml
trunk/maven-clean-plugin/debian/patches/
Modified:
trunk/maven-clean-plugin/debian/build.properties
trunk/maven-clean-plugin/debian/changelog
trunk/maven-clean-plugin/debian/control
trunk/maven-clean-plugin/debian/copyright
trunk/maven-clean-plugin/debian/orig-tar.sh
trunk/maven-clean-plugin/debian/rules
Log:
* New upstream version, add myself to Uploaders
* Use Ant and cdbs-ant as the build system as Maven2 uses
this plugin to build itself now.
* Remove the dependency on default-jre | java2-runtime as this is
a library.
* Use default-jdk as Build-Depends instead of open-jdk-6
* Add the Maven POM to the package,
* 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
Modified: trunk/maven-clean-plugin/debian/build.properties
===================================================================
--- trunk/maven-clean-plugin/debian/build.properties 2009-07-08 23:56:03 UTC
(rev 9015)
+++ trunk/maven-clean-plugin/debian/build.properties 2009-07-08 23:57:02 UTC
(rev 9016)
@@ -1,3 +1,4 @@
-javadoc.dir=build/api
+javadoc.dir=target/api
build.directory=target
-build.outputDirectory=target/classes
+maven.test.skip=true
+maven.generate.target=plugin:descriptor
Deleted: trunk/maven-clean-plugin/debian/build.xml
===================================================================
--- trunk/maven-clean-plugin/debian/build.xml 2009-07-08 23:56:03 UTC (rev
9015)
+++ trunk/maven-clean-plugin/debian/build.xml 2009-07-08 23:57:02 UTC (rev
9016)
@@ -1,35 +0,0 @@
-<?xml version="1.0"?>
-
-<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"/>
-
- <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"/>
- </java>
- <ant target="package" antfile="${maven.build.xml}" dir=".">
- <property name="artifactId" value="maven-clean-plugin"/>
- </ant>
- </target>
-
- <target name="javadoc">
- <javadoc destdir="${javadoc.dir}">
- <packageset dir="src/main/java/"/>
- </javadoc>
- </target>
-
-</project>
Modified: trunk/maven-clean-plugin/debian/changelog
===================================================================
--- trunk/maven-clean-plugin/debian/changelog 2009-07-08 23:56:03 UTC (rev
9015)
+++ trunk/maven-clean-plugin/debian/changelog 2009-07-08 23:57:02 UTC (rev
9016)
@@ -1,3 +1,20 @@
+maven-clean-plugin (2.3-1) unstable; urgency=low
+
+ * New upstream version, add myself to Uploaders
+ * Use Ant and cdbs-ant as the build system as Maven2 uses
+ this plugin to build itself now.
+ * Remove the dependency on default-jre | java2-runtime as this is
+ a library.
+ * Use default-jdk as Build-Depends instead of open-jdk-6
+ * Add the Maven POM to the package,
+ * 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
+
+ -- Ludovic Claude <[email protected]> Sun, 03 May 2009 00:27:41
+0100
+
maven-clean-plugin (2.2-2) unstable; urgency=low
* Switch to openjdk.
Modified: trunk/maven-clean-plugin/debian/control
===================================================================
--- trunk/maven-clean-plugin/debian/control 2009-07-08 23:56:03 UTC (rev
9015)
+++ trunk/maven-clean-plugin/debian/control 2009-07-08 23:57:02 UTC (rev
9016)
@@ -1,20 +1,21 @@
Source: maven-clean-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,
- libmaven-plugin-tools-java, libmaven-file-management-java,
libplexus-containers-java,
+Uploaders: Torsten Werner <[email protected]>, Ludovic Claude
<[email protected]>
+Build-Depends: debhelper (>= 5), cdbs, default-jdk
+Build-Depends-Indep: maven-repo-helper, maven-ant-helper (>> 4), ant,
ant-optional,
+ junit, libmaven-plugin-tools-java, libplexus-velocity-java, velocity,
+ libmaven-file-management-java, libplexus-containers-java,
libplexus-interpolation-java
-Standards-Version: 3.8.0
+Standards-Version: 3.8.1
Vcs-Svn: svn://svn.debian.org/svn/pkg-java/trunk/maven-clean-plugin
Vcs-Browser: http://svn.debian.org/wsvn/pkg-java/trunk/maven-clean-plugin/
Homepage: http://maven.apache.org/plugins/maven-clean-plugin/
Package: libmaven-clean-plugin-java
Architecture: all
-Section: devel
-Depends: ${misc:Depends}, default-jre | java2-runtime,
libmaven-file-management-java
+Depends: ${misc:Depends}, libmaven-file-management-java
Description: Maven clean 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-clean-plugin/debian/copyright
===================================================================
--- trunk/maven-clean-plugin/debian/copyright 2009-07-08 23:56:03 UTC (rev
9015)
+++ trunk/maven-clean-plugin/debian/copyright 2009-07-08 23:57:02 UTC (rev
9016)
@@ -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-clean-plugin/debian/libmaven-clean-plugin-java.poms
===================================================================
--- trunk/maven-clean-plugin/debian/libmaven-clean-plugin-java.poms
(rev 0)
+++ trunk/maven-clean-plugin/debian/libmaven-clean-plugin-java.poms
2009-07-08 23:57:02 UTC (rev 9016)
@@ -0,0 +1 @@
+pom.xml --no-parent
Added: trunk/maven-clean-plugin/debian/maven.rules
===================================================================
--- trunk/maven-clean-plugin/debian/maven.rules (rev 0)
+++ trunk/maven-clean-plugin/debian/maven.rules 2009-07-08 23:57:02 UTC (rev
9016)
@@ -0,0 +1,3 @@
+# keep the version for all Maven plugins as versionless plugins don't work
+* * maven-plugin *
+junit junit jar s/3\..*/3.x/
Property changes on: trunk/maven-clean-plugin/debian/orig-tar.sh
___________________________________________________________________
Modified: svn:executable
-
+ *
Modified: trunk/maven-clean-plugin/debian/rules
===================================================================
--- trunk/maven-clean-plugin/debian/rules 2009-07-08 23:56:03 UTC (rev
9015)
+++ trunk/maven-clean-plugin/debian/rules 2009-07-08 23:57:02 UTC (rev
9016)
@@ -2,23 +2,22 @@
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 file-management plexus-utils
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 file-management plexus-utils 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-clean-plugin/debian/rules
___________________________________________________________________
Modified: svn:executable
-
+ *
_______________________________________________
pkg-java-commits mailing list
[email protected]
http://lists.alioth.debian.org/mailman/listinfo/pkg-java-commits
