[SCM] davmail packaging branch, master, updated. upstream/4.1.0-2042-12-g05ed109

Alexandre Rossi alexandre.rossi at gmail.com
Mon Oct 1 11:57:46 UTC 2012


The following commit has been merged in the master branch:
commit 05ed10946e4079586c68f50d40a936e3b5b1c6fd
Author: Alexandre Rossi <alexandre.rossi at gmail.com>
Date:   Mon Oct 1 13:57:17 2012 +0200

    refresh fix-build patch

diff --git a/debian/patches/fix-build b/debian/patches/fix-build
index d199754..7456d03 100644
--- a/debian/patches/fix-build
+++ b/debian/patches/fix-build
@@ -2,12 +2,12 @@ Description: Use system libraries in the build system and disable windows dist
 Forwarded: no
 Author: Alexandre Rossi <alexandre.rossi at gmail.com>
 
-Index: davmail-src-4.0.0-2016/build.xml
+Index: davmail.git/build.xml
 ===================================================================
---- davmail-src-4.0.0-2016.orig/build.xml	2012-09-14 15:51:01.894386526 +0200
-+++ davmail-src-4.0.0-2016/build.xml	2012-09-30 20:33:10.618922857 +0200
+--- 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.0.0"/>
+     <property name="version" value="4.1.0"/>
  
      <path id="classpath">
 -        <pathelement location="classes"/>
@@ -28,7 +28,7 @@ Index: davmail-src-4.0.0-2016/build.xml
      </path>
  
      <target name="clean">
-@@ -59,7 +66,7 @@
+@@ -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,
@@ -37,7 +37,7 @@ Index: davmail-src-4.0.0-2016/build.xml
                 includeantruntime="false">
              <classpath>
                  <path refid="classpath"/>
-@@ -232,35 +239,13 @@
+@@ -238,35 +245,13 @@
  
      </target>
  
@@ -75,7 +75,7 @@ Index: davmail-src-4.0.0-2016/build.xml
          </pathconvert>
          <jar basedir="target/classes" destfile="dist/davmail.jar">
              <manifest>
-@@ -273,6 +258,10 @@
+@@ -279,6 +264,10 @@
                  </section>
              </manifest>
          </jar>
@@ -86,10 +86,10 @@ Index: davmail-src-4.0.0-2016/build.xml
          <copy todir="dist/lib">
              <fileset dir="lib">
                  <include name="*.jar"/>
-Index: davmail-src-4.0.0-2016/build.properties
+Index: davmail.git/build.properties
 ===================================================================
 --- /dev/null	1970-01-01 00:00:00.000000000 +0000
-+++ davmail-src-4.0.0-2016/build.properties	2012-09-30 20:32:36.330921201 +0200
++++ davmail.git/build.properties	2012-10-01 13:55:41.297891915 +0200
 @@ -0,0 +1,15 @@
 +# Build flags
 +windows-dist = yes

-- 
davmail packaging



More information about the pkg-java-commits mailing list