[SCM] davmail packaging branch, master, updated. debian/4.1.0-2042-1_pre+1-15-ga4fbf3b
Matthias Schmitz
matthias at sigxcpu.org
Sat Apr 13 01:18:16 UTC 2013
The following commit has been merged in the master branch:
commit a42b60244859b8d4fd81e8041bc3b2117a47380c
Author: Matthias Schmitz <matthias at sigxcpu.org>
Date: Sat Apr 13 02:45:46 2013 +0200
Rework fixes for build.xml
diff --git a/debian/patches/0001-Set-classpath-add-target-davmail-lib.patch b/debian/patches/0001-Set-classpath-add-target-davmail-lib.patch
new file mode 100644
index 0000000..c492aae
--- /dev/null
+++ b/debian/patches/0001-Set-classpath-add-target-davmail-lib.patch
@@ -0,0 +1,85 @@
+From bdbe421520ef651516e72a9e2e053fc70357d513 Mon Sep 17 00:00:00 2001
+From: Matthias Schmitz <matthias at sigxcpu.org>
+Date: Sat, 13 Apr 2013 00:51:23 +0200
+Subject: [PATCH] Set classpath, add target davmail-lib
+
+---
+ build.xml | 43 ++++++++++++++++---------------------------
+ 1 file changed, 16 insertions(+), 27 deletions(-)
+
+diff --git a/build.xml b/build.xml
+index 5fec007..3216781 100644
+--- a/build.xml
++++ b/build.xml
+@@ -3,10 +3,17 @@
+ <property name="version" value="4.2.1"/>
+
+ <path id="classpath">
+- <pathelement location="classes"/>
+- <fileset dir="lib">
+- <include name="*.jar"/>
+- </fileset>
++ <pathelement location="${commons-codec}" />
++ <pathelement location="${servlet-api}" />
++ <pathelement location="${commons-httpclient}" />
++ <pathelement location="${htmlcleaner}" />
++ <pathelement location="${gnumail}" />
++ <pathelement location="${jcifs}" />
++ <pathelement location="${jackrabbit-webdav}" />
++ <pathelement location="${woodstox-core}" />
++ <pathelement location="${stax2-api}" />
++ <pathelement location="${swt}" />
++ <pathelement location="${slf4j-api}" />
+ </path>
+
+ <target name="clean">
+@@ -245,34 +252,13 @@
+ </target>
+
+
+- <target name="dist" depends="compile">
++ <target name="davmail-lib" depends="compile">
+ <property name="release-name" value="${release}-trunk"/>
+ <delete dir="dist"/>
+ <mkdir dir="dist"/>
+ <echo file="dist/version.txt" message="${release}"/>
+ <pathconvert property="manifest-classpath" pathsep=" ">
+- <mapper>
+- <chainedmapper>
+- <!-- remove absolute path -->
+- <flattenmapper/>
+- <globmapper from="*" to="lib/*"/>
+- </chainedmapper>
+- </mapper>
+- <path>
+- <fileset dir="lib">
+- <include name="*.jar"/>
+- <exclude name="ant-deb*.jar"/>
+- <exclude name="jarbundler-*.jar"/>
+- <exclude name="jsmoothgen-ant-*.jar"/>
+- <exclude name="junit-*.jar"/>
+- <exclude name="libgrowl-*.jar"/>
+- <exclude name="nsisant-*.jar"/>
+- <exclude name="redline-*.jar"/>
+- <exclude name="servlet-api-*.jar"/>
+- <exclude name="swt-*.jar"/>
+- <exclude name="winrun4j-*.jar"/>
+- </fileset>
+- </path>
++ <path refid="classpath"/>
+ </pathconvert>
+ <jar basedir="target/classes" destfile="dist/davmail.jar">
+ <manifest>
+@@ -285,6 +271,9 @@
+ </section>
+ </manifest>
+ </jar>
++ </target>
++
++ <target name="dist" depends="compile, davmail-lib">
+ <copy todir="dist/lib">
+ <fileset dir="lib">
+ <include name="*.jar"/>
+--
+1.7.10.4
+
diff --git a/debian/patches/fix-build b/debian/patches/fix-build
deleted file mode 100644
index 7456d03..0000000
--- a/debian/patches/fix-build
+++ /dev/null
@@ -1,108 +0,0 @@
-Description: Use system libraries in the build system and disable windows dist
-Forwarded: no
-Author: Alexandre Rossi <alexandre.rossi at gmail.com>
-
-Index: davmail.git/build.xml
-===================================================================
---- davmail.git.orig/build.xml 2012-10-01 13:55:07.000000000 +0200
-+++ davmail.git/build.xml 2012-10-01 13:55:41.281892760 +0200
-@@ -3,10 +3,17 @@
- <property name="version" value="4.1.0"/>
-
- <path id="classpath">
-- <pathelement location="classes"/>
-- <fileset dir="lib">
-- <include name="*.jar"/>
-- </fileset>
-+ <pathelement location="${commons-codec}" />
-+ <pathelement location="${servlet-api}" />
-+ <pathelement location="${commons-httpclient}" />
-+ <pathelement location="${htmlcleaner}" />
-+ <pathelement location="${gnumail}" />
-+ <pathelement location="${jcifs}" />
-+ <pathelement location="${jackrabbit-webdav}" />
-+ <pathelement location="${woodstox-core}" />
-+ <pathelement location="${stax2-api}" />
-+ <pathelement location="${swt}" />
-+ <pathelement location="${slf4j-api}" />
- </path>
-
- <target name="clean">
-@@ -62,7 +69,7 @@
- <mkdir dir="target/classes"/>
- <javac srcdir="src/java" destdir="target/classes" source="1.5" target="1.5" debug="on" encoding="UTF-8"
- excludes="davmail/service/DavService.java,
-- src/java/davmail/ui/tray/OSX*.java"
-+ davmail/ui/tray/OSX*.java"
- includeantruntime="false">
- <classpath>
- <path refid="classpath"/>
-@@ -238,35 +245,13 @@
-
- </target>
-
--
-- <target name="dist" depends="compile">
-+ <target name="davmail-lib" depends="compile">
- <property name="release-name" value="${release}-trunk"/>
- <delete dir="dist"/>
- <mkdir dir="dist"/>
- <echo file="dist/version.txt" message="${release}"/>
- <pathconvert property="manifest-classpath" pathsep=" ">
-- <mapper>
-- <chainedmapper>
-- <!-- remove absolute path -->
-- <flattenmapper/>
-- <globmapper from="*" to="lib/*"/>
-- </chainedmapper>
-- </mapper>
-- <path>
-- <fileset dir="lib">
-- <include name="*.jar"/>
-- <exclude name="ant-deb*.jar"/>
-- <exclude name="jarbundler-*.jar"/>
-- <exclude name="jsmoothgen-ant-*.jar"/>
-- <exclude name="junit-*.jar"/>
-- <exclude name="libgrowl-*.jar"/>
-- <exclude name="nsisant-*.jar"/>
-- <exclude name="redline-*.jar"/>
-- <exclude name="servlet-api-*.jar"/>
-- <exclude name="swt-*.jar"/>
-- <exclude name="winrun4j-*.jar"/>
-- </fileset>
-- </path>
-+ <path refid="classpath"/>
- </pathconvert>
- <jar basedir="target/classes" destfile="dist/davmail.jar">
- <manifest>
-@@ -279,6 +264,10 @@
- </section>
- </manifest>
- </jar>
-+ </target>
-+
-+ <target name="dist" depends="compile, davmail-lib">
-+ <property name="release-name" value="${release}-trunk"/>
- <copy todir="dist/lib">
- <fileset dir="lib">
- <include name="*.jar"/>
-Index: davmail.git/build.properties
-===================================================================
---- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ davmail.git/build.properties 2012-10-01 13:55:41.297891915 +0200
-@@ -0,0 +1,15 @@
-+# Build flags
-+windows-dist = yes
-+
-+# Deps
-+commons-codec = lib/commons-codec-1.3.jar
-+servlet-api = lib/servlet-api.jar
-+commons-httpclient = lib/commons-httpclient-3.1.jar
-+htmlcleaner = lib/htmlcleaner-2.1.jar
-+gnumail = lib/mail-1.4.3.jar
-+jcifs = lib/jcifs-1.3.14.jar
-+jackrabbit-webdav = lib/jackrabbit-webdav-1.4.jar
-+woodstox-core = lib/woodstox-core-asl-4.1.2.jar
-+stax2-api = lib/stax2-api-3.1.1.jar
-+swt = lib/swt-3.7-*.jar
-+slf4j-api = lib/slf4j-api-1.3.1.jar
--
davmail packaging
More information about the pkg-java-commits
mailing list