This is an automated email from the git hooks/post-receive script. ebourg-guest pushed a commit to branch master in repository plexus-cdc.
commit da4423edb23306d2baeb1279d1edef4d480e6310 Author: Torsten Werner <[email protected]> Date: Fri Dec 12 11:08:17 2008 +0000 UNRELEASED * Switch to maven-debian-helper. --- debian/changelog | 7 ++++ debian/control | 4 +-- debian/maven-settings.xml | 9 ----- debian/maven-vars.mk | 89 ----------------------------------------------- debian/maven.mk | 71 ------------------------------------- debian/maven.properties | 3 ++ debian/patches/pom.diff | 21 ++--------- debian/rules | 6 ++-- 8 files changed, 15 insertions(+), 195 deletions(-) diff --git a/debian/changelog b/debian/changelog index 0d21dea..b1d8570 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,10 @@ +plexus-cdc (1.0~alpha14-2) unstable; urgency=low + + UNRELEASED + * Switch to maven-debian-helper. + + -- Torsten Werner <[email protected]> Fri, 12 Dec 2008 11:50:23 +0100 + plexus-cdc (1.0~alpha14-1) unstable; urgency=low * Initial release. (Closes: #508465) diff --git a/debian/control b/debian/control index 1907710..2893059 100644 --- a/debian/control +++ b/debian/control @@ -3,9 +3,7 @@ Section: libs Priority: optional Maintainer: Debian Java Maintainers <[email protected]> Uploaders: Torsten Werner <[email protected]> -Build-Depends: debhelper (>= 5), cdbs, openjdk-6-jdk, quilt, maven2, - libmaven-clean-plugin-java, libmaven-resources-plugin-java, - libmaven-compiler-plugin-java, libmaven-jar-plugin-java, libmaven-filtering-java, +Build-Depends: debhelper (>= 5), cdbs, openjdk-6-jdk, quilt, maven-debian-helper, libslf4j-java, libjdom1-java Standards-Version: 3.8.0 Vcs-Svn: svn://svn.debian.org/svn/pkg-java/trunk/plexus-cdc diff --git a/debian/maven-settings.xml b/debian/maven-settings.xml deleted file mode 100644 index 01f8769..0000000 --- a/debian/maven-settings.xml +++ /dev/null @@ -1,9 +0,0 @@ -<!-- - This is a minimal settings.xml that switches maven to offline mode - and uses the Debian repo as the local repo. ---> - -<settings> - <localRepository>/usr/share/maven-repo</localRepository> - <offline>true</offline> -</settings> diff --git a/debian/maven-vars.mk b/debian/maven-vars.mk deleted file mode 100644 index 786740f..0000000 --- a/debian/maven-vars.mk +++ /dev/null @@ -1,89 +0,0 @@ -# This file is based on ant-vars.mk - -# Copyright © 2003 Stefan Gybas <[email protected]> -# Copyright © 2008 Torsten Werner <[email protected]> -# Description: Defines useful variables for packages which use Maven -# -# This program is free software; you can redistribute it and/or -# modify it under the terms of the GNU General Public License as -# published by the Free Software Foundation; either version 2, or (at -# your option) any later version. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -# General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA -# 02111-1307 USA. - -_cdbs_scripts_path ?= /usr/lib/cdbs -_cdbs_rules_path ?= /usr/share/cdbs/1/rules -_cdbs_class_path ?= /usr/share/cdbs/1/class - -ifndef _cdbs_class_maven_vars -_cdbs_class_maven_vars = 1 - -# Maven home directory. Doesn't need to be changed except when using -# nonstandard Maven installations. -MAVEN_HOME = /usr/share/maven2 - -# The home directory of the Java Runtime Environment (JRE) or Java Development -# Kit (JDK). You can either directly set JAVA_HOME in debian/rules or set -# JAVA_HOME_DIRS to multiple possible home directories. The first existing -# directory from this list is used for JAVA_HOME. You can also override -# JAVACMD in case you don't want to use the default JAVA_HOME/bin/java. -JAVA_HOME = $(shell for jh in $(JAVA_HOME_DIRS); do if [ -x "$$jh/bin/java" ]; then \ - echo $${jh}; exit 0; fi; done) -JAVACMD = $(JAVA_HOME)/bin/java - -# You can list all Java ARchives (JARs) to be added to the class path in -# DEB_JARS, either with their full path or just the basename if the JAR is -# in /usr/share/java. You may also ommit the ".jar" extension. Non-existing -# files will silently be ignored. tools.jar is automatically added to the -# end of the class path if it exists in the JDK's lib directory. -# You can override the complete class path using DEB_CLASSPATH. -DEB_JARS_BASE = /usr/share/java -DEB_CLASSPATH = $(MAVEN_HOME)/boot/classworlds.jar:$(shell for jar in $(DEB_JARS); do \ - if [ -f "$$jar" ]; then echo -n "$${jar}:"; fi; \ - if [ -f "$$jar".jar ]; then echo -n "$${jar}.jar:"; fi; \ - if [ -f $(DEB_JARS_BASE)/"$$jar" ]; then echo -n "$(DEB_JARS_BASE)/$${jar}:"; fi; \ - if [ -f $(DEB_JARS_BASE)/"$$jar".jar ]; then echo -n "$(DEB_JARS_BASE)/$${jar}.jar:"; fi; \ - done; \ - if [ -f "$(JAVA_HOME)/lib/tools.jar" ]; then echo -n "$(JAVA_HOME)/lib/tools.jar"; fi) - -# Extra arguments for the Maven command line. -# TODO: DOES NOT WORK YET BECAUSE IT NEEDS PATCHING MAVEN!!! -DEB_MAVEN_ARGS = - -# Property file for Maven, defaults to debian/maven.properties if it exists. -# You may define additional properties. Please note that command-line -# arguments in MAVEN_ARGS (see below) override the settings in pom.xml and -# the property file. -DEB_MAVEN_PROPERTYFILE = $(shell test -f $(CURDIR)/debian/maven.properties && echo $(CURDIR)/debian/maven.properties) - -# You can specify additional JVM arguments in MAVEN_OPTS and Maven -# command-line arguments in MAVEN_ARGS. You can additionally define -# MAVEN_ARGS_<package> for each individual package. -DEB_MAVEN_INVOKE = cd $(DEB_BUILDDIR) && $(JAVACMD) -classpath $(DEB_CLASSPATH) \ - $(MAVEN_OPTS) -Dclassworlds.conf=${MAVEN_HOME}/conf/m2.conf \ - -Dmaven.home=$(MAVEN_HOME) \ - org.codehaus.classworlds.Launcher $(DEB_MAVEN_ARGS) \ - -s$(CURDIR)/debian/maven-settings.xml \ - $(if $(MAVEN_ARGS_$(cdbs_curpkg)),$(MAVEN_ARGS_$(cdbs_curpkg)),$(MAVEN_ARGS)) - -# TODO: DOES NOT WORK YET -# $(if $(DEB_MAVEN_PROPERTYFILE),-propertyfile $(DEB_MAVEN_PROPERTYFILE),) - -# Targets to invoke for building, installing, testing and cleaning up. -# Building uses the default target from build.xml, installing and testing is -# only called if the corresponding variable is set. You can also specify -# multiple targets for each step. -DEB_MAVEN_BUILD_TARGET = compile jar:jar # TODO: should be 'package' -DEB_MAVEN_INSTALL_TARGET = -DEB_MAVEN_CHECK_TARGET = -DEB_MAVEN_CLEAN_TARGET = clean - -endif diff --git a/debian/maven.mk b/debian/maven.mk deleted file mode 100644 index 0cacbb0..0000000 --- a/debian/maven.mk +++ /dev/null @@ -1,71 +0,0 @@ -# This file is based on ant.mk -# revision: 1 - -# Copyright © 2003 Stefan Gybas <[email protected]> -# Copyright © 2008 Torsten Werner <[email protected]> -# Description: Builds and cleans packages which have an Maven pom.xml file -# -# This program is free software; you can redistribute it and/or -# modify it under the terms of the GNU General Public License as -# published by the Free Software Foundation; either version 2, or (at -# your option) any later version. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -# General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA -# 02111-1307 USA. - -_cdbs_scripts_path ?= /usr/lib/cdbs -_cdbs_rules_path ?= /usr/share/cdbs/1/rules -_cdbs_class_path ?= /usr/share/cdbs/1/class - -ifndef _cdbs_class_maven -_cdbs_class_maven = 1 - -include $(_cdbs_rules_path)/buildcore.mk$(_cdbs_makefile_suffix) -# temporary workaround: -#include $(_cdbs_class_path)/maven-vars.mk$(_cdbs_makefile_suffix) -include $(CURDIR)/debian/maven-vars.mk$(_cdbs_makefile_suffix) - -DEB_PHONY_RULES += maven-sanity-check - -maven-sanity-check: - @if ! test -x "$(JAVACMD)"; then \ - echo "You must specify a valid JAVA_HOME or JAVACMD!"; \ - exit 1; \ - fi - @if ! test -r "$(MAVEN_HOME)/boot/classworlds.jar"; then \ - echo "You must specify a valid MAVEN_HOME directory!"; \ - exit 1; \ - fi - - -common-build-arch common-build-indep:: debian/stamp-maven-build maven-sanity-check -debian/stamp-maven-build: - $(DEB_MAVEN_INVOKE) $(DEB_MAVEN_BUILD_TARGET) - touch $@ - -cleanbuilddir:: maven-sanity-check apply-patches - -$(DEB_MAVEN_INVOKE) $(DEB_MAVEN_CLEAN_TARGET) - $(RM) debian/stamp-maven-build - -common-install-arch common-install-indep:: common-install-impl -common-install-impl:: - $(if $(DEB_MAVEN_INSTALL_TARGET),$(DEB_MAVEN_INVOKE) $(DEB_MAVEN_INSTALL_TARGET),@echo "DEB_MAVEN_INSTALL_TARGET unset, skipping default maven.mk common-install target") - -ifeq (,$(findstring nocheck,$(DEB_BUILD_OPTIONS))) -common-build-arch common-build-indep:: debian/stamp-maven-check -debian/stamp-maven-check: debian/stamp-maven-build - $(if $(DEB_MAVEN_CHECK_TARGET),$(DEB_MAVEN_INVOKE) $(DEB_MAVEN_CHECK_TARGET),@echo "DEB_MAVEN_CHECK_TARGET unset, not running checks") - $(if $(DEB_MAVEN_CHECK_TARGET),touch $@) - -clean:: - $(if $(DEB_MAVEN_CHECK_TARGET),$(RM) debian/stamp-maven-check) -endif - -endif diff --git a/debian/maven.properties b/debian/maven.properties new file mode 100644 index 0000000..b3c7798 --- /dev/null +++ b/debian/maven.properties @@ -0,0 +1,3 @@ +# You can put your properties in this file. + +maven.test.skip = true diff --git a/debian/patches/pom.diff b/debian/patches/pom.diff index e529cbb..37605e5 100644 --- a/debian/patches/pom.diff +++ b/debian/patches/pom.diff @@ -1,3 +1,5 @@ +some temporary workarounds... + Index: plexus-cdc-1.0~alpha14/pom.xml =================================================================== --- plexus-cdc-1.0~alpha14.orig/pom.xml 2008-12-10 15:50:22.000000000 +0100 @@ -59,22 +61,3 @@ Index: plexus-cdc-1.0~alpha14/pom.xml <dependency> <groupId>org.slf4j</groupId> <artifactId>slf4j-simple</artifactId> -@@ -50,6 +73,18 @@ - </dependency> - </dependencies> - -+ <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-tools/tags/plexus-tools-1.0.11/plexus-cdc</connection> - <developerConnection>scm:svn:https://svn.codehaus.org/plexus/plexus-tools/tags/plexus-tools-1.0.11/plexus-cdc</developerConnection> diff --git a/debian/rules b/debian/rules index 8f960b1..392f065 100755 --- a/debian/rules +++ b/debian/rules @@ -1,19 +1,17 @@ #!/usr/bin/make -f include /usr/share/cdbs/1/rules/debhelper.mk -include debian/maven.mk +include /usr/share/cdbs/1/class/maven.mk include /usr/share/cdbs/1/rules/patchsys-quilt.mk PACKAGE := $(DEB_SOURCE_PACKAGE) VERSION := $(shell echo $(DEB_UPSTREAM_VERSION) | sed 's,~alpha,-alpha-,') JAVA_HOME := /usr/lib/jvm/java-6-openjdk -DEB_JARS := plexus-utils plexus-interpolation get-orig-source: sh -e debian/orig-tar.sh -REPO := /usr/share/maven-repo -DEST := $(REPO)/org/codehaus/plexus +DEST := $(DEB_MAVEN_REPO)/org/codehaus/plexus binary-post-install/lib$(PACKAGE)-java:: dh_install target/*.jar $(DEST)/$(PACKAGE)/$(VERSION)/ -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/plexus-cdc.git _______________________________________________ pkg-java-commits mailing list [email protected] http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-commits
