[bnd] 04/17: Drop fix-encoding.patch and use ant.properties file for setting the encoding.

[Markus Koschany]

This is an automated email from the git hooks/post-receive script.

apo-guest pushed a commit to branch master
in repository bnd.

commit 5f697253a717f94980f1c238071bf04848acd473
Author: Markus Koschany <apo at gambaru.de>
Date:   Mon May 18 14:40:07 2015 +0200

    Drop fix-encoding.patch and use ant.properties file for setting the encoding.
---
 debian/ant.properties             |  1 +
 debian/changelog                  |  2 ++
 debian/patches/fix-encoding.patch | 21 ---------------------
 debian/patches/series             |  1 -
 4 files changed, 3 insertions(+), 22 deletions(-)

diff --git a/debian/ant.properties b/debian/ant.properties
index 15c17a0..013a9be 100644
--- a/debian/ant.properties
+++ b/debian/ant.properties
@@ -3,3 +3,4 @@ javac.excludes=**/aQute/bnd/junit/*.java
 # For backwards compat on Java 7
 ant.build.javac.source=1.5
 ant.build.javac.target=1.5
+java.encoding="UTF-8"
diff --git a/debian/changelog b/debian/changelog
index 6729c98..e5b3ff6 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -14,6 +14,8 @@ bnd (2.1.0-1) experimental; urgency=medium
     - find_swt_jar.diff
     - java8-compatibility.diff
     - osgi43_fixes.diff
+  * Drop fix-encoding.patch and use ant.properties file for setting the
+    encoding instead.
   * Use patch extension instead of diff for patches.
   * New patches:
    -  no-ee.j2se.patch
diff --git a/debian/patches/fix-encoding.patch b/debian/patches/fix-encoding.patch
deleted file mode 100644
index 374d101..0000000
--- a/debian/patches/fix-encoding.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-From: Debian Java Maintainers <pkg-java-maintainers at lists.alioth.debian.org>
-Date: Thu, 14 May 2015 13:17:37 +0200
-Subject: fix-encoding
-
----
- cnf/build.xml | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/cnf/build.xml b/cnf/build.xml
-index 9bca47d..44d9552 100644
---- a/cnf/build.xml
-+++ b/cnf/build.xml
-@@ -75,7 +75,7 @@
- 	-->
- 	<target name="compile" depends="dependencies" if="project.sourcepath">
- 		<mkdir dir="${project.output}" />
--		<javac fork="yes" executable="${javac}" srcdir="${project.sourcepath}" destdir="${project.output}" classpath="${project.buildpath}" bootclasspath="${project.bootclasspath}" deprecation="true" listfiles="true" target="${javac.target}" source="${javac.source}" debug="${javac.debug}" includeAntRuntime="no" verbose="${verbose}" excludes="${javac.excludes}" />
-+		<javac fork="yes" executable="${javac}" srcdir="${project.sourcepath}" destdir="${project.output}" classpath="${project.buildpath}" bootclasspath="${project.bootclasspath}" deprecation="true" listfiles="true" target="${javac.target}" source="${javac.source}" debug="${javac.debug}" includeAntRuntime="no" verbose="${verbose}" excludes="${javac.excludes}" encoding="UTF-8"/>
- 		<!-- 
- 		  The eclipse compiler copies resources but the Javac compiler does not
- 		  If ${src} == ${bin} then this is not necessary, but unfortunately, now 
diff --git a/debian/patches/series b/debian/patches/series
index 5856851..0b5d915 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -3,7 +3,6 @@ no_ee_minimum.patch
 no_felix.patch
 no_git_during_build.patch
 display_bsn_on_missing_bundle.patch
-fix-encoding.patch
 no-ee.j2se.patch
 no-osgi.r5.patch
 findbugs.patch

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/bnd.git