[pkg-java] r13859 - trunk/libxbean-java/debian
Damien Raude-Morvan
drazzib at alioth.debian.org
Sun Jul 17 22:25:19 UTC 2011
Author: drazzib
Date: 2011-07-17 22:25:19 +0000 (Sun, 17 Jul 2011)
New Revision: 13859
Added:
trunk/libxbean-java/debian/README.source
trunk/libxbean-java/debian/maven.cleanIgnoreRules
trunk/libxbean-java/debian/maven.ignoreRules
trunk/libxbean-java/debian/maven.properties
trunk/libxbean-java/debian/rules.bootstrap
trunk/libxbean-java/debian/rules.full
Removed:
trunk/libxbean-java/debian/README.Debian
trunk/libxbean-java/debian/libxbean-java-doc.docs
Modified:
trunk/libxbean-java/debian/build.xml
trunk/libxbean-java/debian/changelog
trunk/libxbean-java/debian/control
trunk/libxbean-java/debian/libxbean-java-doc.doc-base
trunk/libxbean-java/debian/rules
Log:
* Add myself as Uploaders.
* d/control: replace "we" by "it" in packages' descriptions.
* Install javadoc into /usr/share/doc/libxbean-java/api/.
* Change default build system to Maven:
- d/control: B-D on maven-debian-helper, libmaven-antrun-plugin-java,
libmaven-bundle-plugin-java, libmaven-javadoc-plugin-java
and libcglib-java.
- debian/rules.full: Use maven.mk from CDBS.
* Provide a way for "bootstrap" without Maven.
- debian/rules.bootstrap: Copy of old ant debian/rules.
- Used when using DEB_BUILD_OPTIONS="bootstrap"
* Bump Standards-Version to 3.9.2: no changes needed.
Deleted: trunk/libxbean-java/debian/README.Debian
===================================================================
--- trunk/libxbean-java/debian/README.Debian 2011-07-16 18:51:26 UTC (rev 13858)
+++ trunk/libxbean-java/debian/README.Debian 2011-07-17 22:25:19 UTC (rev 13859)
@@ -1,13 +0,0 @@
-libxbean-java
---------------
-
-This package does not contain the following XBean modules as they
-rely on some additional dependencies:
-- maven-xbean-plugin
-- xbean-classloader
-
-I would advise to package those additional modules in a separate package, to
-avoid circular dependencies as Maven uses XBean
-
- -- Ludovic Claude <ludovic.claude at laposte.net> Tue, 05 May 2009 18:10:17 +0100
-
Added: trunk/libxbean-java/debian/README.source
===================================================================
--- trunk/libxbean-java/debian/README.source (rev 0)
+++ trunk/libxbean-java/debian/README.source 2011-07-17 22:25:19 UTC (rev 13859)
@@ -0,0 +1,19 @@
+Boostrapping without Maven buildsystem
+======================================
+
+As libxbean-java is actually used by some parts of Maven itself [1], you
+might want to bootstrap libxbean-java without Maven, to break
+cyclic build-dependencies.
+
+debian/rules support using some custom ant script for this task.
+It'll be used if you pass "bootstrap" string in DEB_BUILD_OPTIONS.
+
+For example,
+ DEB_BUILD_OPTIONS="bootstrap" dpkg-buildpackage -us -uc -d
+
+[1] build-rdeps of libxbean-java in main
+ maven-plugin-tools
+ maven-file-management
+ plexus-containers
+
+ -- Damien Raude-Morvan <drazzib at debian.org> Mon, 18 Jul 2011 00:11:34 +0200
\ No newline at end of file
Modified: trunk/libxbean-java/debian/build.xml
===================================================================
--- trunk/libxbean-java/debian/build.xml 2011-07-16 18:51:26 UTC (rev 13858)
+++ trunk/libxbean-java/debian/build.xml 2011-07-17 22:25:19 UTC (rev 13859)
@@ -37,7 +37,6 @@
<cleanmodule dir="xbean-naming"/>
<cleanmodule dir="xbean-reflect"/>
<cleanmodule dir="xbean-telnet"/>
- <cleanmodule dir="xbean-spring"/>
</target>
<!-- we do not build all modules yet -->
@@ -48,7 +47,6 @@
<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">
@@ -58,7 +56,6 @@
<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-07-16 18:51:26 UTC (rev 13858)
+++ trunk/libxbean-java/debian/changelog 2011-07-17 22:25:19 UTC (rev 13859)
@@ -1,3 +1,20 @@
+libxbean-java (3.5-5) unstable; urgency=low
+
+ * Add myself as Uploaders.
+ * d/control: replace "we" by "it" in packages' descriptions.
+ * Install javadoc into /usr/share/doc/libxbean-java/api/.
+ * Change default build system to Maven:
+ - d/control: B-D on maven-debian-helper, libmaven-antrun-plugin-java,
+ libmaven-bundle-plugin-java, libmaven-javadoc-plugin-java
+ and libcglib-java.
+ - debian/rules.full: Use maven.mk from CDBS.
+ * Provide a way for "bootstrap" without Maven.
+ - debian/rules.bootstrap: Copy of old ant debian/rules.
+ - Used when using DEB_BUILD_OPTIONS="bootstrap"
+ * Bump Standards-Version to 3.9.2: no changes needed.
+
+ -- Damien Raude-Morvan <drazzib at debian.org> Mon, 18 Jul 2011 00:24:44 +0200
+
libxbean-java (3.5-4) unstable; urgency=low
* Team Upload.
Modified: trunk/libxbean-java/debian/control
===================================================================
--- trunk/libxbean-java/debian/control 2011-07-16 18:51:26 UTC (rev 13858)
+++ trunk/libxbean-java/debian/control 2011-07-17 22:25:19 UTC (rev 13859)
@@ -2,13 +2,16 @@
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 (>= 7), cdbs, default-jdk
-Build-Depends-Indep: maven-repo-helper, maven-ant-helper (>> 4), ant, ant-optional,
+Uploaders: Torsten Werner <twerner at debian.org>, Damien Raude-Morvan <drazzib at debian.org>
+Build-Depends: debhelper (>= 7), cdbs, default-jdk, maven-debian-helper (>= 1.4.4)
+Build-Depends-Indep: maven-repo-helper, maven-ant-helper (>> 4), ant, ant-optional,
libcommons-logging-java, liblog4j1.2-java, libasm2-java, libasm3-java, groovy,
+# For full Maven build :
libspring-core-java, libspring-beans-java, libspring-context-java, libspring-web-java,
- libqdox-java
-Standards-Version: 3.9.1
+ libqdox-java,
+ libmaven-antrun-plugin-java, libmaven-bundle-plugin-java,
+ libmaven-javadoc-plugin-java, libcglib-java
+Standards-Version: 3.9.2
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/
@@ -22,7 +25,7 @@
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
- install server plugins from an Internet based repository. In addition, we
+ install server plugins from an Internet based repository. In addition, it
include support for multiple IoC systems, support for running with no IoC
system, JMX without JMX code, lifecycle and class loader management, and a rock
solid Spring integration.
@@ -34,7 +37,7 @@
Description: API documentation for XBean
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
- install server plugins from an Internet based repository. In addition, we
+ install server plugins from an Internet based repository. In addition, it
include support for multiple IoC systems, support for running with no IoC
system, JMX without JMX code, lifecycle and class loader management, and a rock
solid Spring integration.
Modified: trunk/libxbean-java/debian/libxbean-java-doc.doc-base
===================================================================
--- trunk/libxbean-java/debian/libxbean-java-doc.doc-base 2011-07-16 18:51:26 UTC (rev 13858)
+++ trunk/libxbean-java/debian/libxbean-java-doc.doc-base 2011-07-17 22:25:19 UTC (rev 13859)
@@ -7,5 +7,5 @@
Section: Programming
Format: HTML
-Index: /usr/share/doc/libxbean-java-doc/api/index.html
-Files: /usr/share/doc/libxbean-java-doc/api/*
+Index: /usr/share/doc/libxbean-java/api/index.html
+Files: /usr/share/doc/libxbean-java/api/*
Deleted: trunk/libxbean-java/debian/libxbean-java-doc.docs
===================================================================
--- trunk/libxbean-java/debian/libxbean-java-doc.docs 2011-07-16 18:51:26 UTC (rev 13858)
+++ trunk/libxbean-java/debian/libxbean-java-doc.docs 2011-07-17 22:25:19 UTC (rev 13859)
@@ -1 +0,0 @@
-build/docs/api
Added: trunk/libxbean-java/debian/maven.cleanIgnoreRules
===================================================================
--- trunk/libxbean-java/debian/maven.cleanIgnoreRules (rev 0)
+++ trunk/libxbean-java/debian/maven.cleanIgnoreRules 2011-07-17 22:25:19 UTC (rev 13859)
@@ -0,0 +1,20 @@
+# 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/
+
+org.apache.maven.plugins maven-idea-plugin * * * *
+org.apache.maven.plugins maven-release-plugin * * * *
+org.apache.maven.plugins maven-remote-resources-plugin * * * *
+org.apache.xbean maven-xbean-plugin * * * *
\ No newline at end of file
Added: trunk/libxbean-java/debian/maven.ignoreRules
===================================================================
--- trunk/libxbean-java/debian/maven.ignoreRules (rev 0)
+++ trunk/libxbean-java/debian/maven.ignoreRules 2011-07-17 22:25:19 UTC (rev 13859)
@@ -0,0 +1,20 @@
+# 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/
+
+org.apache.maven.plugins maven-idea-plugin * * * *
+org.apache.maven.plugins maven-release-plugin * * * *
+org.apache.maven.plugins maven-remote-resources-plugin * * * *
+org.apache.xbean maven-xbean-plugin * * * *
\ No newline at end of file
Added: trunk/libxbean-java/debian/maven.properties
===================================================================
--- trunk/libxbean-java/debian/maven.properties (rev 0)
+++ trunk/libxbean-java/debian/maven.properties 2011-07-17 22:25:19 UTC (rev 13859)
@@ -0,0 +1,2 @@
+# Include here properties to pass to Maven during the build.
+maven.test.skip=true
Modified: trunk/libxbean-java/debian/rules
===================================================================
--- trunk/libxbean-java/debian/rules 2011-07-16 18:51:26 UTC (rev 13858)
+++ trunk/libxbean-java/debian/rules 2011-07-17 22:25:19 UTC (rev 13859)
@@ -1,25 +1,12 @@
#!/usr/bin/make -f
include /usr/share/cdbs/1/rules/debhelper.mk
-include /usr/share/cdbs/1/class/ant.mk
-PACKAGE := $(DEB_SOURCE_PACKAGE)
-VERSION := $(DEB_UPSTREAM_VERSION)
-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 spring
+ifneq (,$(findstring bootstrap, $(DEB_BUILD_OPTIONS)))
+include debian/rules.bootstrap
+else
+include debian/rules.full
+endif
get-orig-source:
uscan --download-version $(VERSION) --force-download --rename
-
-binary-post-install/$(PACKAGE)::
- mh_installpoms -p$(PACKAGE)
- set -e; for MODULE in $(MODULES); do \
- mh_installjar -p$(PACKAGE) -l xbean-$$MODULE/pom.xml xbean-$$MODULE/build/xbean-$$MODULE-$(VERSION).jar; \
- done
-
-clean::
- mh_clean
Added: trunk/libxbean-java/debian/rules.bootstrap
===================================================================
--- trunk/libxbean-java/debian/rules.bootstrap (rev 0)
+++ trunk/libxbean-java/debian/rules.bootstrap 2011-07-17 22:25:19 UTC (rev 13859)
@@ -0,0 +1,24 @@
+#!/usr/bin/make -f
+
+include /usr/share/cdbs/1/class/ant.mk
+
+PACKAGE := $(DEB_SOURCE_PACKAGE)
+VERSION := $(DEB_UPSTREAM_VERSION)
+JAVA_HOME := /usr/lib/jvm/default-java
+DEB_JARS := ant-nodeps commons-logging groovy log4j-1.2
+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
+
+binary-post-install/$(PACKAGE)::
+ mh_installpoms -p$(PACKAGE)
+ set -e; for MODULE in $(MODULES); do \
+ mh_installjar -p$(PACKAGE) -l xbean-$$MODULE/pom.xml xbean-$$MODULE/build/xbean-$$MODULE-$(VERSION).jar; \
+ done
+
+binary-post-install/$(PACKAGE)-doc::
+ dh_install -p $(PACKAGE)-doc build/docs/api /usr/share/doc/libxbean-java/
+
+clean::
+ mh_clean
\ No newline at end of file
Property changes on: trunk/libxbean-java/debian/rules.bootstrap
___________________________________________________________________
Added: svn:executable
+ *
Added: trunk/libxbean-java/debian/rules.full
===================================================================
--- trunk/libxbean-java/debian/rules.full (rev 0)
+++ trunk/libxbean-java/debian/rules.full 2011-07-17 22:25:19 UTC (rev 13859)
@@ -0,0 +1,11 @@
+#!/usr/bin/make -f
+
+include /usr/share/cdbs/1/class/maven.mk
+
+JAVA_HOME := /usr/lib/jvm/default-java
+
+DEB_MAVEN_DOC_TARGET := javadoc:aggregate
+
+binary-post-install/libxbean-java-doc::
+ dh_install -p libxbean-java-doc target/site/apidocs/* /usr/share/doc/libxbean-java/api/
+
Property changes on: trunk/libxbean-java/debian/rules.full
___________________________________________________________________
Added: svn:executable
+ *
More information about the pkg-java-commits
mailing list