Author: ludovicc-guest
Date: 2009-07-05 00:17:21 +0000 (Sun, 05 Jul 2009)
New Revision: 8860
Added:
trunk/plexus-compiler-javac/debian/libplexus-compiler-javac-java.poms
trunk/plexus-compiler-javac/debian/pom.xml
Modified:
trunk/plexus-compiler-javac/debian/build.xml
trunk/plexus-compiler-javac/debian/changelog
trunk/plexus-compiler-javac/debian/control
trunk/plexus-compiler-javac/debian/orig-tar.sh
trunk/plexus-compiler-javac/debian/rules
trunk/plexus-compiler-javac/debian/watch
Log:
* New version
Modified: trunk/plexus-compiler-javac/debian/build.xml
===================================================================
--- trunk/plexus-compiler-javac/debian/build.xml 2009-07-05 00:12:13 UTC
(rev 8859)
+++ trunk/plexus-compiler-javac/debian/build.xml 2009-07-05 00:17:21 UTC
(rev 8860)
@@ -19,14 +19,11 @@
<target name="compile" depends="init">
<mkdir dir="${classes.dir}"/>
<javac srcdir="${source.dir}" destdir="${classes.dir}"
- debug="true" source="1.5"
excludes="org/codehaus/plexus/compiler/javac/Commandline.java" />
+ debug="true" source="1.4"
excludes="org/codehaus/plexus/compiler/javac/Commandline.java" />
</target>
<target name="jar" description="o Create the jar" depends="compile">
<echo message="Building jar ${jar.name}" />
- <copy todir="${classes.dir}/META-INF">
- <fileset dir="META-INF"/>
- </copy>
<jar jarfile="${jar.name}">
<fileset dir="${classes.dir}">
<include name="**"/>
Modified: trunk/plexus-compiler-javac/debian/changelog
===================================================================
--- trunk/plexus-compiler-javac/debian/changelog 2009-07-05 00:12:13 UTC
(rev 8859)
+++ trunk/plexus-compiler-javac/debian/changelog 2009-07-05 00:17:21 UTC
(rev 8860)
@@ -1,3 +1,15 @@
+plexus-compiler-javac (1.5.3-4) unstable; urgency=low
+
+ * 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
+ * Change debian/build.xml: use Java source version 1.4 for
+ compatibility, don't include META-INF/ folder from the sources
+ * Remove redundant dependencies
+
+ -- Ludovic Claude <[email protected]> Sun, 05 Jul 2009 00:41:45
+0000
+
plexus-compiler-javac (1.5.3-3) unstable; urgency=low
* Change Section: java.
Modified: trunk/plexus-compiler-javac/debian/control
===================================================================
--- trunk/plexus-compiler-javac/debian/control 2009-07-05 00:12:13 UTC (rev
8859)
+++ trunk/plexus-compiler-javac/debian/control 2009-07-05 00:17:21 UTC (rev
8860)
@@ -3,8 +3,9 @@
Priority: optional
Maintainer: Debian Java Maintainers
<[email protected]>
Uploaders: Paul Cager <[email protected]>, Torsten Werner
<[email protected]>
-Build-Depends: cdbs, debhelper (>= 6), ant
-Build-Depends-Indep: default-jdk, libplexus-container-default-java,
libplexus-utils-java, libplexus-compiler-api-java
+Build-Depends: cdbs, debhelper (>= 6), ant, default-jdk
+Build-Depends-Indep: maven-repo-helper, libplexus-utils-java,
+ libplexus-compiler-api-java
Standards-Version: 3.8.2
Homepage: http://plexus.codehaus.org
Vcs-Svn: svn://svn.debian.org/svn/pkg-java/trunk/plexus-compiler-javac
@@ -12,7 +13,7 @@
Package: libplexus-compiler-javac-java
Architecture: all
-Depends: ${shlibs:Depends}, ${misc:Depends}, libplexus-container-default-java,
libplexus-utils-java, libplexus-compiler-api-java
+Depends: ${shlibs:Depends}, ${misc:Depends}, libplexus-utils-java,
libplexus-compiler-api-java
Description: The javac plugin for the Plexus compiler system
The Plexus project provides a full software stack for creating and
executing software projects. Based on the Plexus container, the applications
Added: trunk/plexus-compiler-javac/debian/libplexus-compiler-javac-java.poms
===================================================================
--- trunk/plexus-compiler-javac/debian/libplexus-compiler-javac-java.poms
(rev 0)
+++ trunk/plexus-compiler-javac/debian/libplexus-compiler-javac-java.poms
2009-07-05 00:17:21 UTC (rev 8860)
@@ -0,0 +1 @@
+debian/pom.xml --no-parent
Modified: trunk/plexus-compiler-javac/debian/orig-tar.sh
===================================================================
--- trunk/plexus-compiler-javac/debian/orig-tar.sh 2009-07-05 00:12:13 UTC
(rev 8859)
+++ trunk/plexus-compiler-javac/debian/orig-tar.sh 2009-07-05 00:17:21 UTC
(rev 8860)
@@ -1,18 +1,19 @@
#!/bin/sh -e
-# $1 = version
+# $2 = version
-URL=http://repository.codehaus.org/org/codehaus/plexus/plexus-compiler-javac/$1/plexus-compiler-javac-$1-sources.jar
+TAR=../plexus-compiler-javac_$2.orig.tar.gz
+DIR=plexus-compiler-javac-$2
+TAG=$(echo plexus-compiler-$2 | sed 's,~alpha,-alpha-,')
-wget $URL || exit 2
-SOURCE=plexus-compiler-javac-$1
-mkdir $SOURCE
-cd $SOURCE || exit 2
-jar xf ../plexus-compiler-javac-$1-sources.jar
-cd ..
+svn export
http://svn.codehaus.org/plexus/tags/$TAG/plexus-compilers/plexus-compiler-javac/src/main/java
$DIR
+tar -c -z -f $TAR $DIR
+rm -rf $DIR ../$TAG
-GZIP=--best tar czf plexus-compiler-javac_$1.orig.tar.gz $SOURCE || exit 2
+# move to directory 'tarballs'
+if [ -r .svn/deb-layout ]; then
+ . .svn/deb-layout
+ mv $TAR $origDir
+ echo "moved $TAR to $origDir"
+fi
-rm -rf $SOURCE plexus-compiler-javac-$1-sources.jar
-
-
Property changes on: trunk/plexus-compiler-javac/debian/orig-tar.sh
___________________________________________________________________
Modified: svn:executable
-
+ *
Added: trunk/plexus-compiler-javac/debian/pom.xml
===================================================================
--- trunk/plexus-compiler-javac/debian/pom.xml (rev 0)
+++ trunk/plexus-compiler-javac/debian/pom.xml 2009-07-05 00:17:21 UTC (rev
8860)
@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="UTF-8"?><project>
+ <parent>
+ <artifactId>plexus-compilers</artifactId>
+ <groupId>org.codehaus.plexus</groupId>
+ <version>1.5.3</version>
+ </parent>
+ <modelVersion>4.0.0</modelVersion>
+ <artifactId>plexus-compiler-javac</artifactId>
+ <name>Plexus Javac Component</name>
+ <version>1.5.3</version>
+ <dependencies>
+ <dependency>
+ <groupId>org.codehaus.plexus</groupId>
+ <artifactId>plexus-utils</artifactId>
+ <version>1.0.5</version>
+ </dependency>
+ <dependency>
+ <groupId>commons-lang</groupId>
+ <artifactId>commons-lang</artifactId>
+ <version>2.0</version>
+ <scope>test</scope>
+ </dependency>
+ </dependencies>
+ <distributionManagement>
+ <status>deployed</status>
+ </distributionManagement>
+</project>
\ No newline at end of file
Modified: trunk/plexus-compiler-javac/debian/rules
===================================================================
--- trunk/plexus-compiler-javac/debian/rules 2009-07-05 00:12:13 UTC (rev
8859)
+++ trunk/plexus-compiler-javac/debian/rules 2009-07-05 00:17:21 UTC (rev
8860)
@@ -1,21 +1,30 @@
#!/usr/bin/make -f
+include /usr/share/cdbs/1/rules/debhelper.mk
include /usr/share/cdbs/1/class/ant.mk
-include /usr/share/cdbs/1/rules/debhelper.mk
-JAVA_HOME := /usr/lib/jvm/java-gcj
-DEB_ANT_BUILD_TARGET := jar
-DEB_ANT_BUILDFILE := debian/build.xml
-DEB_JARS := plexus-container-default plexus-utils
plexus-compiler-api
-ANT_OPTS := -Dversion=$(DEB_UPSTREAM_VERSION)
-Dcomponent=$(DEB_SOURCE_PACKAGE)
+PACKAGE := $(DEB_SOURCE_PACKAGE)
+VERSION := $(DEB_UPSTREAM_VERSION)
+JAVA_HOME := /usr/lib/jvm/default-java
+DEB_ANT_BUILD_TARGET := jar
+DEB_ANT_BUILDFILE := debian/build.xml
+DEB_JARS := plexus-container-default plexus-utils
plexus-compiler-api
+ANT_OPTS := -Dversion=$(DEB_UPSTREAM_VERSION)
-Dcomponent=$(DEB_SOURCE_PACKAGE)
makebuilddir/libplexus-compiler-javac-java::
install -d classes/META-INF/plexus/
install -m644 debian/components.xml classes/META-INF/plexus/
-install/lib$(DEB_SOURCE_PACKAGE)-java::
- dh_install $(DEB_SOURCE_PACKAGE)-$(DEB_UPSTREAM_VERSION).jar
usr/share/java
- dh_link
/usr/share/java/$(DEB_SOURCE_PACKAGE)-$(DEB_UPSTREAM_VERSION).jar
/usr/share/java/$(DEB_SOURCE_PACKAGE).jar
+binary-post-install/lib$(PACKAGE)-java::
+ mh_installpoms -plib$(PACKAGE)-java
+ mh_installjar -plib$(PACKAGE)-java -l debian/pom.xml
$(PACKAGE)-$(VERSION).jar
+clean::
+ -rm -rf debian/tmp
+
get-orig-source:
- -uscan --upstream-version 0
+ -uscan --download-version $(VERSION) --force-download --rename
+
+get-orig-pom:
+ -wget -O debian/pom.xml
http://repository.sonatype.org/service/local/repositories/central/content/org/codehaus/plexus/plexus-compiler-javac/$(VERSION)/plexus-compiler-javac-$(VERSION).pom
+
Property changes on: trunk/plexus-compiler-javac/debian/rules
___________________________________________________________________
Modified: svn:executable
-
+ *
Modified: trunk/plexus-compiler-javac/debian/watch
===================================================================
--- trunk/plexus-compiler-javac/debian/watch 2009-07-05 00:12:13 UTC (rev
8859)
+++ trunk/plexus-compiler-javac/debian/watch 2009-07-05 00:17:21 UTC (rev
8860)
@@ -1,2 +1,4 @@
version=3
-http://repository.codehaus.org/org/codehaus/plexus/plexus-compiler-javac
([0-9].*)/ debian debian/orig-tar.sh
+opts=uversionmangle=s{-alpha-}{~alpha} \
+ http://svn.codehaus.org/plexus/tags/ \
+ plexus-compiler-(.*)/ debian debian/orig-tar.sh
_______________________________________________
pkg-java-commits mailing list
[email protected]
http://lists.alioth.debian.org/mailman/listinfo/pkg-java-commits
