[pkg-java] r13631 - trunk/libcodemodel-java/debian
James Page
jamespage-guest at alioth.debian.org
Tue May 3 17:37:47 UTC 2011
Author: jamespage-guest
Date: 2011-05-03 17:37:42 +0000 (Tue, 03 May 2011)
New Revision: 13631
Added:
trunk/libcodemodel-java/debian/libcodemodel-java-doc.doc-base.api
trunk/libcodemodel-java/debian/libcodemodel-java-doc.install
trunk/libcodemodel-java/debian/libcodemodel-java.poms
trunk/libcodemodel-java/debian/maven.cleanIgnoreRules
trunk/libcodemodel-java/debian/maven.ignoreRules
trunk/libcodemodel-java/debian/maven.properties
trunk/libcodemodel-java/debian/maven.publishedRules
trunk/libcodemodel-java/debian/maven.rules
Removed:
trunk/libcodemodel-java/debian/ant.properties
trunk/libcodemodel-java/debian/build.xml
Modified:
trunk/libcodemodel-java/debian/changelog
trunk/libcodemodel-java/debian/control
trunk/libcodemodel-java/debian/copyright
trunk/libcodemodel-java/debian/orig-tar.sh
trunk/libcodemodel-java/debian/rules
trunk/libcodemodel-java/debian/watch
Log:
* New upstream release.
* Migrated project to maven + maven-debian-helper.
* Added myself to Uploaders.
* Updated Standards-Version to 3.9.2.
Deleted: trunk/libcodemodel-java/debian/ant.properties
===================================================================
--- trunk/libcodemodel-java/debian/ant.properties 2011-05-03 16:58:42 UTC (rev 13630)
+++ trunk/libcodemodel-java/debian/ant.properties 2011-05-03 17:37:42 UTC (rev 13631)
@@ -1,7 +0,0 @@
-project.name=libcodemodel-java
-class.dir=classes
-source.dir=src/main/java
-codemodel.dir=codemodel
-codemodel-annotation.dir=codemodel-annotation-compiler
-codemodel.jar=codemodel.jar
-codemodel-annotation.jar=codemodel-annotation-compiler.jar
Deleted: trunk/libcodemodel-java/debian/build.xml
===================================================================
--- trunk/libcodemodel-java/debian/build.xml 2011-05-03 16:58:42 UTC (rev 13630)
+++ trunk/libcodemodel-java/debian/build.xml 2011-05-03 17:37:42 UTC (rev 13631)
@@ -1,34 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<project default="jar" name="${project.name}" basedir="..">
-
- <target name="clean">
- <delete dir="${codemodel.dir}/${class.dir}" quiet="true"/>
- <delete dir="${codemodel-annotation.dir}/${class.dir}" quiet="true"/>
- <delete file="${codemodel.jar}" quiet="true"/>
- <delete file="${codemodel-annotation.jar}" quiet="true"/>
- </target>
-
- <target name="jar">
- <mkdir dir="${codemodel.dir}/${class.dir}"/>
- <javac srcdir="${codemodel.dir}/${source.dir}" destdir="${codemodel.dir}/${class.dir}"
- debug="true" source="1.5"/>
-
- <jar jarfile="${codemodel.jar}">
- <fileset dir="${codemodel.dir}/${class.dir}">
- <include name="**"/>
- </fileset>
- </jar>
-
- <mkdir dir="${codemodel-annotation.dir}/${class.dir}"/>
- <javac srcdir="${codemodel-annotation.dir}/${source.dir}" destdir="${codemodel-annotation.dir}/${class.dir}"
- debug="true" source="1.5" classpath="${codemodel.jar}"/>
-
- <jar jarfile="${codemodel-annotation.jar}">
- <fileset dir="${codemodel-annotation.dir}/${class.dir}">
- <include name="**"/>
- </fileset>
- </jar>
- </target>
-
-</project>
Modified: trunk/libcodemodel-java/debian/changelog
===================================================================
--- trunk/libcodemodel-java/debian/changelog 2011-05-03 16:58:42 UTC (rev 13630)
+++ trunk/libcodemodel-java/debian/changelog 2011-05-03 17:37:42 UTC (rev 13631)
@@ -1,3 +1,12 @@
+libcodemodel-java (2.1-1) unstable; urgency=low
+
+ * New upstream release.
+ * Migrated project to maven + maven-debian-helper.
+ * Added myself to Uploaders.
+ * Updated Standards-Version to 3.9.2.
+
+ -- James Page <james.page at canonical.com> Wed, 27 Apr 2011 08:59:09 +0100
+
libcodemodel-java (2.0+dak1-2) UNRELEASED; urgency=low
* Build-Depends on debhelper (>= 7).
Modified: trunk/libcodemodel-java/debian/control
===================================================================
--- trunk/libcodemodel-java/debian/control 2011-05-03 16:58:42 UTC (rev 13630)
+++ trunk/libcodemodel-java/debian/control 2011-05-03 17:37:42 UTC (rev 13631)
@@ -2,19 +2,48 @@
Section: java
Priority: optional
Maintainer: Debian Java Maintainers <pkg-java-maintainers at lists.alioth.debian.org>
-Uploaders: Varun Hiremath <varun at debian.org>, Torsten Werner <twerner at debian.org>, Michael Koch <konqueror at gmx.de>
-Build-Depends: cdbs, debhelper (>= 7), openjdk-6-jdk, ant
-Standards-Version: 3.8.3
-Homepage: https://codemodel.dev.java.net/
+Uploaders:
+ Varun Hiremath <varun at debian.org>,
+ Torsten Werner <twerner at debian.org>,
+ Michael Koch <konqueror at gmx.de>,
+ James Page <james.page at canonical.com>
+Build-Depends: cdbs, debhelper (>= 7), default-jdk, maven-debian-helper
+Build-Depends-Indep:
+ ant,
+ ant-doc,
+ default-jdk-doc,
+ junit,
+ libmaven-compiler-plugin-java (>= 2.0.2),
+ libmaven-install-plugin-java,
+ libmaven-javadoc-plugin-java,
+ libmaven-javadoc-plugin-java (>= 2.6.1),
+ libsurefire-java (>= 2.4.3)
+Standards-Version: 3.9.2
+Homepage: http://codemodel.java.net/
Vcs-Svn: svn://svn.debian.org/svn/pkg-java/trunk/libcodemodel-java
Vcs-Browser: http://svn.debian.org/wsvn/pkg-java/trunk/libcodemodel-java
Package: libcodemodel-java
Architecture: all
-Depends: openjdk-6-jre-headless | sun-java5-jre | java1-runtime | java2-runtime
+Depends: ${maven:Depends}, ${misc:Depends}
+Recommends: ${maven:OptionalDepends}
Description: Java library for code generators
CodeModel is a Java library for code generators; it provides a way to
generate Java programs in a way much nicer than
PrintStream.println(). This project is a spin-off from the JAXB
Reference Implementation for its schema compiler to generate Java
source files.
+
+Package: libcodemodel-java-doc
+Architecture: all
+Section: doc
+Depends: ${misc:Depends}
+Suggests: libcodemodel-java
+Description: Documentation for Java library for code generators
+ CodeModel is a Java library for code generators; it provides a way to
+ generate Java programs in a way much nicer than
+ PrintStream.println(). This project is a spin-off from the JAXB
+ Reference Implementation for its schema compiler to generate Java
+ source files.
+ .
+ This package provides the API documentation for libcodemodel-java.
Modified: trunk/libcodemodel-java/debian/copyright
===================================================================
--- trunk/libcodemodel-java/debian/copyright 2011-05-03 16:58:42 UTC (rev 13630)
+++ trunk/libcodemodel-java/debian/copyright 2011-05-03 17:37:42 UTC (rev 13631)
@@ -5,7 +5,7 @@
Copyright: © 2005-2008 Sun Microsystems
-Upstream Authors:
+Upstream Authors:
Bhakti Mehta
Kohsuke Kawaguchi
Mark Reinhold
@@ -29,12 +29,12 @@
Modifications, in each case including portions thereof.
1.4. "Executable" means the Covered Software in any form
- other than Source Code.
+ other than Source Code.
1.5. "Initial Developer" means the individual or entity
that first makes Original Software available under this
- License.
-
+ License.
+
1.6. "Larger Work" means a work which combines Covered
Software or portions thereof with code not governed by the
terms of this License.
@@ -45,29 +45,29 @@
maximum extent possible, whether at the time of the initial
grant or subsequently acquired, any and all of the rights
conveyed herein.
-
+
1.9. "Modifications" means the Source Code and Executable
- form of any of the following:
+ form of any of the following:
A. Any file that results from an addition to,
deletion from or modification of the contents of a
file containing Original Software or previous
- Modifications;
+ Modifications;
B. Any new file that contains any part of the
- Original Software or previous Modification; or
+ Original Software or previous Modification; or
C. Any new file that is contributed or otherwise made
available under the terms of this License.
1.10. "Original Software" means the Source Code and
Executable form of computer software code that is
- originally released under this License.
+ originally released under this License.
1.11. "Patent Claims" means any patent claim(s), now owned
or hereafter acquired, including without limitation,
method, process, and apparatus claims, in any patent
- Licensable by grantor.
+ Licensable by grantor.
1.12. "Source Code" means (a) the common form of computer
software code in which modifications are made and (b)
@@ -84,40 +84,40 @@
of more than fifty percent (50%) of the outstanding shares
or beneficial ownership of such entity.
- 2. License Grants.
+ 2. License Grants.
2.1. The Initial Developer Grant.
Conditioned upon Your compliance with Section 3.1 below and
subject to third party intellectual property claims, the
Initial Developer hereby grants You a world-wide,
- royalty-free, non-exclusive license:
+ royalty-free, non-exclusive license:
(a) under intellectual property rights (other than
patent or trademark) Licensable by Initial Developer,
to use, reproduce, modify, display, perform,
sublicense and distribute the Original Software (or
portions thereof), with or without Modifications,
- and/or as part of a Larger Work; and
+ and/or as part of a Larger Work; and
(b) under Patent Claims infringed by the making,
using or selling of Original Software, to make, have
made, use, practice, sell, and offer for sale, and/or
otherwise dispose of the Original Software (or
- portions thereof).
+ portions thereof).
(c) The licenses granted in Sections 2.1(a) and (b)
are effective on the date Initial Developer first
distributes or otherwise makes the Original Software
available to a third party under the terms of this
- License.
+ License.
(d) Notwithstanding Section 2.1(b) above, no patent
license is granted: (1) for code that You delete from
the Original Software, or (2) for infringements
caused by: (i) the modification of the Original
Software, or (ii) the combination of the Original
- Software with other software or devices.
+ Software with other software or devices.
2.2. Contributor Grant.
@@ -133,8 +133,8 @@
Contributor (or portions thereof), either on an
unmodified basis, with other Modifications, as
Covered Software and/or as part of a Larger Work; and
-
+
(b) under Patent Claims infringed by the making,
using, or selling of Modifications made by that
Contributor either alone and/or in combination with
@@ -144,12 +144,12 @@
Modifications made by that Contributor (or portions
thereof); and (2) the combination of Modifications
made by that Contributor with its Contributor Version
- (or portions of such combination).
+ (or portions of such combination).
(c) The licenses granted in Sections 2.2(a) and
2.2(b) are effective on the date Contributor first
distributes or otherwise makes the Modifications
- available to a third party.
+ available to a third party.
(d) Notwithstanding Section 2.2(b) above, no patent
license is granted: (1) for any code that Contributor
@@ -160,7 +160,7 @@
with other software (except as part of the
Contributor Version) or other devices; or (3) under
Patent Claims infringed by Covered Software in the
- absence of Modifications made by that Contributor.
+ absence of Modifications made by that Contributor.
3. Distribution Obligations.
@@ -211,8 +211,8 @@
Developer and every Contributor for any liability incurred
by the Initial Developer or such Contributor as a result of
warranty, support, indemnity or liability terms You offer.
-
+
3.5. Distribution of Executable Versions.
You may distribute the Executable form of the Covered
@@ -238,10 +238,10 @@
with other code not governed by the terms of this License
and distribute the Larger Work as a single product. In such
a case, You must make sure the requirements of this License
- are fulfilled for the Covered Software.
-
- 4. Versions of the License.
+ are fulfilled for the Covered Software.
+ 4. Versions of the License.
+
4.1. New Versions.
Sun Microsystems, Inc. is the initial license steward and
@@ -249,7 +249,7 @@
from time to time. Each version will be given a
distinguishing version number. Except as provided in
Section 4.3, no one other than the license steward has the
- right to modify this License.
+ right to modify this License.
4.2. Effect of New Versions.
@@ -265,7 +265,7 @@
the Covered Software. Otherwise, You may also choose to
use, distribute or otherwise make the Covered Software
available under the terms of any subsequent version of the
- License published by the license steward.
+ License published by the license steward.
4.3. Modified Versions.
@@ -276,8 +276,8 @@
license steward (except to note that the license differs
from this License); and (b) otherwise make it clear that
the license contains terms which differ from this License.
-
+
5. DISCLAIMER OF WARRANTY.
COVERED SOFTWARE IS PROVIDED UNDER THIS LICENSE ON AN "AS IS"
@@ -291,9 +291,9 @@
ANY NECESSARY SERVICING, REPAIR OR CORRECTION. THIS DISCLAIMER OF
WARRANTY CONSTITUTES AN ESSENTIAL PART OF THIS LICENSE. NO USE OF
ANY COVERED SOFTWARE IS AUTHORIZED HEREUNDER EXCEPT UNDER THIS
- DISCLAIMER.
+ DISCLAIMER.
- 6. TERMINATION.
+ 6. TERMINATION.
6.1. This License and the rights granted hereunder will
terminate automatically if You fail to comply with terms
Added: trunk/libcodemodel-java/debian/libcodemodel-java-doc.doc-base.api
===================================================================
--- trunk/libcodemodel-java/debian/libcodemodel-java-doc.doc-base.api (rev 0)
+++ trunk/libcodemodel-java/debian/libcodemodel-java-doc.doc-base.api 2011-05-03 17:37:42 UTC (rev 13631)
@@ -0,0 +1,10 @@
+Document: libcodemodel-java
+Title: API Javadoc for Codemodel
+Author: Sun Microsystems developers
+Abstract: This is the API Javadoc provided for the
+ libcodemodel-java library.
+Section: Programming
+
+Format: HTML
+Index: /usr/share/doc/libcodemodel-java/api/index.html
+Files: /usr/share/doc/libcodemodel-java/api/*
Added: trunk/libcodemodel-java/debian/libcodemodel-java-doc.install
===================================================================
--- trunk/libcodemodel-java/debian/libcodemodel-java-doc.install (rev 0)
+++ trunk/libcodemodel-java/debian/libcodemodel-java-doc.install 2011-05-03 17:37:42 UTC (rev 13631)
@@ -0,0 +1,2 @@
+
+codemodel/target/apidocs/* usr/share/doc/libcodemodel-java/api
Added: trunk/libcodemodel-java/debian/libcodemodel-java.poms
===================================================================
--- trunk/libcodemodel-java/debian/libcodemodel-java.poms (rev 0)
+++ trunk/libcodemodel-java/debian/libcodemodel-java.poms 2011-05-03 17:37:42 UTC (rev 13631)
@@ -0,0 +1,9 @@
+# List of POM files for the package
+# Format of this file is:
+# <path to pom file> [option]
+# where option can be:
+# --ignore: ignore this POM or
+# --no-parent: remove the <parent> tag from the POM
+pom.xml
+codemodel/pom.xml
+codemodel-annotation-compiler/pom.xml
Added: trunk/libcodemodel-java/debian/maven.cleanIgnoreRules
===================================================================
--- trunk/libcodemodel-java/debian/maven.cleanIgnoreRules (rev 0)
+++ trunk/libcodemodel-java/debian/maven.cleanIgnoreRules 2011-05-03 17:37:42 UTC (rev 13631)
@@ -0,0 +1,18 @@
+# Maven ignore rules - ignore some Maven dependencies and plugins
+# Format of this file is:
+# [group] [artifact] [type] [version] [classifier] [scope]
+# where each element can be either
+# - the exact string, for example org.apache for the group, or 3.1
+# for the version. In this case, the element is simply matched
+# and left as it is
+# - * (the star character, alone). In this case, anything will
+# match and be left as it is. For example, using * on the
+# position of the artifact field will match any artifact id
+# All elements much match before a rule can be applied
+# Example rule: match jar with groupid= junit, artifactid= junit
+# and version starting with 3., this dependency is then removed
+# from the POM
+# junit junit jar s/3\\..*/3.x/
+
+com.sun.wts.tools.ant package-rename-task * * * *
+org.jvnet.wagon-svn wagon-svn * * * *
Added: trunk/libcodemodel-java/debian/maven.ignoreRules
===================================================================
--- trunk/libcodemodel-java/debian/maven.ignoreRules (rev 0)
+++ trunk/libcodemodel-java/debian/maven.ignoreRules 2011-05-03 17:37:42 UTC (rev 13631)
@@ -0,0 +1,18 @@
+# Maven ignore rules - ignore some Maven dependencies and plugins
+# Format of this file is:
+# [group] [artifact] [type] [version] [classifier] [scope]
+# where each element can be either
+# - the exact string, for example org.apache for the group, or 3.1
+# for the version. In this case, the element is simply matched
+# and left as it is
+# - * (the star character, alone). In this case, anything will
+# match and be left as it is. For example, using * on the
+# position of the artifact field will match any artifact id
+# All elements much match before a rule can be applied
+# Example rule: match jar with groupid= junit, artifactid= junit
+# and version starting with 3., this dependency is then removed
+# from the POM
+# junit junit jar s/3\\..*/3.x/
+
+com.sun.wts.tools.ant package-rename-task * * * *
+org.jvnet.wagon-svn wagon-svn * * * *
Added: trunk/libcodemodel-java/debian/maven.properties
===================================================================
--- trunk/libcodemodel-java/debian/maven.properties (rev 0)
+++ trunk/libcodemodel-java/debian/maven.properties 2011-05-03 17:37:42 UTC (rev 13631)
@@ -0,0 +1,4 @@
+# Include here properties to pass to Maven during the build.
+# For example:
+# maven.test.skip=true
+
Added: trunk/libcodemodel-java/debian/maven.publishedRules
===================================================================
--- trunk/libcodemodel-java/debian/maven.publishedRules (rev 0)
+++ trunk/libcodemodel-java/debian/maven.publishedRules 2011-05-03 17:37:42 UTC (rev 13631)
@@ -0,0 +1,19 @@
+# Maven published rules - additional rules to publish, to help
+# the packaging work of Debian maintainers using mh_make
+# Format of this file is:
+# [group] [artifact] [type] [version] [classifier] [scope]
+# where each element can be either
+# - the exact string, for example org.apache for the group, or 3.1
+# for the version. In this case, the element is simply matched
+# and left as it is
+# - * (the star character, alone). In this case, anything will
+# match and be left as it is. For example, using * on the
+# position of the artifact field will match any artifact id
+# - a regular expression of the form s/match/replace/
+# in this case, elements that match are transformed using
+# the regex rule.
+# All elements much match before a rule can be applied
+# Example rule: match jar with groupid= junit, artifactid= junit
+# and version starting with 3., replacing the version with 3.x
+# junit junit jar s/3\\..*/3.x/
+
Added: trunk/libcodemodel-java/debian/maven.rules
===================================================================
--- trunk/libcodemodel-java/debian/maven.rules (rev 0)
+++ trunk/libcodemodel-java/debian/maven.rules 2011-05-03 17:37:42 UTC (rev 13631)
@@ -0,0 +1,20 @@
+# Maven rules - transform Maven dependencies and plugins
+# Format of this file is:
+# [group] [artifact] [type] [version] [classifier] [scope]
+# where each element can be either
+# - the exact string, for example org.apache for the group, or 3.1
+# for the version. In this case, the element is simply matched
+# and left as it is
+# - * (the star character, alone). In this case, anything will
+# match and be left as it is. For example, using * on the
+# position of the artifact field will match any artifact id
+# - a regular expression of the form s/match/replace/
+# in this case, elements that match are transformed using
+# the regex rule.
+# All elements much match before a rule can be applied
+# Example rule: match jar with groupid= junit, artifactid= junit
+# and version starting with 3., replacing the version with 3.x
+# junit junit jar s/3\\..*/3.x/
+
+junit junit jar s/3\..*/3.x/ * *
+s/ant/org.apache.ant/ * * s/.*/debian/ * *
Modified: trunk/libcodemodel-java/debian/orig-tar.sh
===================================================================
--- trunk/libcodemodel-java/debian/orig-tar.sh 2011-05-03 16:58:42 UTC (rev 13630)
+++ trunk/libcodemodel-java/debian/orig-tar.sh 2011-05-03 17:37:42 UTC (rev 13631)
@@ -1,14 +1,13 @@
#!/bin/sh -e
-# $1 = version
-TAR=../libcodemodel-java_$1.orig.tar.gz
-DIR=libcodemodel-java-$1.orig
-#EXTRA_ARGS=--username xxx
+VERSION=$2
+TAR=../libcodemodel-java_$VERSION.orig.tar.gz
+DIR=libcodemodel-java-$VERSION.orig
# clean up the upstream tarball
-svn export https://codemodel.dev.java.net/svn/codemodel/tags/codemodel-$1/ \
- $DIR $EXTRA_ARGS
-GZIP=--best tar -c -z -f $TAR $DIR
+svn export https://svn.java.net/svn/codemodel~svn/tags/codemodel-$VERSION/ \
+ $DIR
+GZIP=--best tar -c -z -f $TAR --exclude '*.jar' --exclude '*.class' $DIR
rm -rf $DIR
# move to directory 'tarballs'
Modified: trunk/libcodemodel-java/debian/rules
===================================================================
--- trunk/libcodemodel-java/debian/rules 2011-05-03 16:58:42 UTC (rev 13630)
+++ trunk/libcodemodel-java/debian/rules 2011-05-03 17:37:42 UTC (rev 13631)
@@ -1,23 +1,11 @@
#!/usr/bin/make -f
-include /usr/share/cdbs/1/class/ant.mk
include /usr/share/cdbs/1/rules/debhelper.mk
+include /usr/share/cdbs/1/class/maven.mk
-JAVA_HOME_DIRS := /usr/lib/jvm/java-6-openjdk /usr/lib/jvm/java-1.5.0-sun
-DEB_ANT_BUILD_TARGET := jar
-DEB_ANT_BUILDFILE := debian/build.xml
-ANT_OPTS := -Dant.build.javac.source=1.5 -Dant.build.javac.target=1.5
+JAVA_HOME := /usr/lib/jvm/default-java
+DEB_MAVEN_DOC_TARGET := javadoc:jar javadoc:aggregate
+DEB_MAVEN_BUILD_TARGET := install
-ALL_JARS = $(wildcard *.jar)
-DEST_DIR = $(DEB_DESTDIR)/usr/share/java
-
-common-install-prehook-indep::
- for jar in $(ALL_JARS); do \
- BASENAME=`basename $$jar .jar`; \
- FULLNAME=$$BASENAME-$(DEB_UPSTREAM_VERSION).jar; \
- install -m 644 -D $$jar $(DEST_DIR)/$$FULLNAME; \
- ln -s $$FULLNAME $(DEST_DIR)/$$BASENAME.jar; \
- done
-
get-orig-source:
- sh debian/orig-tar.sh $(DEB_UPSTREAM_VERSION)
+ uscan --download-version $(DEB_UPSTREAM_VERSION) --force-download --rename
Modified: trunk/libcodemodel-java/debian/watch
===================================================================
--- trunk/libcodemodel-java/debian/watch 2011-05-03 16:58:42 UTC (rev 13630)
+++ trunk/libcodemodel-java/debian/watch 2011-05-03 17:37:42 UTC (rev 13631)
@@ -1,2 +1,4 @@
version=3
-http://download.java.net/maven/2/com/sun/codemodel/codemodel/([\d.]+)/codemodel-([\d.]+)-sources\.jar
+opts="uversionmangle=s/-(alpha|beta)-/~$1/" \
+ http://java.net/projects/codemodel/sources/svn/show/tags \
+ /projects/codemodel/sources/svn/show/tags/codemodel-(\d+).(\d+).* debian debian/orig-tar.sh
More information about the pkg-java-commits
mailing list