This is an automated email from the git hooks/post-receive script.

ebourg-guest pushed a commit to branch master
in repository libswingx-java.

commit 6a1961fd3a9e48421f3aded28b21115263fd1ff0
Author: Damien Raude-Morvan <draz...@debian.org>
Date:   Sun Nov 1 23:17:24 2009 +0000

    * New "libswingx-java-doc" package:
      - contains API javadoc documentation
      - Describe quilt patch system in debian/README.source
    * Maven POMs:
      - Add a Build-Depends-Indep dependency on maven-repo-helper
      - Use mh_installpoms and mh_installjar to install the POM and the jar to 
the
        Maven repository
      - Remove unneeded dependencies in pom.diff patch
    * Maven ant helper (build system):
      - Add a Build-Depends dependency on maven-ant-helper
      - Update debian/build.xml to use 
/usr/share/maven-ant-helper/maven-build.xml
      - Build classpath is now defined in debian/build.properties
---
 debian/README.source               | 14 ++++++-
 debian/ant.properties              |  4 --
 debian/build.properties            |  6 +++
 debian/build.xml                   | 78 +++++++++++++++++++-------------------
 debian/changelog                   | 20 ++++++++--
 debian/control                     | 30 +++++++++++++--
 debian/docs                        |  2 -
 debian/libswingx-java-doc.doc-base |  9 +++++
 debian/libswingx-java-doc.install  |  1 +
 debian/libswingx-java.poms         |  3 ++
 debian/maven.rules                 |  4 ++
 debian/patches/pom.diff            | 55 +++++++++++++++++++++++++++
 debian/patches/series              |  1 +
 debian/patches/swingworker.diff    |  5 +--
 debian/rules                       | 22 +++++++----
 15 files changed, 191 insertions(+), 63 deletions(-)

diff --git a/debian/README.source b/debian/README.source
index 58e11b7..fdb1337 100644
--- a/debian/README.source
+++ b/debian/README.source
@@ -1,5 +1,15 @@
-libswingx-java
-==============
+Patch system
+============
+
+This package uses quilt to manage all modifications to the upstream
+source.  Changes are stored in the source package as diffs in
+debian/patches and applied during the build.
+
+See /usr/share/doc/quilt/README.source for a detailed explanation.
+
+
+Orig tarball repack
+===================
 
 The upstream supplied source package contains binary jar files.
 Currently no clean source distribution exists. Therefore, the upstream
diff --git a/debian/ant.properties b/debian/ant.properties
deleted file mode 100644
index 600bef5..0000000
--- a/debian/ant.properties
+++ /dev/null
@@ -1,4 +0,0 @@
-installdir=/usr/share/java
-ant.build.javac.source=1.5
-ant.build.javac.target=1.5
-
diff --git a/debian/build.properties b/debian/build.properties
new file mode 100644
index 0000000..d9c3d56
--- /dev/null
+++ b/debian/build.properties
@@ -0,0 +1,6 @@
+javadoc.dir=build/api
+maven.test.skip=true
+build.javaVersion=1.5
+classpath.compile = \
+             /usr/share/java/batik-all.jar:\
+             ${basedir}/swingx-core/build/swingx-core-${version}.jar
diff --git a/debian/build.xml b/debian/build.xml
index 904f177..c45f787 100644
--- a/debian/build.xml
+++ b/debian/build.xml
@@ -1,47 +1,49 @@
 <project name="swingx" basedir=".." default="build">
 
-  <property name="jarfile" value="${ant.project.name}.jar"/>
-
-  <patternset id="compiler.resources">
-       <include name="**/?*.properties" />
-       <include name="**/?*.xml" />
-       <include name="**/?*.gif" />
-       <include name="**/?*.png" />
-       <include name="**/?*.jpeg" />
-       <include name="**/?*.jpg" />
-       <include name="**/?*.html" />
-       <include name="**/?*.dtd" />
-       <include name="**/?*.tld" />
-       <include name="**/?*.ttf" />
-  </patternset>
-
-  <target name="build"
-    description="build the jar file">
-    <mkdir dir="build"/>
-    <javac destdir="build">
-      <src path="src/beaninfo"/>
-      <src path="src/java"/>
-    </javac>
-    <copy todir="build">
-       <fileset dir="src/beaninfo">
-               <patternset refid="compiler.resources" />
-       </fileset>
-       <fileset dir="src/java">
-               <patternset refid="compiler.resources" />
-       </fileset>
-    </copy>
-    <jar destfile="${jarfile}" basedir="build" index="yes"/>
+  <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="src"/>
+    <sequential>
+      <ant target="package" antfile="${maven.build}" dir="@{dir}">
+        <property name="debian.dir" location="debian" />
+        <property name="project.dir" value="@{dir}" />
+        <property name="build.sourceDirectory" value="@{src}"/>
+      </ant>
+    </sequential>
+  </macrodef>
+
+
+  <target name="clean">
+    <delete dir="build"/>
+    <cleanmodule dir="swingx-core"/>
+    <cleanmodule dir="swingx-beaninfo"/>
   </target>
 
