This is an automated email from the git hooks/post-receive script. ben pushed a commit to branch master in repository rsyntaxtextarea.
commit 4f4aefa53d40e97dfd4633f51f50b8dd5e36a746 Author: Benjamin Mesing <[email protected]> Date: Mon Sep 23 21:26:20 2013 +0200 - switch from quilt-native to gbp pq --- ...build-process.patch => 0001-build-process.patch} | 19 +++++++++++-------- ...02-20-fix-IOException-jdk5-compiler-error.patch} | 12 +++++++++++- debian/patches/series | 4 ++-- 3 files changed, 24 insertions(+), 11 deletions(-) diff --git a/debian/patches/build-process.patch b/debian/patches/0001-build-process.patch similarity index 73% rename from debian/patches/build-process.patch rename to debian/patches/0001-build-process.patch index be80dbb..9b1582a 100644 --- a/debian/patches/build-process.patch +++ b/debian/patches/0001-build-process.patch @@ -1,13 +1,16 @@ -Description: Changes in the build process to perform clean and build - the javadoc linked to default-jdk-doc. -Author: Vladimir Kotov <[email protected]> -Bug-Debian: http://bugs.debian.org/613585 -Forwarded: not-needed -Last-Update: 2011-03-16 +From: Debian Java Maintainers <[email protected]> +Date: Mon, 23 Sep 2013 21:12:52 +0200 +Subject: build-process +--- + build.xml | 10 ++++++++-- + 1 file changed, 8 insertions(+), 2 deletions(-) + +diff --git a/build.xml b/build.xml +index 0d47079..37e6cf4 100644 --- a/build.xml +++ b/build.xml -@@ -44,7 +44,7 @@ +@@ -50,7 +50,7 @@ <!-- Creates the jar file. --> @@ -16,7 +19,7 @@ Last-Update: 2011-03-16 description="Create RSyntaxTextArea jar"> <delete includeEmptyDirs="true" quiet="true" dir="${dist-dir}"/> <mkdir dir="${dist-dir}"/> -@@ -92,12 +92,18 @@ +@@ -105,12 +105,18 @@ <!-- Builds the javadoc. --> <target name="make-javadoc" depends="compile"> <javadoc destdir="${doc-dir}" author="true" version="true" diff --git a/debian/patches/20-fix-IOException-jdk5-compiler-error.patch b/debian/patches/0002-20-fix-IOException-jdk5-compiler-error.patch similarity index 54% rename from debian/patches/20-fix-IOException-jdk5-compiler-error.patch rename to debian/patches/0002-20-fix-IOException-jdk5-compiler-error.patch index 992c31d..73c7728 100644 --- a/debian/patches/20-fix-IOException-jdk5-compiler-error.patch +++ b/debian/patches/0002-20-fix-IOException-jdk5-compiler-error.patch @@ -1,6 +1,16 @@ +From: Debian Java Maintainers <[email protected]> +Date: Mon, 23 Sep 2013 21:12:52 +0200 +Subject: 20-fix-IOException-jdk5-compiler-error + +--- + src/org/fife/ui/rsyntaxtextarea/parser/XmlParser.java | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +diff --git a/src/org/fife/ui/rsyntaxtextarea/parser/XmlParser.java b/src/org/fife/ui/rsyntaxtextarea/parser/XmlParser.java +index 7ac405b..de956be 100644 --- a/src/org/fife/ui/rsyntaxtextarea/parser/XmlParser.java +++ b/src/org/fife/ui/rsyntaxtextarea/parser/XmlParser.java -@@ -205,8 +205,9 @@ +@@ -205,8 +205,9 @@ public class XmlParser extends AbstractParser { // NOTE: If you compile with Java 5+, you must add IOException to the // throws clause of this method. The "official" release is built with // Java 1.4. diff --git a/debian/patches/series b/debian/patches/series index 3e6bd47..b1565ff 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -1,2 +1,2 @@ -build-process.patch -20-fix-IOException-jdk5-compiler-error.patch +0001-build-process.patch +0002-20-fix-IOException-jdk5-compiler-error.patch -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/rsyntaxtextarea.git _______________________________________________ pkg-java-commits mailing list [email protected] http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-commits
