[pkg-java] r13860 - in trunk/libxbean-java/debian: . patches

Damien Raude-Morvan drazzib at alioth.debian.org
Mon Jul 18 23:27:29 UTC 2011


Author: drazzib
Date: 2011-07-18 23:27:28 +0000 (Mon, 18 Jul 2011)
New Revision: 13860

Added:
   trunk/libxbean-java/debian/bootstrap.properties
   trunk/libxbean-java/debian/bootstrap.xml
   trunk/libxbean-java/debian/patches/
   trunk/libxbean-java/debian/patches/bootstrap.diff
   trunk/libxbean-java/debian/patches/bootstrap.series
   trunk/libxbean-java/debian/patches/bundle.diff
   trunk/libxbean-java/debian/patches/full.series
   trunk/libxbean-java/debian/patches/modules.diff
   trunk/libxbean-java/debian/rules.bootstrap
Removed:
   trunk/libxbean-java/debian/build.properties
   trunk/libxbean-java/debian/build.xml
   trunk/libxbean-java/debian/rules.bootstrap
Modified:
   trunk/libxbean-java/debian/README.source
   trunk/libxbean-java/debian/changelog
   trunk/libxbean-java/debian/control
   trunk/libxbean-java/debian/libxbean-java.poms
   trunk/libxbean-java/debian/maven.ignoreRules
   trunk/libxbean-java/debian/maven.properties
   trunk/libxbean-java/debian/maven.rules
   trunk/libxbean-java/debian/rules
   trunk/libxbean-java/debian/rules.full
   trunk/libxbean-java/debian/watch