-  <target name="install" depends="build"
-    description="installs the jar file">
-    <copy file="${jarfile}" todir="${destdir}${installdir}"/>
+  <target name="package">
+    <packagemodule dir="swingx-core" src="../src/java/"/>
+    <packagemodule dir="swingx-beaninfo" src="../src/beaninfo/"/>
   </target>
 
-  <target name="clean"
-     description="clean up the build dir">
-     <delete dir="build"/>
-     <delete file="${jarfile}"/>
+  <target name="javadoc">
+    <javadoc destdir="${javadoc.dir}">
+      <packageset dir="src/java/"/>
+      <packageset dir="src/beaninfo/"/>
+    </javadoc>
   </target>
 
+
 </project>
diff --git a/debian/changelog b/debian/changelog
index 83b26d3..a2438e3 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,18 +1,30 @@
-libswingx-java (1:1.0-1) UNRELEASED; urgency=low
+libswingx-java (1:1.0-1) unstable; urgency=low
 
   * New upstream release.
+  * New "libswingx-java-doc" package:
+    - contains API javadoc documentation
   * Bump Standards-Version to 3.8.3
     - Change section to "java"
     - Rename debian/README.Debian-source to debian/README.source
+    - Describe quilt patch system in debian/README.source
   * Bump debhelper version to >= 7
   * Remove unused Depends on ${shlibs:Depends}
   * Default JRE:
     - Build-Depends on default-jdk
     - Use /usr/lib/jvm/default-java as JAVA_HOME
   * Add myself to Uploaders
-  * Use DEP5 format for debian/copyright 
-
- -- Damien Raude-Morvan <draz...@debian.org>  Sun, 01 Nov 2009 00:40:37 +0100
+  * Use DEP5 format for debian/copyright
+  * Maven POMs:
+    - Add a Build-Depends-Indep dependency on maven-repo-helper
+    - Use mh_installpoms and mh_installjar to install the POM and the jar to 
the
+      Maven repository
+    - Remove unneeded dependencies in pom.diff patch
+  * Maven ant helper (build system):
+    - Add a Build-Depends dependency on maven-ant-helper
+    - Update debian/build.xml to use 
/usr/share/maven-ant-helper/maven-build.xml
+    - Build classpath is now defined in debian/build.properties
+
+ -- Damien Raude-Morvan <draz...@debian.org>  Mon, 02 Nov 2009 00:17:00 +0100
 
 libswingx-java (1:0.9.5-1) unstable; urgency=low
 
diff --git a/debian/control b/debian/control
index f0121f6..55925b1 100644
--- a/debian/control
+++ b/debian/control
@@ -4,8 +4,8 @@ Priority: optional
 Maintainer: Debian Java Maintainers 
<pkg-java-maintainers@lists.alioth.debian.org>
 Uploaders: Varun Hiremath <va...@debian.org>, Torsten Werner 
<twer...@debian.org>,
  Damien Raude-Morvan <draz...@debian.org>
-Build-Depends: cdbs, debhelper (>= 7), quilt, default-jdk, ant
-Build-Depends-Indep: libbatik-java
+Build-Depends: cdbs, debhelper (>= 7), quilt, default-jdk, ant, 
maven-ant-helper
+Build-Depends-Indep: libbatik-java, maven-repo-helper
 Standards-Version: 3.8.3
 Homepage: https://swingx.dev.java.net/
 Vcs-Svn: svn://svn.debian.org/svn/pkg-java/trunk/libswingx-java/
@@ -14,7 +14,6 @@ Vcs-Browser: 
http://svn.debian.org/wsvn/pkg-java/trunk/libswingx-java/
 Package: libswingx-java
 Architecture: all
 Depends: ${misc:Depends}, default-jre | java5-runtime
-Suggests: java-virtual-machine
 Description: extensions to the Swing GUI toolkit
  This package contains extensions to the Swing GUI toolkit, including new and
  enhanced components that provide functionality commonly required by rich
