[pkg-java] r9360 - in trunk/commons-math/debian: . patches
Damien Raude-Morvan
drazzib-guest at alioth.debian.org
Thu Jul 16 15:27:14 UTC 2009
Author: drazzib-guest
Date: 2009-07-16 15:27:13 +0000 (Thu, 16 Jul 2009)
New Revision: 9360
Added:
trunk/commons-math/debian/README.source
trunk/commons-math/debian/patches/01_no_download_during_build.diff
trunk/commons-math/debian/patches/02_no_tests_on_build.diff
trunk/commons-math/debian/patches/03_define_source_target_class_version.diff
trunk/commons-math/debian/patches/series
Removed:
trunk/commons-math/debian/patches/00list
trunk/commons-math/debian/patches/01_no_download_during_build.dpatch
trunk/commons-math/debian/patches/02_no_tests_on_build.dpatch
trunk/commons-math/debian/patches/03_define_source_target_class_version.dpatch
Modified:
trunk/commons-math/debian/changelog
trunk/commons-math/debian/control
trunk/commons-math/debian/rules
Log:
[commons-math]
* Set Maintainer field to Debian Java Team
* Add myself as Uploaders
* Switch to Quilt patch system:
- Refresh all patches
- Remove B-D on dpatch, Add B-D on quilt
- Include patchsys-quilt.mk in debian/rules
* Bump Standards-Version to 3.8.2:
- Add a README.source to describe patch system
Added: trunk/commons-math/debian/README.source
===================================================================
--- trunk/commons-math/debian/README.source (rev 0)
+++ trunk/commons-math/debian/README.source 2009-07-16 15:27:13 UTC (rev 9360)
@@ -0,0 +1,9 @@
+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.
+
Modified: trunk/commons-math/debian/changelog
===================================================================
--- trunk/commons-math/debian/changelog 2009-07-15 18:39:45 UTC (rev 9359)
+++ trunk/commons-math/debian/changelog 2009-07-16 15:27:13 UTC (rev 9360)
@@ -1,3 +1,16 @@
+commons-math (1.2-2) UNRELEASED; urgency=low
+
+ * Set Maintainer field to Debian Java Team
+ * Add myself as Uploaders
+ * Switch to Quilt patch system:
+ - Refresh all patchs
+ - Remove B-D on dpatch, Add B-D on quilt
+ - Include patchsys-quilt.mk in debian/rules
+ * Bump Standards-Version to 3.8.2:
+ - Add a README.source to describe patch system
+
+ -- Damien Raude-Morvan <drazzib at drazzib.com> Thu, 16 Jul 2009 17:21:48 +0200
+
commons-math (1.2-1) unstable; urgency=low
* Initial release. (Closes: #506987)
Modified: trunk/commons-math/debian/control
===================================================================
--- trunk/commons-math/debian/control 2009-07-15 18:39:45 UTC (rev 9359)
+++ trunk/commons-math/debian/control 2009-07-16 15:27:13 UTC (rev 9360)
@@ -1,6 +1,7 @@
Source: commons-math
-Maintainer: Damien Raude-Morvan <drazzib at drazzib.com>
-Standards-Version: 3.8.1
+Maintainer: Debian Java maintainers <pkg-java-maintainers at lists.alioth.debian.org>
+Uploaders: Damien Raude-Morvan <drazzib at drazzib.com>
+Standards-Version: 3.8.2
Section: java
Priority: optional
Build-Depends: openjdk-6-jdk, ant, debhelper (>= 5), cdbs, dpatch
Deleted: trunk/commons-math/debian/patches/00list
===================================================================
--- trunk/commons-math/debian/patches/00list 2009-07-15 18:39:45 UTC (rev 9359)
+++ trunk/commons-math/debian/patches/00list 2009-07-16 15:27:13 UTC (rev 9360)
@@ -1,4 +0,0 @@
-01_no_download_during_build
-02_no_tests_on_build
-03_define_source_target_class_version
-
Added: trunk/commons-math/debian/patches/01_no_download_during_build.diff
===================================================================
--- trunk/commons-math/debian/patches/01_no_download_during_build.diff (rev 0)
+++ trunk/commons-math/debian/patches/01_no_download_during_build.diff 2009-07-16 15:27:13 UTC (rev 9360)
@@ -0,0 +1,83 @@
+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>
Deleted: trunk/commons-math/debian/patches/01_no_download_during_build.dpatch
===================================================================
--- trunk/commons-math/debian/patches/01_no_download_during_build.dpatch 2009-07-15 18:39:45 UTC (rev 9359)
+++ trunk/commons-math/debian/patches/01_no_download_during_build.dpatch 2009-07-16 15:27:13 UTC (rev 9360)
@@ -1,86 +0,0 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 01_no_download_during_build.dpatch by Damien Raude-Morvan <drazzib at drazzib.com>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: build.xml: don't download JAR from internet on 'compile' or 'javadoc' targets.
-
- at DPATCH@
-diff -urNad trunk~/build.xml trunk/build.xml
---- trunk~/build.xml 2008-02-18 06:53:39.000000000 +0100
-+++ trunk/build.xml 2008-11-03 20:06:41.000000000 +0100
-@@ -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>
Added: trunk/commons-math/debian/patches/02_no_tests_on_build.diff
===================================================================
--- trunk/commons-math/debian/patches/02_no_tests_on_build.diff (rev 0)
+++ trunk/commons-math/debian/patches/02_no_tests_on_build.diff 2009-07-16 15:27:13 UTC (rev 9360)
@@ -0,0 +1,17 @@
+Description: build.xml: don't run test directly after build
+ as per Java Policy: "Failing tests MUST not lead to a failing build."
+Author: Damien Raude-Morvan <drazzib at drazzib.com>
+Forwarded: not-needed
+Origin: vendor
+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>
Deleted: trunk/commons-math/debian/patches/02_no_tests_on_build.dpatch
===================================================================
--- trunk/commons-math/debian/patches/02_no_tests_on_build.dpatch 2009-07-15 18:39:45 UTC (rev 9359)
+++ trunk/commons-math/debian/patches/02_no_tests_on_build.dpatch 2009-07-16 15:27:13 UTC (rev 9360)
@@ -1,20 +0,0 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 02_no_tests_on_build.dpatch by Damien Raude-Morvan <drazzib at drazzib.com>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: build.xml: don't run test directly after build
-## DP: as per Java Policy: "Failing tests MUST not lead to a failing build."
-
- at DPATCH@
-diff -urNad trunk~/build.xml trunk/build.xml
---- trunk~/build.xml 2008-02-18 06:53:39.000000000 +0100
-+++ trunk/build.xml 2008-10-26 19:21:13.000000000 +0100
-@@ -88,7 +88,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>
Added: trunk/commons-math/debian/patches/03_define_source_target_class_version.diff
===================================================================
--- trunk/commons-math/debian/patches/03_define_source_target_class_version.diff (rev 0)
+++ trunk/commons-math/debian/patches/03_define_source_target_class_version.diff 2009-07-16 15:27:13 UTC (rev 9360)
@@ -0,0 +1,27 @@
+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/03_define_source_target_class_version.dpatch
===================================================================
--- trunk/commons-math/debian/patches/03_define_source_target_class_version.dpatch 2009-07-15 18:39:45 UTC (rev 9359)
+++ trunk/commons-math/debian/patches/03_define_source_target_class_version.dpatch 2009-07-16 15:27:13 UTC (rev 9360)
@@ -1,30 +0,0 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 03_define_source_target_class_version.dpatch by Damien Raude-Morvan <drazzib at drazzib.com>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: build.xml: force -source AND -target at 1.3 class format version.
-
- at DPATCH@
-diff -urNad trunk~/build.xml trunk/build.xml
---- trunk~/build.xml 2008-11-03 20:13:19.000000000 +0100
-+++ trunk/build.xml 2008-11-03 20:13:40.000000000 +0100
-@@ -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>
Added: trunk/commons-math/debian/patches/series
===================================================================
--- trunk/commons-math/debian/patches/series (rev 0)
+++ trunk/commons-math/debian/patches/series 2009-07-16 15:27:13 UTC (rev 9360)
@@ -0,0 +1,3 @@
+01_no_download_during_build.diff
+02_no_tests_on_build.diff
+03_define_source_target_class_version.diff
Modified: trunk/commons-math/debian/rules
===================================================================
--- trunk/commons-math/debian/rules 2009-07-15 18:39:45 UTC (rev 9359)
+++ trunk/commons-math/debian/rules 2009-07-16 15:27:13 UTC (rev 9360)
@@ -1,7 +1,7 @@
#!/usr/bin/make -f
include /usr/share/cdbs/1/rules/debhelper.mk
-include /usr/share/cdbs/1/rules/dpatch.mk
+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
More information about the pkg-java-commits
mailing list