[pkg-java] r9012 - in trunk/plexus-cdc/debian: . patches
Ludovic Claude
ludovicc-guest at alioth.debian.org
Wed Jul 8 23:50:37 UTC 2009
Author: ludovicc-guest
Date: 2009-07-08 23:50:36 +0000 (Wed, 08 Jul 2009)
New Revision: 9012
Added:
trunk/plexus-cdc/debian/build.properties
trunk/plexus-cdc/debian/libplexus-cdc-java.poms
trunk/plexus-cdc/debian/maven.rules
trunk/plexus-cdc/debian/patches/qdox1_9.patch
Removed:
trunk/plexus-cdc/debian/maven.properties
trunk/plexus-cdc/debian/patches/pom.diff
Modified:
trunk/plexus-cdc/debian/changelog
trunk/plexus-cdc/debian/control
trunk/plexus-cdc/debian/orig-tar.sh
trunk/plexus-cdc/debian/patches/series
trunk/plexus-cdc/debian/rules
Log:
* Change section to java, bump up Standards-Version to 3.8.1
* 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
* Change the build dependency on openjdk-6-jdk to default-jdk
* Remove the dependencies on Java runtimes as this is a library.
Added: trunk/plexus-cdc/debian/build.properties
===================================================================
--- trunk/plexus-cdc/debian/build.properties (rev 0)
+++ trunk/plexus-cdc/debian/build.properties 2009-07-08 23:50:36 UTC (rev 9012)
@@ -0,0 +1,3 @@
+javadoc.dir=target/api
+build.directory=target
+maven.test.skip=true
Modified: trunk/plexus-cdc/debian/changelog
===================================================================
--- trunk/plexus-cdc/debian/changelog 2009-07-08 23:48:41 UTC (rev 9011)
+++ trunk/plexus-cdc/debian/changelog 2009-07-08 23:50:36 UTC (rev 9012)
@@ -1,3 +1,16 @@
+plexus-cdc (1.0~alpha14-2) unstable; urgency=low
+
+ * Change section to java, bump up Standards-Version to 3.8.1
+ * 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
+ * Change the build dependency on openjdk-6-jdk to default-jdk
+ * Remove the dependencies on Java runtimes as this is a library.
+
+ -- Ludovic Claude <ludovic.claude at laposte.net> Sun, 17 May 2009 18:55:16 +0100
+
plexus-cdc (1.0~alpha14-1) unstable; urgency=low
* Initial release. (Closes: #508465)
Modified: trunk/plexus-cdc/debian/control
===================================================================
--- trunk/plexus-cdc/debian/control 2009-07-08 23:48:41 UTC (rev 9011)
+++ trunk/plexus-cdc/debian/control 2009-07-08 23:50:36 UTC (rev 9012)
@@ -1,19 +1,21 @@
Source: plexus-cdc
-Section: libs
+Section: java
Priority: optional
Maintainer: Debian Java Maintainers <pkg-java-maintainers at lists.alioth.debian.org>
Uploaders: Torsten Werner <twerner at debian.org>
-Build-Depends: debhelper (>= 5), cdbs, openjdk-6-jdk, quilt, maven-debian-helper,
- libslf4j-java, libjdom1-java
-Standards-Version: 3.8.0
+Build-Depends: debhelper (>= 5), cdbs, quilt, default-jdk
+Build-Depends-Indep: maven-repo-helper, maven-ant-helper (>> 4), ant, ant-optional,
+ libplexus-containers-java, libplexus-utils-java,
+ libslf4j-java, libjdom1-java, libqdox-java
+Standards-Version: 3.8.1
Vcs-Svn: svn://svn.debian.org/svn/pkg-java/trunk/plexus-cdc
Vcs-Browser: http://svn.debian.org/wsvn/pkg-java/trunk/plexus-cdc/
Homepage: http://plexus.codehaus.org/guides/quick-start/component-descriptor-creator.html
Package: libplexus-cdc-java
Architecture: all
-Depends: ${misc:Depends}, default-jre | java2-runtime, libslf4j-java,
- libjdom1-java
+Depends: ${misc:Depends}, libplexus-containers-java, libplexus-utils-java,
+ libslf4j-java, libjdom1-java, libqdox-java
Description: Plexus Component Descriptor Creator
The Plexus project provides a full software stack for creating and
executing software projects. Based on the Plexus container, the applications
Added: trunk/plexus-cdc/debian/libplexus-cdc-java.poms
===================================================================
--- trunk/plexus-cdc/debian/libplexus-cdc-java.poms (rev 0)
+++ trunk/plexus-cdc/debian/libplexus-cdc-java.poms 2009-07-08 23:50:36 UTC (rev 9012)
@@ -0,0 +1 @@
+pom.xml --no-parent
Deleted: trunk/plexus-cdc/debian/maven.properties
===================================================================
--- trunk/plexus-cdc/debian/maven.properties 2009-07-08 23:48:41 UTC (rev 9011)
+++ trunk/plexus-cdc/debian/maven.properties 2009-07-08 23:50:36 UTC (rev 9012)
@@ -1,3 +0,0 @@
-# You can put your properties in this file.
-
-maven.test.skip = true
Added: trunk/plexus-cdc/debian/maven.rules
===================================================================
--- trunk/plexus-cdc/debian/maven.rules (rev 0)
+++ trunk/plexus-cdc/debian/maven.rules 2009-07-08 23:50:36 UTC (rev 9012)
@@ -0,0 +1,2 @@
+s/jdom/org.jdom/ jdom jar s/1\..*/debian/
+junit junit jar s/3\..*/3.x/
\ No newline at end of file
Property changes on: trunk/plexus-cdc/debian/orig-tar.sh
___________________________________________________________________
Modified: svn:executable
-
+ *
Deleted: trunk/plexus-cdc/debian/patches/pom.diff
===================================================================
--- trunk/plexus-cdc/debian/patches/pom.diff 2009-07-08 23:48:41 UTC (rev 9011)
+++ trunk/plexus-cdc/debian/patches/pom.diff 2009-07-08 23:50:36 UTC (rev 9012)
@@ -1,48 +0,0 @@
-some temporary workarounds...
-
-Index: plexus-cdc-1.0~alpha14/pom.xml
-===================================================================
---- plexus-cdc-1.0~alpha14.orig/pom.xml 2008-12-18 06:59:40.000000000 +0100
-+++ plexus-cdc-1.0~alpha14/pom.xml 2008-12-18 07:03:30.000000000 +0100
-@@ -21,6 +21,8 @@
- <groupId>org.slf4j</groupId>
- <artifactId>slf4j-api</artifactId>
- <version>1.4.3</version>
-+ <scope>system</scope>
-+ <systemPath>/usr/share/java/slf4j-api.jar</systemPath>
- </dependency>
- <!--
- NOTE: When QDox 1.7 is fuly cooked should update this and consider using it to provide source-level
-@@ -36,18 +38,31 @@
- <groupId>com.thoughtworks.qdox</groupId>
- <artifactId>qdox</artifactId>
- <version>1.6.3</version>
-+ <scope>system</scope>
-+ <systemPath>/usr/share/java/qdox.jar</systemPath>
- </dependency>
- <dependency>
- <groupId>jdom</groupId>
- <artifactId>jdom</artifactId>
- <version>1.0</version>
-+ <scope>system</scope>
-+ <systemPath>/usr/share/java/jdom1.jar</systemPath>
- </dependency>
-+ <dependency>
-+ <groupId>org.codehaus.plexus</groupId>
-+ <artifactId>plexus-container-default</artifactId>
-+ <version>1.0-alpha-9-stable-1</version>
-+ <scope>system</scope>
-+ <systemPath>/usr/share/java/plexus-container-default.jar</systemPath>
-+ </dependency>
-+ <!-- we don't run tests yet
- <dependency>
- <groupId>org.slf4j</groupId>
- <artifactId>slf4j-simple</artifactId>
- <version>1.4.3</version>
- <scope>test</scope>
-- </dependency>
-+ </dependency>
-+ -->
- </dependencies>
-
- <scm>
Added: trunk/plexus-cdc/debian/patches/qdox1_9.patch
===================================================================
--- trunk/plexus-cdc/debian/patches/qdox1_9.patch (rev 0)
+++ trunk/plexus-cdc/debian/patches/qdox1_9.patch 2009-07-08 23:50:36 UTC (rev 9012)
@@ -0,0 +1,65 @@
+--- a/src/main/java/org/codehaus/plexus/cdc/PlexusDefaultComponentGleaner.java
++++ b/src/main/java/org/codehaus/plexus/cdc/PlexusDefaultComponentGleaner.java
+@@ -274,7 +274,7 @@
+
+ String fqn = ifc.getFullyQualifiedName();
+
+- String pkg = ifc.getPackage();
++ String pkg = ifc.getPackage().getName();
+
+ if ( pkg == null )
+ {
+@@ -292,7 +292,7 @@
+ // prepend the gleaned class' package
+ // -----------------------------------------------------------------------
+
+- pkg = javaClass.getPackage();
++ pkg = javaClass.getPackage().getName();
+
+ fqn = pkg + "." + fqn;
+ }
+@@ -445,7 +445,7 @@
+
+ JavaClass roleClass = classCache.getClassByName( role );
+
+- if ( role.indexOf( '.' ) == -1 && StringUtils.isEmpty( roleClass.getPackage() ) )
++ if ( role.indexOf( '.' ) == -1 && StringUtils.isEmpty( roleClass.getPackage().getName() ) )
+ {
+ role = javaClass.getPackage() + "." + roleClass.getName();
+ }
+--- a/src/main/java/org/codehaus/plexus/cdc/gleaner/QDoxComponentGleaner.java
++++ b/src/main/java/org/codehaus/plexus/cdc/gleaner/QDoxComponentGleaner.java
+@@ -271,7 +271,7 @@
+
+ String fqn = ifc.getFullyQualifiedName();
+
+- String pkg = ifc.getPackage();
++ String pkg = ifc.getPackage().getName();
+
+ if ( pkg == null )
+ {
+@@ -289,7 +289,7 @@
+ // prepend the gleaned class' package
+ // -----------------------------------------------------------------------
+
+- pkg = javaClass.getPackage();
++ pkg = javaClass.getPackage().getName();
+
+ fqn = pkg + "." + fqn;
+ }
+@@ -441,7 +441,7 @@
+
+ JavaClass roleClass = classCache.getClassByName( role );
+
+- if ( role.indexOf( '.' ) == -1 && StringUtils.isEmpty( roleClass.getPackage() ) )
++ if ( role.indexOf( '.' ) == -1 && StringUtils.isEmpty( roleClass.getPackage().getName() ) )
+ {
+ role = javaClass.getPackage() + "." + roleClass.getName();
+ }
+@@ -543,4 +543,4 @@
+
+ return value;
+ }
+-}
+\ No newline at end of file
++}
Modified: trunk/plexus-cdc/debian/patches/series
===================================================================
--- trunk/plexus-cdc/debian/patches/series 2009-07-08 23:48:41 UTC (rev 9011)
+++ trunk/plexus-cdc/debian/patches/series 2009-07-08 23:50:36 UTC (rev 9012)
@@ -1 +1 @@
-pom.diff
+qdox1_9.patch
Modified: trunk/plexus-cdc/debian/rules
===================================================================
--- trunk/plexus-cdc/debian/rules 2009-07-08 23:48:41 UTC (rev 9011)
+++ trunk/plexus-cdc/debian/rules 2009-07-08 23:50:36 UTC (rev 9012)
@@ -1,10 +1,24 @@
#!/usr/bin/make -f
include /usr/share/cdbs/1/rules/debhelper.mk
-include /usr/share/cdbs/1/class/maven.mk
+include /usr/share/cdbs/1/class/ant.mk
include /usr/share/cdbs/1/rules/patchsys-quilt.mk
-JAVA_HOME := /usr/lib/jvm/java-6-openjdk
+PACKAGE := $(DEB_SOURCE_PACKAGE)
+VERSION := $(DEB_UPSTREAM_VERSION)
+JAVA_HOME := /usr/lib/jvm/default-java
+DEB_JARS := ant-nodeps slf4j-api qdox jdom1 plexus-container-default plexus-utils
+DEB_ANT_BUILD_TARGET := package #javadoc
+DEB_ANT_BUILDFILE := /usr/share/maven-ant-helper/maven-build.xml
+DEB_ANT_ARGS := -Dbasedir=$(realpath .) -Dpackage=$(PACKAGE) -Dversion=$(VERSION)
+API_DOCS := target/api
+binary-post-install/lib$(PACKAGE)-java::
+ mh_installpoms -plib$(PACKAGE)-java
+ mh_installjar -plib$(PACKAGE)-java -l pom.xml target/$(PACKAGE)-$(VERSION).jar
+
+clean::
+ -rm -rf debian/tmp
+
get-orig-source:
sh -e debian/orig-tar.sh
Property changes on: trunk/plexus-cdc/debian/rules
___________________________________________________________________
Modified: svn:executable
-
+ *
More information about the pkg-java-commits
mailing list