[med-svn] [Git][med-team/treeview][master] 4 commits: Fix encoding to build with Java 9

[Andreas Tille]

Andreas Tille pushed to branch master at Debian Med / treeview


Commits:
85ce0e88 by Andreas Tille at 2018-03-19T13:53:33+01:00
Fix encoding to build with Java 9

- - - - -
1594fc75 by Andreas Tille at 2018-03-19T13:55:27+01:00
Standards-Version: 4.1.3

- - - - -
b82071f8 by Andreas Tille at 2018-03-19T13:55:45+01:00
debhelper 11

- - - - -
d2cfc34d by Andreas Tille at 2018-03-19T14:04:11+01:00
Upload to unstable

- - - - -


5 changed files:

- debian/changelog
- debian/compat
- debian/control
- + debian/patches/fix_encoding_to_build_with_java9.patch
- debian/patches/series


Changes:

=====================================
debian/changelog
=====================================
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,12 @@
+treeview (1.1.6.4+dfsg1-3) unstable; urgency=medium
+
+  * Fix encoding to build with Java 9
+    Closes: #893496
+  * Standards-Version: 4.1.3
+  * debhelper 11
+
+ -- Andreas Tille <tille at debian.org>  Mon, 19 Mar 2018 13:55:47 +0100
+
 treeview (1.1.6.4+dfsg1-2) unstable; urgency=medium
 
   * cme fix dpkg-control


=====================================
debian/compat
=====================================
--- a/debian/compat
+++ b/debian/compat
@@ -1 +1 @@
-9
+11


=====================================
debian/control
=====================================
--- a/debian/control
+++ b/debian/control
@@ -5,7 +5,7 @@ Uploaders: Steffen Moeller <moeller at debian.org>,
            Thorsten Alteholz <debian at alteholz.de>
 Section: science
 Priority: optional
-Build-Depends: debhelper (>= 9),
+Build-Depends: debhelper (>= 11~),
                ant,
                default-jdk,
                libnanoxml2-java,
@@ -16,7 +16,7 @@ Build-Depends: debhelper (>= 9),
                docbook-to-man,
                xsltproc,
                fop
-Standards-Version: 3.9.8
+Standards-Version: 4.1.3
 Vcs-Browser: https://anonscm.debian.org/cgit/debian-med/treeview.git
 Vcs-Git: https://anonscm.debian.org/git/debian-med/treeview.git
 Homepage: http://jtreeview.sourceforge.net


=====================================
debian/patches/fix_encoding_to_build_with_java9.patch
=====================================
--- /dev/null
+++ b/debian/patches/fix_encoding_to_build_with_java9.patch
@@ -0,0 +1,35 @@
+Description: Fix encoding to build with Java 9
+Bug-Debian: https://bugs.debian.org/893496
+Author: Andreas Tille <tille at debian.org>
+Last-Update: Mon, 19 Mar 2018 13:51:59 +0100
+
+--- a/src/edu/stanford/genetics/treeview/plugin/scatterview/ScatterView.java
++++ b/src/edu/stanford/genetics/treeview/plugin/scatterview/ScatterView.java
+@@ -700,10 +700,10 @@ class ScatterView extends ModelView  {
+ 				// Invoked when a key has been pressed. 
+ 		}
+ 		public void keyReleased (KeyEvent e) {
+-				//Invoked when a key has been released. 
++				// Invoked when a key has been released. 
+ 		}
+ 		public void keyTyped (KeyEvent e) {
+-				//Invoked when a key has been typed
++				// Invoked when a key has been typed
+ 			switch (e.getKeyChar()) {
+ 				case '-':
+ 					zoomFactor(0.5, startPoint);
+--- a/src/edu/stanford/genetics/treeview/plugin/karyoview/KaryoView.java
++++ b/src/edu/stanford/genetics/treeview/plugin/karyoview/KaryoView.java
+@@ -533,10 +533,10 @@ public class KaryoView extends ModelView
+ 				// Invoked when a key has been pressed. 
+ 		}
+ 		public void keyReleased (KeyEvent e) {
+-				//Invoked when a key has been released. 
++				// Invoked when a key has been released. 
+ 		}
+ 		public void keyTyped (KeyEvent e) {
+-			  //	Invoked when a key has been typed.
++			  // Invoked when a key has been typed.
+ 			switch (e.getKeyChar()) {
+ 				case '-':
+ 					zoomFactor(0.5, startPoint);


=====================================
debian/patches/series
=====================================
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1 +1,2 @@
 classpath.patch
+fix_encoding_to_build_with_java9.patch



View it on GitLab: https://salsa.debian.org/med-team/treeview/compare/377ac093719be0c0e1538393f92714af16ad823a...d2cfc34dc6b1dc5759930c6873f972a934a82c4a

---
View it on GitLab: https://salsa.debian.org/med-team/treeview/compare/377ac093719be0c0e1538393f92714af16ad823a...d2cfc34dc6b1dc5759930c6873f972a934a82c4a
You're receiving this email because of your account on salsa.debian.org.
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.alioth.debian.org/pipermail/debian-med-commit/attachments/20180319/5f43ff82/attachment-0001.html>