apache-commons/UnpackedTarball_apache_commons_codec.mk | 4 ++
apache-commons/patches/codec.patch | 28 ++++++++---------
2 files changed, 18 insertions(+), 14 deletions(-)
New commits:
commit f0a29602b50418dd427e7bfa093d5671f33fa307
Author: Norbert Thiebaud <nthieb...@gmail.com>
Date: Thu Sep 27 08:10:02 2012 -0500
fix patch eol issue in apache_commons_codec
Change-Id: Ie03b654538fc18d02c33aadd7e99fe76b29bef56
diff --git a/apache-commons/UnpackedTarball_apache_commons_codec.mk
b/apache-commons/UnpackedTarball_apache_commons_codec.mk
index 2e7ae65..17d7e50 100644
--- a/apache-commons/UnpackedTarball_apache_commons_codec.mk
+++ b/apache-commons/UnpackedTarball_apache_commons_codec.mk
@@ -11,6 +11,10 @@ $(eval $(call
gb_UnpackedTarball_UnpackedTarball,apache_commons_codec))
$(eval $(call
gb_UnpackedTarball_set_tarball,apache_commons_codec,$(APACHE_COMMONS_CODEC_TARBALL)))
+$(eval $(call gb_UnpackedTarball_fix_end_of_line,apache_commons_codec,\
+ build.xml \
+))
+
$(eval $(call gb_UnpackedTarball_add_patches,apache_commons_codec,\
apache-commons/patches/codec.patch \
))
diff --git a/apache-commons/patches/codec.patch
b/apache-commons/patches/codec.patch
index dea25ad..ffbcb57 100644
--- a/apache-commons/patches/codec.patch
+++ b/apache-commons/patches/codec.patch
@@ -1,17 +1,17 @@
--- misc/build/commons-codec-1.3/build.xml-old 2008-01-31 15:28:58.000000000
+0100
+++ misc/build/commons-codec-1.3/build.xml 2008-01-31 15:29:21.000000000
+0100
@@ -90,14 +90,12 @@
- </target>
- <target name="dist" depends="compile,javadoc" description="Create binary
distribution">
- <mkdir dir="${dist.home}"/>
-- <copy file="../LICENSE" todir="${dist.home}"/>
- <copy file="${basedir}/RELEASE-NOTES.txt" todir="${dist.home}"/>
- <antcall target="jar"/>
- </target>
- <target name="jar" depends="compile" description="Create jar">
- <mkdir dir="${dist.home}"/>
- <mkdir dir="${build.home}/classes/META-INF"/>
-- <copy file="../LICENSE"
tofile="${build.home}/classes/META-INF/LICENSE.txt"/>
- <jar jarfile="${dist.home}/${final.name}.jar"
basedir="${build.home}/classes" manifest="${build.home}/conf/MANIFEST.MF"/>
- </target>
- <target name="install-jar" depends="jar" description="--> Installs jar
file in ${lib.repo}">
+ </target>
+ <target name="dist" depends="compile,javadoc" description="Create binary
distribution">
+ <mkdir dir="${dist.home}"/>
+- <copy file="../LICENSE" todir="${dist.home}"/>
+ <copy file="${basedir}/RELEASE-NOTES.txt" todir="${dist.home}"/>
+ <antcall target="jar"/>
+ </target>
+ <target name="jar" depends="compile" description="Create jar">
+ <mkdir dir="${dist.home}"/>
+ <mkdir dir="${build.home}/classes/META-INF"/>
+- <copy file="../LICENSE"
tofile="${build.home}/classes/META-INF/LICENSE.txt"/>
+ <jar jarfile="${dist.home}/${final.name}.jar"
basedir="${build.home}/classes" manifest="${build.home}/conf/MANIFEST.MF"/>
+ </target>
+ <target name="install-jar" depends="jar" description="--> Installs jar
file in ${lib.repo}">
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
