The following commit has been merged in the master branch:
commit d4e22113c6d9a597173553d91368c4c1097bc906
Author: David Paleino <da...@debian.org>
Date: Wed May 5 23:45:03 2010 +0200
debian/patches/00-fix_readme_in_about.patch removed, merged upstream
diff --git a/debian/changelog b/debian/changelog
index fdd9d28..1200485 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -9,8 +9,9 @@ gpsprune (10-1) UNRELEASED; urgency=low
* debian/rules:
- added srtmtiles target; re-build the srtmtiles.dat binary file
at build-time
+ * debian/patches/00-fix_readme_in_about.patch removed, merged upstream
- -- David Paleino <da...@debian.org> Wed, 05 May 2010 23:42:21 +0200
+ -- David Paleino <da...@debian.org> Wed, 05 May 2010 23:44:52 +0200
gpsprune (9-2) unstable; urgency=low
diff --git a/debian/patches/00-fix_readme_in_about.patch
b/debian/patches/00-fix_readme_in_about.patch
deleted file mode 100644
index cbabeaa..0000000
--- a/debian/patches/00-fix_readme_in_about.patch
+++ /dev/null
@@ -1,71 +0,0 @@
-From: David Paleino <da...@debian.org>
-Subject: read the text needed for the About Screen from the installed
- readme.txt.gz rather than from the one embedded in the .jar (missing
- in the Debian one)
-Forwarded: no
-
----
- tim/prune/function/AboutScreen.java | 40
+++++++++++++++++++++++++++++++-----
- 1 file changed, 35 insertions(+), 5 deletions(-)
-
---- gpsprune.orig/tim/prune/function/AboutScreen.java
-+++ gpsprune/tim/prune/function/AboutScreen.java
-@@ -11,7 +11,12 @@ import java.awt.event.ActionEvent;
- import java.awt.event.ActionListener;
- import java.awt.event.KeyEvent;
- import java.awt.event.KeyListener;
-+
- import java.io.InputStream;
-+import java.io.FileInputStream;
-+import java.io.ByteArrayOutputStream;
-+import java.io.OutputStream;
-+import java.util.zip.GZIPInputStream;
-
- import javax.swing.BorderFactory;
- import javax.swing.BoxLayout;
-@@ -283,15 +288,40 @@ public class AboutScreen extends Generic
- {
- // For some reason using ../readme.txt doesn't work, so
need absolute path
- InputStream in =
AboutScreen.class.getResourceAsStream("/tim/prune/readme.txt");
-- if (in != null) {
-- byte[] buffer = new byte[in.available()];
-- in.read(buffer);
-- return new String(buffer);
-- }
-+
-+ byte[] buffer = new byte[in.available()];
-+ in.read(buffer);
-+ return new String(buffer);
- }
- catch (java.io.IOException e) {
- System.err.println("Exception trying to get readme : "
+ e.getMessage());
- }
-+ catch (java.lang.NullPointerException e) {
-+ GZIPInputStream in = null;
-+ OutputStream out = null;
-+
-+ try {
-+ String readme =
"/usr/share/doc/gpsprune/readme.txt.gz";
-+ in = new GZIPInputStream(new
FileInputStream(readme));
-+ out = new ByteArrayOutputStream();
-+ String ret = "";
-+
-+ byte[] buffer = new byte[8 * 1024];
-+ int count = 0;
-+ do {
-+ out.write(buffer, 0, count);
-+ count = in.read(buffer, 0,
buffer.length);
-+ } while (count != -1);
-+
-+ ret = out.toString();
-+ out.close();
-+ in.close();
-+ return ret;
-+ }
-+ catch (java.io.IOException ex) {
-+ System.err.println("Exception trying to get
readme : " + ex.getMessage());
-+ }
-+ }
- return I18nManager.getText("error.readme.notfound");
- }
-
diff --git a/debian/patches/series b/debian/patches/series
deleted file mode 100644
index cb27725..0000000
--- a/debian/patches/series
+++ /dev/null
@@ -1 +0,0 @@
-00-fix_readme_in_about.patch
--
Tool to visualize, edit, convert and prune GPS data
_______________________________________________
Pkg-grass-devel mailing list
Pkg-grass-devel@lists.alioth.debian.org
http://lists.alioth.debian.org/mailman/listinfo/pkg-grass-devel
