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 b708b9bd9aa8c5db6e36d33b81cdce6d8586a27e Author: Ludovic Claude <[email protected]> Date: Wed Jul 8 23:50:36 2009 +0000 * 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. --- debian/build.properties | 3 ++ debian/changelog | 13 +++++++++ debian/control | 14 +++++---- debian/libplexus-cdc-java.poms | 1 + debian/maven.properties | 3 -- debian/maven.rules | 2 ++ debian/patches/pom.diff | 48 ------------------------------- debian/patches/qdox1_9.patch | 65 ++++++++++++++++++++++++++++++++++++++++++ debian/patches/series | 2 +- debian/rules | 18 ++++++++++-- 10 files changed, 109 insertions(+), 60 deletions(-) diff --git a/debian/build.properties b/debian/build.properties new file mode 100644 index 0000000..231acb2 --- /dev/null +++ b/debian/build.properties @@ -0,0 +1,3 @@ +javadoc.dir=target/api +build.directory=target +maven.test.skip=true diff --git a/debian/changelog b/debian/changelog index 0d21dea..5959c69 100644 --- a/debian/changelog +++ b/debian/changelog @@ -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 <[email protected]> Sun, 17 May 2009 18:55:16 +0100 + plexus-cdc (1.0~alpha14-1) unstable; urgency=low * Initial release. (Closes: #508465) diff --git a/debian/control b/debian/control index 5f0823c..2c15f8e 100644 --- a/debian/control +++ b/debian/control @@ -1,19 +1,21 @@ Source: plexus-cdc -Section: libs +Section: java Priority: optional Maintainer: Debian Java Maintainers <[email protected]> Uploaders: Torsten Werner <[email protected]> -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 diff --git a/debian/libplexus-cdc-java.poms b/debian/libplexus-cdc-java.poms new file mode 100644 index 0000000..43e746b --- /dev/null +++ b/debian/libplexus-cdc-java.poms @@ -0,0 +1 @@ +pom.xml --no-parent diff --git a/debian/maven.properties b/debian/maven.properties deleted file mode 100644 index b3c7798..0000000 --- a/debian/maven.properties +++ /dev/null @@ -1,3 +0,0 @@ -# You can put your properties in this file. - -maven.test.skip = true diff --git a/debian/maven.rules b/debian/maven.rules new file mode 100644 index 0000000..d608d14 --- /dev/null +++ b/debian/maven.rules @@ -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 diff --git a/debian/patches/pom.diff b/debian/patches/pom.diff deleted file mode 100644 index f7ce78a..0000000 --- a/debian/patches/pom.diff +++ /dev/null @@ -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> diff --git a/debian/patches/qdox1_9.patch b/debian/patches/qdox1_9.patch new file mode 100644 index 0000000..203ef57 --- /dev/null +++ b/debian/patches/qdox1_9.patch @@ -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 ++} diff --git a/debian/patches/series b/debian/patches/series index 7740e23..00c9287 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -1 +1 @@ -pom.diff +qdox1_9.patch diff --git a/debian/rules b/debian/rules index 84d441f..e674773 100755 --- a/debian/rules +++ b/debian/rules @@ -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 -- 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
