[rsyntaxtextarea] 03/03: - droped patch for java5 compilation (incorporated upstream) - updated README.source

[Benjamin Mesing]

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

ben pushed a commit to branch master
in repository rsyntaxtextarea.

commit d1de0793403f85d912050788fa8364b8ab14582a
Author: Benjamin Mesing <bensmail at gmx.net>
Date:   Sun Oct 20 22:02:58 2013 +0200

    - droped patch for java5 compilation (incorporated upstream)
    - updated README.source
---
 debian/README.source                               |   10 +++++++++
 ...0001-Fix-source-for-compiling-with-Java-6.patch |   23 --------------------
 ...d-build.xml-for-debian-specific-settings.patch} |    6 ++---
 debian/patches/series                              |    3 +--
 4 files changed, 14 insertions(+), 28 deletions(-)

diff --git a/debian/README.source b/debian/README.source
index 3bce570..d6d6439 100644
--- a/debian/README.source
+++ b/debian/README.source
@@ -7,3 +7,13 @@ This package uses a git version control system as described in
 http://wiki.debian.org/Java/JavaVcs and the pages linked from there.
 Specifically git-build-package is used for version control and patch 
 management.
+
+Workflow for new upstream:
+# download new upstream version
+uscan
+# import upstream version into git repo
+gbp import-orig ../rsyntaxtextarea_2.5.0.orig.tar.gz
+# switch to patch-queue branch an reapply patches
+gbp-pq rebase
+# recreated debian/patches and switch back to master
+gbp-pq export
diff --git a/debian/patches/0001-Fix-source-for-compiling-with-Java-6.patch b/debian/patches/0001-Fix-source-for-compiling-with-Java-6.patch
deleted file mode 100644
index b767e07..0000000
--- a/debian/patches/0001-Fix-source-for-compiling-with-Java-6.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-From: Benjamin Mesing <bensmail at gmx.net>
-Date: Mon, 7 Oct 2013 21:09:27 +0200
-Subject: Fix source for compiling with Java >= 6
-
----
- 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 @@ 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.
-+		// BM-debianisation: added throws clause to fix compiler error
- 		public InputSource resolveEntity(String publicId, String systemId)
--								throws SAXException {
-+								throws SAXException, IOException {
- 			if (entityResolver!=null) {
- 				try {
- 					return entityResolver.resolveEntity(publicId, systemId);
diff --git a/debian/patches/0002-Modified-build.xml-for-debian-specific-settings.patch b/debian/patches/0001-Modified-build.xml-for-debian-specific-settings.patch
similarity index 93%
rename from debian/patches/0002-Modified-build.xml-for-debian-specific-settings.patch
rename to debian/patches/0001-Modified-build.xml-for-debian-specific-settings.patch
index d780cb7..6bbd0e5 100644
--- a/debian/patches/0002-Modified-build.xml-for-debian-specific-settings.patch
+++ b/debian/patches/0001-Modified-build.xml-for-debian-specific-settings.patch
@@ -9,10 +9,10 @@ Subject: =?UTF-8?q?Modified=20build.xml=20for=20debian=20specific=20settin?=
  1 file changed, 8 insertions(+), 2 deletions(-)
 
 diff --git a/build.xml b/build.xml
-index 0d47079..37e6cf4 100644
+index e118d20..229e5c6 100644
 --- a/build.xml
 +++ b/build.xml
-@@ -50,7 +50,7 @@
+@@ -45,7 +45,7 @@
  
  
  	<!-- Creates the jar file. -->
@@ -21,7 +21,7 @@ index 0d47079..37e6cf4 100644
  			description="Create RSyntaxTextArea jar">
  		<delete includeEmptyDirs="true" quiet="true" dir="${dist-dir}"/>
  		<mkdir dir="${dist-dir}"/>
-@@ -105,12 +105,18 @@
+@@ -100,12 +100,18 @@
  	<!-- Builds the javadoc.  -->
  	<target name="make-javadoc" depends="compile">
  		<javadoc  destdir="${doc-dir}" author="true" version="true"
diff --git a/debian/patches/series b/debian/patches/series
index 9bfe000..f188c3e 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1 @@
-0001-Fix-source-for-compiling-with-Java-6.patch
-0002-Modified-build.xml-for-debian-specific-settings.patch
+0001-Modified-build.xml-for-debian-specific-settings.patch

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