[pkg-java] r7658 - in trunk/maven-debian-helper: debian etc maven-debian-plugin
twerner at alioth.debian.org
twerner at alioth.debian.org
Sun Dec 14 19:18:52 UTC 2008
Author: twerner
Date: 2008-12-14 19:18:52 +0000 (Sun, 14 Dec 2008)
New Revision: 7658
Modified:
trunk/maven-debian-helper/debian/rules
trunk/maven-debian-helper/etc/m2-debian.conf
trunk/maven-debian-helper/maven-debian-plugin/pom.xml
Log:
use our own plugin to install files
Modified: trunk/maven-debian-helper/debian/rules
===================================================================
--- trunk/maven-debian-helper/debian/rules 2008-12-14 16:39:05 UTC (rev 7657)
+++ trunk/maven-debian-helper/debian/rules 2008-12-14 19:18:52 UTC (rev 7658)
@@ -8,14 +8,10 @@
DEST := $(DEB_MAVEN_REPO)/org/debian/maven/
-binary-post-install/$(DEB_SOURCE_PACKAGE)::
- # maven-debian
- dh_installdirs $(DEST)/maven-debian/$(VERSION)
- install -m644 pom.xml $(DEB_DESTDIR)$(DEST)/maven-debian/$(VERSION)/maven-debian-$(VERSION).pom
- # maven-debian-helper
- dh_install maven-debian-helper/target/*.jar $(DEST)/maven-debian-helper/$(VERSION)
- install -m644 pom.xml $(DEB_DESTDIR)$(DEST)/maven-debian-helper/$(VERSION)/maven-debian-helper-$(VERSION).pom
- dh_link $(DEST)/maven-debian-helper/$(VERSION)/maven-debian-helper-$(VERSION).jar /usr/share/maven2/debian/maven-debian-helper.jar
- # maven-debian-helper
- dh_install maven-debian-plugin/target/*.jar $(DEST)/maven-debian-plugin/$(VERSION)
- install -m644 pom.xml $(DEB_DESTDIR)$(DEST)/maven-debian-plugin/$(VERSION)/maven-debian-plugin-$(VERSION).pom
+DEB_JAR_PACKAGE ?= $(firstword $(shell dh_listpackages))
+DEB_PLUGIN_VERSION = $(shell ls /usr/share/maven-repo/org/debian/maven/maven-debian-helper/)
+
+PLUGIN_GOAL = org.debian.maven:maven-debian-plugin:$(DEB_PLUGIN_VERSION):install
+PLUGIN_ARGS = -Ddebian.dir=$(CURDIR)/debian -Ddebian.package=$(DEB_JAR_PACKAGE)
+binary-post-install/$(DEB_JAR_PACKAGE)::
+ $(DEB_MAVEN_INVOKE) $(PLUGIN_GOAL) $(PLUGIN_ARGS)
Modified: trunk/maven-debian-helper/etc/m2-debian.conf
===================================================================
--- trunk/maven-debian-helper/etc/m2-debian.conf 2008-12-14 16:39:05 UTC (rev 7657)
+++ trunk/maven-debian-helper/etc/m2-debian.conf 2008-12-14 19:18:52 UTC (rev 7658)
@@ -3,5 +3,5 @@
set maven.home default /usr/share/maven2
[debian]
-load ${maven.home}/debian/*.jar
+load /usr/share/java/maven-debian-helper.jar
load ${maven.home}/lib/*.jar
Modified: trunk/maven-debian-helper/maven-debian-plugin/pom.xml
===================================================================
--- trunk/maven-debian-helper/maven-debian-plugin/pom.xml 2008-12-14 16:39:05 UTC (rev 7657)
+++ trunk/maven-debian-helper/maven-debian-plugin/pom.xml 2008-12-14 19:18:52 UTC (rev 7658)
@@ -11,4 +11,14 @@
<artifactId>maven-debian-plugin</artifactId>
<packaging>maven-plugin</packaging>
<name>Maven Debian Plugin</name>
+
+ <dependencies>
+ <dependency>
+ <groupId>org.codehaus.plexus</groupId>
+ <artifactId>plexus-utils</artifactId>
+ <version>1.5.6</version>
+ <scope>system</scope>
+ <systemPath>/usr/share/java/plexus-utils.jar</systemPath>
+ </dependency>
+ </dependencies>
</project>
More information about the pkg-java-commits
mailing list