@@ -31,3 +30,28 @@ Description: extensions to the Swing GUI toolkit
  Many of these features will eventually be incorporated into the Swing toolkit,
  although API compatibility will not be guaranteed. The SwingX project focuses
  exclusively on the raw components themselves.
+
+Package: libswingx-java-doc
+Architecture: all
+Section: doc
+Depends: ${misc:Depends}
+Suggests: libswingx-java
+Description: extensions to the Swing GUI toolkit - documentation
+ This package contains extensions to the Swing GUI toolkit, including new and
+ enhanced components that provide functionality commonly required by rich
+ client applications. Highlights include:
+  - Sorting, filtering, highlighting for tables, trees, and lists
+  - Find/search
+  - Auto-completion
+  - Login/authentication framework
+  - TreeTable component
+  - Collapsible panel component
+  - Date picker component
+  - Tip-of-the-Day component
+ .
+ Many of these features will eventually be incorporated into the Swing toolkit,
+ although API compatibility will not be guaranteed. The SwingX project focuses
+ exclusively on the raw components themselves.
+ .
+ This package contains API documentation (Javadoc) of SwingX GUI Toolkit.
+
diff --git a/debian/docs b/debian/docs
deleted file mode 100644
index 8d9501e..0000000
--- a/debian/docs
+++ /dev/null
@@ -1,2 +0,0 @@
-docs/*
-
diff --git a/debian/libswingx-java-doc.doc-base 
b/debian/libswingx-java-doc.doc-base
new file mode 100644
index 0000000..4333dab
--- /dev/null
+++ b/debian/libswingx-java-doc.doc-base
@@ -0,0 +1,9 @@
+Document: libswingx-java-doc
+Title: API Javadoc for SwingX
+Author: SwingX developers
+Abstract: This is the API Javadoc provided by the SwingX library.
+Section: Programming
+
+Format: HTML
+Index: /usr/share/doc/libswingx-java/api/index.html
+Files: /usr/share/doc/libswingx-java/api/*
diff --git a/debian/libswingx-java-doc.install 
b/debian/libswingx-java-doc.install
new file mode 100644
index 0000000..862fc1f
--- /dev/null
+++ b/debian/libswingx-java-doc.install
@@ -0,0 +1 @@
+build/api /usr/share/doc/libswingx-java/
diff --git a/debian/libswingx-java.poms b/debian/libswingx-java.poms
new file mode 100644
index 0000000..d2ea97b
--- /dev/null
+++ b/debian/libswingx-java.poms
@@ -0,0 +1,3 @@
+pom.xml --no-parent
+swingx-core/pom.xml --no-parent
+swingx-beaninfo/pom.xml --no-parent
diff --git a/debian/maven.rules b/debian/maven.rules
new file mode 100644
index 0000000..39f88c6
--- /dev/null
+++ b/debian/maven.rules
@@ -0,0 +1,4 @@
+commons-collections commons-collections jar s/3\..*/3.x/
+junit junit jar s/3\..*/3.x/
+jmock jmock jar s/.*/1.x/
+
diff --git a/debian/patches/pom.diff b/debian/patches/pom.diff
new file mode 100644
index 0000000..33860db
--- /dev/null
+++ b/debian/patches/pom.diff
@@ -0,0 +1,55 @@
+--- a/swingx-beaninfo/pom.xml
++++ b/swingx-beaninfo/pom.xml
+@@ -20,14 +20,6 @@
+                       <groupId>com.jhlabs</groupId>
+                       <artifactId>filters</artifactId>
+               </dependency>
+-              <dependency>
+-            <groupId>org.swinglabs</groupId>
+-            <artifactId>swing-worker</artifactId>
+-        </dependency>
+-        <dependency>
+-            <groupId>org.swinglabs</groupId>
+-            <artifactId>multiplegradientpaint</artifactId>
+-        </dependency>    
+         <!-- Preferably we should use this jmock configuration with junit 4 
-->
+         <!--dependency>
+             <groupId>org.jmock</groupId>
+--- a/swingx-core/pom.xml
++++ b/swingx-core/pom.xml
+@@ -16,14 +16,6 @@
+                       <artifactId>filters</artifactId>
+               </dependency>
+               <dependency>
+-            <groupId>org.swinglabs</groupId>
+-            <artifactId>swing-worker</artifactId>
+-        </dependency>
+-        <dependency>
+-            <groupId>org.swinglabs</groupId>
+-            <artifactId>multiplegradientpaint</artifactId>
+-        </dependency>    
+-              <dependency>
+             <groupId>junit</groupId>
+             <artifactId>junit</artifactId>
+         </dependency>
+--- a/pom.xml
++++ b/pom.xml
+@@ -113,18 +113,6 @@
+                       <scope>compile</scope>
+               </dependency>
+               <dependency>
+-            <groupId>org.swinglabs</groupId>
+-            <artifactId>swing-worker</artifactId>
+-            <version>1.1</version>
+-            <!--scope>compile</scope-->
+-        </dependency>
+-        <dependency>
+-            <groupId>org.swinglabs</groupId>
+-            <artifactId>multiplegradientpaint</artifactId>
+-            <version>1.0</version>
+-            <scope>compile</scope>
+-        </dependency> 
+-              <dependency>
+             <groupId>junit</groupId>
+             <artifactId>junit</artifactId>
+             <version>4.5</version>
diff --git a/debian/patches/series b/debian/patches/series
index 5065ab9..5ff0c9d 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1 +1,2 @@
 swingworker.diff
