[bouncycastle] 03/08: Refreshed the patches
Emmanuel Bourg
ebourg-guest at moszumanska.debian.org
Thu Apr 28 22:27:14 UTC 2016
This is an automated email from the git hooks/post-receive script.
ebourg-guest pushed a commit to branch master
in repository bouncycastle.
commit 8028d2acb66369a874aee788fb972f99ebc6821d
Author: Emmanuel Bourg <ebourg at apache.org>
Date: Thu Apr 28 23:32:19 2016 +0200
Refreshed the patches
---
debian/changelog | 8 ++++++++
debian/patches/fix-encoding.patch | 16 +++++++---------
2 files changed, 15 insertions(+), 9 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index a343a64..fd6f740 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+bouncycastle (1.54-1) UNRELEASED; urgency=medium
+
+ * Team upload.
+ * New upstream release
+ - Refreshed the patches
+
+ -- Emmanuel Bourg <ebourg at apache.org> Thu, 28 Apr 2016 17:25:04 +0200
+
bouncycastle (1.51-4) unstable; urgency=medium
* Team upload.
diff --git a/debian/patches/fix-encoding.patch b/debian/patches/fix-encoding.patch
index 90ef339..c1308a0 100644
--- a/debian/patches/fix-encoding.patch
+++ b/debian/patches/fix-encoding.patch
@@ -10,11 +10,9 @@ Bug: https://bugs.debian.org/798343
ant/bc+-build.xml | 12 ++++++++----
1 file changed, 8 insertions(+), 4 deletions(-)
-diff --git a/ant/bc+-build.xml b/ant/bc+-build.xml
-index 8b6778f..1406026 100644
--- a/ant/bc+-build.xml
+++ b/ant/bc+-build.xml
-@@ -101,7 +101,8 @@
+@@ -100,7 +100,8 @@
<javac source="${bc.javac.source}" target="${bc.javac.target}"
srcdir="${artifacts.dir}/@{target}/src"
destdir="${build.dir}/@{target}/classes"
@@ -24,7 +22,7 @@ index 8b6778f..1406026 100644
<classpath>
<path refid="project.classpath" />
<fileset dir="${artifacts.jars.dir}">
-@@ -137,7 +138,8 @@
+@@ -136,7 +137,8 @@
<javac source="${bc.javac.source}" target="${bc.javac.target}"
srcdir="${artifacts.dir}/@{target}/src"
destdir="${build.dir}/@{target}/classes"
@@ -34,7 +32,7 @@ index 8b6778f..1406026 100644
<classpath>
<path refid="project.classpath" />
<fileset dir="${artifacts.jars.dir}">
-@@ -204,7 +206,8 @@
+@@ -211,7 +213,8 @@
<javadoc maxmemory="384m" sourcepath="@{srcDir}"
destdir="@{docsDir}"
windowtitle="Bouncy Castle Library ${release.name} API Specification"
@@ -44,13 +42,13 @@ index 8b6778f..1406026 100644
<docElements/>
<arg value="${javadoc.args}" />
<classpath>
-@@ -268,7 +271,8 @@
+@@ -273,7 +276,8 @@
<javac source="${bc.javac.source}" target="${bc.javac.target}"
srcdir="${lcrypto.target.src.dir}"
destdir="${lcrypto.target.classes.dir}"
- debug="${release.debug}">
+ debug="${release.debug}"
+ encoding="UTF-8">
- </javac>
- </target>
-
+ <classpath>
+ <path refid="project.classpath" />
+ </classpath>
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/bouncycastle.git
More information about the pkg-java-commits
mailing list