[pkg-java] r9974 - in trunk/commons-math/debian: . patches
Damien Raude-Morvan
drazzib-guest at alioth.debian.org
Fri Aug 14 09:48:13 UTC 2009
Author: drazzib-guest
Date: 2009-08-14 09:48:11 +0000 (Fri, 14 Aug 2009)
New Revision: 9974
Added:
trunk/commons-math/debian/libcommons-math-java-doc.install
trunk/commons-math/debian/libcommons-math-java.poms
trunk/commons-math/debian/maven.rules
Removed:
trunk/commons-math/debian/libcommons-math-java-doc.docs
trunk/commons-math/debian/patches/01_no_download_during_build.diff
trunk/commons-math/debian/patches/03_define_source_target_class_version.diff
trunk/commons-math/debian/patches/04_no_home_dir.diff
Modified:
trunk/commons-math/debian/changelog
trunk/commons-math/debian/control
trunk/commons-math/debian/libcommons-math-java-doc.doc-base
trunk/commons-math/debian/patches/02_no_tests_on_build.diff
trunk/commons-math/debian/patches/series
trunk/commons-math/debian/rules
Log:
[commons-math]
* New upstream release.
* Maven POMs:
- Add a Build-Depends-Indep dependency on maven-repo-helper
- Use mh_installpom and mh_installjar to install the POM and the jar to the
Maven repository
* Use default-jdk/jre:
- Depends on java5-runtime-headless
- Build-Depends on default-jdk
- Use /usr/lib/jvm/default-java as JAVA_HOME
* Move api documentation to /usr/share/doc/libcommons-math-java/api
Modified: trunk/commons-math/debian/changelog
===================================================================
--- trunk/commons-math/debian/changelog 2009-08-14 09:46:27 UTC (rev 9973)
+++ trunk/commons-math/debian/changelog 2009-08-14 09:48:11 UTC (rev 9974)
@@ -1,5 +1,6 @@
-commons-math (1.2-2) UNRELEASED; urgency=low
+commons-math (2.0-1) UNRELEASED; urgency=low
+ * New upstream release.
* Set Maintainer field to Debian Java Team
* Add myself as Uploaders
* Switch to Quilt patch system:
@@ -10,8 +11,17 @@
- Add a README.source to describe patch system
* New patch 02_no_home_dir.diff: don't try to create/copy files
in $HOME as many autobuilder won't have one
+ * Maven POMs:
+ - Add a Build-Depends-Indep dependency on maven-repo-helper
+ - Use mh_installpom and mh_installjar to install the POM and the jar to the
+ Maven repository
+ * Use default-jdk/jre:
+ - Depends on java5-runtime-headless
+ - Build-Depends on default-jdk
+ - Use /usr/lib/jvm/default-java as JAVA_HOME
+ * Move api documentation to /usr/share/doc/libcommons-math-java/api
- -- Damien Raude-Morvan <drazzib at drazzib.com> Thu, 16 Jul 2009 21:07:58 +0200
+ -- Damien Raude-Morvan <drazzib at drazzib.com> Fri, 14 Aug 2009 01:59:02 +0200
commons-math (1.2-1) unstable; urgency=low
Modified: trunk/commons-math/debian/control
===================================================================
--- trunk/commons-math/debian/control 2009-08-14 09:46:27 UTC (rev 9973)
+++ trunk/commons-math/debian/control 2009-08-14 09:48:11 UTC (rev 9974)
@@ -4,8 +4,8 @@
Standards-Version: 3.8.2
Section: java
Priority: optional
-Build-Depends: openjdk-6-jdk, ant, debhelper (>= 5), cdbs, quilt
-Build-Depends-Indep: libcommons-discovery-java, junit, ant-optional
+Build-Depends: default-jdk, ant, debhelper (>= 5), cdbs, quilt
+Build-Depends-Indep: libcommons-discovery-java, junit, ant-optional, maven-repo-helper
Homepage: http://commons.apache.org/math/
Vcs-Svn: svn://svn.debian.org/svn/pkg-java/trunk/commons-math
Vcs-Browser: http://svn.debian.org/wsvn/pkg-java/trunk/commons-math
@@ -13,7 +13,7 @@
Package: libcommons-math-java
Architecture: all
Depends: ${misc:Depends}, libcommons-discovery-java
-Suggests: openjdk-6-jre-headless
+Suggests: openjdk-6-jre-headless | java5-runtime-headless
Description: Java lightweight mathematics and statistics components
Commons Math is a Java library of lightweight, self-contained mathematics
and statistics components.
Modified: trunk/commons-math/debian/libcommons-math-java-doc.doc-base
===================================================================
--- trunk/commons-math/debian/libcommons-math-java-doc.doc-base 2009-08-14 09:46:27 UTC (rev 9973)
+++ trunk/commons-math/debian/libcommons-math-java-doc.doc-base 2009-08-14 09:48:11 UTC (rev 9974)
@@ -5,5 +5,5 @@
Section: Programming
Format: HTML
-Index: /usr/share/doc/libcommons-math-java-doc/api/index.html
-Files: /usr/share/doc/libcommons-math-java-doc/api/*
+Index: /usr/share/doc/libcommons-math-java/api/index.html
+Files: /usr/share/doc/libcommons-math-java/api/*
Deleted: trunk/commons-math/debian/libcommons-math-java-doc.docs
===================================================================
--- trunk/commons-math/debian/libcommons-math-java-doc.docs 2009-08-14 09:46:27 UTC (rev 9973)
+++ trunk/commons-math/debian/libcommons-math-java-doc.docs 2009-08-14 09:48:11 UTC (rev 9974)
@@ -1 +0,0 @@
-dist/docs/api
\ No newline at end of file
Copied: trunk/commons-math/debian/libcommons-math-java-doc.install (from rev 9970, trunk/commons-math/debian/libcommons-math-java-doc.docs)
===================================================================
--- trunk/commons-math/debian/libcommons-math-java-doc.install (rev 0)
+++ trunk/commons-math/debian/libcommons-math-java-doc.install 2009-08-14 09:48:11 UTC (rev 9974)
@@ -0,0 +1 @@
+target/api /usr/share/doc/libcommons-math-java
Added: trunk/commons-math/debian/libcommons-math-java.poms
===================================================================
--- trunk/commons-math/debian/libcommons-math-java.poms (rev 0)
+++ trunk/commons-math/debian/libcommons-math-java.poms 2009-08-14 09:48:11 UTC (rev 9974)
@@ -0,0 +1 @@
+pom.xml --no-parent
Added: trunk/commons-math/debian/maven.rules
===================================================================
--- trunk/commons-math/debian/maven.rules (rev 0)
+++ trunk/commons-math/debian/maven.rules 2009-08-14 09:48:11 UTC (rev 9974)
@@ -0,0 +1 @@
+junit junit jar s/4\..*/4.x/
Deleted: trunk/commons-math/debian/patches/01_no_download_during_build.diff
===================================================================
--- trunk/commons-math/debian/patches/01_no_download_during_build.diff 2009-08-14 09:46:27 UTC (rev 9973)
+++ trunk/commons-math/debian/patches/01_no_download_during_build.diff 2009-08-14 09:48:11 UTC (rev 9974)
@@ -1,83 +0,0 @@
-Description: build.xml: don't download JAR from internet on 'compile' or 'javadoc' targets.
-Author: Damien Raude-Morvan <drazzib at drazzib.com>
-Forwarded: not-needed
-Origin: vendor
-Last-Update: 2009-07-16
---- a/build.xml
-+++ b/build.xml
-@@ -36,12 +36,6 @@
- </property>
- <property name="proxy.password" value="">
- </property>
-- <path id="build.classpath">
-- <pathelement location="${libdir}/commons-logging/jars/commons-logging-1.0.3.jar">
-- </pathelement>
-- <pathelement location="${libdir}/commons-discovery/jars/commons-discovery-0.2.jar">
-- </pathelement>
-- </path>
- <target name="init" description="o Initializes some properties">
- <mkdir dir="${libdir}">
- </mkdir>
-@@ -66,7 +60,7 @@
- </and>
- </condition>
- </target>
-- <target name="compile" description="o Compile the code" depends="get-deps">
-+ <target name="compile" description="o Compile the code">
- <mkdir dir="${classesdir}">
- </mkdir>
- <javac destdir="${classesdir}" deprecation="true" debug="true" optimize="false" excludes="**/package.html">
-@@ -74,8 +68,6 @@
- <pathelement location="${basedir}/src/java">
- </pathelement>
- </src>
-- <classpath refid="build.classpath">
-- </classpath>
- </javac>
- <mkdir dir="${classesdir}/META-INF">
- </mkdir>
-@@ -123,8 +115,6 @@
- <formatter usefile="false" type="plain">
- </formatter>
- <classpath>
-- <path refid="build.classpath">
-- </path>
- <pathelement path="${testclassesdir}">
- </pathelement>
- <pathelement path="${classesdir}">
-@@ -154,8 +144,6 @@
- </pathelement>
- </src>
- <classpath>
-- <path refid="build.classpath">
-- </path>
- <pathelement path="${classesdir}">
- </pathelement>
- </classpath>
-@@ -169,7 +157,7 @@
- </fileset>
- </copy>
- </target>
-- <target name="javadoc" description="o Generate javadoc" depends="get-deps">
-+ <target name="javadoc" description="o Generate javadoc">
- <mkdir dir="${javadocdir}">
- </mkdir>
- <tstamp>
-@@ -181,10 +169,6 @@
- <property name="title" value="Math 1.2-SNAPSHOT API">
- </property>
- <javadoc use="true" private="true" destdir="${javadocdir}" author="true" version="true" sourcepath="${basedir}/src/java" packagenames="org.apache.commons.math.*">
-- <classpath>
-- <path refid="build.classpath">
-- </path>
-- </classpath>
- </javadoc>
- </target>
- <target name="get-dep-commons-logging.jar" description="o Download the dependency : commons-logging.jar" unless="commons-logging.jar" depends="init,setProxy,noProxy,get-custom-dep-commons-logging.jar">
-@@ -232,4 +216,4 @@
- <unjar dest="${maven.home}" src="${user.home}/maven-install-latest.jar">
- </unjar>
- </target>
--</project>
-\ No newline at end of file
-+</project>
Modified: trunk/commons-math/debian/patches/02_no_tests_on_build.diff
===================================================================
--- trunk/commons-math/debian/patches/02_no_tests_on_build.diff 2009-08-14 09:46:27 UTC (rev 9973)
+++ trunk/commons-math/debian/patches/02_no_tests_on_build.diff 2009-08-14 09:48:11 UTC (rev 9974)
@@ -6,12 +6,12 @@
Last-Update: 2009-07-16
--- a/build.xml
+++ b/build.xml
-@@ -80,7 +80,7 @@
- </fileset>
- </copy>
- </target>
-- <target name="jar" description="o Create the jar" depends="compile,test">
-+ <target name="jar" description="o Create the jar" depends="compile">
- <jar jarfile="${defaulttargetdir}/${final.name}.jar" excludes="**/package.html" basedir="${classesdir}">
- </jar>
- </target>
+@@ -228,7 +228,7 @@
+
+ <!-- ========== Create Jar ================================================ -->
+
+- <target name="jar" depends="test" description="Create jar file">
++ <target name="jar" description="Create jar file">
+
+ <mkdir dir="${build.home}/classes/META-INF"/>
+ <copy file="LICENSE.txt" tofile="${build.home}/classes/META-INF/LICENSE.txt"/>
Deleted: trunk/commons-math/debian/patches/03_define_source_target_class_version.diff
===================================================================
--- trunk/commons-math/debian/patches/03_define_source_target_class_version.diff 2009-08-14 09:46:27 UTC (rev 9973)
+++ trunk/commons-math/debian/patches/03_define_source_target_class_version.diff 2009-08-14 09:48:11 UTC (rev 9974)
@@ -1,27 +0,0 @@
-Description: force -source AND -target at 1.3 class format version.
-Author: Damien Raude-Morvan <drazzib at drazzib.com>
-Forwarded: not-needed
-Origin: vendor
-Last-Update: 2009-07-16
---- a/build.xml
-+++ b/build.xml
-@@ -63,7 +63,8 @@
- <target name="compile" description="o Compile the code">
- <mkdir dir="${classesdir}">
- </mkdir>
-- <javac destdir="${classesdir}" deprecation="true" debug="true" optimize="false" excludes="**/package.html">
-+ <javac destdir="${classesdir}" deprecation="true" debug="true" optimize="false" excludes="**/package.html"
-+ source="1.3" target="1.3">
- <src>
- <pathelement location="${basedir}/src/java">
- </pathelement>
-@@ -138,7 +139,8 @@
- <target name="compile-tests" if="Junit.present" depends="junit-present,compile">
- <mkdir dir="${testclassesdir}">
- </mkdir>
-- <javac destdir="${testclassesdir}" deprecation="true" debug="true" optimize="false" excludes="**/package.html">
-+ <javac destdir="${testclassesdir}" deprecation="true" debug="true" optimize="false" excludes="**/package.html"
-+ source="1.3" target="1.3">
- <src>
- <pathelement location="${basedir}/src/test">
- </pathelement>
Deleted: trunk/commons-math/debian/patches/04_no_home_dir.diff
===================================================================
--- trunk/commons-math/debian/patches/04_no_home_dir.diff 2009-08-14 09:46:27 UTC (rev 9973)
+++ trunk/commons-math/debian/patches/04_no_home_dir.diff 2009-08-14 09:48:11 UTC (rev 9974)
@@ -1,32 +0,0 @@
-Description: (build.xml) Don't use user.home as many buildd
- don't have a $HOME directory
-Author: Damien Raude-Morvan <drazzib at drazzib.com>
-Forwarded: not-needed
-Origin: vendor
-Last-Update: 2009-07-16
---- a/build.xml
-+++ b/build.xml
-@@ -8,14 +8,10 @@
-
- <property file="build.properties">
- </property>
-- <property file="${user.home}/build.properties">
-- </property>
- <!--Build properties-->
-
- <property name="defaulttargetdir" value="${basedir}/target">
- </property>
-- <property name="libdir" value="${user.home}/.maven/repository">
-- </property>
- <property name="classesdir" value="${basedir}/target/classes">
- </property>
- <property name="testclassesdir" value="${basedir}/target/test-classes">
-@@ -37,8 +33,6 @@
- <property name="proxy.password" value="">
- </property>
- <target name="init" description="o Initializes some properties">
-- <mkdir dir="${libdir}">
-- </mkdir>
- <condition property="noget">
- <equals arg2="only" arg1="${build.sysclasspath}">
- </equals>
Modified: trunk/commons-math/debian/patches/series
===================================================================
--- trunk/commons-math/debian/patches/series 2009-08-14 09:46:27 UTC (rev 9973)
+++ trunk/commons-math/debian/patches/series 2009-08-14 09:48:11 UTC (rev 9974)
@@ -1,4 +1 @@
-01_no_download_during_build.diff
02_no_tests_on_build.diff
-03_define_source_target_class_version.diff
-04_no_home_dir.diff
Modified: trunk/commons-math/debian/rules
===================================================================
--- trunk/commons-math/debian/rules 2009-08-14 09:46:27 UTC (rev 9973)
+++ trunk/commons-math/debian/rules 2009-08-14 09:48:11 UTC (rev 9974)
@@ -4,22 +4,25 @@
include /usr/share/cdbs/1/rules/patchsys-quilt.mk
include /usr/share/cdbs/1/class/ant.mk
-# Build using OpenJDK 6 because is really to slow
-# at math computation
-JAVA_HOME := /usr/lib/jvm/java-6-openjdk
-ANT_HOME := /usr/share/ant
-
+JAVA_HOME := /usr/lib/jvm/default-java
DEB_JARS := commons-discovery junit ant-junit
+PACKAGE := $(DEB_SOURCE_PACKAGE)
+
DEB_ANT_CLEAN_TARGET := clean
DEB_ANT_BUILD_TARGET := jar javadoc
-# Use "internal-test" won't fail the build on error
-DEB_ANT_CHECK_TARGET := internal-test
+DEB_ANT_CHECK_TARGET := test
# Per Debian Java Policy, install a versioned JAR and an unversioned symlink
-binary-post-install/lib$(DEB_SOURCE_PACKAGE)-java::
- dh_install target/$(DEB_SOURCE_PACKAGE)-$(DEB_UPSTREAM_VERSION).jar usr/share/java
- dh_link usr/share/java/$(DEB_SOURCE_PACKAGE)-$(DEB_UPSTREAM_VERSION).jar usr/share/java/$(DEB_SOURCE_PACKAGE).jar
+binary-post-install/lib$(PACKAGE)-java::
+ mh_installpoms -plib$(PACKAGE)-java
+ mh_installjar -plib$(PACKAGE)-java -l pom.xml target/$(PACKAGE)-$(DEB_UPSTREAM_VERSION).jar
+install/lib$(PACKAGE)-java-doc::
+ mv target/apidocs target/api
+
+clean::
+ -rm -rf debian/tmp
+
get-orig-source:
uscan --force-download --rename
More information about the pkg-java-commits
mailing list