+pom.diff
diff --git a/debian/patches/swingworker.diff b/debian/patches/swingworker.diff
index fddc31c..66d97d8 100644
--- a/debian/patches/swingworker.diff
+++ b/debian/patches/swingworker.diff
@@ -1,6 +1,5 @@
-diff -urN 
swingx-2007_07_22-src.orig/src/java/org/jdesktop/swingx/auth/LoginService.java 
swingx-2007_07_22-src/src/java/org/jdesktop/swingx/auth/LoginService.java
---- 
swingx-2007_07_22-src.orig/src/java/org/jdesktop/swingx/auth/LoginService.java  
   2007-08-04 00:35:55.000000000 +0530
-+++ swingx-2007_07_22-src/src/java/org/jdesktop/swingx/auth/LoginService.java  
2007-08-04 00:37:57.000000000 +0530
+--- a/src/java/org/jdesktop/swingx/auth/LoginService.java
++++ b/src/java/org/jdesktop/swingx/auth/LoginService.java
 @@ -27,7 +27,7 @@
  import javax.swing.event.EventListenerList;
  
diff --git a/debian/rules b/debian/rules
index 570a35a..805c493 100755
--- a/debian/rules
+++ b/debian/rules
@@ -4,15 +4,23 @@ include /usr/share/cdbs/1/rules/debhelper.mk
 include /usr/share/cdbs/1/class/ant.mk
 include /usr/share/cdbs/1/rules/patchsys-quilt.mk
 
-JAVA_HOME              := /usr/lib/jvm/default-java
-DEB_ANT_BUILDFILE      := debian/build.xml
+PACKAGE              := swingx
+VERSION              := $(DEB_UPSTREAM_VERSION)
 
-# it was batik.jar up to version 1.6 and is is now batik-all.jar
-DEB_JARS               := batik batik-all
+JAVA_HOME            := /usr/lib/jvm/default-java
+DEB_JARS             := ant-nodeps
+DEB_ANT_BUILD_TARGET := package javadoc
+DEB_ANT_BUILDFILE    := debian/build.xml
+DEB_ANT_ARGS         := -Dpackage=$(PACKAGE) -Dversion=$(VERSION)
 
-install/libswingx-java::
-       install -m 644 -D swingx.jar 
$(DEB_DESTDIR)/usr/share/java/swingx-$(DEB_UPSTREAM_VERSION).jar
-       dh_link /usr/share/java/swingx-$(DEB_UPSTREAM_VERSION).jar 
/usr/share/java/swingx.jar
+
+binary-post-install/lib$(PACKAGE)-java::
+       mh_installpoms -plib$(PACKAGE)-java
+       mh_installjar -plib$(PACKAGE)-java -l -nswingx swingx-core/pom.xml 
swingx-core/build/swingx-core-$(VERSION).jar
+       mh_installjar -plib$(PACKAGE)-java -l swingx-beaninfo/pom.xml 
swingx-beaninfo/build/swingx-beaninfo-$(VERSION).jar
+
+clean::
+       -rm -rf debian/tmp
 
 get-orig-source:
        uscan --upstream-version 0

-- 
Alioth's /usr/local/bin/git-commit-notice on 
/srv/git.debian.org/git/pkg-java/libswingx-java.git

_______________________________________________
pkg-java-commits mailing list
pkg-java-comm...@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-commits

Reply via email to