[pkg-java] r13483 - in trunk/libxbean-java/debian: . source
Damien Raude-Morvan
drazzib at alioth.debian.org
Wed Mar 30 19:16:05 UTC 2011
Author: drazzib
Date: 2011-03-30 19:15:51 +0000 (Wed, 30 Mar 2011)
New Revision: 13483
Added:
trunk/libxbean-java/debian/source/
trunk/libxbean-java/debian/source/format
Modified:
trunk/libxbean-java/debian/README.Debian
trunk/libxbean-java/debian/build.xml
trunk/libxbean-java/debian/changelog
trunk/libxbean-java/debian/compat
trunk/libxbean-java/debian/control
trunk/libxbean-java/debian/libxbean-java.poms
trunk/libxbean-java/debian/maven.rules
trunk/libxbean-java/debian/rules
Log:
* Team Upload.
* Enable Spring module:
- Update d/build.xml
- d/control: Add Build-D on libspring-*-java and libqdox.
- d/rules: Add spring-* and qdox into classpath.
* Update Standards-Version to 3.9.1: no changes needed.
* Switch to 3.0 (quilt) format.
* Bump debhelper compat level to 7.
* Switch to default-jdk:
- d/control: Build-Depends on default-jdk.
- d/rules: JAVA_HOME set to default-java.
Modified: trunk/libxbean-java/debian/README.Debian
===================================================================
--- trunk/libxbean-java/debian/README.Debian 2011-03-30 18:17:56 UTC (rev 13482)
+++ trunk/libxbean-java/debian/README.Debian 2011-03-30 19:15:51 UTC (rev 13483)
@@ -5,7 +5,6 @@
rely on some additional dependencies:
- maven-xbean-plugin
- xbean-classloader
-- xbean-spring
I would advise to package those additional modules in a separate package, to
avoid circular dependencies as Maven uses XBean
Modified: trunk/libxbean-java/debian/build.xml
===================================================================
--- trunk/libxbean-java/debian/build.xml 2011-03-30 18:17:56 UTC (rev 13482)
+++ trunk/libxbean-java/debian/build.xml 2011-03-30 19:15:51 UTC (rev 13483)
@@ -37,6 +37,7 @@
<cleanmodule dir="xbean-naming"/>
<cleanmodule dir="xbean-reflect"/>
<cleanmodule dir="xbean-telnet"/>
+ <cleanmodule dir="xbean-spring"/>
</target>
<!-- we do not build all modules yet -->
@@ -47,6 +48,7 @@
<packagemodule dir="xbean-naming"/>
<packagemodule dir="xbean-reflect" classpath="${classpath.compile}:/usr/share/java/asm2.jar:/usr/share/java/asm2-commons.jar"/>
<packagemodule dir="xbean-telnet"/>
+ <packagemodule dir="xbean-spring"/>
</target>
<target name="javadoc">
@@ -56,6 +58,7 @@
<packageset dir="xbean-naming/src/main/java/"/>
<packageset dir="xbean-reflect/src/main/java/"/>
<packageset dir="xbean-telnet/src/main/java/"/>
+ <packageset dir="xbean-spring/src/main/java/"/>
</javadoc>
</target>
Modified: trunk/libxbean-java/debian/changelog
===================================================================
--- trunk/libxbean-java/debian/changelog 2011-03-30 18:17:56 UTC (rev 13482)
+++ trunk/libxbean-java/debian/changelog 2011-03-30 19:15:51 UTC (rev 13483)
@@ -1,3 +1,19 @@
+libxbean-java (3.5-4) unstable; urgency=low
+
+ * Team Upload.
+ * Enable Spring module:
+ - Update d/build.xml
+ - d/control: Add Build-D on libspring-*-java and libqdox.
+ - d/rules: Add spring-* and qdox into classpath.
+ * Update Standards-Version to 3.9.1: no changes needed.
+ * Switch to 3.0 (quilt) format.
+ * Bump debhelper compat level to 7.
+ * Switch to default-jdk:
+ - d/control: Build-Depends on default-jdk.
+ - d/rules: JAVA_HOME set to default-java.
+
+ -- Damien Raude-Morvan <drazzib at debian.org> Wed, 30 Mar 2011 21:03:36 +0200
+
libxbean-java (3.5-3) unstable; urgency=low
* Upload to unstable.
Modified: trunk/libxbean-java/debian/compat
===================================================================
--- trunk/libxbean-java/debian/compat 2011-03-30 18:17:56 UTC (rev 13482)
+++ trunk/libxbean-java/debian/compat 2011-03-30 19:15:51 UTC (rev 13483)
@@ -1 +1 @@
-5
+7
Modified: trunk/libxbean-java/debian/control
===================================================================
--- trunk/libxbean-java/debian/control 2011-03-30 18:17:56 UTC (rev 13482)
+++ trunk/libxbean-java/debian/control 2011-03-30 19:15:51 UTC (rev 13483)
@@ -3,10 +3,12 @@
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
+Build-Depends: debhelper (>= 7), cdbs, default-jdk
Build-Depends-Indep: maven-repo-helper, maven-ant-helper (>> 4), ant, ant-optional,
- libcommons-logging-java, liblog4j1.2-java, libasm2-java, libasm3-java, groovy
-Standards-Version: 3.8.1
+ libcommons-logging-java, liblog4j1.2-java, libasm2-java, libasm3-java, groovy,
+ libspring-core-java, libspring-beans-java, libspring-context-java, libspring-web-java,
+ libqdox-java
+Standards-Version: 3.9.1
Vcs-Svn: svn://svn.debian.org/svn/pkg-java/trunk/libxbean-java
Vcs-Browser: http://svn.debian.org/wsvn/pkg-java/trunk/libxbean-java/
Homepage: http://geronimo.apache.org/xbean/
@@ -15,6 +17,8 @@
Architecture: all
Depends: ${misc:Depends}
Recommends: libcommons-logging-java, liblog4j1.2-java, libasm2-java, libasm3-java, groovy
+Suggests: libspring-core-java, libspring-beans-java, libspring-context-java, libspring-web-java,
+ libqdox-java
Description: plugin based Java application server
The goal of XBean project is to created a plugin based server analogous to
Eclipse being a plugin based IDE. XBean will be able to discover, download and
Modified: trunk/libxbean-java/debian/libxbean-java.poms
===================================================================
--- trunk/libxbean-java/debian/libxbean-java.poms 2011-03-30 18:17:56 UTC (rev 13482)
+++ trunk/libxbean-java/debian/libxbean-java.poms 2011-03-30 19:15:51 UTC (rev 13483)
@@ -1,7 +1,34 @@
-pom.xml --no-parent
-xbean-classpath/pom.xml
-xbean-finder/pom.xml
-xbean-naming/pom.xml
-xbean-reflect/pom.xml
-xbean-telnet/pom.xml
-
+# 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
+# --package=<package>: an alternative package to use when installing this POM
+# and its artifact
+# --has-package-version: to indicate that the original version of the POM is the same as the upstream part
+# of the version for the package.
+# --keep-elements=<elem1,elem2>: a list of XML elements to keep in the POM
+# during a clean operation with mh_cleanpom or mh_installpom
+# --artifact=<path>: path to the build artifact associated with this POM,
+# it will be installed when using the command mh_install
+# --java-lib: install the jar into /usr/share/java to comply with Debian
+# packaging guidelines
+# --usj-name=<name>: name to use when installing the library in /usr/share/java
+# --usj-version=<version>: version to use when installing the library in /usr/share/java
+# --no-usj-versionless: don't install the versionless link in /usr/share/java
+# --dest-jar=<path>: the destination for the real jar
+# it will be installed with mh_install.
+# --classifier=<classifier>: Optional, the classifier for the jar. Empty by default.
+# --ignore-pom: don't install the POM with mh_install or mh_installpoms. To use with POM files that are created
+# temporarily for certain artifacts such as Javadoc jars.
+#
+pom.xml --no-parent --has-package-version
+xbean-classloader/pom.xml --has-package-version
+xbean-classpath/pom.xml --has-package-version
+xbean-finder/pom.xml --has-package-version
+xbean-naming/pom.xml --has-package-version
+xbean-reflect/pom.xml --has-package-version
+xbean-spring/pom.xml --has-package-version
+xbean-telnet/pom.xml --has-package-version
+maven-xbean-plugin/pom.xml --has-package-version
Modified: trunk/libxbean-java/debian/maven.rules
===================================================================
--- trunk/libxbean-java/debian/maven.rules 2011-03-30 18:17:56 UTC (rev 13482)
+++ trunk/libxbean-java/debian/maven.rules 2011-03-30 19:15:51 UTC (rev 13483)
@@ -1,6 +1,30 @@
-asm * * s/2\..*/2.x/
-asm * * s/3\..*/3.x/
-log4j log4j jar s/1\.2\..*/1.2.x/
-junit junit jar s/3\..*/3.x/
-# force using commons-logging instead of only the api
-commons-logging s/commons-logging-api/commons-logging/ * s/.*/debian/
+# 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/ * *
+log4j log4j jar s/1\.2\..*/1.2.x/ * *
+commons-logging s/commons-logging-api/commons-logging/ * s/.*/debian/ * *
+s/ant/org.apache.ant/ * * s/.*/debian/ * *
+asm * * s/2\..*/2.x/ * *
+asm * * s/3\..*/3.x/ * *
+s/groovy/org.codehaus.groovy/ groovy* * s/.*/debian/ * *
+org.springframework * * s/.*/3.x/ * *
+s/qdox/com.thoughtworks.qdox/ * * s/.*/debian/ * *
+
+# Install with "jar" packaging type instead of "bundle"
+org.apache.xbean * s/bundle/jar/ s/.*/debian/
Modified: trunk/libxbean-java/debian/rules
===================================================================
--- trunk/libxbean-java/debian/rules 2011-03-30 18:17:56 UTC (rev 13482)
+++ trunk/libxbean-java/debian/rules 2011-03-30 19:15:51 UTC (rev 13483)
@@ -5,12 +5,12 @@
PACKAGE := $(DEB_SOURCE_PACKAGE)
VERSION := $(DEB_UPSTREAM_VERSION)
-JAVA_HOME := /usr/lib/jvm/java-6-openjdk
-DEB_JARS := ant-nodeps commons-logging groovy log4j-1.2
+JAVA_HOME := /usr/lib/jvm/default-java
+DEB_JARS := ant-nodeps commons-logging groovy log4j-1.2 spring3-core spring3-beans spring3-context spring3-web qdox
DEB_ANT_BUILD_TARGET := package javadoc
DEB_ANT_BUILDFILE := debian/build.xml
DEB_ANT_ARGS := -Dbasedir=$(realpath .) -Dpackage=$(PACKAGE) -Dbin.package=$(PACKAGE) -Dversion=$(VERSION)
-MODULES := classpath naming reflect telnet
+MODULES := classpath naming reflect telnet spring
get-orig-source:
uscan --download-version $(VERSION) --force-download --rename
@@ -22,4 +22,4 @@
done
clean::
- -rm -rf debian/tmp
+ mh_clean
Added: trunk/libxbean-java/debian/source/format
===================================================================
--- trunk/libxbean-java/debian/source/format (rev 0)
+++ trunk/libxbean-java/debian/source/format 2011-03-30 19:15:51 UTC (rev 13483)
@@ -0,0 +1 @@
+3.0 (quilt)
More information about the pkg-java-commits
mailing list