diff options
| author | Martin Quinson <mquinson@debian.org> | 2014-07-24 10:29:32 +0200 |
|---|---|---|
| committer | git-ubuntu importer <ubuntu-devel-discuss@lists.ubuntu.com> | 2014-07-24 16:17:49 +0000 |
| commit | 5ef377539c52a100250ff0e354fcc56f38b41e8c (patch) | |
| tree | 35ffd93aa7f2933a6b847014048f7df782b03d35 | |
| parent | 62b739845437faa2b5b8bf935d656cc5f5752cda (diff) | |
0.9.6~r156-5 (patches unapplied)import/0.9.6_r156-5ubuntu/wily-develubuntu/wilyubuntu/vivid-develubuntu/vividubuntu/utopic-proposedubuntu/utopic-develubuntu/utopicdebian/jessie
Imported using git-ubuntu import.
Notes
Notes:
* d/p/NPE_null_scroll_pane: upstream bug fix (NPE when the line
number ruler is installed before the scroll pane)
* d/p/js-problem-java8: Fix a JavaScript problem with Java8 [Felix Natter]
* d/copyright: point to /usr/share/common-licenses to please lintian.
| -rw-r--r-- | debian/changelog | 9 | ||||
| -rw-r--r-- | debian/control | 2 | ||||
| -rw-r--r-- | debian/copyright | 15 | ||||
| -rw-r--r-- | debian/patches/NPE_null_scroll_pane | 26 | ||||
| -rw-r--r-- | debian/patches/js-problem-java8 | 22 | ||||
| -rw-r--r-- | debian/patches/scala-property-comments | 4 | ||||
| -rw-r--r-- | debian/patches/series | 2 |
7 files changed, 66 insertions, 14 deletions
diff --git a/debian/changelog b/debian/changelog index a143ca8..2c9fd3b 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,12 @@ +libjsyntaxpane-java (0.9.6~r156-5) unstable; urgency=low + + * d/p/NPE_null_scroll_pane: upstream bug fix (NPE when the line + number ruler is installed before the scroll pane) + * d/p/js-problem-java8: Fix a JavaScript problem with Java8 [Felix Natter] + * d/copyright: point to /usr/share/common-licenses to please lintian. + + -- Martin Quinson <mquinson@debian.org> Thu, 24 Jul 2014 10:29:32 +0200 + libjsyntaxpane-java (0.9.6~r156-4) unstable; urgency=low * d/p/scala-property-comments: fix upstream bug where # was used as diff --git a/debian/control b/debian/control index 72a797c..bd8d49e 100644 --- a/debian/control +++ b/debian/control @@ -6,7 +6,7 @@ Uploaders: Martin Quinson <mquinson@debian.org> Build-Depends: debhelper (>= 7.0.50~), javahelper (>= 0.32), jflex Build-Depends-Indep: default-jdk Standards-Version: 3.9.4 -Vcs-Git: git://git.debian.org/pkg-java/libjsyntaxpane-java.git +Vcs-Git: git://anonscm.debian.org/pkg-java/libjsyntaxpane-java.git Vcs-Browser: http://anonscm.debian.org/gitweb/?p=pkg-java/libjsyntaxpane-java.git Homepage: http://code.google.com/p/jsyntaxpane/ diff --git a/debian/copyright b/debian/copyright index d765c1b..5fdde64 100644 --- a/debian/copyright +++ b/debian/copyright @@ -9,18 +9,9 @@ Copyright: Copyright 2008 Ayman Al-Sairafi ayman.alsairafi@gmail.com License: Apache-2 License: Apache-2 - Licensed under the Apache License, Version 2.0 (the "License"); - you may not use this file except in compliance with the License. - You may obtain a copy of the License - at http://www.apache.org/licenses/LICENSE-2.0 - Unless required by applicable law or agreed to in writing, software - distributed under the License is distributed on an "AS IS" BASIS, - WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - See the License for the specific language governing permissions and - limitations under the License. - - + On Debian systems, the complete text of the GPL-3 can be found in + /usr/share/common-licenses/Apache-2.0 Files: debian/* -Copyright: 2011 Martin Quinson +Copyright: 2011-2014 Martin Quinson License: Apache-2 diff --git a/debian/patches/NPE_null_scroll_pane b/debian/patches/NPE_null_scroll_pane new file mode 100644 index 0000000..d5e8b0b --- /dev/null +++ b/debian/patches/NPE_null_scroll_pane @@ -0,0 +1,26 @@ +Description: Avoid a NPE when the ruler is installed before the scrollPane + This could happen by passing the content type to the JEditorPane + constructor, ie clearly before the addition of the editor pane to a + scroll pane. +Author: Martin Quinson +Upstream-status: Forwarded +Upstream-bug: https://code.google.com/p/jsyntaxpane/issues/detail?id=191 + +--- + src/main/java/jsyntaxpane/components/LineNumbersRuler.java | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +Index: b/src/main/java/jsyntaxpane/components/LineNumbersRuler.java +=================================================================== +--- a/src/main/java/jsyntaxpane/components/LineNumbersRuler.java ++++ b/src/main/java/jsyntaxpane/components/LineNumbersRuler.java +@@ -127,7 +127,8 @@ + editor.addCaretListener(this); + editor.addPropertyChangeListener(this); + JScrollPane sp = getScrollPane(editor); +- sp.setRowHeaderView(this); ++ if (sp != null) ++ sp.setRowHeaderView(this); + mouseListener = new MouseAdapter() { + + @Override diff --git a/debian/patches/js-problem-java8 b/debian/patches/js-problem-java8 new file mode 100644 index 0000000..482433d --- /dev/null +++ b/debian/patches/js-problem-java8 @@ -0,0 +1,22 @@ +--- + src/main/resources/META-INF/services/jsyntaxpane/scripts/insertdate.js | 8 ++++---- + 1 file changed, 4 insertions(+), 4 deletions(-) + +Index: b/src/main/resources/META-INF/services/jsyntaxpane/scripts/insertdate.js +=================================================================== +--- a/src/main/resources/META-INF/services/jsyntaxpane/scripts/insertdate.js ++++ b/src/main/resources/META-INF/services/jsyntaxpane/scripts/insertdate.js +@@ -1,8 +1,8 @@ + // Import the needed java packages and classes
+-importPackage(java.util);
+-importClass(javax.swing.JOptionPane)
++//importPackage(java.util);
++//importClass(javax.swing.JOptionPane)
+
+ function putDate() {
+- TARGET.replaceSelection("This is a dummy proc that inserts the Current Date:\n" + new Date());
++ TARGET.replaceSelection("This is a dummy proc that inserts the Current Date:\n" + new java.util.Date());
+ TARGET.replaceSelection("\nTab Size of doc = " + AU.getTabSize(TARGET));
+-} +\ No newline at end of file ++}
diff --git a/debian/patches/scala-property-comments b/debian/patches/scala-property-comments index b90dce3..07a74ca 100644 --- a/debian/patches/scala-property-comments +++ b/debian/patches/scala-property-comments @@ -1,4 +1,6 @@ -Fix the comment marker for scala. +Description: Fix the comment marker for scala. +Author: Martin Quinson +Upstream-status: not forwarded yet --- src/main/resources/META-INF/services/jsyntaxpane/syntaxkits/scalasyntaxkit/config.properties | 2 +- diff --git a/debian/patches/series b/debian/patches/series index 0f52ac1..3d794b7 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -1,2 +1,4 @@ +NPE_null_scroll_pane load-bundle-i18n scala-property-comments +js-problem-java8 |