[pkg-java] r7819 - in trunk/maven-debian-helper: . debian maven-debian-helper maven-debian-plugin
twerner at alioth.debian.org
twerner at alioth.debian.org
Wed Jan 14 06:18:29 UTC 2009
Author: twerner
Date: 2009-01-14 06:18:29 +0000 (Wed, 14 Jan 2009)
New Revision: 7819
Added:
trunk/maven-debian-helper/bootstrap.sh
Removed:
trunk/maven-debian-helper/ganneff.sh
Modified:
trunk/maven-debian-helper/debian/changelog
trunk/maven-debian-helper/debian/rules
trunk/maven-debian-helper/maven-debian-helper/pom.xml
trunk/maven-debian-helper/maven-debian-plugin/pom.xml
trunk/maven-debian-helper/pom.xml
Log:
Rename the bootstrap script.
Copied: trunk/maven-debian-helper/bootstrap.sh (from rev 7818, trunk/maven-debian-helper/ganneff.sh)
===================================================================
--- trunk/maven-debian-helper/bootstrap.sh (rev 0)
+++ trunk/maven-debian-helper/bootstrap.sh 2009-01-14 06:18:29 UTC (rev 7819)
@@ -0,0 +1,76 @@
+#!/bin/sh
+
+# This horror script is used to bootstrap maven-debian-helper.
+
+set -e
+
+JAVA_HOME=/usr/lib/jvm/java-6-openjdk
+REPO=/usr/share/maven-repo
+ODM=$REPO/org/debian/maven
+VERSION=$(dpkg-parsechangelog | sed -ne 's/Version: //p')
+DESTDIR=debian/maven-debian-helper
+
+boot() {
+ PKG=org/apache/maven/project
+ POM=$PKG/pom-4.0.0.xml
+ DIR=maven-debian-helper/src/main/resources
+ mkdir -p $PKG
+ sed '/startworkaround/,/endworkaround/d' $DIR/$POM > $POM
+ jar cf boot.jar org
+ rm -rf org
+ sed -e's,/.*/maven-debian-helper.jar,boot.jar,' \
+ -e's,org.debian.maven.Wrapper,org.apache.maven.cli.MavenCli,' \
+ etc/m2-debian.conf > boot.conf
+}
+
+scan() {
+ P_ARCHIVER=$(ls $REPO/org/codehaus/plexus/plexus-archiver/)
+ P_INTERPOLATION=$(ls $REPO/org/codehaus/plexus/plexus-interpolation/)
+ M_RESOURCES_P=$(ls $REPO/org/apache/maven/plugins/maven-resources-plugin/)
+ M_PLUGIN_P=$(ls $REPO/org/apache/maven/plugins/maven-plugin-plugin/)
+}
+
+maven() {
+ $JAVA_HOME/bin/java -cp /usr/share/maven2/boot/classworlds.jar \
+ -D"classworlds.conf=boot.conf" org.codehaus.classworlds.Launcher \
+ -s"etc/settings-debian.xml" \
+ -D"org.codehaus.plexus.plexus-archiver.version=$P_ARCHIVER" \
+ -D"org.codehaus.plexus.plexus-interpolation.version=$P_INTERPOLATION" \
+ -D"org.apache.maven.plugins.maven-resources-plugin.version=$M_RESOURCES_P" \
+ -D"org.apache.maven.plugins.maven-plugin-plugin.version=$M_PLUGIN_P" \
+ "$@"
+}
+
+debian_install() {
+ # parent pom
+ install -D -m644 pom.xml \
+ $DESTDIR/$ODM/maven-debian/$VERSION/maven-debian-$VERSION.pom
+ # maven-debian-helper
+ dh_install -pmaven-debian-helper maven-debian-helper/target/*.jar \
+ $ODM/maven-debian-helper/$VERSION/
+ dh_link -pmaven-debian-helper \
+ $ODM/maven-debian-helper/$VERSION/maven-debian-helper-$VERSION.jar \
+ /usr/share/java/maven-debian-helper.jar
+ install -D -m644 maven-debian-helper/pom.xml \
+ $DESTDIR/$ODM/maven-debian-helper/$VERSION/maven-debian-helper-$VERSION.pom
+ # maven-debian-plugin
+ dh_install -pmaven-debian-helper maven-debian-plugin/target/*.jar \
+ $ODM/maven-debian-plugin/$VERSION/
+ dh_link -pmaven-debian-helper \
+ $ODM/maven-debian-plugin/$VERSION/maven-debian-plugin-$VERSION.jar \
+ /usr/share/java/maven-debian-plugin.jar
+ install -D -m644 maven-debian-plugin/pom.xml \
+ $DESTDIR/$ODM/maven-debian-plugin/$VERSION/maven-debian-plugin-$VERSION.pom
+}
+
+cleanup() {
+ maven clean
+ rm -f boot.jar boot.conf
+}
+
+boot
+scan
+maven package
+debian_install
+cleanup
+
Property changes on: trunk/maven-debian-helper/bootstrap.sh
___________________________________________________________________
Name: svn:mergeinfo
+
Modified: trunk/maven-debian-helper/debian/changelog
===================================================================
--- trunk/maven-debian-helper/debian/changelog 2009-01-12 21:30:16 UTC (rev 7818)
+++ trunk/maven-debian-helper/debian/changelog 2009-01-14 06:18:29 UTC (rev 7819)
@@ -1,3 +1,9 @@
+maven-debian-helper (0.2) UNRELEASED; urgency=low
+
+ * Rename the bootstrap script.
+
+ -- Torsten Werner <twerner at debian.org> Wed, 14 Jan 2009 07:08:49 +0100
+
maven-debian-helper (0.1) unstable; urgency=low
* Initial release. (Closes: #508511)
Modified: trunk/maven-debian-helper/debian/rules
===================================================================
--- trunk/maven-debian-helper/debian/rules 2009-01-12 21:30:16 UTC (rev 7818)
+++ trunk/maven-debian-helper/debian/rules 2009-01-14 06:18:29 UTC (rev 7819)
@@ -3,4 +3,4 @@
include /usr/share/cdbs/1/rules/debhelper.mk
install/maven-debian-helper::
- sh ganneff.sh
+ sh bootstrap.sh
Deleted: trunk/maven-debian-helper/ganneff.sh
===================================================================
--- trunk/maven-debian-helper/ganneff.sh 2009-01-12 21:30:16 UTC (rev 7818)
+++ trunk/maven-debian-helper/ganneff.sh 2009-01-14 06:18:29 UTC (rev 7819)
@@ -1,76 +0,0 @@
-#!/bin/sh
-
-# This horror script is used to bootstrap maven-debian-helper.
-
-set -e
-
-JAVA_HOME=/usr/lib/jvm/java-6-openjdk
-REPO=/usr/share/maven-repo
-ODM=$REPO/org/debian/maven
-VERSION=$(dpkg-parsechangelog | sed -ne 's/Version: //p')
-DESTDIR=debian/maven-debian-helper
-
-boot() {
- PKG=org/apache/maven/project
- POM=$PKG/pom-4.0.0.xml
- DIR=maven-debian-helper/src/main/resources
- mkdir -p $PKG
- sed '/startworkaround/,/endworkaround/d' $DIR/$POM > $POM
- jar cf boot.jar org
- rm -rf org
- sed -e's,/.*/maven-debian-helper.jar,boot.jar,' \
- -e's,org.debian.maven.Wrapper,org.apache.maven.cli.MavenCli,' \
- etc/m2-debian.conf > boot.conf
-}
-
-scan() {
- P_ARCHIVER=$(ls $REPO/org/codehaus/plexus/plexus-archiver/)
- P_INTERPOLATION=$(ls $REPO/org/codehaus/plexus/plexus-interpolation/)
- M_RESOURCES_P=$(ls $REPO/org/apache/maven/plugins/maven-resources-plugin/)
- M_PLUGIN_P=$(ls $REPO/org/apache/maven/plugins/maven-plugin-plugin/)
-}
-
-maven() {
- $JAVA_HOME/bin/java -cp /usr/share/maven2/boot/classworlds.jar \
- -D"classworlds.conf=boot.conf" org.codehaus.classworlds.Launcher \
- -s"etc/settings-debian.xml" \
- -D"org.codehaus.plexus.plexus-archiver.version=$P_ARCHIVER" \
- -D"org.codehaus.plexus.plexus-interpolation.version=$P_INTERPOLATION" \
- -D"org.apache.maven.plugins.maven-resources-plugin.version=$M_RESOURCES_P" \
- -D"org.apache.maven.plugins.maven-plugin-plugin.version=$M_PLUGIN_P" \
- "$@"
-}
-
-debian_install() {
- # parent pom
- install -D -m644 pom.xml \
- $DESTDIR/$ODM/maven-debian/$VERSION/maven-debian-$VERSION.pom
- # maven-debian-helper
- dh_install -pmaven-debian-helper maven-debian-helper/target/*.jar \
- $ODM/maven-debian-helper/$VERSION/
- dh_link -pmaven-debian-helper \
- $ODM/maven-debian-helper/$VERSION/maven-debian-helper-$VERSION.jar \
- /usr/share/java/maven-debian-helper.jar
- install -D -m644 maven-debian-helper/pom.xml \
- $DESTDIR/$ODM/maven-debian-helper/$VERSION/maven-debian-helper-$VERSION.pom
- # maven-debian-plugin
- dh_install -pmaven-debian-helper maven-debian-plugin/target/*.jar \
- $ODM/maven-debian-plugin/$VERSION/
- dh_link -pmaven-debian-helper \
- $ODM/maven-debian-plugin/$VERSION/maven-debian-plugin-$VERSION.jar \
- /usr/share/java/maven-debian-plugin.jar
- install -D -m644 maven-debian-plugin/pom.xml \
- $DESTDIR/$ODM/maven-debian-plugin/$VERSION/maven-debian-plugin-$VERSION.pom
-}
-
-cleanup() {
- maven clean
- rm -f boot.jar boot.conf
-}
-
-boot
-scan
-maven package
-debian_install
-cleanup
-
Modified: trunk/maven-debian-helper/maven-debian-helper/pom.xml
===================================================================
--- trunk/maven-debian-helper/maven-debian-helper/pom.xml 2009-01-12 21:30:16 UTC (rev 7818)
+++ trunk/maven-debian-helper/maven-debian-helper/pom.xml 2009-01-14 06:18:29 UTC (rev 7819)
@@ -5,7 +5,7 @@
<parent>
<groupId>org.debian.maven</groupId>
<artifactId>maven-debian</artifactId>
- <version>0.1</version>
+ <version>0.2</version>
</parent>
<artifactId>maven-debian-helper</artifactId>
Modified: trunk/maven-debian-helper/maven-debian-plugin/pom.xml
===================================================================
--- trunk/maven-debian-helper/maven-debian-plugin/pom.xml 2009-01-12 21:30:16 UTC (rev 7818)
+++ trunk/maven-debian-helper/maven-debian-plugin/pom.xml 2009-01-14 06:18:29 UTC (rev 7819)
@@ -5,7 +5,7 @@
<parent>
<artifactId>maven-debian</artifactId>
<groupId>org.debian.maven</groupId>
- <version>0.1</version>
+ <version>0.2</version>
</parent>
<artifactId>maven-debian-plugin</artifactId>
Modified: trunk/maven-debian-helper/pom.xml
===================================================================
--- trunk/maven-debian-helper/pom.xml 2009-01-12 21:30:16 UTC (rev 7818)
+++ trunk/maven-debian-helper/pom.xml 2009-01-14 06:18:29 UTC (rev 7819)
@@ -4,7 +4,7 @@
<groupId>org.debian.maven</groupId>
<artifactId>maven-debian</artifactId>
- <version>0.1</version>
+ <version>0.2</version>
<packaging>pom</packaging>
<name>helper tools for using Maven to build Debian packages</name>
More information about the pkg-java-commits
mailing list