Log:
* New upstream release.
* d/control: Move groovy from Recommends to Suggests (Closes: #632365).
* Readd B-D on quilt to be able to use patchsys-quilt.mk.
  - d/rules.full: Use maven.mk from CDBS.
  - d/patches/full.series: Use this series for normal build.
  - d/patches/bootstrap.series: Use this series for bootstrap build.

Modified: trunk/libxbean-java/debian/README.source
===================================================================
--- trunk/libxbean-java/debian/README.source	2011-07-17 22:25:19 UTC (rev 13859)
+++ trunk/libxbean-java/debian/README.source	2011-07-18 23:27:28 UTC (rev 13860)
@@ -11,9 +11,28 @@
 For example,
   DEB_BUILD_OPTIONS="bootstrap" dpkg-buildpackage -us -uc -d
 
+  [From SVN repository, you can use:]
+  DEB_BUILD_OPTIONS="bootstrap" svn-buildpackage --svn-builder="pdebuild --pbuilder cowbuilder --debbuildopts '-us -uc -d'"
+  
+
 [1] build-rdeps of libxbean-java in main
-    maven-plugin-tools
-    maven-file-management
-    plexus-containers
+    maven-plugin-tools (just transitive-Depends)
+    maven-file-management (just transitive-Depends)
+    plexus-containers (used in XBeanComponentBuilder.java)
+    
+Patches
+=======
 
+Since we don't use "quilt (3.0)" format tools to handle our patches, we need
+to change list of patches on-the-fly during build phase.
+
+In debian/rules.bootstrap we use :
+    export QUILT_SERIES=bootstrap.series
+
+Whereas in debian/rules.full we use :
+    export QUILT_SERIES=full.series
+
+If you wan't to edit this package's patches, you'll have to do this before
+any quilt push / quilt edit.
+
  -- Damien Raude-Morvan <drazzib at debian.org>  Mon, 18 Jul 2011 00:11:34 +0200
\ No newline at end of file

Copied: trunk/libxbean-java/debian/bootstrap.properties (from rev 13859, trunk/libxbean-java/debian/build.properties)
===================================================================
--- trunk/libxbean-java/debian/bootstrap.properties	                        (rev 0)
+++ trunk/libxbean-java/debian/bootstrap.properties	2011-07-18 23:27:28 UTC (rev 13860)
@@ -0,0 +1,3 @@
+javadoc.dir=build/docs/api
+maven.test.skip=true
+build.javaVersion=1.5

Copied: trunk/libxbean-java/debian/bootstrap.xml (from rev 13859, trunk/libxbean-java/debian/build.xml)
===================================================================
--- trunk/libxbean-java/debian/bootstrap.xml	                        (rev 0)
+++ trunk/libxbean-java/debian/bootstrap.xml	2011-07-18 23:27:28 UTC (rev 13860)
@@ -0,0 +1,59 @@
+<?xml version="1.0"?>
+ 
+<project name="xbean" default="package" basedir="..">
+ 
+  <property file="debian/bootstrap.properties"/>
+  <property name="maven.build" value="/usr/share/maven-ant-helper/maven-build.xml"/>
+  <property file="/usr/share/maven-ant-helper/maven-defaults.properties"/>
+
+  <macrodef name="cleanmodule">
+    <attribute name="dir"/>
+    <sequential>
+      <ant target="clean" antfile="${maven.build}" dir="@{dir}">
+        <property name="debian.dir" location="debian" />
+        <property name="project.dir" value="@{dir}" />
+      </ant>
+    </sequential>
+  </macrodef>
+
+  <macrodef name="packagemodule">
+    <attribute name="dir"/>
+    <attribute name="classpath" default="${classpath.compile}" />
+    <sequential>
+      <ant target="package" antfile="${maven.build}" dir="@{dir}">
+        <property name="debian.dir" location="debian" />
+        <property name="project.dir" value="@{dir}" />
+        <property name="classpath.compile" value="@{classpath}"/>
+      </ant>
+    </sequential>
+  </macrodef>
+
+  <target name="clean">
+    <delete dir="build"/>
+    <!--cleanmodule dir="maven-xbean-plugin"/>
+    <cleanmodule dir="xbean-classloader"/-->
+    <cleanmodule dir="xbean-classpath"/>
+    <cleanmodule dir="xbean-naming"/>
+    <cleanmodule dir="xbean-reflect"/>
+    <cleanmodule dir="xbean-telnet"/>
+  </target>
+
+  <!-- we do not build all modules yet -->
+  <target name="package">
+    <packagemodule dir=""/>
+    <packagemodule dir="xbean-classpath"/>
+    <packagemodule dir="xbean-naming"/>
+    <packagemodule dir="xbean-reflect"/>
+    <packagemodule dir="xbean-telnet"/>
+  </target>
+
+  <target name="javadoc">
+    <javadoc destdir="${javadoc.dir}">
+      <packageset dir="xbean-classpath/src/main/java/"/>
+      <packageset dir="xbean-naming/src/main/java/"/>
+      <packageset dir="xbean-reflect/src/main/java/"/>
+      <packageset dir="xbean-telnet/src/main/java/"/>
+    </javadoc>
+  </target>
+
+</project>

Deleted: trunk/libxbean-java/debian/build.properties
===================================================================
--- trunk/libxbean-java/debian/build.properties	2011-07-17 22:25:19 UTC (rev 13859)
+++ trunk/libxbean-java/debian/build.properties	2011-07-18 23:27:28 UTC (rev 13860)
@@ -1,3 +0,0 @@
-javadoc.dir=build/docs/api
-maven.test.skip=true
-build.javaVersion=1.5

Deleted: trunk/libxbean-java/debian/build.xml
===================================================================
--- trunk/libxbean-java/debian/build.xml	2011-07-17 22:25:19 UTC (rev 13859)
+++ trunk/libxbean-java/debian/build.xml	2011-07-18 23:27:28 UTC (rev 13860)
@@ -1,62 +0,0 @@
-<?xml version="1.0"?>
- 
-<project name="xbean" default="package" basedir="..">
- 
-  <property file="debian/build.properties"/>
-  <property name="maven.build" value="/usr/share/maven-ant-helper/maven-build.xml"/>
-  <property file="/usr/share/maven-ant-helper/maven-defaults.properties"/>
-
-  <macrodef name="cleanmodule">
-    <attribute name="dir"/>
-    <sequential>
-      <ant target="clean" antfile="${maven.build}" dir="@{dir}">
-        <property name="debian.dir" location="debian" />
-        <property name="project.dir" value="@{dir}" />
-      </ant>
-    </sequential>
-  </macrodef>
-
-  <macrodef name="packagemodule">
-    <attribute name="dir"/>
-    <attribute name="classpath" default="${classpath.compile}" />
-    <sequential>
-      <ant target="package" antfile="${maven.build}" dir="@{dir}">
-        <property name="debian.dir" location="debian" />
-        <property name="project.dir" value="@{dir}" />
-        <property name="classpath.compile" value="@{classpath}"/>
-      </ant>
-    </sequential>
-  </macrodef>
-
-  <target name="clean">
-    <delete dir="build"/>
-    <!--cleanmodule dir="maven-xbean-plugin"/>
-    <cleanmodule dir="xbean-classloader"/-->
-    <cleanmodule dir="xbean-classpath"/>
-    <cleanmodule dir="xbean-finder"/>
-    <cleanmodule dir="xbean-naming"/>
-    <cleanmodule dir="xbean-reflect"/>
-    <cleanmodule dir="xbean-telnet"/>
-  </target>
-
-  <!-- we do not build all modules yet -->
-  <target name="package">
-    <packagemodule dir=""/>
-    <packagemodule dir="xbean-classpath"/>
-    <packagemodule dir="xbean-finder" classpath="${classpath.compile}:/usr/share/java/asm3.jar:/usr/share/java/asm3-commons.jar"/>
-    <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"/>
-  </target>
-
-  <target name="javadoc">
-    <javadoc destdir="${javadoc.dir}">
-      <packageset dir="xbean-classpath/src/main/java/"/>
-      <packageset dir="xbean-finder/src/main/java/"/>
-      <packageset dir="xbean-naming/src/main/java/"/>
-      <packageset dir="xbean-reflect/src/main/java/"/>
-      <packageset dir="xbean-telnet/src/main/java/"/>
-    </javadoc>
-  </target>
-
-</project>

Modified: trunk/libxbean-java/debian/changelog
===================================================================
--- trunk/libxbean-java/debian/changelog	2011-07-17 22:25:19 UTC (rev 13859)
+++ trunk/libxbean-java/debian/changelog	2011-07-18 23:27:28 UTC (rev 13860)
@@ -1,19 +1,24 @@
-libxbean-java (3.5-5) unstable; urgency=low
+libxbean-java (3.7-1) unstable; urgency=low
 
+  * New upstream release.
   * Add myself as Uploaders.
   * d/control: replace "we" by "it" in packages' descriptions.
   * Install javadoc into /usr/share/doc/libxbean-java/api/.
+  * d/control: Move groovy from Recommends to Suggests (Closes: #632365).
+  * Readd B-D on quilt to be able to use patchsys-quilt.mk.
   * 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.
+    - d/rules.full: Use maven.mk from CDBS.
+    - d/patches/full.series: Use this series for normal build.
   * Provide a way for "bootstrap" without Maven.
     - debian/rules.bootstrap: Copy of old ant debian/rules.
     - Used when using DEB_BUILD_OPTIONS="bootstrap"
+    - d/patches/bootstrap.series: Use this series for bootstrap build.
   * 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
+ -- Damien Raude-Morvan <drazzib at debian.org>  Tue, 19 Jul 2011 01:27:18 +0200
 
 libxbean-java (3.5-4) unstable; urgency=low
 

Modified: trunk/libxbean-java/debian/control
===================================================================
--- trunk/libxbean-java/debian/control	2011-07-17 22:25:19 UTC (rev 13859)
+++ trunk/libxbean-java/debian/control	2011-07-18 23:27:28 UTC (rev 13860)
@@ -3,14 +3,18 @@
 Priority: optional
 Maintainer: Debian Java Maintainers <pkg-java-maintainers at lists.alioth.debian.org>
 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,
+Build-Depends: debhelper (>= 7), cdbs, default-jdk, quilt,
 # For full Maven build :
- libspring-core-java, libspring-beans-java, libspring-context-java, libspring-web-java,
- libqdox-java,
- libmaven-antrun-plugin-java, libmaven-bundle-plugin-java,
- libmaven-javadoc-plugin-java, libcglib-java
+ maven-debian-helper (>= 1.4.4)
+Build-Depends-Indep: maven-repo-helper, ant, ant-optional,
+ libcommons-logging-java, liblog4j1.2-java, libasm3-java, groovy,
+# For full Maven build :
+ libspring-core-java, libspring-beans-java, libspring-context-java,
+ libspring-web-java, libqdox-java, libequinox-osgi-java, libslf4j-java,
+ libmaven-antrun-plugin-java, libmaven-bundle-plugin-java, libmaven-install-plugin-java,
+ libmaven-javadoc-plugin-java, libcglib-java, libmaven-shade-plugin-java,
+# For bootstrap build :
+ maven-ant-helper (>> 4)
 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/
@@ -19,9 +23,9 @@
 Package: libxbean-java
 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
+Recommends: libcommons-logging-java, liblog4j1.2-java, libasm3-java
+Suggests: groovy, libspring-core-java, libspring-beans-java, libspring-context-java,
+ libspring-web-java, libqdox-java, libequinox-osgi-java, libslf4j-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-07-17 22:25:19 UTC (rev 13859)
+++ trunk/libxbean-java/debian/libxbean-java.poms	2011-07-18 23:27:28 UTC (rev 13860)
@@ -23,12 +23,17 @@
 #   --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
+
+pom.xml --no-parent
+maven-xbean-plugin/pom.xml
+xbean-asm-shaded/pom.xml
+xbean-blueprint/pom.xml --ignore
+xbean-bundleutils/pom.xml
+xbean-classloader/pom.xml
+xbean-classpath/pom.xml
+xbean-finder/pom.xml
+xbean-finder-shaded/pom.xml
+xbean-naming/pom.xml
+xbean-reflect/pom.xml
+xbean-spring/pom.xml
+xbean-telnet/pom.xml

Modified: trunk/libxbean-java/debian/maven.ignoreRules
===================================================================
--- trunk/libxbean-java/debian/maven.ignoreRules	2011-07-17 22:25:19 UTC (rev 13859)
+++ trunk/libxbean-java/debian/maven.ignoreRules	2011-07-18 23:27:28 UTC (rev 13860)
@@ -17,4 +17,8 @@
 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
+org.apache.xbean maven-xbean-plugin maven-plugin * * *
+
+org.ops4j.pax.logging pax-logging-api * * * *
+org.ops4j.pax.logging pax-logging-service * * * *
+org.apache.aries.blueprint org.apache.aries.blueprint * * * *
\ No newline at end of file

Modified: trunk/libxbean-java/debian/maven.properties
===================================================================
--- trunk/libxbean-java/debian/maven.properties	2011-07-17 22:25:19 UTC (rev 13859)
+++ trunk/libxbean-java/debian/maven.properties	2011-07-18 23:27:28 UTC (rev 13860)
@@ -1,2 +1,4 @@
 # Include here properties to pass to Maven during the build.
 maven.test.skip=true
+maven.compiler.source=1.5
+maven.compiler.target=1.5
\ No newline at end of file

Modified: trunk/libxbean-java/debian/maven.rules
===================================================================
--- trunk/libxbean-java/debian/maven.rules	2011-07-17 22:25:19 UTC (rev 13859)
+++ trunk/libxbean-java/debian/maven.rules	2011-07-18 23:27:28 UTC (rev 13860)
@@ -25,6 +25,6 @@
 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/
+s/org.osgi/org.eclipse.osgi/ s/org.osgi.compendium/org.eclipse.osgi.services/ jar s/.*/debian/ * *
+s/org.osgi/org.eclipse.osgi/ s/org.osgi.core/org.eclipse.osgi/ jar s/.*/debian/ * *
+s/org.apache.commons/commons-jexl/ commons-jexl jar s/.*/debian/ * *
\ No newline at end of file

Added: trunk/libxbean-java/debian/patches/bootstrap.diff
===================================================================
--- trunk/libxbean-java/debian/patches/bootstrap.diff	                        (rev 0)
+++ trunk/libxbean-java/debian/patches/bootstrap.diff	2011-07-18 23:27:28 UTC (rev 13860)
@@ -0,0 +1,31 @@
+Description: Change declared package of ASM when building in bootstrap mode
+ as we don't have any "shading" Maven module.
+Author: Damien Raude-Morvan <drazzib at debian.org>
+Last-Update: 2011-07-19
+Forwarded: not-needed
+--- a/xbean-reflect/src/main/java/org/apache/xbean/recipe/XbeanAsmParameterNameLoader.java
++++ b/xbean-reflect/src/main/java/org/apache/xbean/recipe/XbeanAsmParameterNameLoader.java
+@@ -30,11 +30,11 @@
+ import java.util.WeakHashMap;
+ import java.util.Arrays;
+ 
+-import org.apache.xbean.asm.ClassReader;
+-import org.apache.xbean.asm.Label;
+-import org.apache.xbean.asm.MethodVisitor;
+-import org.apache.xbean.asm.Type;
+-import org.apache.xbean.asm.commons.EmptyVisitor;
++import org.objectweb.asm.ClassReader;
++import org.objectweb.asm.Label;
++import org.objectweb.asm.MethodVisitor;
++import org.objectweb.asm.Type;
++import org.objectweb.asm.commons.EmptyVisitor;
+ 
+ /**
+  * Implementation of ParameterNameLoader that uses ASM to read the parameter names from the local variable table in the
+@@ -302,4 +302,4 @@
+             return null;
+         }
+     }
+-}
+\ No newline at end of file
++}

Added: trunk/libxbean-java/debian/patches/bootstrap.series
===================================================================
--- trunk/libxbean-java/debian/patches/bootstrap.series	                        (rev 0)
+++ trunk/libxbean-java/debian/patches/bootstrap.series	2011-07-18 23:27:28 UTC (rev 13860)
@@ -0,0 +1,3 @@
+bootstrap.diff
+bundle.diff
+modules.diff

Added: trunk/libxbean-java/debian/patches/bundle.diff
===================================================================
--- trunk/libxbean-java/debian/patches/bundle.diff	                        (rev 0)
+++ trunk/libxbean-java/debian/patches/bundle.diff	2011-07-18 23:27:28 UTC (rev 13860)
@@ -0,0 +1,115 @@
+Description: Change "bundle" packaging to type to "jar".
+Author: Damien Raude-Morvan <drazzib at debian.org>
+Last-Update: 2011-07-19
+Forwarded: not-needed
+
+--- a/xbean-naming/pom.xml
++++ b/xbean-naming/pom.xml
+@@ -27,7 +27,7 @@
+     </parent>
+     <modelVersion>4.0.0</modelVersion>
+     <artifactId>xbean-naming</artifactId>
+-    <packaging>bundle</packaging>
++    <packaging>jar</packaging>
+     <name>Apache XBean :: Naming</name>
+     <description>xbean-naming implements a flexible non-persistent jndi provider</description>
+ 
+--- a/xbean-spring/pom.xml
++++ b/xbean-spring/pom.xml
+@@ -30,7 +30,7 @@
+     </parent>
+ 
+     <artifactId>xbean-spring</artifactId>
+-    <packaging>bundle</packaging>
++    <packaging>jar</packaging>
+     <name>Apache XBean :: Spring</name>
+ 
+     <description>xbean-spring provides a schema-driven proprietary namespace handler for spring contexts</description>
+--- a/xbean-telnet/pom.xml
++++ b/xbean-telnet/pom.xml
+@@ -30,7 +30,7 @@
+     </parent>
+ 
+     <artifactId>xbean-telnet</artifactId>
+-    <packaging>bundle</packaging>
++    <packaging>jar</packaging>
+     <name>Apache XBean :: Telnet</name>
+ 
+     <dependencies>
+--- a/xbean-finder/pom.xml
++++ b/xbean-finder/pom.xml
+@@ -28,7 +28,7 @@
+         <version>3.7</version>
+     </parent>
+     <artifactId>xbean-finder</artifactId>
+-    <packaging>bundle</packaging>
++    <packaging>jar</packaging>
+     <name>Apache XBean :: Classpath Resource Finder</name>
+     <description>XBean Finder helps to find annotations in classes</description>
+     <dependencies>
+--- a/xbean-asm-shaded/pom.xml
++++ b/xbean-asm-shaded/pom.xml
+@@ -28,7 +28,7 @@
+         <version>3.7</version>
+     </parent>
+     <artifactId>xbean-asm-shaded</artifactId>
+-    <packaging>bundle</packaging>
++    <packaging>jar</packaging>
+     <name>Apache XBean :: ASM shaded (repackaged)</name>
+ 
+     <description>Repackaged and shaded asm jars</description>
+--- a/xbean-blueprint/pom.xml
++++ b/xbean-blueprint/pom.xml
+@@ -30,7 +30,7 @@
+     </parent>
+ 
+     <artifactId>xbean-blueprint</artifactId>
+-    <packaging>bundle</packaging>
++    <packaging>jar</packaging>
+     <name>Apache XBean :: OSGI Blueprint Namespace Handler</name>
+ 
+     <description>xbean-blueprint provides a schema-driven namespace handler for Apache Aries Blueprint</description>
+--- a/xbean-bundleutils/pom.xml
++++ b/xbean-bundleutils/pom.xml
+@@ -24,7 +24,7 @@
+         <version>3.7</version>
+     </parent>
+     <artifactId>xbean-bundleutils</artifactId>
+-    <packaging>bundle</packaging>
++    <packaging>jar</packaging>
+     <name>Apache XBean OSGI Bundle Utilitiess</name>
+ 
+     <dependencies>
+--- a/xbean-classloader/pom.xml
++++ b/xbean-classloader/pom.xml
+@@ -30,7 +30,7 @@
+     </parent>
+ 
+     <artifactId>xbean-classloader</artifactId>
+-    <packaging>bundle</packaging>
++    <packaging>jar</packaging>
+     <name>Apache XBean :: Classloader</name>
+     <description>xbean-classloader includes a flexibie multi-parent classloader</description>
+     <build>
+--- a/xbean-classpath/pom.xml
++++ b/xbean-classpath/pom.xml
+@@ -30,7 +30,7 @@
+     </parent>
+ 
+     <artifactId>xbean-classpath</artifactId>
+-    <packaging>bundle</packaging>
++    <packaging>jar</packaging>
+     <name>Apache XBean :: ClassPath</name>
+ 
+ </project>
+--- a/xbean-reflect/pom.xml
++++ b/xbean-reflect/pom.xml
+@@ -28,7 +28,7 @@
+         <version>3.7</version>
+     </parent>
+     <artifactId>xbean-reflect</artifactId>
+-    <packaging>bundle</packaging>
++    <packaging>jar</packaging>
+     <name>Apache XBean :: Reflect</name>
+     <description>xbean-reflect provides very flexible ways to creat objects and graphs of objects for DI frameworks</description>
+     <dependencies>

Added: trunk/libxbean-java/debian/patches/full.series
===================================================================
--- trunk/libxbean-java/debian/patches/full.series	                        (rev 0)
+++ trunk/libxbean-java/debian/patches/full.series	2011-07-18 23:27:28 UTC (rev 13860)
@@ -0,0 +1,2 @@
+bundle.diff
+modules.diff

Added: trunk/libxbean-java/debian/patches/modules.diff
===================================================================
--- trunk/libxbean-java/debian/patches/modules.diff	                        (rev 0)
+++ trunk/libxbean-java/debian/patches/modules.diff	2011-07-18 23:27:28 UTC (rev 13860)
@@ -0,0 +1,24 @@
+Description: Don't build OSGI blueprint module (missing
+ depends in Debian)
+Author: Damien Raude-Morvan <drazzib at debian.org>
+Last-Update: 2011-07-19
+Forwarded: not-needed
+
+--- a/pom.xml
++++ b/pom.xml
+@@ -353,7 +353,7 @@
+         <module>xbean-finder</module>
+         <module>xbean-naming</module>
+         <module>xbean-reflect</module>
+-        <module>xbean-blueprint</module>
++<!--        <module>xbean-blueprint</module> -->
+         <module>xbean-spring</module>
+         <module>xbean-telnet</module>
+         <module>maven-xbean-plugin</module>
+@@ -422,4 +422,4 @@
+         </plugins>
+     </reporting>
+ 
+-</project>
+\ No newline at end of file
++</project>

Modified: trunk/libxbean-java/debian/rules
===================================================================
--- trunk/libxbean-java/debian/rules	2011-07-17 22:25:19 UTC (rev 13859)
+++ trunk/libxbean-java/debian/rules	2011-07-18 23:27:28 UTC (rev 13860)
@@ -2,6 +2,8 @@
 
 include /usr/share/cdbs/1/rules/debhelper.mk
 
+VERSION              := $(DEB_UPSTREAM_VERSION)
+
 ifneq (,$(findstring bootstrap, $(DEB_BUILD_OPTIONS)))
 include debian/rules.bootstrap
 else

Deleted: trunk/libxbean-java/debian/rules.bootstrap
===================================================================
--- trunk/libxbean-java/debian/rules.bootstrap	2011-07-17 22:25:19 UTC (rev 13859)
+++ trunk/libxbean-java/debian/rules.bootstrap	2011-07-18 23:27:28 UTC (rev 13860)
@@ -1,24 +0,0 @@
-#!/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

Added: trunk/libxbean-java/debian/rules.bootstrap
===================================================================
--- trunk/libxbean-java/debian/rules.bootstrap	                        (rev 0)
+++ trunk/libxbean-java/debian/rules.bootstrap	2011-07-18 23:27:28 UTC (rev 13860)
@@ -0,0 +1,29 @@
+#!/usr/bin/make -f
+
+include /usr/share/cdbs/1/class/ant.mk
+include /usr/share/cdbs/1/rules/patchsys-quilt.mk
+
+PACKAGE              := $(DEB_SOURCE_PACKAGE)
+JAVA_HOME            := /usr/lib/jvm/default-java
+DEB_JARS             := ant-nodeps commons-logging groovy log4j-1.2 asm3 asm3-commons
+DEB_ANT_BUILD_TARGET := package javadoc
+DEB_ANT_BUILDFILE    := debian/bootstrap.xml
+DEB_ANT_PROPERTYFILE := debian/bootstrap.properties
+DEB_ANT_ARGS         := -Dbasedir=$(realpath .) -Dpackage=$(PACKAGE) -Dbin.package=$(PACKAGE) -Dversion=$(VERSION)
+MODULES              := classpath naming reflect telnet
+
+DEB_PATCHDIRS        := $(CURDIR)/debian/patches
+QUILT_SERIES         := bootstrap.series
+export QUILT_SERIES
+
+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/$(PACKAGE)/
+
+clean::
+	mh_clean
\ No newline at end of file

Modified: trunk/libxbean-java/debian/rules.full
===================================================================
--- trunk/libxbean-java/debian/rules.full	2011-07-17 22:25:19 UTC (rev 13859)
+++ trunk/libxbean-java/debian/rules.full	2011-07-18 23:27:28 UTC (rev 13860)
@@ -1,11 +1,16 @@
 #!/usr/bin/make -f
 
 include /usr/share/cdbs/1/class/maven.mk
+include /usr/share/cdbs/1/rules/patchsys-quilt.mk
 
-JAVA_HOME            := /usr/lib/jvm/default-java
+PACKAGE                := $(DEB_SOURCE_PACKAGE)
+JAVA_HOME              := /usr/lib/jvm/default-java
+DEB_MAVEN_DOC_TARGET   := javadoc:aggregate
 
-DEB_MAVEN_DOC_TARGET := javadoc:aggregate
+DEB_PATCHDIRS        := $(CURDIR)/debian/patches
+QUILT_SERIES         := full.series
+export QUILT_SERIES
 
-binary-post-install/libxbean-java-doc::
-	dh_install -p libxbean-java-doc target/site/apidocs/* /usr/share/doc/libxbean-java/api/
+binary-post-install/$(PACKAGE)-doc::
+	dh_install -p $(PACKAGE)-doc target/site/apidocs/* /usr/share/doc/$(PACKAGE)/api/
 

Modified: trunk/libxbean-java/debian/watch
===================================================================
--- trunk/libxbean-java/debian/watch	2011-07-17 22:25:19 UTC (rev 13859)
+++ trunk/libxbean-java/debian/watch	2011-07-18 23:27:28 UTC (rev 13860)
@@ -1,4 +1,3 @@
 version=3
-
 http://svn.apache.org/repos/asf/geronimo/xbean/tags/ xbean-(.*)/ \
   debian debian/orig-tar.sh




More information about the pkg-java-commits mailing list