[bsaf] 03/06: Build with maven-debian-helper instead of javahelper
Emmanuel Bourg
ebourg-guest at moszumanska.debian.org
Wed Mar 26 16:10:47 UTC 2014
This is an automated email from the git hooks/post-receive script.
ebourg-guest pushed a commit to branch master
in repository bsaf.
commit 04c404b1d854de701ccc534b5e3a23fe7ce27138
Author: Emmanuel Bourg <ebourg at apache.org>
Date: Wed Mar 26 14:19:59 2014 +0100
Build with maven-debian-helper instead of javahelper
---
debian/changelog | 1 +
debian/control | 11 +-
debian/libbetter-appframework-java-doc.doc-base | 6 +-
debian/libbetter-appframework-java-doc.install | 1 +
debian/libbetter-appframework-java-doc.javadoc | 1 -
debian/libbetter-appframework-java.jlibs | 1 -
debian/libbetter-appframework-java.poms | 28 +++++
debian/maven.ignoreRules | 7 ++
debian/maven.properties | 5 +
debian/maven.rules | 3 +
debian/patches/01-jnlp-dependency.patch | 21 ++++
debian/patches/build.xml.patch | 159 ------------------------
debian/patches/series | 2 +-
debian/rules | 10 +-
14 files changed, 82 insertions(+), 174 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index abd1970..b244079 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,7 @@
bsaf (1.9-5) UNRELEASED; urgency=medium
* Team upload.
+ * Build with maven-debian-helper instead of javahelper
* debian/control:
- Standards-Version updated to 3.9.5 (no changes)
* Switch to debhelper level 9
diff --git a/debian/control b/debian/control
index 4c06392..92a58e0 100644
--- a/debian/control
+++ b/debian/control
@@ -3,8 +3,8 @@ Section: java
Priority: optional
Maintainer: Debian Java Maintainers <pkg-java-maintainers at lists.alioth.debian.org>
Uploaders: Andres Mejia <amejia at debian.org>, Andrew Ross <ubuntu at rossfamily.co.uk>
-Build-Depends: debhelper (>= 9), javahelper, default-jdk, ant,
- ant-optional, junit4, libnetx-java
+Build-Depends: cdbs, debhelper (>= 9), default-jdk, maven-debian-helper, junit4,
+ libnetx-java, libmaven-javadoc-plugin-java
Standards-Version: 3.9.5
Homepage: http://kenai.com/projects/bsaf
Vcs-Browser: http://git.debian.org/?p=pkg-java/bsaf.git
@@ -12,7 +12,8 @@ Vcs-Git: git://git.debian.org/git/pkg-java/bsaf.git
Package: libbetter-appframework-java
Architecture: all
-Depends: ${java:Depends}, ${misc:Depends}
+Depends: ${misc:Depends}, ${maven:Depends}
+Suggests: ${maven:OptionalDepends}
Provides: libappframework-java
Description: Java Better Swing Application Framework (library)
The Better Swing Application Framework is a fork of the original Swing
@@ -33,8 +34,8 @@ Description: Java Better Swing Application Framework (library)
Package: libbetter-appframework-java-doc
Architecture: all
Section: doc
-Depends: ${misc:Depends}
-Recommends: ${java:Recommends}
+Depends: ${maven:DocDepends}, ${misc:Depends}
+Suggests: ${maven:DocOptionalDepends}
Description: Java Better Swing Application Framework (documentation)
The Better Swing Application Framework is a fork of the original Swing
Application Framework (appframework) reference implementation of JSR 296. Since
diff --git a/debian/libbetter-appframework-java-doc.doc-base b/debian/libbetter-appframework-java-doc.doc-base
index e4b2d81..8df26d1 100644
--- a/debian/libbetter-appframework-java-doc.doc-base
+++ b/debian/libbetter-appframework-java-doc.doc-base
@@ -3,8 +3,8 @@ Title: Better Swing Application Framework API
Author: Illya Yalovyy
Abstract: This is the API documentation for the Better Swing Application
Framework.
-Section: Java
+Section: Programming
Format: HTML
-Index: /usr/share/doc/libbetter-appframework-java-doc/api/index.html
-Files: /usr/share/doc/libbetter-appframework-java-doc/api/*.html
+Index: /usr/share/doc/libbetter-appframework-java/api/index.html
+Files: /usr/share/doc/libbetter-appframework-java/api/*.html
diff --git a/debian/libbetter-appframework-java-doc.install b/debian/libbetter-appframework-java-doc.install
new file mode 100644
index 0000000..8a91b00
--- /dev/null
+++ b/debian/libbetter-appframework-java-doc.install
@@ -0,0 +1 @@
+target/apidocs/* usr/share/doc/libbetter-appframework-java/api
diff --git a/debian/libbetter-appframework-java-doc.javadoc b/debian/libbetter-appframework-java-doc.javadoc
deleted file mode 100644
index 6744a8c..0000000
--- a/debian/libbetter-appframework-java-doc.javadoc
+++ /dev/null
@@ -1 +0,0 @@
-dist/javadoc
diff --git a/debian/libbetter-appframework-java.jlibs b/debian/libbetter-appframework-java.jlibs
deleted file mode 100644
index 5eb5f6f..0000000
--- a/debian/libbetter-appframework-java.jlibs
+++ /dev/null
@@ -1 +0,0 @@
-dist/bsaf-*.jar
diff --git a/debian/libbetter-appframework-java.poms b/debian/libbetter-appframework-java.poms
new file mode 100644
index 0000000..1d885c3
--- /dev/null
+++ b/debian/libbetter-appframework-java.poms
@@ -0,0 +1,28 @@
+# 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 and its artifact if any
+# --ignore-pom: don't install the POM. To use on POM files that are created
+# temporarily for certain artifacts such as Javadoc jars. [mh_install, mh_installpoms]
+# --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. [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. [mh_install]
+# --classifier=<classifier>: Optional, the classifier for the jar. Empty by default.
+# --site-xml=<location>: Optional, the location for site.xml if it needs to be installed.
+# Empty by default. [mh_install]
+#
+pom.xml --has-package-version --java-lib
diff --git a/debian/maven.ignoreRules b/debian/maven.ignoreRules
new file mode 100644
index 0000000..7ca34e7
--- /dev/null
+++ b/debian/maven.ignoreRules
@@ -0,0 +1,7 @@
+
+org.apache.maven.plugins maven-changes-plugin * * * *
+org.apache.maven.plugins maven-checkstyle-plugin * * * *
+org.apache.maven.plugins maven-pmd-plugin * * * *
+org.apache.maven.plugins maven-source-plugin * * * *
+org.codehaus.mojo findbugs-maven-plugin * * * *
+org.jvnet.wagon-svn wagon-svn * * * *
diff --git a/debian/maven.properties b/debian/maven.properties
new file mode 100644
index 0000000..e593715
--- /dev/null
+++ b/debian/maven.properties
@@ -0,0 +1,5 @@
+# Include here properties to pass to Maven during the build.
+# For example:
+# maven.test.skip=true
+
+maven.test.skip=true
diff --git a/debian/maven.rules b/debian/maven.rules
new file mode 100644
index 0000000..324301e
--- /dev/null
+++ b/debian/maven.rules
@@ -0,0 +1,3 @@
+
+junit junit jar s/4\..*/4.x/ * *
+org.jdesktop.bsaf bsaf jar s/.*/debian/ * *
diff --git a/debian/patches/01-jnlp-dependency.patch b/debian/patches/01-jnlp-dependency.patch
new file mode 100644
index 0000000..c395c69
--- /dev/null
+++ b/debian/patches/01-jnlp-dependency.patch
@@ -0,0 +1,21 @@
+Description: Point to netx.jar to provide the JNLP classes
+Author: Emmanuel Bourg <ebourg at apache.org>
+Forwarded: not-needed
+--- a/pom.xml
++++ b/pom.xml
+@@ -148,7 +148,7 @@
+ <artifactId>jnlp</artifactId>
+ <version>1.6</version>
+ <scope>system</scope>
+- <systemPath>${java.home}/lib/javaws.jar</systemPath>
++ <systemPath>/usr/share/java/netx.jar</systemPath>
+ </dependency>
+ </dependencies>
+ <reporting>
+@@ -207,4 +207,4 @@
+ <url>http://download.java.net/maven/2/</url>
+ </repository>
+ </repositories>
+-</project>
+\ No newline at end of file
++</project>
diff --git a/debian/patches/build.xml.patch b/debian/patches/build.xml.patch
deleted file mode 100644
index e17961b..0000000
--- a/debian/patches/build.xml.patch
+++ /dev/null
@@ -1,159 +0,0 @@
-Description: Patch to be able to use ant for building package. This makes it
- easier to support offline building of this library.
-Author: Andres Mejia <mcitadel at gmail.com>
-Forwarded: no
-Last-Update: 2011-01-21
-
---- /dev/null
-+++ bsaf-1.9/build.xml
-@@ -0,0 +1,150 @@
-+<?xml version="1.0" encoding="UTF-8"?>
-+<project name="bsaf" default="dist" basedir=".">
-+ <description>
-+ Better Swing Application Framework, a fork of the original Swing
-+ Application Framework
-+ </description>
-+
-+ <property environment="env"/>
-+ <property name="src.dir" value="src/main/java" />
-+ <property name="resources.dir" value="src/main/resources" />
-+ <property name="test-src.dir" value="src/test/java" />
-+ <property name="test-resources.dir" value="src/test/resources" />
-+ <property name="build.dir" value="build" />
-+ <property name="dist.dir" value="dist" />
-+ <property name="test.dir" value="test" />
-+ <property name="javadoc.dir" value="${dist.dir}/javadoc" />
-+ <property name="bundles.dir" value="${dist.dir}/bundles" />
-+ <property name="www.dir" value="www" />
-+ <property name="external.doc"
-+ value="http://download.oracle.com/javase/6/docs/api" />
-+
-+ <target name="clean">
-+ <delete dir="${build.dir}"/>
-+ <delete dir="${dist.dir}"/>
-+ <delete dir="${test.dir}"/>
-+ </target>
-+
-+ <target name="init">
-+ <mkdir dir="${build.dir}"/>
-+ <mkdir dir="${dist.dir}"/>
-+ <mkdir dir="${test.dir}"/>
-+ <tstamp/>
-+ </target>
-+
-+ <target name="compile" depends="init">
-+ <javac source="1.5" destdir="${build.dir}" memoryMaximumSize="200m"
-+ fork="yes" encoding="UTF-8">
-+ <src path="${src.dir}"/>
-+ </javac>
-+ <copy todir="${build.dir}">
-+ <fileset dir="${resources.dir}">
-+ <exclude name="COPYING"/>
-+ </fileset>
-+ </copy>
-+ </target>
-+
-+ <target name="compile-test" depends="compile">
-+ <javac source="1.5" destdir="${test.dir}" memoryMaximumSize="200m"
-+ fork="yes" encoding="UTF-8">
-+ <classpath>
-+ <pathelement location="${build.dir}"/>
-+ </classpath>
-+ <src path="${test-src.dir}"/>
-+ </javac>
-+ <copy todir="${test.dir}">
-+ <fileset dir="${test-resources.dir}"/>
-+ </copy>
-+ </target>
-+
-+ <target name="check-display">
-+ <condition property="have.display">
-+ <isset property="env.DISPLAY"/>
-+ </condition>
-+ </target>
-+
-+ <target name="test" depends="compile-test, check-display">
-+ <junit printsummary="yes" showoutput="yes" fork="yes"
-+ haltonfailure="yes">
-+ <sysproperty key="LocalStorage.dir"
-+ value="${basedir}/${build.dir}/local-storage.tmp" />
-+ <formatter type="brief" usefile="false"/>
-+ <classpath>
-+ <pathelement location="${test.dir}"/>
-+ <pathelement location="${build.dir}"/>
-+ </classpath>
-+
-+ <test name="org.jdesktop.application.AbstractBeanTest"/>
-+ <test name="org.jdesktop.application.ApplicationActionMapTest"/>
-+ <test name="org.jdesktop.application.ApplicationActionsTest"
-+ if="have.display"/>
-+ <test name="org.jdesktop.application.ApplicationDefaultLNFResourceTest"/>
-+ <test name="org.jdesktop.application.ApplicationEndTest"/>
-+ <test name="org.jdesktop.application.ApplicationMotifLNFResourceTest"/>
-+ <test name="org.jdesktop.application.ApplicationNimbusLNFResourceTest"/>
-+ <test name="org.jdesktop.application.ApplicationNoLNFResourceTest"/>
-+ <test name="org.jdesktop.application.ApplicationPrivateCtorTest"/>
-+ <test name="org.jdesktop.application.ApplicationSystemLNFResourceTest"/>
-+ <test name="org.jdesktop.application.ApplicationTest"
-+ if="have.display"/>
-+ <test name="org.jdesktop.application.BadSessionStateTest"
-+ if="have.display"/>
-+ <test name="org.jdesktop.application.CustomPropertySupportTest"
-+ if="have.display"/>
-+ <test name="org.jdesktop.application.DefaultInputBlockerDelayTest"
-+ if="have.display"/>
-+ <test name="org.jdesktop.application.EnabledPropertyInGermanLocaleTest"
-+ if="have.display"/>
-+ <test name="org.jdesktop.application.LocalStorageTest"/>
-+ <test name="org.jdesktop.application.MnemonicTextTest"/>
-+ <test name="org.jdesktop.application.ProxyActionTest"
-+ if="have.display"/>
-+ <test name="org.jdesktop.application.ResourceManagerTest"/>
-+ <test name="org.jdesktop.application.ResourceMapTest"
-+ if="have.display"/>
-+ <test name="org.jdesktop.application.TaskMonitorTest"/>
-+ <test name="org.jdesktop.application.TaskStateTest"/>
-+ <test name="org.jdesktop.application.TaskTest"/>
-+ </junit>
-+ </target>
-+
-+ <target name="jar" depends="compile" description="Create the bsaf.jar file">
-+ <jar destfile="${dist.dir}/bsaf-1.9.jar">
-+ <fileset dir="${build.dir}"/>
-+ <manifest>
-+ <attribute name="Built-By" value="${user.name}"/>
-+ </manifest>
-+ </jar>
-+ </target>
-+
-+ <target name="javadoc" depends="init">
-+ <javadoc access="protected" link=""
-+ packagenames="org.jdesktop.application" author="true"
-+ destdir="${javadoc.dir}" nodeprecated="false"
-+ nodeprecatedlist="false" noindex="false" nonavbar="false"
-+ notree="false" use="true" version="true">
-+ <link href="${external.doc}" />
-+ <sourcepath>
-+ <pathelement path="${src.dir}" />
-+ </sourcepath>
-+ </javadoc>
-+ </target>
-+
-+ <target name="dist" depends="jar, test, javadoc"/>
-+
-+ <target name="bundles" depends="clean, dist">
-+ <mkdir dir="${bundles.dir}"/>
-+ <zip basedir="." destfile="${bundles.dir}/bsaf-src.zip"
-+ includes="src/**, configs/**, build.xml, pom.xml"
-+ />
-+ <zip basedir="${javadoc.dir}" destfile="${bundles.dir}/bsaf-doc.zip"/>
-+ <jar basedir="${build.dir}" destfile="${bundles.dir}/bsaf.jar"/>
-+ </target>
-+
-+ <target name="www" depends="clean, javadoc">
-+ <delete dir="${www.dir}/javadoc"/>
-+ <copy todir="${www.dir}/javadoc">
-+ <fileset dir="${javadoc.dir}"/>
-+ </copy>
-+ </target>
-+</project>
diff --git a/debian/patches/series b/debian/patches/series
index 2e6952a..669860b 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1 +1 @@
-build.xml.patch
+01-jnlp-dependency.patch
diff --git a/debian/rules b/debian/rules
index 5724798..261ec16 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,7 +1,9 @@
#!/usr/bin/make -f
-export JAVA_HOME=/usr/lib/jvm/default-java
-export CLASSPATH=/usr/share/java/junit4.jar:/usr/share/java/netx.jar
+include /usr/share/cdbs/1/rules/debhelper.mk
+include /usr/share/cdbs/1/class/maven.mk
-%:
- dh $@ --with javahelper
+JAVA_HOME := /usr/lib/jvm/default-java
+
+get-orig-source:
+ uscan --download-current-version --force-download --rename
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/bsaf.git
More information about the pkg-java-commits
mailing list