Bug#893663: freeplane: CVE-2018-1000069 XXE vulnerability

[Felix Natter]

Salvatore Bonaccorso <car...@debian.org> writes:

> Hi Felix,

hello Salvatore,

> Sorry for the delay in getting back to you.
>
> On Fri, Apr 06, 2018 at 09:40:40PM +0200, Felix Natter wrote:
>> hello Security Team,
>> 
>> here are the CVE-2018-169 security updates for jessie and stretch:
>> 
>> [jessie]
>> https://anonscm.debian.org/cgit/pkg-java/freeplane.git/log/?h=jessie-CVE-2018-169
>> (jessie-CVE-2018-169 branch)
>> 
>> [stretch]
>> https://anonscm.debian.org/cgit/pkg-java/freeplane.git/log/?h=stretch-CVE-2018-169
>> (stretch-CVE-2018-169 branch)
>> 
>> Both are tested:
>> - builds
>> - activation log message is seen
>> - Save and Load XML works
>> 
>> In what format would you like the "tested packages"? *.deb?
>> 
>> Here is the corrsponding upstream commit:
>> https://github.com/freeplane/freeplane/commit/a5dce7f9f
>> 
>> The debdiffs are attached.
>
> Debdiffs looks good to me. I just have a question, for the
> jessie-debdiff: In the ScriptingRegistration.java was the removal of
> the import of org.freeplane.n3.nanoxml.XMLParserFactory not done on
> purpose?

Yes and no. On jessie the patch did not cleanly apply, so I would have
had to apply that change manually. Since removing the import has no
effect on the semantics of the program (as long as it still compiles), I
was too lazy. It should be ok.

> Other than that, when above question commented on, feel free to upload
> to security-master (AFICS you will need a sponsor, but guess Markus
> will cime in here as well). Remember that both needs to be build with
> -sa.

May I ask why the full source must be included?

@Markus: Would you be so kind to take care of uploading?

Cheers and Best Regards,
-- 
Felix Natter
debian/rules!

__
This is the maintainer address of Debian's Java team
<http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-maintainers>. 
Please use
debian-j...@lists.debian.org for discussions and questions.

Bug#893663: freeplane: CVE-2018-1000069 XXE vulnerability

[Felix Natter]

hello Security Team,

here are the CVE-2018-169 security updates for jessie and stretch:

[jessie]
https://anonscm.debian.org/cgit/pkg-java/freeplane.git/log/?h=jessie-CVE-2018-169
(jessie-CVE-2018-169 branch)

[stretch]
https://anonscm.debian.org/cgit/pkg-java/freeplane.git/log/?h=stretch-CVE-2018-169
(stretch-CVE-2018-169 branch)

Both are tested:
- builds
- activation log message is seen
- Save and Load XML works

In what format would you like the "tested packages"? *.deb?

Here is the corrsponding upstream commit:
https://github.com/freeplane/freeplane/commit/a5dce7f9f

The debdiffs are attached.

@Markus: Did you already submit the update for wheezy?

Cheers and Best Regards,
-- 
Felix Natter
debian/rules!


jessie-CVE-2018-169.debdiff
Description: Binary data


stretch-CVE-2018-16.debdiff
Description: Binary data
__
This is the maintainer address of Debian's Java team
<http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-maintainers>. 
Please use
debian-j...@lists.debian.org for discussions and questions.

[freeplane] 01/01: add patch for CVE-2018-1000069 [jessie]

[Felix Natter]

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

fnatter-guest pushed a commit to branch jessie-CVE-2018-169
in repository freeplane.

commit 02ec050446fd9765c5e9d374121c7e546e94fb34
Author: Felix Natter <fnat...@gmx.net>
Date:   Fri Apr 6 15:18:08 2018 -0400

add patch for CVE-2018-169 [jessie]
---
 debian/changelog |   9 +
 debian/patches/97_fix_CVE-2018-169.patch | 265 +++
 debian/patches/series|   1 +
 3 files changed, 275 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index 7601a2b..baf093c 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,12 @@
+freeplane (1.3.12-1+deb8u1) jessie-security; urgency=high
+
+  * Fix CVE-2018-169: Wojciech Reguła discovered that FreePlane was
+affected by a XML External Entity (XXE) vulnerability in its mindmap
+loader that could compromise a user's machine by opening a specially
+crafted mind map file. (Closes: #893663)
+
+ -- Felix Natter <fnat...@gmx.net>  Fri, 06 Apr 2018 14:20:40 -0400
+
 freeplane (1.3.12-1) unstable; urgency=medium
 
   * New upstream version (bugfix release).
diff --git a/debian/patches/97_fix_CVE-2018-169.patch 
b/debian/patches/97_fix_CVE-2018-169.patch
new file mode 100644
index 000..88a2c3c
--- /dev/null
+++ b/debian/patches/97_fix_CVE-2018-169.patch
@@ -0,0 +1,265 @@
+From a5dce7f9f4d29675fb256053aee3858bf8d76001 Mon Sep 17 00:00:00 2001
+From: Dimitry Polivaev <dpoliv...@gmx.de>
+Date: Sun, 5 Mar 2017 21:28:14 +0100
+Subject: [PATCH] Do not reference external entities in freeplane xml parser
+
+---
+ .../org/freeplane/core/io/xml/LocalEntityResolver.java| 15 +++
+ .../org/freeplane/core/io/xml/XMLLocalParserFactory.java  | 12 
+ .../main/java/org/freeplane/core/io/xml/XMLParser.java|  5 +
+ .../core/resources/WindowConfigurationStorage.java|  5 +++--
+ .../features/export/mindmapmode/ExportController.java |  4 ++--
+ .../org/freeplane/features/filter/FilterController.java   |  4 ++--
+ .../org/freeplane/features/format/FormatController.java   |  4 ++--
+ .../org/freeplane/features/format/ScannerController.java  |  4 ++--
+ .../java/org/freeplane/main/addons/AddOnsController.java  |  4 ++--
+ .../java/org/freeplane/n3/nanoxml/XMLEntityResolver.java  |  2 +-
+ .../freeplane/plugin/script/ScriptingRegistration.java|  4 ++--
+ 11 files changed, 48 insertions(+), 15 deletions(-)
+ create mode 100644 
freeplane/src/org/freeplane/core/io/xml/LocalEntityResolver.java
+ create mode 100644 
freeplane/src/org/freeplane/core/io/xml/XMLLocalParserFactory.java
+
+--- /dev/null
 b/freeplane/src/org/freeplane/core/io/xml/LocalEntityResolver.java
+@@ -0,0 +1,15 @@
++package org.freeplane.core.io.xml;
++
++import java.io.Reader;
++
++import org.freeplane.n3.nanoxml.IXMLReader;
++import org.freeplane.n3.nanoxml.XMLEntityResolver;
++import org.freeplane.n3.nanoxml.XMLParseException;
++
++final class LocalEntityResolver extends XMLEntityResolver {
++  @Override
++  protected Reader openExternalEntity(IXMLReader xmlReader, String 
publicID, String systemID)
++  throws XMLParseException {
++  throw new XMLParseException("External entities are not 
allowed");
++  }
++}
+\ No newline at end of file
+--- /dev/null
 b/freeplane/src/org/freeplane/core/io/xml/XMLLocalParserFactory.java
+@@ -0,0 +1,12 @@
++package org.freeplane.core.io.xml;
++
++import org.freeplane.n3.nanoxml.IXMLParser;
++
++public class XMLLocalParserFactory {
++
++  public static IXMLParser createLocalXMLParser() {
++  IXMLParser parser = 
org.freeplane.n3.nanoxml.XMLParserFactory.createDefaultXMLParser();
++  parser.setResolver(new LocalEntityResolver());
++  return parser;
++  }
++}
+--- a/freeplane/src/org/freeplane/core/io/xml/XMLParser.java
 b/freeplane/src/org/freeplane/core/io/xml/XMLParser.java
+@@ -30,6 +30,11 @@
+ class XMLParser extends StdXMLParser implements IXMLParser {
+   private boolean skipNextElementContent = false;
+ 
++  public XMLParser() {
++  super();
++  setResolver(new LocalEntityResolver());
++  }
++
+   void notParseNextElementContent() {
+   skipNextElementContent = true;
+   }
+--- 
a/freeplane/src/org/freeplane/core/resources/WindowConfigurationStorage.java
 
b/freeplane/src/org/freeplane/core/resources/WindowConfigurationStorage.java
+@@ -16,8 +16,8 @@
+ import org.freeplane.n3.nanoxml.StdXMLReader;
+ import org.freeplane.n3.nanoxml.XMLElement;
+ import org.freeplane.n3.nanoxml.XMLException;
+-import org.freeplane.n3.nanoxml.XMLParserFactory;
+ import org.freeplane.n3.nanoxml.XMLWriter;
++import org.freeplane.core.io.xml.XMLLocalParserFactory;
+ 
+ public class WindowConfigurationStorage {
+   protected int height;
+@@ -107,7 +107,7 @@
+   }
+   protected 

[freeplane] branch jessie-CVE-2018-1000069 created (now 02ec050)

[Felix Natter]

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

fnatter-guest pushed a change to branch jessie-CVE-2018-169
in repository freeplane.

at  02ec050   add patch for CVE-2018-169 [jessie]

This branch includes the following new commits:

   new  02ec050   add patch for CVE-2018-169 [jessie]

The 1 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "adds" were already present in the repository and have only
been added to this reference.


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

___
pkg-java-commits mailing list
pkg-java-comm...@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-commits

Bug#893663: freeplane: CVE-2018-1000069 XXE vulnerability

[Felix Natter]

Salvatore Bonaccorso <car...@debian.org> writes:

> Hi Felix,

hello Salvatore,

> On Sun, Apr 01, 2018 at 06:04:27PM +0200, Markus Koschany wrote:
>> 
>> 
>> Am 01.04.2018 um 17:57 schrieb Felix Natter:
>> [...]
>> > Thanks, done.
>> > BTW: Is it ok to close the bug with the stretch-security upload even if
>> > the jessie-security upload is still pending?
>> 
>> Yes, that's ok. You can close the bug with both uploads.
>> 
>> > What is there to do next?
>> 
>> As soon as the security team has approved the changes, I can upload your
>> packages to security-master.
>
> Thanks for working on it, the issue is severe enought that it warrants
> a DSA. Could you send the security team alias
> (t...@security.debian.org) debdiffs resulting from the build and
> tested packages for a short review + ack?

The stretch update is here (branch stretch-CVE-2018-169):
https://anonscm.debian.org/cgit/pkg-java/freeplane.git/log/?h=stretch-CVE-2018-169=1

This is tested:
- activation log message is seen
- Save and Load XML works

In what format would you like the "tested packages"? *.deb?

Here is the upstream commit:
https://github.com/freeplane/freeplane/commit/a5dce7f9f

The debdiff (for stretch-security) is attached.

I am still working on the jessie update, this could take until Saturday
(sorry for the delay).

Best Regards,
-- 
Felix Natter
debian/rules!


stretch-CVE-2018-16.debdiff
Description: Binary data
__
This is the maintainer address of Debian's Java team
<http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-maintainers>. 
Please use
debian-j...@lists.debian.org for discussions and questions.

[freeplane] branch stretch-CVE-2018-1000069 updated (c358116 -> 5bdd168)

[Felix Natter]

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

fnatter-guest pushed a change to branch stretch-CVE-2018-169
in repository freeplane.

  from  c358116   fix changelog entry
   new  5bdd168   add log output to double-check activation of patch

The 1 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "adds" were already present in the repository and have only
been added to this reference.


Summary of changes:
 debian/patches/50_fix_CVE-2018-169 | 10 ++
 1 file changed, 10 insertions(+)

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

___
pkg-java-commits mailing list
pkg-java-comm...@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-commits

[freeplane] 01/01: add log output to double-check activation of patch

[Felix Natter]

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

fnatter-guest pushed a commit to branch stretch-CVE-2018-169
in repository freeplane.

commit 5bdd1682ee556f5aebbb59cc7b846248bd9f3226
Author: Felix Natter <fnat...@gmx.net>
Date:   Tue Apr 3 20:59:31 2018 +0200

add log output to double-check activation of patch
---
 debian/patches/50_fix_CVE-2018-169 | 10 ++
 1 file changed, 10 insertions(+)

diff --git a/debian/patches/50_fix_CVE-2018-169 
b/debian/patches/50_fix_CVE-2018-169
index 9618fff..9b9d214 100644
--- a/debian/patches/50_fix_CVE-2018-169
+++ b/debian/patches/50_fix_CVE-2018-169
@@ -268,3 +268,13 @@ Subject: [PATCH] Do not reference external entities in 
freeplane xml parser
for (File file : addonXmlFiles) {
BufferedInputStream inputStream = null;
try {
+--- a/freeplane/src/main/java/org/freeplane/main/osgi/Activator.java
 b/freeplane/src/main/java/org/freeplane/main/osgi/Activator.java
+@@ -34,6 +34,7 @@
+   FreeplaneMain.checkJavaVersion();
+   activatorImpl = new ActivatorImpl();
+   activatorImpl.start(context);
++  org.freeplane.core.util.LogUtils.info("CVE-2018-169 fix 
activated");
+   }
+ 
+   public void stop(final BundleContext context) throws Exception {

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

___
pkg-java-commits mailing list
pkg-java-comm...@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-commits

Bug#893635: does not show up in GNOME's application menus

[Felix Natter]

hello Antoine,

I have got a reply from xdg from a user who has the same problem:
  https://lists.freedesktop.org/archives/xdg/2018-April/014010.html

So it looks like this might be a GNOME(3) problem (or can you reproduce
this with KDE or another desktop?)

I think it would make sense to report this against GNOME (either
upstream or in Debian), unless you can reproduce it with KDE, e17, etc.

Cheers and Best Regards,
-- 
Felix Natter
debian/rules!

__
This is the maintainer address of Debian's Java team
<http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-maintainers>. 
Please use
debian-j...@lists.debian.org for discussions and questions.

Bug#893663: freeplane: CVE-2018-1000069 XXE vulnerability

[Felix Natter]

Markus Koschany <a...@debian.org> writes:

> Hi Felix,

hello Markus,

> Am 01.04.2018 um 16:23 schrieb Felix Natter:
>> hello Markus,
>> 
>> I have prepared the patched 1.5.18-1+deb9u1 for stretch
>> I hope I got the version number right? The changelog entry is probably
>> not correct either. Can you advice what to read?
>> 
>> I briefly tested saving+loading mindmaps.
>> 
>> Here it is:
>> https://anonscm.debian.org/cgit/pkg-java/freeplane.git/log/?h=stretch-CVE-2018-169
>> (branch stretch-CVE-2018-169 in the freeplane alioth repo).
>> 
>> I am in the process of setting up a vbox instance for jessie to address
>> the other update.
>> 
>> Cheers and Best Regards,
>
> The version is correct. I would write in your changelog:
>
> Fix CVE-2018-169: Wojciech Reguła discovered that FreePlane was
> affected by a XML External Entity (XXE) vulnerability in its mindmap
> loader that could compromise a user's machine by opening a specially
> crafted mind map file. (Closes: #893663)

Thanks, done.
BTW: Is it ok to close the bug with the stretch-security upload even if
the jessie-security upload is still pending?

What is there to do next?

> Distribution should be stretch-security though and the urgency is high.
> Similar for Jessie, jessie-security and the version is 1.3.12-1+deb8u1

I will do this soon, hopefully tomorrow.

Cheers and Best Regards,
-- 
Felix Natter
debian/rules!

__
This is the maintainer address of Debian's Java team
<http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-maintainers>. 
Please use
debian-j...@lists.debian.org for discussions and questions.

[freeplane] branch stretch-CVE-2018-1000069 updated (6073895 -> c358116)

[Felix Natter]

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

fnatter-guest pushed a change to branch stretch-CVE-2018-169
in repository freeplane.

  from  6073895   change version number
   new  c358116   fix changelog entry

The 1 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "adds" were already present in the repository and have only
been added to this reference.


Summary of changes:
 debian/changelog | 9 ++---
 1 file changed, 6 insertions(+), 3 deletions(-)

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

___
pkg-java-commits mailing list
pkg-java-comm...@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-commits

[freeplane] 01/01: fix changelog entry

[Felix Natter]

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

fnatter-guest pushed a commit to branch stretch-CVE-2018-169
in repository freeplane.

commit c358116cf3858f53a7f8e9b43f2bfc5a26515048
Author: Felix Natter <fnat...@gmx.net>
Date:   Sun Apr 1 17:56:00 2018 +0200

fix changelog entry
---
 debian/changelog | 9 ++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index a591cc6..0fb9b24 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,8 +1,11 @@
-freeplane (1.5.18-1+deb9u1) unstable; urgency=medium
+freeplane (1.5.18-1+deb9u1) stretch-security; urgency=high
 
-  * fix CVE-2018-169
+  * Fix CVE-2018-169: Wojciech Reguła discovered that FreePlane was
+affected by a XML External Entity (XXE) vulnerability in its mindmap
+loader that could compromise a user's machine by opening a specially
+crafted mind map file. (Closes: #893663)
 
- -- Felix Natter <fnat...@gmx.net>  Sun, 01 Apr 2018 15:53:49 +0200
+ -- Felix Natter <fnat...@gmx.net>  Sun, 01 Apr 2018 17:55:27 +0200
 
 freeplane (1.5.18-1) unstable; urgency=medium
 

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

___
pkg-java-commits mailing list
pkg-java-comm...@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-commits

Bug#893635: does not show up in GNOME's application menus

[Felix Natter]

hello Antoine,

thank you for the report. I cannot reproduce this on stretch with
GNOME3: It shows up in the list of applications (super key), and in both
"menu editors". Can you provide your desktop environment (GNOME3?) and a
screenshot that shows the problem?

I will ask x...@lists.freedesktop.org.

Cheers and Best Regards,
-- 
Felix Natter
debian/rules!

__
This is the maintainer address of Debian's Java team
<http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-maintainers>. 
Please use
debian-j...@lists.debian.org for discussions and questions.

Bug#893663: freeplane: CVE-2018-1000069 XXE vulnerability

[Felix Natter]

hello Markus,

I have prepared the patched 1.5.18-1+deb9u1 for stretch
I hope I got the version number right? The changelog entry is probably
not correct either. Can you advice what to read?

I briefly tested saving+loading mindmaps.

Here it is:
https://anonscm.debian.org/cgit/pkg-java/freeplane.git/log/?h=stretch-CVE-2018-169
(branch stretch-CVE-2018-169 in the freeplane alioth repo).

I am in the process of setting up a vbox instance for jessie to address
the other update.

Cheers and Best Regards,
-- 
Felix Natter
debian/rules!

__
This is the maintainer address of Debian's Java team
<http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-maintainers>. 
Please use
debian-j...@lists.debian.org for discussions and questions.

[freeplane] 01/01: change version number

[Felix Natter]

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

fnatter-guest pushed a commit to branch stretch-CVE-2018-169
in repository freeplane.

commit 6073895b7909fefa5b9cc22d8f946ead834e21f0
Author: Felix Natter <fnat...@gmx.net>
Date:   Sun Apr 1 15:56:54 2018 +0200

change version number
---
 debian/changelog | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 75e11af..a591cc6 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,8 +1,8 @@
-freeplane (1.5.18-1+deb9u4) UNRELEASED; urgency=medium
+freeplane (1.5.18-1+deb9u1) unstable; urgency=medium
 
   * fix CVE-2018-169
 
- -- Felix Natter <fnat...@gmx.net>  Sat, 31 Mar 2018 17:27:23 +0200
+ -- Felix Natter <fnat...@gmx.net>  Sun, 01 Apr 2018 15:53:49 +0200
 
 freeplane (1.5.18-1) unstable; urgency=medium
 

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

___
pkg-java-commits mailing list
pkg-java-comm...@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-commits

[freeplane] branch stretch-CVE-2018-1000069 updated (331ea5f -> 6073895)

[Felix Natter]

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

fnatter-guest pushed a change to branch stretch-CVE-2018-169
in repository freeplane.

  from  331ea5f   import patch for fixing CVE-2018-169
   new  6073895   change version number

The 1 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "adds" were already present in the repository and have only
been added to this reference.


Summary of changes:
 debian/changelog | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

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

___
pkg-java-commits mailing list
pkg-java-comm...@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-commits

[freeplane] branch stretch-CVE-2018-1000069 created (now 331ea5f)

[Felix Natter]

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

fnatter-guest pushed a change to branch stretch-CVE-2018-169
in repository freeplane.

at  331ea5f   import patch for fixing CVE-2018-169

This branch includes the following new commits:

   new  331ea5f   import patch for fixing CVE-2018-169

The 1 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "adds" were already present in the repository and have only
been added to this reference.


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

___
pkg-java-commits mailing list
pkg-java-comm...@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-commits

[freeplane] 01/01: import patch for fixing CVE-2018-1000069

[Felix Natter]

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

fnatter-guest pushed a commit to branch stretch-CVE-2018-169
in repository freeplane.

commit 331ea5f904176d9e2330c12ab3f190298e6ac553
Author: Felix Natter <fnat...@gmx.net>
Date:   Sat Mar 31 17:33:02 2018 +0200

import patch for fixing CVE-2018-169
---
 debian/changelog   |   6 +
 debian/patches/50_fix_CVE-2018-169 | 270 +
 debian/patches/series  |   1 +
 3 files changed, 277 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index db00a6f..75e11af 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+freeplane (1.5.18-1+deb9u4) UNRELEASED; urgency=medium
+
+  * fix CVE-2018-169
+
+ -- Felix Natter <fnat...@gmx.net>  Sat, 31 Mar 2018 17:27:23 +0200
+
 freeplane (1.5.18-1) unstable; urgency=medium
 
   * New upstream release.
diff --git a/debian/patches/50_fix_CVE-2018-169 
b/debian/patches/50_fix_CVE-2018-169
new file mode 100644
index 000..9618fff
--- /dev/null
+++ b/debian/patches/50_fix_CVE-2018-169
@@ -0,0 +1,270 @@
+From a5dce7f9f4d29675fb256053aee3858bf8d76001 Mon Sep 17 00:00:00 2001
+From: Dimitry Polivaev <dpoliv...@gmx.de>
+Date: Sun, 5 Mar 2017 21:28:14 +0100
+Subject: [PATCH] Do not reference external entities in freeplane xml parser
+
+---
+ .../org/freeplane/core/io/xml/LocalEntityResolver.java| 15 +++
+ .../org/freeplane/core/io/xml/XMLLocalParserFactory.java  | 12 
+ .../main/java/org/freeplane/core/io/xml/XMLParser.java|  5 +
+ .../core/resources/WindowConfigurationStorage.java|  5 +++--
+ .../features/export/mindmapmode/ExportController.java |  4 ++--
+ .../org/freeplane/features/filter/FilterController.java   |  4 ++--
+ .../org/freeplane/features/format/FormatController.java   |  4 ++--
+ .../org/freeplane/features/format/ScannerController.java  |  4 ++--
+ .../java/org/freeplane/main/addons/AddOnsController.java  |  4 ++--
+ .../java/org/freeplane/n3/nanoxml/XMLEntityResolver.java  |  2 +-
+ .../freeplane/plugin/script/ScriptingRegistration.java|  4 ++--
+ 11 files changed, 48 insertions(+), 15 deletions(-)
+ create mode 100644 
freeplane/src/main/java/org/freeplane/core/io/xml/LocalEntityResolver.java
+ create mode 100644 
freeplane/src/main/java/org/freeplane/core/io/xml/XMLLocalParserFactory.java
+
+--- /dev/null
 
b/freeplane/src/main/java/org/freeplane/core/io/xml/LocalEntityResolver.java
+@@ -0,0 +1,15 @@
++package org.freeplane.core.io.xml;
++
++import java.io.Reader;
++
++import org.freeplane.n3.nanoxml.IXMLReader;
++import org.freeplane.n3.nanoxml.XMLEntityResolver;
++import org.freeplane.n3.nanoxml.XMLParseException;
++
++final class LocalEntityResolver extends XMLEntityResolver {
++  @Override
++  protected Reader openExternalEntity(IXMLReader xmlReader, String 
publicID, String systemID)
++  throws XMLParseException {
++  throw new XMLParseException("External entities are not 
allowed");
++  }
++}
+\ No newline at end of file
+--- /dev/null
 
b/freeplane/src/main/java/org/freeplane/core/io/xml/XMLLocalParserFactory.java
+@@ -0,0 +1,12 @@
++package org.freeplane.core.io.xml;
++
++import org.freeplane.n3.nanoxml.IXMLParser;
++
++public class XMLLocalParserFactory {
++
++  public static IXMLParser createLocalXMLParser() {
++  IXMLParser parser = 
org.freeplane.n3.nanoxml.XMLParserFactory.createDefaultXMLParser();
++  parser.setResolver(new LocalEntityResolver());
++  return parser;
++  }
++}
+--- a/freeplane/src/main/java/org/freeplane/core/io/xml/XMLParser.java
 b/freeplane/src/main/java/org/freeplane/core/io/xml/XMLParser.java
+@@ -30,6 +30,11 @@
+ class XMLParser extends StdXMLParser implements IXMLParser {
+   private boolean skipNextElementContent = false;
+ 
++  public XMLParser() {
++  super();
++  setResolver(new LocalEntityResolver());
++  }
++
+   void notParseNextElementContent() {
+   skipNextElementContent = true;
+   }
+--- 
a/freeplane/src/main/java/org/freeplane/core/resources/WindowConfigurationStorage.java
 
b/freeplane/src/main/java/org/freeplane/core/resources/WindowConfigurationStorage.java
+@@ -5,6 +5,8 @@
+ import java.io.StringWriter;
+ 
+ import javax.swing.JDialog;
++
++import org.freeplane.core.io.xml.XMLLocalParserFactory;
+ import org.freeplane.core.ui.components.UITools;
+ import org.freeplane.core.util.LogUtils;
+ import org.freeplane.n3.nanoxml.IXMLParser;
+@@ -12,7 +14,6 @@
+ import org.freeplane.n3.nanoxml.StdXMLReader;
+ import org.freeplane.n3.nanoxml.XMLElement;
+ import org.freeplane.n3.nanoxml.XMLException;
+-import org.freeplane.n3.nanoxml.XMLParserFactory;
+ import org.freeplane.n3.nanoxml.XMLWriter;
+ 
+ public class WindowConfigurationStorage {
+@@ -103,7 +104,7 @@
+   }
+   protected XMLElem

[knopflerfish-osgi] annotated tag debian/6.1.1-2 created (now f886b61)

[Felix Natter]

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

fnatter-guest pushed a change to annotated tag debian/6.1.1-2
in repository knopflerfish-osgi.

at  f886b61   (tag)
   tagging  1dde7a4672168a55c4ab4ea341cdcc53858cbf34 (commit)
  replaces  debian/6.1.1-1
 tagged by  Felix Natter
on  Sat Mar 31 14:23:30 2018 +0200

- Log -
knopflerfish-osgi Debian release 6.1.1-2

Emmanuel Bourg (4):
  Fixed my email in the patch header
  Wrap and sort
  Switch to debhelper level 11
  Upload to unstable

Felix Natter (5):
  drop java-doc package
  Merge branch 'master' of 
git+ssh://git.debian.org/git/pkg-java/knopflerfish-osgi
  fix Priority: extra lintian
  install NOTICE.txt
  bump standards version

---

No new revisions were added by this update.

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

___
pkg-java-commits mailing list
pkg-java-comm...@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-commits

Bug#893221: knopflerfish-osgi FTBFS with openjdk-9

[Felix Natter]

Emmanuel Bourg <ebo...@apache.org> writes:

hello Emmanuel,

> Le 30/03/2018 à 09:41, Felix Natter a écrit :
>
>> Is the following ok for getting rid of the -java-doc package
>> (I don't think it makes sense to keep an older doc package)?
>> 
>>  Package: libknopflerfish-osgi-framework-java
>>  Architecture: all
>>  Depends: ${misc:Depends}
>> -Suggests: libknopflerfish-osgi-java-doc
>> +Provides: libknopflerfish-osgi-java-doc
>> +Conflicts: libknopflerfish-osgi-java-doc
>> +Replaces: libknopflerfish-osgi-java-doc
>
> libknopflerfish-osgi-java-doc has no reverse dependencies, no need to
> add these fields you can drop it directly.

Are you sure? Without these settings, libknopflerfish-osgi-java-doc-X
will still be kept if libknopflerfish-osgi-framework-java is updated to
Y, thus you have an old doc package lying around.

One important lintian is an FP (#894397)
W: libknopflerfish-osgi-framework-java:
incompatible-java-bytecode-format Java9 version (Class format: 53)

Would you want to sponsor this minor update?

knopflerfish-osgi (6.1.1-2) unstable; urgency=medium

  * Drop -java-doc package due to low popcon (Closes: #893221)
  * Correct description (R5->R6)
  * Priority extra->optional
  * Install NOTICE.txt in main package
  * Bump standards version to 4.1.3

 -- Felix Natter <fnat...@gmx.net>  Fri, 30 Mar 2018 17:29:18 +0200

https://anonscm.debian.org/cgit/pkg-java/knopflerfish-osgi.git

Many Thanks and Best Regards,
-- 
Felix Natter
debian/rules!

__
This is the maintainer address of Debian's Java team
<http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-maintainers>. 
Please use
debian-j...@lists.debian.org for discussions and questions.

[knopflerfish-osgi] 01/01: bump standards version

[Felix Natter]

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

fnatter-guest pushed a commit to branch master
in repository knopflerfish-osgi.

commit c009cdef3bb696c5b49c276bca29de44cb1cb931
Author: Felix Natter <fnat...@gmx.net>
Date:   Fri Mar 30 18:03:38 2018 +0200

bump standards version
---
 debian/changelog | 1 +
 debian/control   | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/debian/changelog b/debian/changelog
index 8d76ba8..7984792 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -4,6 +4,7 @@ knopflerfish-osgi (6.1.1-2) unstable; urgency=medium
   * Correct description (R5->R6)
   * Priority extra->optional
   * Install NOTICE.txt in main package
+  * Bump standards version to 4.1.3
 
  -- Felix Natter <fnat...@gmx.net>  Fri, 30 Mar 2018 17:29:18 +0200
 
diff --git a/debian/control b/debian/control
index 49f972c..c923b93 100644
--- a/debian/control
+++ b/debian/control
@@ -5,7 +5,7 @@ Maintainer: Debian Java Maintainers 
<pkg-java-maintain...@lists.alioth.debian.or
 Uploaders: Felix Natter <fnat...@gmx.net>
 Build-Depends-Indep: libasm-java (>= 5.0), default-jdk, libosgi-annotation-java
 Build-Depends: debhelper (>= 10), ant
-Standards-Version: 4.1.0
+Standards-Version: 4.1.3
 Vcs-Git: https://anonscm.debian.org/git/pkg-java/knopflerfish-osgi.git
 Vcs-Browser: https://anonscm.debian.org/cgit/pkg-java/knopflerfish-osgi.git
 Homepage: http://www.knopflerfish.org/

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

___
pkg-java-commits mailing list
pkg-java-comm...@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-commits

[knopflerfish-osgi] branch master updated (854cccc -> c009cde)

[Felix Natter]

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

fnatter-guest pushed a change to branch master
in repository knopflerfish-osgi.

  from  854   install NOTICE.txt
   new  c009cde   bump standards version

The 1 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "adds" were already present in the repository and have only
been added to this reference.


Summary of changes:
 debian/changelog | 1 +
 debian/control   | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

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

___
pkg-java-commits mailing list
pkg-java-comm...@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-commits

[knopflerfish-osgi] branch master updated (f696f62 -> 854cccc)

[Felix Natter]

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

fnatter-guest pushed a change to branch master
in repository knopflerfish-osgi.

  from  f696f62   fix Priority: extra lintian
   new  854   install NOTICE.txt

The 1 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "adds" were already present in the repository and have only
been added to this reference.


Summary of changes:
 debian/changelog   | 1 +
 debian/libknopflerfish-osgi-framework-java.install | 1 +
 2 files changed, 2 insertions(+)

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

___
pkg-java-commits mailing list
pkg-java-comm...@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-commits

[knopflerfish-osgi] 01/01: install NOTICE.txt

[Felix Natter]

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

fnatter-guest pushed a commit to branch master
in repository knopflerfish-osgi.

commit 8549936fb07883ae38c9b8593b5042394c02
Author: Felix Natter <fnat...@gmx.net>
Date:   Fri Mar 30 17:58:04 2018 +0200

install NOTICE.txt
---
 debian/changelog   | 1 +
 debian/libknopflerfish-osgi-framework-java.install | 1 +
 2 files changed, 2 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index 2df1980..8d76ba8 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,6 +3,7 @@ knopflerfish-osgi (6.1.1-2) unstable; urgency=medium
   * Drop -java-doc package due to low popcon (Closes: #893221)
   * Correct description (R5->R6)
   * Priority extra->optional
+  * Install NOTICE.txt in main package
 
  -- Felix Natter <fnat...@gmx.net>  Fri, 30 Mar 2018 17:29:18 +0200
 
diff --git a/debian/libknopflerfish-osgi-framework-java.install 
b/debian/libknopflerfish-osgi-framework-java.install
index 742316e..750ba8a 100644
--- a/debian/libknopflerfish-osgi-framework-java.install
+++ b/debian/libknopflerfish-osgi-framework-java.install
@@ -1 +1,2 @@
 osgi/jars/framework-8.0.5.jar usr/share/knopflerfish/
+NOTICE.txt usr/share/doc/libknopflerfish-osgi-framework-java/

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

___
pkg-java-commits mailing list
pkg-java-comm...@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-commits

[knopflerfish-osgi] 01/01: fix Priority: extra lintian

[Felix Natter]

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

fnatter-guest pushed a commit to branch master
in repository knopflerfish-osgi.

commit f696f62aebf9d5b7d0df8fc6eb18ed41a4c4d9e1
Author: Felix Natter <fnat...@gmx.net>
Date:   Fri Mar 30 17:42:02 2018 +0200

fix Priority: extra lintian
---
 debian/changelog | 1 +
 debian/control   | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/debian/changelog b/debian/changelog
index a9c7f6a..2df1980 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,6 +2,7 @@ knopflerfish-osgi (6.1.1-2) unstable; urgency=medium
 
   * Drop -java-doc package due to low popcon (Closes: #893221)
   * Correct description (R5->R6)
+  * Priority extra->optional
 
  -- Felix Natter <fnat...@gmx.net>  Fri, 30 Mar 2018 17:29:18 +0200
 
diff --git a/debian/control b/debian/control
index 321975e..49f972c 100644
--- a/debian/control
+++ b/debian/control
@@ -1,6 +1,6 @@
 Source: knopflerfish-osgi
 Section: java
-Priority: extra
+Priority: optional
 Maintainer: Debian Java Maintainers 
<pkg-java-maintainers@lists.alioth.debian.org>
 Uploaders: Felix Natter <fnat...@gmx.net>
 Build-Depends-Indep: libasm-java (>= 5.0), default-jdk, libosgi-annotation-java

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

___
pkg-java-commits mailing list
pkg-java-comm...@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-commits

[knopflerfish-osgi] branch master updated (8592fc2 -> f696f62)

[Felix Natter]

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

fnatter-guest pushed a change to branch master
in repository knopflerfish-osgi.

  from  8592fc2   Merge branch 'master' of 
git+ssh://git.debian.org/git/pkg-java/knopflerfish-osgi
   new  f696f62   fix Priority: extra lintian

The 1 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "adds" were already present in the repository and have only
been added to this reference.


Summary of changes:
 debian/changelog | 1 +
 debian/control   | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

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

___
pkg-java-commits mailing list
pkg-java-comm...@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-commits

[knopflerfish-osgi] 01/02: drop java-doc package

[Felix Natter]

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

fnatter-guest pushed a commit to branch master
in repository knopflerfish-osgi.

commit 540068b2ea8450a479450c36b92de06ee0f6
Author: Felix Natter <fnat...@gmx.net>
Date:   Fri Mar 30 17:37:59 2018 +0200

drop java-doc package
---
 debian/changelog|  7 +++
 debian/control  | 20 +---
 debian/libknopflerfish-osgi-java-doc.doc-base.api   | 10 --
 debian/libknopflerfish-osgi-java-doc.doc-base.intro |  9 -
 debian/libknopflerfish-osgi-java-doc.docs   |  2 --
 debian/libknopflerfish-osgi-java-doc.javadoc|  1 -
 debian/rules|  3 ---
 7 files changed, 8 insertions(+), 44 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 2fa06f9..a9c7f6a 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+knopflerfish-osgi (6.1.1-2) unstable; urgency=medium
+
+  * Drop -java-doc package due to low popcon (Closes: #893221)
+  * Correct description (R5->R6)
+
+ -- Felix Natter <fnat...@gmx.net>  Fri, 30 Mar 2018 17:29:18 +0200
+
 knopflerfish-osgi (6.1.1-1) unstable; urgency=medium
 
   [ Felix Natter ]
diff --git a/debian/control b/debian/control
index 59f356c..321975e 100644
--- a/debian/control
+++ b/debian/control
@@ -13,8 +13,7 @@ Homepage: http://www.knopflerfish.org/
 Package: libknopflerfish-osgi-framework-java
 Architecture: all
 Depends: ${misc:Depends}
-Suggests: libknopflerfish-osgi-java-doc
-Description: Java framework implementing the OSGi R5 version
+Description: Java framework implementing the OSGi R6 version
  OSGi, Open Service Gateway Initiative, specifies an industry standard Java
  application platform, allowing multiple applications, to securely run in a
  single JVM. These programs can share resources as data, functionality and
@@ -25,20 +24,3 @@ Description: Java framework implementing the OSGi R5 version
  was the embedded market, but other uses are certainly possible.
  .
  This package specifically provides the framework JAR file.
-
-Package: libknopflerfish-osgi-java-doc
-Section: doc
-Architecture: all
-Depends: ${misc:Depends}
-Recommends: iceweasel | firefox | www-browser
-Description: Java framework implementing the OSGi R5 version (docs)
- OSGi, Open Service Gateway Initiative, specifies an industry standard Java
- application platform, allowing multiple applications, to securely run in a
- single JVM. These programs can share resources as data, functionality and
- threads.
- .
- Applications areas for OSGi ranges from use as a service platform on embedded
- devices, to plugin mechanisms for larger programs. The initial goal of OSGi
- was the embedded market, but other uses are certainly possible.
- .
- This package contains the documentation, currently mainly for the framework.
diff --git a/debian/libknopflerfish-osgi-java-doc.doc-base.api 
b/debian/libknopflerfish-osgi-java-doc.doc-base.api
deleted file mode 100644
index c62673a..000
--- a/debian/libknopflerfish-osgi-java-doc.doc-base.api
+++ /dev/null
@@ -1,10 +0,0 @@
-Document: knopflerfish-osgi-javadoc
-Title: API JavaDoc for Knopflerfish's OSGi implementation
-Author: The Knopflerfish Project
-Abstract: This the API JavaDoc for Knopflerfish's OSGi framework
- and the OSGi interface.
-Section: Programming
-
-Format: HTML
-Index: /usr/share/doc/libknopflerfish-osgi-java-doc/api/index.html
-Files: /usr/share/doc/libknopflerfish-osgi-java-doc/api/*.html
diff --git a/debian/libknopflerfish-osgi-java-doc.doc-base.intro 
b/debian/libknopflerfish-osgi-java-doc.doc-base.intro
deleted file mode 100644
index ba805af..000
--- a/debian/libknopflerfish-osgi-java-doc.doc-base.intro
+++ /dev/null
@@ -1,9 +0,0 @@
-Document: knopflerfish-osgi-framework-intro
-Title: Introduction to Knopflerfish's OSGi implementation
-Author: The Knopflerfish Project
-Abstract: Quickstart guide for using the Knopflerfish OSGi framework
-Section: Programming
-
-Format: HTML
-Index: /usr/share/doc/libknopflerfish-osgi-java-doc/framework.html
-Files: /usr/share/doc/libknopflerfish-osgi-java-doc/framework.html
diff --git a/debian/libknopflerfish-osgi-java-doc.docs 
b/debian/libknopflerfish-osgi-java-doc.docs
deleted file mode 100644
index af7de37..000
--- a/debian/libknopflerfish-osgi-java-doc.docs
+++ /dev/null
@@ -1,2 +0,0 @@
-api/
-framework.html
diff --git a/debian/libknopflerfish-osgi-java-doc.javadoc 
b/debian/libknopflerfish-osgi-java-doc.javadoc
deleted file mode 100644
index eedd89b..000
--- a/debian/libknopflerfish-osgi-java-doc.javadoc
+++ /dev/null
@@ -1 +0,0 @@
-api
diff --git a/debian/rules b/debian/rules
index 63e26fc..26f7e73 100755
--- a/debian/rules
+++ b/debian/rules
@@ -12,9 +12,6 @@ override_dh_auto_build:
dh_auto_build -- -f ant/bundletasks.xml build_bundle_tasks 
-Dasm.jar=/usr/share/java/asm-all.jar
dh_auto_build -- -f osgi/framewor

[knopflerfish-osgi] branch master updated (4e9b2ba -> 8592fc2)

[Felix Natter]

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

fnatter-guest pushed a change to branch master
in repository knopflerfish-osgi.

  from  4e9b2ba   Fixed my email in the patch header
   new  540068b   drop java-doc package
   new  8592fc2   Merge branch 'master' of 
git+ssh://git.debian.org/git/pkg-java/knopflerfish-osgi

The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "adds" were already present in the repository and have only
been added to this reference.


Summary of changes:
 debian/changelog|  7 +++
 debian/control  | 20 +---
 debian/libknopflerfish-osgi-java-doc.doc-base.api   | 10 --
 debian/libknopflerfish-osgi-java-doc.doc-base.intro |  9 -
 debian/libknopflerfish-osgi-java-doc.docs   |  2 --
 debian/libknopflerfish-osgi-java-doc.javadoc|  1 -
 debian/rules|  3 ---
 7 files changed, 8 insertions(+), 44 deletions(-)
 delete mode 100644 debian/libknopflerfish-osgi-java-doc.doc-base.api
 delete mode 100644 debian/libknopflerfish-osgi-java-doc.doc-base.intro
 delete mode 100644 debian/libknopflerfish-osgi-java-doc.docs
 delete mode 100644 debian/libknopflerfish-osgi-java-doc.javadoc

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

___
pkg-java-commits mailing list
pkg-java-comm...@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-commits

[knopflerfish-osgi] 02/02: Merge branch 'master' of git+ssh://git.debian.org/git/pkg-java/knopflerfish-osgi

[Felix Natter]

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

fnatter-guest pushed a commit to branch master
in repository knopflerfish-osgi.

commit 8592fc2f80615a562a9fe8e04ba17d2006e04be0
Merge: 540068b 4e9b2ba
Author: Felix Natter <fnat...@gmx.net>
Date:   Fri Mar 30 17:39:03 2018 +0200

Merge branch 'master' of 
git+ssh://git.debian.org/git/pkg-java/knopflerfish-osgi

 debian/patches/40_ignore_android.patch | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

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

___
pkg-java-commits mailing list
pkg-java-comm...@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-commits

Bug#893221: knopflerfish-osgi FTBFS with openjdk-9

[Felix Natter]

Emmanuel Bourg <ebo...@apache.org> writes:

> Le 28/03/2018 à 21:40, Felix Natter a écrit :
>
>> I tried several variations of javadoc's -exclude parameter:
>> 
>> -exclude "org.knopflerfish.framework.bundlestorage.dex"
>> -exclude "org.knopflerfish.framework.bundlestorage.dex.DexArchive"
>> -exclude "org.knopflerfish.framework.bundlestorage.dex.*"
>> -exclude "org/knopflerfish/framework/bundlestorage/dex"
>> -exclude dalvik.system
>> [...]
>> 
>> Do you have an idea what I'm doing wrong? To me it looks like -exclude
>> is broken/ignored. If we can't fix the javadoc invocation, I suggest
>> to patch out DexArchive.java.
>> What do you think?
>
> I gave it a try and I haven't been able to get the -exclude option to
> work as documented either. I managed to build the javadoc with the
> "--ignore-source-errors -Xdoclint:none" options, but this may break
> again in the future.
>
> I suggest simply removing the -java-doc package, it has a low popcon and
> no reverse dependencies.

I agree, thanks for looking into this!

Is the following ok for getting rid of the -java-doc package
(I don't think it makes sense to keep an older doc package)?

 Package: libknopflerfish-osgi-framework-java
 Architecture: all
 Depends: ${misc:Depends}
-Suggests: libknopflerfish-osgi-java-doc
+Provides: libknopflerfish-osgi-java-doc
+Conflicts: libknopflerfish-osgi-java-doc
+Replaces: libknopflerfish-osgi-java-doc

Many Thanks and Best Regards,
-- 
Felix Natter
debian/rules!

__
This is the maintainer address of Debian's Java team
<http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-maintainers>. 
Please use
debian-j...@lists.debian.org for discussions and questions.

Bug#893221: knopflerfish-osgi FTBFS with openjdk-9

[Felix Natter]

Adrian Bunk <b...@debian.org> writes:

> On Sat, Mar 24, 2018 at 11:35:48AM +0100, Felix Natter wrote:
>> hello Adrian,
>
> Hi Felix,

hello Adrian,

>> thank you very much for the report.
>> 
>> I am not sure that this is a Java9 issue, lookls more like some classes
>> (org.osgi.annotation.versioning.*) were dropped from a package I depend
>> on.
>
> the relevant change is that javadoc now gives errors instead of warnings 
> for some problems (often caused by incorrect/incomplete classpath).
>
> Fails with Java 9:
> /usr/lib/jvm/java-9-openjdk-amd64/bin/javadoc -locale en -encoding "UTF-8" 
> -sourcepath osgi/framework/src -d api -subpackages org.knopflerfish:org.osgi
>
> Works with Java 8:
> /usr/lib/jvm/java-8-openjdk-amd64/bin/javadoc -locale en -encoding "UTF-8" 
> -sourcepath osgi/framework/src -d api -subpackages org.knopflerfish:org.osgi

Many thanks for the explanation. Most errors are fixed by adding "-cp
/usr/share/java/osgi.annotation.jar".

The remaining problem is the Android (Dalvik) dependency (we build
without Android support):

Loading source files for package org.knopflerfish...
Loading source files for package org.osgi...
Constructing Javadoc information...
osgi/framework/src/org/knopflerfish/framework/bundlestorage/dex/DexArchive.java:47:
 error: package dalvik.system does not exist
import dalvik.system.DexFile;
^
osgi/framework/src/org/knopflerfish/framework/bundlestorage/dex/DexArchive.java:57:
 error: cannot find symbol
  private DexFile dexFile = null;
  ^
  symbol:   class DexFile
  location: class DexArchive
2 errors

I tried several variations of javadoc's -exclude parameter:

-exclude "org.knopflerfish.framework.bundlestorage.dex"
-exclude "org.knopflerfish.framework.bundlestorage.dex.DexArchive"
-exclude "org.knopflerfish.framework.bundlestorage.dex.*"
-exclude "org/knopflerfish/framework/bundlestorage/dex"
-exclude dalvik.system
[...]

Do you have an idea what I'm doing wrong? To me it looks like -exclude
is broken/ignored. If we can't fix the javadoc invocation, I suggest
to patch out DexArchive.java.
What do you think?

Many Thanks and Best Regards,
-- 
Felix Natter
debian/rules!

__
This is the maintainer address of Debian's Java team
<http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-maintainers>. 
Please use
debian-j...@lists.debian.org for discussions and questions.

Bug#893221: knopflerfish-osgi FTBFS with openjdk-9

[Felix Natter]

hello Adrian,

thank you very much for the report.

I am not sure that this is a Java9 issue, lookls more like some classes
(org.osgi.annotation.versioning.*) were dropped from a package I depend
on.

I will look into this soon (Friday, start of Easter weekend, at the
latest). Can we change the priority so that the package is not removed?

Cheers and Best Regards,
-- 
Felix Natter
debian/rules!

__
This is the maintainer address of Debian's Java team
<http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-maintainers>. 
Please use
debian-j...@lists.debian.org for discussions and questions.

Bug#893663: freeplane: CVE-2018-1000069 XXE vulnerability

[Felix Natter]

Markus Koschany <a...@debian.org> writes:

> Am 22.03.2018 um 20:52 schrieb Felix Natter:
>> Markus Koschany <a...@debian.org> writes:
>> 
>>> Package: freeplane
>>> X-Debbugs-CC: t...@security.debian.org
>>> X-Debbugs-CC: fnat...@gmx.net
>>> Severity: important
>>> Tags: security
>>>
>>> Hi,
>> 
>> hello Markus,
>> 
>>> the following vulnerability was published for freeplane. Apparently only
>>> stretch/jessie/wheezy might be affected.
>> 
>> Thank you for paying attention to this, I completely overlooked this!
>

Hi Markus,

> Thanks for your reply!
>
>> 
>>> @Felix
>>> Can you tell us more about this vulnerability? There only seems to be a
>>> reference in freeplane's wiki.
>> 
>> I think it is very well explained here:
>> https://www.owasp.org/index.php/XML_External_Entity_(XXE)_Processing
>> 
>> In short: External identities are "includes" for XML documents that can
>> be specified in DTDs.
>> 
>> Here is the commit that should fix it:
>> https://github.com/freeplane/freeplane/commit/a5dce7f9f
>
> That's what we were looking for.
>
> [...]
>
>
>> I can confirm that the the fix is in 1.5.20 and 1.6.1, so it's true that
>> wheezy, jessie and stretch are affected.
>> 
>> Shall I add the patch in git branches from the debian/X tags here?
>> https://anonscm.debian.org/cgit/pkg-java/freeplane.git
>> Or did you want to do this, Markus?
>
> Please prepare updates for Jessie and Stretch if time permits and I will
> upload the fix either as a security update, provided the security team
> agrees, or as a point-update. I will take care of Wheezy myself.

Since I am hiking this weekend, would it be possible to do this as the
first thing on the Easter weekend (next Friday)? I also need to fix the
knopflerfish RC bug (#893221), I will look into that this morning.

BTW: I *think* the patch should apply without major problems (the XML
persistence hasn't changed much). But on the ant build systems (< 1.5)
the sources are in /src/** instead of /src/main/java/**,
so you can apply there with -p4 or something (and ignore the unmatched part
for freeplane_plugin_script [1]). That part ([1]) can be applied
manually.
I will checkout the respective tag (debian/1.3.12-1, debian/1.5.18-1),
create a branch from there ("jessie-security1", "stretch-security1"),
import the patch, create a new changelog entry (will read about that)
and test, ok?

[1] 
freeplane_plugin_script/src/main/java/org/freeplane/plugin/script/ScriptingRegistration.java

Cheers and Best Regards,
-- 
Felix Natter
debian/rules!

__
This is the maintainer address of Debian's Java team
<http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-maintainers>. 
Please use
debian-j...@lists.debian.org for discussions and questions.

Bug#893663: freeplane: CVE-2018-1000069 XXE vulnerability

[Felix Natter]

Markus Koschany <a...@debian.org> writes:

> Package: freeplane
> X-Debbugs-CC: t...@security.debian.org
> X-Debbugs-CC: fnat...@gmx.net
> Severity: important
> Tags: security
>
> Hi,

hello Markus,

> the following vulnerability was published for freeplane. Apparently only
> stretch/jessie/wheezy might be affected.

Thank you for paying attention to this, I completely overlooked this!

> @Felix
> Can you tell us more about this vulnerability? There only seems to be a
> reference in freeplane's wiki.

I think it is very well explained here:
https://www.owasp.org/index.php/XML_External_Entity_(XXE)_Processing

In short: External identities are "includes" for XML documents that can
be specified in DTDs.

Here is the commit that should fix it:
https://github.com/freeplane/freeplane/commit/a5dce7f9f

> https://www.freeplane.org/wiki/index.php/XML_External_Entity_vulnerability_in_map_parser
>
> CVE-2018-169[0]:
> | FreePlane version 1.5.9 and earlier contains a XML External Entity
> | (XXE) vulnerability in XML Parser in mindmap loader that can result in
> | stealing data from victim's machine. This attack appears to require
> | the vicim to open a specially crafted mind map file. This
> | vulnerability appears to have been fixed in 1.6+.
>
> If you fix the vulnerability please also make sure to include the
> CVE (Common Vulnerabilities & Exposures) id in your changelog entry.
>
> For further information see:
>
> [0] https://security-tracker.debian.org/tracker/CVE-2018-169
> https://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2018-169
>
> Please adjust the affected versions in the BTS as needed.

I can confirm that the the fix is in 1.5.20 and 1.6.1, so it's true that
wheezy, jessie and stretch are affected.

Shall I add the patch in git branches from the debian/X tags here?
https://anonscm.debian.org/cgit/pkg-java/freeplane.git
Or did you want to do this, Markus?

I will read more about security updates on the weekend.

Cheers and Best Regards,
-- 
Felix Natter
debian/rules!

__
This is the maintainer address of Debian's Java team
<http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-maintainers>. 
Please use
debian-j...@lists.debian.org for discussions and questions.

[freeplane] branch master updated (1f942fe -> 10dfdf5)

[Felix Natter]

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

fnatter-guest pushed a change to branch master
in repository freeplane.

  from  1f942fe   remove dh_make-template from d/rules
   new  10dfdf5   target unstable

The 1 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "adds" were already present in the repository and have only
been added to this reference.


Summary of changes:
 debian/changelog | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

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

___
pkg-java-commits mailing list
pkg-java-comm...@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-commits

[freeplane] 01/01: target unstable

[Felix Natter]

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

fnatter-guest pushed a commit to branch master
in repository freeplane.

commit 10dfdf570a2f3c007c4155eb80d1d8e989bd854d
Author: Felix Natter <fnat...@gmx.net>
Date:   Sat Feb 10 14:00:34 2018 +0100

target unstable
---
 debian/changelog | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 642beca..67ffb0c 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,10 +1,10 @@
-freeplane (1.6.13-1) UNRELEASED; urgency=medium
+freeplane (1.6.13-1) unstable; urgency=medium
 
   * New upstream release.
   * Update/refresh patches, update man page.
   * Update standards-version to 4.1.3 (no changes)
 
- -- Felix Natter <fnat...@gmx.net>  Sat, 10 Feb 2018 13:24:27 +0100
+ -- Felix Natter <fnat...@gmx.net>  Sat, 10 Feb 2018 14:00:05 +0100
 
 freeplane (1.6.10-1) unstable; urgency=medium
 

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

___
pkg-java-commits mailing list
pkg-java-comm...@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-commits

[freeplane] 02/07: Update upstream source from tag 'upstream/1.6.13'

[Felix Natter]

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

fnatter-guest pushed a commit to branch master
in repository freeplane.

commit 73eba005cb778825ce46128b6ad6f6479ba5bd62
Merge: 836086a add54b4
Author: Felix Natter <fnat...@gmx.net>
Date:   Sat Feb 10 13:16:07 2018 +0100

Update upstream source from tag 'upstream/1.6.13'

Update to upstream version '1.6.13'
with Debian dir 39c73792d8053fcac2218c14348e1590d4293094

 build.gradle   | 17 +-
 freeplane/build.gradle |  8 +-
 freeplane/doc/freeplane.mm |  2 +-
 freeplane/doc/freeplane_ja.mm  |  2 +-
 freeplane/doc/history_en.txt   | 25 +
 .../external-resources/xml/mindmapmodemenu.xml |  8 +-
 freeplane/external-resources/xml/preferences.xml   |  1 +
 freeplane/external-resources/xml/stylemodemenu.xml |  6 +-
 freeplane/external-resources/xslt/mm2adoc.xsl  |  8 +-
 freeplane/external-resources/xslt/mm2opml.xsl  | 50 +-
 freeplane/external-resources/xslt/mm2text.xsl  | 22 +-
 freeplane/resources/html/freeplane_applet.jnlp |  2 +-
 freeplane/resources/images/StrikeThrough.png   |Bin 0 -> 455 bytes
 freeplane/resources/images/StrikeThrough.svg   | 59 +
 .../resources/translations/Resources_af.properties | 53 +-
 .../resources/translations/Resources_ar.properties |  3 +-
 .../resources/translations/Resources_ca.properties |  5 +-
 .../resources/translations/Resources_cs.properties | 19 +-
 .../resources/translations/Resources_da.properties | 11 +-
 .../resources/translations/Resources_de.properties | 13 +-
 .../resources/translations/Resources_el.properties |  7 +-
 .../resources/translations/Resources_es.properties |  9 +-
 .../resources/translations/Resources_et.properties |  5 +-
 .../resources/translations/Resources_eu.properties |  9 +-
 .../resources/translations/Resources_fr.properties | 24 +-
 .../resources/translations/Resources_gl.properties |  7 +-
 .../resources/translations/Resources_hr.properties | 21 +-
 .../resources/translations/Resources_hu.properties |  9 +-
 .../resources/translations/Resources_id.properties |  5 +-
 .../resources/translations/Resources_it.properties | 41 +-
 .../resources/translations/Resources_ja.properties | 17 +-
 .../resources/translations/Resources_kn.properties | 39 +
 .../resources/translations/Resources_ko.properties | 16 +-
 .../resources/translations/Resources_lt.properties |  5 +-
 .../resources/translations/Resources_nb.properties |  5 +-
 .../resources/translations/Resources_nl.properties | 17 +-
 .../resources/translations/Resources_nn.properties |  5 +-
 .../resources/translations/Resources_oc.properties |Bin 104925 -> 104809 
bytes
 .../resources/translations/Resources_pl.properties | 18 +-
 .../translations/Resources_pt_BR.properties|  9 +-
 .../translations/Resources_pt_PT.properties| 15 +-
 .../resources/translations/Resources_ru.properties |  9 +-
 .../resources/translations/Resources_sk.properties |169 +-
 .../resources/translations/Resources_sl.properties | 20 +-
 .../resources/translations/Resources_sr.properties |  7 +-
 .../resources/translations/Resources_sv.properties |  7 +-
 .../resources/translations/Resources_tr.properties |146 +-
 .../translations/Resources_uk_UA.properties| 27 +-
 .../translations/Resources_zh_CN.properties| 19 +-
 .../translations/Resources_zh_TW.properties|793 +-
 freeplane/resources/xslt/opml2mm.xsl   | 31 +-
 freeplane/resources/xslt/toxhtml.xsl   |  5 +-
 .../core/resources/ResourceController.java | 94 +-
 .../core/resources/components/KeyProperty.java |  2 +-
 .../resources/components/OptionPanelBuilder.java   |  1 -
 .../components/ShowPreferencesAction.java  |  4 +-
 .../org/freeplane/core/ui/AFreeplaneAction.java| 18 +-
 .../core/ui/components/MultipleImage.java  |  4 +-
 .../components/OptionalDontShowMeAgainDialog.java  | 36 +-
 .../core/ui/components/RenderedContent.java| 51 +-
 .../core/ui/components/TypedListCellRenderer.java  |  4 +-
 .../core/ui/components/html/CssRuleBuilder.java|  4 +
 .../freeplane/core/ui/image/BigBufferedImage.java  | 21 +-
 .../core/ui/menubuilders/menu/MenuIconScaling.java |  4 +-
 .../freeplane/core/ui/svgicons/CachingIcon.java| 63 +
 .../core/ui/svgicons/FreeplaneIconFactory.java |116 +
 .../freeplane/core/ui/svgicons/GraphicsHints.java  | 18 +
 .../ui/textchanger/TranslatedElementFactory.java   | 26 +-
 .../core/ui/textchanger/UITextChanger.java | 59 +-
 .../java/org/freeplane/core/util/FileUtils.java| 64 +-
 .../freepla

[freeplane] 07/07: remove dh_make-template from d/rules

[Felix Natter]

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

fnatter-guest pushed a commit to branch master
in repository freeplane.

commit 1f942fe1fcaa3479aae3228d8fd1149d2dfc25b6
Author: Felix Natter <fnat...@gmx.net>
Date:   Sat Feb 10 13:53:28 2018 +0100

remove dh_make-template from d/rules
---
 debian/rules | 4 
 1 file changed, 4 deletions(-)

diff --git a/debian/rules b/debian/rules
index ade58e0..60df507 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,11 +1,7 @@
 #!/usr/bin/make -f
-# See debhelper(7) (uncomment to enable)
-# output every command that modifies files on the build system.
 #DH_VERBOSE = 1
 
 DEB_COMPRESS_EXCLUDE := .mm .pdf
-#DEB_DH_INSTALL_ARGS := -XLICENSE.txt
-
 
 %:
dh $@ --buildsystem=gradle --no-parallel

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

___
pkg-java-commits mailing list
pkg-java-comm...@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-commits

[freeplane] branch pristine-tar updated (06b1324 -> 47be4fd)

[Felix Natter]

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

fnatter-guest pushed a change to branch pristine-tar
in repository freeplane.

  from  06b1324   pristine-tar data for freeplane_1.6.10.orig.tar.gz
   new  47be4fd   pristine-tar data for freeplane_1.6.13.orig.tar.gz

The 1 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "adds" were already present in the repository and have only
been added to this reference.


Summary of changes:
 freeplane_1.6.13.orig.tar.gz.delta | Bin 0 -> 96116 bytes
 freeplane_1.6.13.orig.tar.gz.id|   1 +
 2 files changed, 1 insertion(+)
 create mode 100644 freeplane_1.6.13.orig.tar.gz.delta
 create mode 100644 freeplane_1.6.13.orig.tar.gz.id

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

___
pkg-java-commits mailing list
pkg-java-comm...@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-commits

[freeplane] 01/01: pristine-tar data for freeplane_1.6.13.orig.tar.gz

[Felix Natter]

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

fnatter-guest pushed a commit to branch pristine-tar
in repository freeplane.

commit 47be4fd145185c1b79f354a7bd6d58d49bcc814e
Author: Felix Natter <fnat...@gmx.net>
Date:   Sat Feb 10 13:16:07 2018 +0100

pristine-tar data for freeplane_1.6.13.orig.tar.gz
---
 freeplane_1.6.13.orig.tar.gz.delta | Bin 0 -> 96116 bytes
 freeplane_1.6.13.orig.tar.gz.id|   1 +
 2 files changed, 1 insertion(+)

diff --git a/freeplane_1.6.13.orig.tar.gz.delta 
b/freeplane_1.6.13.orig.tar.gz.delta
new file mode 100644
index 000..f7e568f
Binary files /dev/null and b/freeplane_1.6.13.orig.tar.gz.delta differ
diff --git a/freeplane_1.6.13.orig.tar.gz.id b/freeplane_1.6.13.orig.tar.gz.id
new file mode 100644
index 000..a3c25d3
--- /dev/null
+++ b/freeplane_1.6.13.orig.tar.gz.id
@@ -0,0 +1 @@
+2dad0f2274afb8afb249e11f18c70b6072d85867

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

___
pkg-java-commits mailing list
pkg-java-comm...@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-commits

[freeplane] 03/07: update patches for 1.6.13

[Felix Natter]

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

fnatter-guest pushed a commit to branch master
in repository freeplane.

commit e1c477a6783338efb527ff4bbe604a48c83f24eb
Author: Felix Natter <fnat...@gmx.net>
Date:   Sat Feb 10 13:21:40 2018 +0100

update patches for 1.6.13
---
 debian/patches/10_build_usr_share_java.patch | 26 +-
 debian/patches/20_freeplane_sh.patch | 24 +---
 debian/patches/30_disable_update_check.patch |  4 ++--
 3 files changed, 24 insertions(+), 30 deletions(-)

diff --git a/debian/patches/10_build_usr_share_java.patch 
b/debian/patches/10_build_usr_share_java.patch
index 7a635fa..84295b9 100644
--- a/debian/patches/10_build_usr_share_java.patch
+++ b/debian/patches/10_build_usr_share_java.patch
@@ -86,7 +86,7 @@ Last-Update: 2016-02-04
  dependencies {
  testCompile 'junit:junit:4.11'
  testCompile 'org.assertj:assertj-core:2.6.0'
-@@ -108,14 +121,9 @@
+@@ -117,14 +130,9 @@
  // OSGi projects (/plugin/, freeplane) need this for compilation (e.g. 
resolve Bundle),
  // and freeplane_framework needs to copy it to BUILD/framework.jar
  configure(subprojects.findAll {it.name =~ /plugin/ || it.name =~ 
/^freeplane$/ || it.name =~ /^freeplane_framework$/}){
@@ -103,7 +103,7 @@ Last-Update: 2016-02-04
  }
  }
  
-@@ -128,11 +136,13 @@
+@@ -137,11 +145,13 @@
  else
 ext.pluginid = project.name.replace("freeplane_plugin_", 
"org.freeplane.plugin.")
  
@@ -122,7 +122,7 @@ Last-Update: 2016-02-04
  
  task filterOSGiManifestForEclipse(type: Copy) {
  from('build/tmp/jar/MANIFEST.MF') {
-@@ -184,18 +194,9 @@
+@@ -193,18 +203,9 @@
  configure(subprojects.findAll {it.name =~ /plugin/ }) {
  
  task copyOSGiJars(type: Copy) {
@@ -184,7 +184,7 @@ Last-Update: 2016-02-04
  }
  
  sourceSets {
-@@ -181,16 +181,17 @@
+@@ -187,16 +187,17 @@
  }
  
  task copyOSGiJars(type: Copy) {
@@ -211,7 +211,7 @@ Last-Update: 2016-02-04
   }
   into(globalBin + '/core/' + pluginid + '/lib/')
  }
-@@ -315,7 +316,7 @@
+@@ -321,7 +322,7 @@
  jar.dependsOn viewerJar
  jar.dependsOn editorJar
  jar.dependsOn osgiJar
@@ -222,8 +222,8 @@ Last-Update: 2016-02-04
  build.dependsOn copyExternalResources
 --- a/freeplane_plugin_jsyntaxpane/build.gradle
 +++ b/freeplane_plugin_jsyntaxpane/build.gradle
-@@ -2,7 +2,8 @@
- compile project(':freeplane')
+@@ -3,7 +3,8 @@
+   testCompile project(':freeplane')
  
  // from flatDir "localGitDepsRepository":
 -compile ':jsyntaxpane-0.9.6~r156-5' // from the Debian 
"libjsyntaxpane-java" package
@@ -236,7 +236,7 @@ Last-Update: 2016-02-04
 +++ b/freeplane_plugin_openmaps/build.gradle
 @@ -8,7 +8,8 @@
  dependencies {
- compile project(':freeplane')
+ compileOnly project(':freeplane')
  
 -compile 'org.openstreetmap.jmapviewer:jmapviewer:1.14'
 +//compile 'org.openstreetmap.jmapviewer:jmapviewer:1.14'
@@ -246,18 +246,18 @@ Last-Update: 2016-02-04
  jar {
 --- a/freeplane_plugin_script/build.gradle
 +++ b/freeplane_plugin_script/build.gradle
-@@ -2,10 +2,10 @@
- compile project(':freeplane')
- compile project(':freeplane_plugin_jsyntaxpane')
+@@ -4,10 +4,10 @@
+ compileOnly project(':freeplane_plugin_jsyntaxpane')
+   testCompile project(':freeplane_plugin_jsyntaxpane')
  compile 'org.codehaus.groovy:groovy-all:2.3.1'
 -  compile ('org.freeplane.securegroovy:groovy-patcher:0.0.2') {
 -  transitive = false
 -  }
--compile 'net.bytebuddy:byte-buddy:1.6.9'
+-compile 'net.bytebuddy:byte-buddy:1.7.9'
 +  //compile ('org.freeplane.securegroovy:groovy-patcher:0.0.2') {
 +  //  transitive = false
 +  //}
-+//compile 'net.bytebuddy:byte-buddy:1.6.9'
++//compile 'net.bytebuddy:byte-buddy:1.7.9'
  }
  
  tasks.withType(JavaCompile) {
diff --git a/debian/patches/20_freeplane_sh.patch 
b/debian/patches/20_freeplane_sh.patch
index 0770596..2b64358 100644
--- a/debian/patches/20_freeplane_sh.patch
+++ b/debian/patches/20_freeplane_sh.patch
@@ -20,7 +20,7 @@ Last-Update: 2016-05-05
  ## FUNCTIONS DEFINITIONS ###
  
  _debug() {
-@@ -29,36 +36,36 @@
+@@ -29,31 +36,31 @@
  
  findjava() {
# We try hard to find the proper 'java' command
@@ -58,18 +58,12 @@ Last-Update: 2016-05-05
 -  "$JAVACMD" -version >&2
 +  "$JAVA_CMD" -version >&2
fi
--  if (! "${JAVACMD}" -version 2>&1 | grep -qe 'Java(TM)' -e 
OpenJDK); then
-+  if (! "${JAVA_CMD}" -version 2>&1 | grep -qe 'Java(TM)' -e 
OpenJDK); then
-   _error "Your Java is not a derivative from Sun's code," 
\
-  "" \
-  "FREEPLANE WILL MOST

[freeplane] 05/07: bump standards-version (no changes)

[Felix Natter]

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

fnatter-guest pushed a commit to branch master
in repository freeplane.

commit 0e1998767489845f91412bde905d6571dcb8afbd
Author: Felix Natter <fnat...@gmx.net>
Date:   Sat Feb 10 13:23:45 2018 +0100

bump standards-version (no changes)
---
 debian/control | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/debian/control b/debian/control
index 486431c..243ab47 100644
--- a/debian/control
+++ b/debian/control
@@ -36,7 +36,7 @@ Build-Depends-Indep: javahelp2,
  jmapviewer (>= 1.11),
  libmnemonicsetter-java (>= 0.5),
  gradle-debian-helper
-Standards-Version: 4.1.1
+Standards-Version: 4.1.3
 Vcs-Browser: https://anonscm.debian.org/cgit/pkg-java/freeplane.git
 Vcs-Git: https://anonscm.debian.org/git/pkg-java/freeplane.git
 Homepage: http://freeplane.org/

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

___
pkg-java-commits mailing list
pkg-java-comm...@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-commits

[freeplane] annotated tag upstream/1.6.13 created (now afe5282)

[Felix Natter]

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

fnatter-guest pushed a change to annotated tag upstream/1.6.13
in repository freeplane.

at  afe5282   (tag)
   tagging  add54b4074ee7c9803efa4896ee63a087b072d4b (commit)
  replaces  upstream/1.6.10
 tagged by  Felix Natter
on  Sat Feb 10 13:16:07 2018 +0100

- Log -
Upstream version 1.6.13

Felix Natter (1):
  New upstream version 1.6.13

---

No new revisions were added by this update.

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

___
pkg-java-commits mailing list
pkg-java-comm...@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-commits

[freeplane] 06/07: build 1.6.13-1

[Felix Natter]

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

fnatter-guest pushed a commit to branch master
in repository freeplane.

commit 806fe2742b147072d731995fbb87ccae825bbf08
Author: Felix Natter <fnat...@gmx.net>
Date:   Sat Feb 10 13:25:11 2018 +0100

build 1.6.13-1
---
 debian/changelog | 8 
 1 file changed, 8 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index 952d0b1..642beca 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+freeplane (1.6.13-1) UNRELEASED; urgency=medium
+
+  * New upstream release.
+  * Update/refresh patches, update man page.
+  * Update standards-version to 4.1.3 (no changes)
+
+ -- Felix Natter <fnat...@gmx.net>  Sat, 10 Feb 2018 13:24:27 +0100
+
 freeplane (1.6.10-1) unstable; urgency=medium
 
   * New upstream release.

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

___
pkg-java-commits mailing list
pkg-java-comm...@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-commits

[freeplane] 04/07: bump version in man page

[Felix Natter]

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

fnatter-guest pushed a commit to branch master
in repository freeplane.

commit 52a524272443873d0e02a8a52d569868e919cec6
Author: Felix Natter <fnat...@gmx.net>
Date:   Sat Feb 10 13:22:39 2018 +0100

bump version in man page
---
 debian/freeplane.1.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/debian/freeplane.1.xml b/debian/freeplane.1.xml
index 127f09d..e48518b 100644
--- a/debian/freeplane.1.xml
+++ b/debian/freeplane.1.xml
@@ -19,7 +19,7 @@
   Debian">
   GNU">
   GPL">
-  
+  
 ]>
 
 

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

___
pkg-java-commits mailing list
pkg-java-comm...@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-commits

[freeplane] branch master updated (836086a -> 1f942fe)

[Felix Natter]

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

fnatter-guest pushed a change to branch master
in repository freeplane.

  from  836086a   finalize changelog for 1.6.10-1
   new  add54b4   New upstream version 1.6.13
   new  73eba00   Update upstream source from tag 'upstream/1.6.13'
   new  e1c477a   update patches for 1.6.13
   new  52a5242   bump version in man page
   new  0e19987   bump standards-version (no changes)
   new  806fe27   build 1.6.13-1
   new  1f942fe   remove dh_make-template from d/rules

The 7 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "adds" were already present in the repository and have only
been added to this reference.


Summary of changes:
 build.gradle   | 17 +-
 debian/changelog   |  8 +
 debian/control |  2 +-
 debian/freeplane.1.xml |  2 +-
 debian/patches/10_build_usr_share_java.patch   | 26 +-
 debian/patches/20_freeplane_sh.patch   | 24 +-
 debian/patches/30_disable_update_check.patch   |  4 +-
 debian/rules   |  4 -
 freeplane/build.gradle |  8 +-
 freeplane/doc/freeplane.mm |  2 +-
 freeplane/doc/freeplane_ja.mm  |  2 +-
 freeplane/doc/history_en.txt   | 25 +
 .../external-resources/xml/mindmapmodemenu.xml |  8 +-
 freeplane/external-resources/xml/preferences.xml   |  1 +
 freeplane/external-resources/xml/stylemodemenu.xml |  6 +-
 freeplane/external-resources/xslt/mm2adoc.xsl  |  8 +-
 freeplane/external-resources/xslt/mm2opml.xsl  | 50 +-
 freeplane/external-resources/xslt/mm2text.xsl  | 22 +-
 freeplane/resources/html/freeplane_applet.jnlp |  2 +-
 freeplane/resources/images/StrikeThrough.png   |Bin 0 -> 455 bytes
 freeplane/resources/images/StrikeThrough.svg   | 59 +
 .../resources/translations/Resources_af.properties | 53 +-
 .../resources/translations/Resources_ar.properties |  3 +-
 .../resources/translations/Resources_ca.properties |  5 +-
 .../resources/translations/Resources_cs.properties | 19 +-
 .../resources/translations/Resources_da.properties | 11 +-
 .../resources/translations/Resources_de.properties | 13 +-
 .../resources/translations/Resources_el.properties |  7 +-
 .../resources/translations/Resources_es.properties |  9 +-
 .../resources/translations/Resources_et.properties |  5 +-
 .../resources/translations/Resources_eu.properties |  9 +-
 .../resources/translations/Resources_fr.properties | 24 +-
 .../resources/translations/Resources_gl.properties |  7 +-
 .../resources/translations/Resources_hr.properties | 21 +-
 .../resources/translations/Resources_hu.properties |  9 +-
 .../resources/translations/Resources_id.properties |  5 +-
 .../resources/translations/Resources_it.properties | 41 +-
 .../resources/translations/Resources_ja.properties | 17 +-
 .../resources/translations/Resources_kn.properties | 39 +
 .../resources/translations/Resources_ko.properties | 16 +-
 .../resources/translations/Resources_lt.properties |  5 +-
 .../resources/translations/Resources_nb.properties |  5 +-
 .../resources/translations/Resources_nl.properties | 17 +-
 .../resources/translations/Resources_nn.properties |  5 +-
 .../resources/translations/Resources_oc.properties |Bin 104925 -> 104809 
bytes
 .../resources/translations/Resources_pl.properties | 18 +-
 .../translations/Resources_pt_BR.properties|  9 +-
 .../translations/Resources_pt_PT.properties| 15 +-
 .../resources/translations/Resources_ru.properties |  9 +-
 .../resources/translations/Resources_sk.properties |169 +-
 .../resources/translations/Resources_sl.properties | 20 +-
 .../resources/translations/Resources_sr.properties |  7 +-
 .../resources/translations/Resources_sv.properties |  7 +-
 .../resources/translations/Resources_tr.properties |146 +-
 .../translations/Resources_uk_UA.properties| 27 +-
 .../translations/Resources_zh_CN.properties| 19 +-
 .../translations/Resources_zh_TW.properties|793 +-
 freeplane/resources/xslt/opml2mm.xsl   | 31 +-
 freeplane/resources/xslt/toxhtml.xsl   |  5 +-
 .../core/resources/ResourceController.java | 94 +-
 .../core/resources/components/KeyProperty.java |  2 +-
 .../resources/components/OptionPanelBuilder.java   |  1 -
 .../components/ShowPreferencesAction.java  |  4 +-
 .../org/freeplane/core/ui/AFreeplaneAction.java| 18 +-
 .../core/ui/components/MultipleImage.java  |

[freeplane] branch pristine-tar updated (cd7d060 -> 06b1324)

[Felix Natter]

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

fnatter-guest pushed a change to branch pristine-tar
in repository freeplane.

  from  cd7d060   pristine-tar data for freeplane_1.6.6.orig.tar.gz
   new  06b1324   pristine-tar data for freeplane_1.6.10.orig.tar.gz

The 1 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "adds" were already present in the repository and have only
been added to this reference.


Summary of changes:
 freeplane_1.6.10.orig.tar.gz.delta | Bin 0 -> 95816 bytes
 freeplane_1.6.10.orig.tar.gz.id|   1 +
 2 files changed, 1 insertion(+)
 create mode 100644 freeplane_1.6.10.orig.tar.gz.delta
 create mode 100644 freeplane_1.6.10.orig.tar.gz.id

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

___
pkg-java-commits mailing list
pkg-java-comm...@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-commits

[freeplane] 01/01: pristine-tar data for freeplane_1.6.10.orig.tar.gz

[Felix Natter]

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

fnatter-guest pushed a commit to branch pristine-tar
in repository freeplane.

commit 06b13242b5db3decf24aa83f9e15793ecbeabc9e
Author: Felix Natter <fnat...@gmx.net>
Date:   Sat Nov 4 09:25:23 2017 +0100

pristine-tar data for freeplane_1.6.10.orig.tar.gz
---
 freeplane_1.6.10.orig.tar.gz.delta | Bin 0 -> 95816 bytes
 freeplane_1.6.10.orig.tar.gz.id|   1 +
 2 files changed, 1 insertion(+)

diff --git a/freeplane_1.6.10.orig.tar.gz.delta 
b/freeplane_1.6.10.orig.tar.gz.delta
new file mode 100644
index 000..5fc0acb
Binary files /dev/null and b/freeplane_1.6.10.orig.tar.gz.delta differ
diff --git a/freeplane_1.6.10.orig.tar.gz.id b/freeplane_1.6.10.orig.tar.gz.id
new file mode 100644
index 000..60a1f43
--- /dev/null
+++ b/freeplane_1.6.10.orig.tar.gz.id
@@ -0,0 +1 @@
+3ce40dd146f5e8cb77c3d5035ae405b237f7e2d6

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

___
pkg-java-commits mailing list
pkg-java-comm...@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-commits

[freeplane] 02/07: Update upstream source from tag 'upstream/1.6.10'

[Felix Natter]

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

fnatter-guest pushed a commit to branch master
in repository freeplane.

commit 3c8ed35fb3084f3ce1b64d8556c74ae67a955446
Merge: 48b7e43 95aeb2e
Author: Felix Natter <fnat...@gmx.net>
Date:   Sat Nov 4 09:25:23 2017 +0100

Update upstream source from tag 'upstream/1.6.10'

Update to upstream version '1.6.10'
with Debian dir f55adeaee7f57ad5031ee7aed42117b3d72fcfc0

 build.gradle   |4 +-
 dist.gradle|5 +-
 freeplane/build.gradle |2 +-
 freeplane/doc/history_en.txt   |   22 +
 freeplane/external-resources/templates/BuzanMap.mm |  156 ++
 .../external-resources/xslt/mm2latexartcl.xsl  |2 +-
 freeplane/external-resources/xslt/mm2markdown.xsl  |2 +-
 freeplane/external-resources/xslt/mm2opml.xsl  |2 +-
 .../resources/default_accelerators.properties  |5 -
 .../resources/default_accelerators_mac.properties  |4 +
 .../resources/images/AssignAttributesAction.svg|  338 ++--
 .../resources/images/EditAttributesAction.svg  |  252 ++-
 freeplane/resources/images/arrow-mode-none.svg |   72 +-
 freeplane/resources/images/edit12.svg  |  297 ++--
 .../resources/translations/Resources_af.properties |  227 +++
 .../resources/translations/Resources_ca.properties |2 +-
 .../resources/translations/Resources_cs.properties |   56 +-
 .../resources/translations/Resources_de.properties |  110 +-
 .../resources/translations/Resources_es.properties |8 +-
 .../resources/translations/Resources_et.properties |   28 +-
 .../resources/translations/Resources_fr.properties |   18 +-
 .../resources/translations/Resources_hr.properties |8 +-
 .../resources/translations/Resources_it.properties |  440 +-
 .../resources/translations/Resources_ja.properties |6 +-
 .../resources/translations/Resources_kn.properties |0
 .../resources/translations/Resources_ko.properties |8 +-
 .../resources/translations/Resources_nl.properties |   48 +-
 .../resources/translations/Resources_oc.properties |  Bin 0 -> 104925 bytes
 .../resources/translations/Resources_pl.properties |  210 +--
 .../translations/Resources_pt_PT.properties|6 +-
 .../resources/translations/Resources_ru.properties |2 +
 .../resources/translations/Resources_sk.properties | 1642 
 .../resources/translations/Resources_sl.properties | 1315 ++--
 .../resources/translations/Resources_sv.properties |4 +-
 .../resources/translations/Resources_tr.properties |   88 +-
 .../translations/Resources_uk_UA.properties|   28 +-
 freeplane/resources/xslt/opml2mm.xsl   |2 +-
 freeplane/resources/xslt/xml2mm.xsl|2 +-
 freeplane/signjar.gradle   |   58 +-
 .../java/com/thebuzzmedia/imgscalr/AsyncScalr.java |2 +-
 .../main/java/com/thebuzzmedia/imgscalr/Scalr.java |2 +-
 .../freeplane/core/io/xml/LocalEntityResolver.java |2 +-
 .../resources/components/OptionPanelBuilder.java   |9 -
 .../java/org/freeplane/core/ui/ActionEnabler.java  |2 +-
 .../ButtonModelStateChangeListenerForProperty.java |2 +-
 .../org/freeplane/core/ui/ColoredIconCreator.java  |2 +-
 .../core/ui/DelegatingPopupMenuListener.java   |2 +-
 .../java/org/freeplane/core/ui/LengthUnits.java|2 +-
 .../java/org/freeplane/core/ui/MenuSplitter.java   |2 +-
 .../core/ui/MenuSplitterConfiguration.java |2 +-
 .../org/freeplane/core/ui/MouseInsideListener.java |2 +-
 .../org/freeplane/core/ui/TimePeriodUnits.java |2 +-
 .../ui/components/ActionToggleButtonModel.java |2 +-
 .../core/ui/components/html/ScaledStyleSheet.java  |4 +-
 .../freeplane/core/ui/image/BigBufferedImage.java  |   41 +-
 .../ui/menubuilders/FreeplaneResourceAccessor.java |2 +-
 .../menubuilders/action/ActionSelectListener.java  |2 +-
 .../ui/menubuilders/action/EntriesForAction.java   |2 +-
 .../ui/menubuilders/generic/ChildEntryFilter.java  |2 +-
 .../ui/menubuilders/generic/ChildEntryRemover.java |2 +-
 .../ui/menubuilders/generic/EmptyEntryVisitor.java |2 +-
 .../generic/EntryNavigatorFactory.java |2 +-
 .../menubuilders/generic/IllegalEntryVisitor.java  |2 +-
 .../menubuilders/generic/NullResourceAccessor.java |2 +-
 .../menubuilders/generic/SkippingEntryVisitor.java |2 +-
 .../ui/menubuilders/generic/SubtreeProcessor.java  |2 +-
 .../ui/menubuilders/menu/JComponentRemover.java|2 +-
 .../core/ui/menubuilders/menu/MenuIconScaling.java |2 +-
 .../menu/PopupMenuListenerForEntry.java|2 +-
 .../core/ui/textchanger/TranslatedElement.java |2 +-
 .../freeplane/core/util/ClassLoaderFactory.java|2 +-
 .../org/freeplane/core/util/DelayedRunner.java |2 +-
 .../main/java/org/freep

[freeplane] branch master updated (48b7e43 -> 836086a)

[Felix Natter]

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

fnatter-guest pushed a change to branch master
in repository freeplane.

  from  48b7e43   disable broken parallel build
   new  95aeb2e   New upstream version 1.6.10
   new  3c8ed35   Update upstream source from tag 'upstream/1.6.10'
   new  85dcb2c   update patches for 1.6.10
   new  51b620f   bump version in man page
   new  0d4e67b   build 1.6.10-1
   new  0b472e1   update dependencies (jlatexmath, re-worked svg/pdf 
dependencies)
   new  836086a   finalize changelog for 1.6.10-1

The 7 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "adds" were already present in the repository and have only
been added to this reference.


Summary of changes:
 build.gradle   |4 +-
 debian/changelog   |   10 +
 debian/control |   14 +-
 debian/freeplane.1.xml |2 +-
 debian/patches/10_build_usr_share_java.patch   |   72 +-
 dist.gradle|5 +-
 freeplane/build.gradle |2 +-
 freeplane/doc/history_en.txt   |   22 +
 freeplane/external-resources/templates/BuzanMap.mm |  156 ++
 .../external-resources/xslt/mm2latexartcl.xsl  |2 +-
 freeplane/external-resources/xslt/mm2markdown.xsl  |2 +-
 freeplane/external-resources/xslt/mm2opml.xsl  |2 +-
 .../resources/default_accelerators.properties  |5 -
 .../resources/default_accelerators_mac.properties  |4 +
 .../resources/images/AssignAttributesAction.svg|  338 ++--
 .../resources/images/EditAttributesAction.svg  |  252 ++-
 freeplane/resources/images/arrow-mode-none.svg |   72 +-
 freeplane/resources/images/edit12.svg  |  297 ++--
 .../resources/translations/Resources_af.properties |  227 +++
 .../resources/translations/Resources_ca.properties |2 +-
 .../resources/translations/Resources_cs.properties |   56 +-
 .../resources/translations/Resources_de.properties |  110 +-
 .../resources/translations/Resources_es.properties |8 +-
 .../resources/translations/Resources_et.properties |   28 +-
 .../resources/translations/Resources_fr.properties |   18 +-
 .../resources/translations/Resources_hr.properties |8 +-
 .../resources/translations/Resources_it.properties |  440 +-
 .../resources/translations/Resources_ja.properties |6 +-
 .../resources/translations/Resources_kn.properties |0
 .../resources/translations/Resources_ko.properties |8 +-
 .../resources/translations/Resources_nl.properties |   48 +-
 .../resources/translations/Resources_oc.properties |  Bin 0 -> 104925 bytes
 .../resources/translations/Resources_pl.properties |  210 +--
 .../translations/Resources_pt_PT.properties|6 +-
 .../resources/translations/Resources_ru.properties |2 +
 .../resources/translations/Resources_sk.properties | 1642 
 .../resources/translations/Resources_sl.properties | 1315 ++--
 .../resources/translations/Resources_sv.properties |4 +-
 .../resources/translations/Resources_tr.properties |   88 +-
 .../translations/Resources_uk_UA.properties|   28 +-
 freeplane/resources/xslt/opml2mm.xsl   |2 +-
 freeplane/resources/xslt/xml2mm.xsl|2 +-
 freeplane/signjar.gradle   |   58 +-
 .../java/com/thebuzzmedia/imgscalr/AsyncScalr.java |2 +-
 .../main/java/com/thebuzzmedia/imgscalr/Scalr.java |2 +-
 .../freeplane/core/io/xml/LocalEntityResolver.java |2 +-
 .../resources/components/OptionPanelBuilder.java   |9 -
 .../java/org/freeplane/core/ui/ActionEnabler.java  |2 +-
 .../ButtonModelStateChangeListenerForProperty.java |2 +-
 .../org/freeplane/core/ui/ColoredIconCreator.java  |2 +-
 .../core/ui/DelegatingPopupMenuListener.java   |2 +-
 .../java/org/freeplane/core/ui/LengthUnits.java|2 +-
 .../java/org/freeplane/core/ui/MenuSplitter.java   |2 +-
 .../core/ui/MenuSplitterConfiguration.java |2 +-
 .../org/freeplane/core/ui/MouseInsideListener.java |2 +-
 .../org/freeplane/core/ui/TimePeriodUnits.java |2 +-
 .../ui/components/ActionToggleButtonModel.java |2 +-
 .../core/ui/components/html/ScaledStyleSheet.java  |4 +-
 .../freeplane/core/ui/image/BigBufferedImage.java  |   41 +-
 .../ui/menubuilders/FreeplaneResourceAccessor.java |2 +-
 .../menubuilders/action/ActionSelectListener.java  |2 +-
 .../ui/menubuilders/action/EntriesForAction.java   |2 +-
 .../ui/menubuilders/generic/ChildEntryFilter.java  |2 +-
 .../ui/menubuilders/generic/ChildEntryRemover.java |2 +-
 .../ui/menubuilders/generic/EmptyEntryVisitor.java |2 +-
 .../generic/EntryNavigatorFactory.java |2 +-
 

[freeplane] annotated tag upstream/1.6.10 created (now 036dd70)

[Felix Natter]

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

fnatter-guest pushed a change to annotated tag upstream/1.6.10
in repository freeplane.

at  036dd70   (tag)
   tagging  95aeb2e69a7cba77e22b41a871fe30d7873bbcd8 (commit)
  replaces  upstream/1.6.6
 tagged by  Felix Natter
on  Sat Nov 4 09:25:23 2017 +0100

- Log -
Upstream version 1.6.10

Felix Natter (1):
  New upstream version 1.6.10

---

No new revisions were added by this update.

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

___
pkg-java-commits mailing list
pkg-java-comm...@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-commits

[freeplane] 04/07: bump version in man page

[Felix Natter]

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

fnatter-guest pushed a commit to branch master
in repository freeplane.

commit 51b620f3ad85c94eb766bc944885b5d35c51cc2c
Author: Felix Natter <fnat...@gmx.net>
Date:   Sat Nov 4 10:01:51 2017 +0100

bump version in man page
---
 debian/freeplane.1.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/debian/freeplane.1.xml b/debian/freeplane.1.xml
index c747a00..127f09d 100644
--- a/debian/freeplane.1.xml
+++ b/debian/freeplane.1.xml
@@ -19,7 +19,7 @@
   Debian">
   GNU">
   GPL">
-  
+  
 ]>
 
 

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

___
pkg-java-commits mailing list
pkg-java-comm...@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-commits

[freeplane] 03/07: update patches for 1.6.10

[Felix Natter]

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

fnatter-guest pushed a commit to branch master
in repository freeplane.

commit 85dcb2c081fb34eb361b50a2c00ec386a6c47a23
Author: Felix Natter <fnat...@gmx.net>
Date:   Sat Nov 4 10:01:38 2017 +0100

update patches for 1.6.10
---
 debian/patches/10_build_usr_share_java.patch | 72 +++-
 1 file changed, 17 insertions(+), 55 deletions(-)

diff --git a/debian/patches/10_build_usr_share_java.patch 
b/debian/patches/10_build_usr_share_java.patch
index fb6befc..7a635fa 100644
--- a/debian/patches/10_build_usr_share_java.patch
+++ b/debian/patches/10_build_usr_share_java.patch
@@ -19,11 +19,14 @@ Last-Update: 2016-02-04
  
  allprojects {
  // in a multi-project setup, all projects must have the same version 
number!
-@@ -20,23 +20,45 @@
-rootDir.path + "/freeplane_plugin_jsyntaxpane/lib",
-rootDir.path + "/freeplane_plugin_latex/lib",
-rootDir.path + "/freeplane_plugin_svg/lib"]
-+flatDir name: '/usr/share/java', dir: '/usr/share/java'
+@@ -15,26 +15,45 @@
+   maven { url "http://www.knopflerfish.org/releases/6.1.0/maven2; 
}
+ // this is necessary to grab both binary and source jars
+ // for local (git) dependencies
+-flatDir name: 'localGitDepsRepository',
+-dirs: [rootDir.path + "/freeplane/lib",
+-   rootDir.path + "/freeplane_plugin_jsyntaxpane/lib"]
++  flatDir name: '/usr/share/java', dir: '/usr/share/java'
  }
  
  }
@@ -70,7 +73,7 @@ Last-Update: 2016-02-04
  }
  
  def filterAndExternalizePluginDependencies(runtime_files) {
-@@ -82,12 +104,6 @@
+@@ -80,12 +99,6 @@
failOnError = false  
  }
  
@@ -83,7 +86,7 @@ Last-Update: 2016-02-04
  dependencies {
  testCompile 'junit:junit:4.11'
  testCompile 'org.assertj:assertj-core:2.6.0'
-@@ -110,14 +126,9 @@
+@@ -108,14 +121,9 @@
  // OSGi projects (/plugin/, freeplane) need this for compilation (e.g. 
resolve Bundle),
  // and freeplane_framework needs to copy it to BUILD/framework.jar
  configure(subprojects.findAll {it.name =~ /plugin/ || it.name =~ 
/^freeplane$/ || it.name =~ /^freeplane_framework$/}){
@@ -100,7 +103,7 @@ Last-Update: 2016-02-04
  }
  }
  
-@@ -130,11 +141,13 @@
+@@ -128,11 +136,13 @@
  else
 ext.pluginid = project.name.replace("freeplane_plugin_", 
"org.freeplane.plugin.")
  
@@ -119,7 +122,7 @@ Last-Update: 2016-02-04
  
  task filterOSGiManifestForEclipse(type: Copy) {
  from('build/tmp/jar/MANIFEST.MF') {
-@@ -186,18 +199,9 @@
+@@ -184,18 +194,9 @@
  configure(subprojects.findAll {it.name =~ /plugin/ }) {
  
  task copyOSGiJars(type: Copy) {
@@ -148,10 +151,10 @@ Last-Update: 2016-02-04
  dependencies {

 -  mergedViewerDependencies 
'org.dpolivaev.mnemonicsetter:mnemonicsetter:0.5'
--  mergedViewerDependencies ':kitfox-svg-salamander-1.1.1-p1'
+-  compile ':kitfox-svg-salamander-1.1.1-p1'
 +  //mergedViewerDependencies 
'org.dpolivaev.mnemonicsetter:mnemonicsetter:0.5'
 +  compile 'org.dpolivaev.mnemonicsetter:mnemonicsetter:0.5'
-+  //mergedViewerDependencies ':kitfox-svg-salamander-1.1.1-p1'
++  //compile ':kitfox-svg-salamander-1.1.1-p1'
 +  compile ':svgSalamander'

  compile project(':JOrtho_0.4_freeplane')
@@ -229,18 +232,6 @@ Last-Update: 2016-02-04
  }
  
  jar {
 a/freeplane_plugin_latex/build.gradle
-+++ b/freeplane_plugin_latex/build.gradle
-@@ -1,8 +1,7 @@
- dependencies {
- compile project(':freeplane')
- compile project(':freeplane_plugin_jsyntaxpane')
--// from flatDir "localGitDepsRepository" (jlatexmath-1.0.3 is not in 
maven!)
--compile ':jlatexmath-1.0.3'
-+compile ':jlatexmath'
- }
- 
- jar {
 --- a/freeplane_plugin_openmaps/build.gradle
 +++ b/freeplane_plugin_openmaps/build.gradle
 @@ -8,7 +8,8 @@
@@ -253,35 +244,6 @@ Last-Update: 2016-02-04
  }
  
  jar {
 a/freeplane_plugin_svg/build.gradle
-+++ b/freeplane_plugin_svg/build.gradle
-@@ -20,11 +20,13 @@
- 'org.apache.xmlgraphics:batik-util:1.7',
- 'org.apache.xmlgraphics:batik-xml:1.7',
- 
--'org.mozilla:rhino:1.7R4', // "js.jar"/librhino-java
-+//'org.mozilla:rhino:1.7R4', // "js.jar"/librhino-java
-+  'rhino:js:1.7R4',
- 
- // cannot pull this due to broken "avalon" dependency
- // (replaced by ./lib/pdf-transcoder.jar below):
- //'org.apache.xmlgraphics:fop:1.1', // "fop.jar"/libfop-java
-+  ':fop',
- 
- // libxml-commons-external-java 1.4.01
- //WRONG: 'org.apache.xmlgraphics:xmlgraphics-commons:1.4'
-@@ -34,10 +36,8 @@
- // need to fix javax.xml.parsers.FactoryConfigurationError:
- // P

[freeplane] 05/07: build 1.6.10-1

[Felix Natter]

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

fnatter-guest pushed a commit to branch master
in repository freeplane.

commit 0d4e67ba7a254565df14930001c25ee1f999ce01
Author: Felix Natter <fnat...@gmx.net>
Date:   Sat Nov 4 10:02:15 2017 +0100

build 1.6.10-1
---
 debian/changelog | 9 +
 1 file changed, 9 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index af3c56e..a15e39c 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,12 @@
+freeplane (1.6.10-1) UNRELEASED; urgency=medium
+
+  * New upstream release.
+* PDF/SVG export fixed and re-enabled
+  * depend on jlatexmath >= 1.0.6
+  * re-worked plugin-svg dependencies
+
+ -- Felix Natter <fnat...@gmx.net>  Sat, 04 Nov 2017 09:45:08 +0100
+
 freeplane (1.6.6-3) unstable; urgency=medium
 
   * Fix broken build on buildds by disabling parallel build

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

___
pkg-java-commits mailing list
pkg-java-comm...@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-commits

[freeplane] 07/07: finalize changelog for 1.6.10-1

[Felix Natter]

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

fnatter-guest pushed a commit to branch master
in repository freeplane.

commit 836086ac10619d52ea33c5504608073a4f00ac87
Author: Felix Natter <fnat...@gmx.net>
Date:   Sat Nov 4 10:43:52 2017 +0100

finalize changelog for 1.6.10-1
---
 debian/changelog | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index a15e39c..952d0b1 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,11 +1,12 @@
-freeplane (1.6.10-1) UNRELEASED; urgency=medium
+freeplane (1.6.10-1) unstable; urgency=medium
 
   * New upstream release.
 * PDF/SVG export fixed and re-enabled
   * depend on jlatexmath >= 1.0.6
   * re-worked plugin-svg dependencies
+  * bump version in man page
 
- -- Felix Natter <fnat...@gmx.net>  Sat, 04 Nov 2017 09:45:08 +0100
+ -- Felix Natter <fnat...@gmx.net>  Sat, 04 Nov 2017 10:41:23 +0100
 
 freeplane (1.6.6-3) unstable; urgency=medium
 

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

___
pkg-java-commits mailing list
pkg-java-comm...@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-commits

[freeplane] 06/07: update dependencies (jlatexmath, re-worked svg/pdf dependencies)

[Felix Natter]

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

fnatter-guest pushed a commit to branch master
in repository freeplane.

commit 0b472e1aa681dc314ca3b77a9b2e86c6228913f6
Author: Felix Natter <fnat...@gmx.net>
Date:   Sat Nov 4 10:18:51 2017 +0100

update dependencies (jlatexmath, re-worked svg/pdf dependencies)
---
 debian/control | 14 ++
 1 file changed, 10 insertions(+), 4 deletions(-)

diff --git a/debian/control b/debian/control
index 01bf44c..486431c 100644
--- a/debian/control
+++ b/debian/control
@@ -21,11 +21,14 @@ Build-Depends-Indep: javahelp2,
  simplyhtml (>= 0.17.3),
  libbatik-java (>= 1.9-3),
  librhino-java,
- libfop-java,
+ libfop-java (>= 2.1),
  libxerces2-java,
  libxml-commons-external-java,
+ libxmlgraphics-commons-java,
+ libavalon-framework-java,
+ libcommons-logging-java,
  libjaxp1.3-java,
- libjlatexmath-java (>= 1.0.2),
+ libjlatexmath-java (>= 1.0.6),
  libknopflerfish-osgi-framework-java (>= 6.1.1),
  libjsyntaxpane-java (>= 0.9.6~r156),
  libcommons-codec-java (>= 1.7),
@@ -51,11 +54,14 @@ Depends: ${misc:Depends},
  simplyhtml (>= 0.17.3),
  libbatik-java (>= 1.9-3),
  librhino-java,
- libfop-java,
+ libfop-java (>= 2.1),
  libxerces2-java,
  libxml-commons-external-java,
+ libxmlgraphics-commons-java,
+ libavalon-framework-java,
+ libcommons-logging-java,
  libjaxp1.3-java,
- libjlatexmath-java (>= 1.0.2),
+ libjlatexmath-java (>= 1.0.6),
  libknopflerfish-osgi-framework-java (>= 6.1.1),
  libjsyntaxpane-java (>= 0.9.6~r156),
  libcommons-codec-java (>= 1.7),

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

___
pkg-java-commits mailing list
pkg-java-comm...@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-commits

Bug#870103: freeplane: a Java (knopflerfish) exception will prevent freeplane from starting

[Felix Natter]

hello Sophoklis,

I packaged the latest version of knopflerfish (and freeplane), so if
there is a bug, it could be closed now.

Cheers and Best Regards,
-- 
Felix Natter
debian/rules!

__
This is the maintainer address of Debian's Java team
<http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-maintainers>. 
Please use
debian-j...@lists.debian.org for discussions and questions.

Bug#875322: libbatik-java: batik-1.9 causes FTBFS for freeplane due to changed artifacts/poms

[Felix Natter]

t; 
org.apache.xmlgraphics:batik-util:debian
   > No cached version of org.apache.xmlgraphics:batik-i18n:debian available 
for offline mode.
   > No cached version of org.apache.xmlgraphics:batik-i18n:debian available 
for offline mode.
> Could not resolve org.apache.xmlgraphics:batik-rasterizer-ext:debian.
  Required by:
  project :freeplane_plugin_svg > org.apache.xmlgraphics:batik-all:debian
   > No cached version of org.apache.xmlgraphics:batik-rasterizer-ext:debian 
available for offline mode.
   > No cached version of org.apache.xmlgraphics:batik-rasterizer-ext:debian 
available for offline mode.
> Could not resolve org.apache.xmlgraphics:batik-squiggle-ext:debian.
  Required by:
  project :freeplane_plugin_svg > org.apache.xmlgraphics:batik-all:debian
   > No cached version of org.apache.xmlgraphics:batik-squiggle-ext:debian 
available for offline mode.
   > No cached version of org.apache.xmlgraphics:batik-squiggle-ext:debian 
available for offline mode.
> Could not resolve org.apache.xmlgraphics:batik-svgbrowser:debian.
  Required by:
  project :freeplane_plugin_svg > org.apache.xmlgraphics:batik-all:debian
  project :freeplane_plugin_svg > org.apache.xmlgraphics:batik-all:debian > 
org.apache.xmlgraphics:batik-squiggle:debian
   > No cached version of org.apache.xmlgraphics:batik-svgbrowser:debian 
available for offline mode.
   > No cached version of org.apache.xmlgraphics:batik-svgbrowser:debian 
available for offline mode.
> Could not resolve org.apache.xmlgraphics:batik-svgrasterizer:debian.
  Required by:
  project :freeplane_plugin_svg > org.apache.xmlgraphics:batik-all:debian
  project :freeplane_plugin_svg > org.apache.xmlgraphics:batik-all:debian > 
org.apache.xmlgraphics:batik-rasterizer:debian
   > No cached version of org.apache.xmlgraphics:batik-svgrasterizer:debian 
available for offline mode.
   > No cached version of org.apache.xmlgraphics:batik-svgrasterizer:debian 
available for offline mode.
> Could not resolve org.python:jython:debian.
  Required by:
  project :freeplane_plugin_svg > org.apache.xmlgraphics:batik-all:debian > 
org.apache.xmlgraphics:batik-script:debian
   > No cached version of org.python:jython:debian available for offline mode.
   > No cached version of org.python:jython:debian available for offline mode.

I tried only batik-swing:

 problem occurred evaluating project ':freeplane_plugin_svg'.
> Could not resolve all dependencies for configuration 
> ':freeplane_plugin_svg:runtime'.
   > Could not resolve org.apache.xmlgraphics:swing:1.7.
 Required by:
 project :freeplane_plugin_svg
  > No cached version of org.apache.xmlgraphics:swing:1.7 available for 
offline mode.
  > No cached version of org.apache.xmlgraphics:swing:1.7 available for 
offline mode.

Could you please fix this?


-- System Information:
Debian Release: buster/sid
  APT prefers unstable
  APT policy: (500, 'unstable')
Architecture: amd64 (x86_64)

Kernel: Linux 4.12.0-1-amd64 (SMP w/1 CPU core)
Locale: LANG=en_US.utf8, LC_CTYPE=en_US.utf8 (charmap=UTF-8), LANGUAGE=en_US:en 
(charmap=UTF-8)
Shell: /bin/sh linked to /bin/dash
Init: systemd (via /run/systemd/system)

Versions of packages libbatik-java depends on:
ii  java-wrappers 0.1.28
ii  libbsf-java   1:2.4.0-5
ii  libcommons-io-java2.5-1
ii  libcommons-logging-java   1.2-1
ii  libxalan2-java2.7.1-9
ii  libxml-commons-external-java  1.4.01-2
ii  libxmlgraphics-commons-java   2.1-2

Versions of packages libbatik-java recommends:
ii  default-jre  2:1.8-59
pn  fop  
pn  rhino

libbatik-java suggests no packages.

-- no debconf information

Thanks and Best Regards,
-- 
Felix Natter
debian/rules!

__
This is the maintainer address of Debian's Java team
<http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-maintainers>. 
Please use
debian-j...@lists.debian.org for discussions and questions.

Bug#870103: freeplane: a Java (knopflerfish) exception will prevent freeplane from starting

[Felix Natter]

hello Sophoklis,

a workaround should be to copy:
  /usr/share/freeplane/props.xargs ->
  /usr/share/freeplane/fwdir/fwprops.xargs
and
  /usr/share/freeplane/init.xargs ->
  /usr/share/freeplane/fwdir/fwinit.xargs

Is there anything special in your freeplane config?
Which working directory?

I am wondering whether we shall ask knopflerfish upstream.

Cheers and Best Regards,
-- 
Felix Natter

__
This is the maintainer address of Debian's Java team
<http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-maintainers>. 
Please use
debian-j...@lists.debian.org for discussions and questions.

Bug#870103: freeplane: a Java (knopflerfish) exception will prevent freeplane from starting

[Felix Natter]

hello Sophoklis,

unfortunately I cannot reproduce this, but I'll look into it.

Does that file exist (could be a permission problem...)?

Could you try to touch that file (as root) as a possible workaround?
If that doesn't work, try to "sudo cp" the attached "props.xargs" to
/usr/share/freeplane/fwdir/fwprops.xargs?

Cheers and Best Regards,
-- 
Felix Natter


props.xargs
Description: Binary data
__
This is the maintainer address of Debian's Java team
<http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-maintainers>. 
Please use
debian-j...@lists.debian.org for discussions and questions.

Bug#856058: freeplane: Fails to export to pdf due to missing class (org/apache/avalon/framework/configuration/Configurable)

[Felix Natter]

hello Hans,

[I am sending this again in plain text]

thanks very much for the bug report. I will work on fixing this in the
next few weeks. Please use a pdf printer in the mean time.

Incidentally, the pdf export might be disabled in 1.6.x because it
creates problems with the new SVG icons capability!

Cheers and Best Regards,
-- 
Felix Natter

__
This is the maintainer address of Debian's Java team
<http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-maintainers>. 
Please use
debian-j...@lists.debian.org for discussions and questions.

Bug#856058: freeplane: Fails to export to pdf due to missing class (org/apache/avalon/framework/configuration/Configurable)

[Felix Natter]

hello Hans,


thanks very much for the bug report. I will work on fixing this in the
next few weeks. Please use a pdf printer in the mean time.
Incidentally, the pdf export might be disabled in 1.6.x because it creates problems
with the new SVG icons capability.

Cheers and Best Regards,


Felix Natter

__
This is the maintainer address of Debian's Java team
<http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-maintainers>. 
Please use
debian-j...@lists.debian.org for discussions and questions.

Bug#853134: CVE-2017-5617: svgSalamander

[Felix Natter]

hello d-gis/Bas,

there is a security vulnerability in svgSalamander:
  https://github.com/blackears/svgSalamander/issues/11

The problem occurs when including raster/svg images via .
The reporter says "How to fix - any schemes apart from data in the
xlink:href attribute should be disallowed"

--> I am not aware of svgSalamander properties (the only other toggle I
can think of is java system properties), so can we _disable_ other
schemes? I don't think that breaks SVG renderding in Freeplane, how
about josm / other applications?

http://stackoverflow.com/questions/6249664/does-svg-support-embedding-of-bitmap-images
--> data: schema seems provides a way for including base64 encoded
raster/svg images inline in an SVG.

--> Can we discuss how to fix this?

Or shall we wait until Mark (the upstream author) fixes this
(might take a month)? Or at least ping him for a solution?

Cheers and Best Regards,
-- 
Felix Natter

__
This is the maintainer address of Debian's Java team
<http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-maintainers>. 
Please use
debian-j...@lists.debian.org for discussions and questions.

Bug#846816: java.lang.NoSuchFieldError: DLU2

[Felix Natter]

@Tony: Please do NOT upload,
I need to add a jgoodies>=1.9.0 
dependency.
I will ask on debian-Java for a
Sponsor!
Cheers and Best Regards,
Felix


> Am 04.12.2016 um 20:52 schrieb gregor herrmann <gre...@debian.org>:
> 
>> On Sun, 04 Dec 2016 19:13:47 +0100, Felix Natter wrote:
>> 
>> @Vincent/@Gregor: Could you please try the following (with the old
>> freeplane-1.5.16-2)? (please do NOT remove your ~/.config/freeplane
>> before)
>> 
>> - find out which java you are using:
>> 
>> $ ls -lh /etc/alternatives/java
>> lrwxrwxrwx 1 root root 46 Oct  9  2015 /etc/alternatives/java -> 
>> /usr/lib/jvm/java-8-openjdk-amd64/jre/bin/java
> 
> ls -lh /etc/alternatives/java
> lrwxrwxrwx 1 root root 46 Feb  6  2016 /etc/alternatives/java -> 
> /usr/lib/jvm/java-8-openjdk-amd64/jre/bin/java
> 
>> - edit /etc/java-8-openjdk/accessibility.properties
>>  (please use the correct one for your java version)
>> - comment out this line:
>> #assistive_technologies=org.GNOME.Accessibility.AtkWrapper
> 
> done
> 
>> - start freeplane again (from console)
> 
> Same error:
> 
> STDERR: Exception in thread "AWT-EventQueue-0" 
> STDERR: java.lang.NoSuchFieldError: DLU2
> STDERR: at 
> org.freeplane.features.styles.mindmapmode.StyleEditorPanel.init(StyleEditorPanel.java:845)
> STDERR: at 
> org.freeplane.features.styles.mindmapmode.StyleEditorPanel.access$2500(StyleEditorPanel.java:119)
> STDERR: at 
> org.freeplane.features.styles.mindmapmode.StyleEditorPanel$1.hierarchyChanged(StyleEditorPanel.java:582)
> 
> 
> Cheers,
> gregor
> 
> -- 
> .''`.  https://info.comodo.priv.at/ - Debian Developer https://www.debian.org
> : :' : OpenPGP fingerprint D1E1 316E 93A7 60A8 104D  85FA BB3A 6801 8649 AA06
> `. `'  Member of VIBE!AT & SPI, fellow of the Free Software Foundation Europe
>   `-   NP: Gypsy Sun And Rainbows: Voodoo Child (Slight Return)

__
This is the maintainer address of Debian's Java team
<http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-maintainers>. 
Please use
debian-j...@lists.debian.org for discussions and questions.

Bug#846816: java.lang.NoSuchFieldError: DLU2

[Felix Natter]

hi Vincent,
hi Gregor,

I think that since the stack trace contains an invocation of GNOME's
AtkWrapper, that may be the problem (we've had problems with this
before!).

@Vincent/@Gregor: Could you please try the following (with the old
freeplane-1.5.16-2)? (please do NOT remove your ~/.config/freeplane
before)

- find out which java you are using:

$ ls -lh /etc/alternatives/java
lrwxrwxrwx 1 root root 46 Oct  9  2015 /etc/alternatives/java -> 
/usr/lib/jvm/java-8-openjdk-amd64/jre/bin/java

- edit /etc/java-8-openjdk/accessibility.properties
  (please use the correct one for your java version)

- comment out this line:
#assistive_technologies=org.GNOME.Accessibility.AtkWrapper

- start freeplane again (from console)

Thanks for Reporting & Testing,
-- 
Felix Natter

__
This is the maintainer address of Debian's Java team
<http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-maintainers>. 
Please use
debian-j...@lists.debian.org for discussions and questions.

Bug#846816: java.lang.NoSuchFieldError: DLU2

[Felix Natter]

hello,

one correction: I saw the "blank window" issue under XFCE4/sid.

Cheers and Best Regards,
-- 
Felix Natter

__
This is the maintainer address of Debian's Java team
<http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-maintainers>. 
Please use
debian-j...@lists.debian.org for discussions and questions.

Bug#846816: java.lang.NoSuchFieldError: DLU2

[Felix Natter]

hello all,

gregor herrmann <gre...@debian.org> writes:
>> - seems to happen only at runtime?
>
> That's what confused my as well ...
>  
>> > added to debian/patches/50_jgoodies-1.9.patch, but when starting
>> > freeplane I then only see an empty white windows.
>> I could reproduce this once after updating my sid (but not previously
>> when updating jgoodies but not sid). Could you please try another
>> desktop environment?
>
> I don't have any desktop enviroments installed :)
> (Just awesome as a window manager.)
>  
>> If that does not work, you can rename ~/.config/freeplane.
>> This worked for me, and I can no longer reproduce the bug
>> even when starting with the old ~/.config/freeplane.
>
> I've now rebuilt freeplane from git, and installed it.
> Again, I only get (a question about standard.mm) and then a white
> window.
>
> After blowing away ~/.config/freeplane, I don't get the dialog but a
> white windows with a title of "whatsNew-1.5.x - Freeplane - Mind map
> mode (Read Only) /usr/share/freeplane/doc/whatsNew-1.5.x.mm".

That is ok - if you don't have ~/.config/freeplane, the user is
presented with the map of features that are new in 1.5.x.

> Oh, interesting, I can right-click, get a menu, can choose
> fullscreen, and then I see a mindmap. I can also enable the menubar
> etc.
> When I leave fullscreen mode, all is gone (the mindmap as well as the
> menubar ...).
>
> Back in fullscreen mode, when I enter the configuration, I get an
> empty grey window.
>
> Anyway, it's well possible that this is all another problem and
> related to some interaction between my window manager and
> java/freeplane.

Not probable, as I could see it under GNOME3 :-/

Please tell me if this issue pops up again.

> And I can confirm that the updated patch in git gets rid of the
> error.

@Tony: Could you upload freeplane-1.5.16-3 from git
(https://anonscm.debian.org/cgit/pkg-java/freeplane.git)?

I will work on understanding the issue in parallel.

Thanks and Best Regards,
-- 
Felix Natter

__
This is the maintainer address of Debian's Java team
<http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-maintainers>. 
Please use
debian-j...@lists.debian.org for discussions and questions.

Bug#846816: java.lang.NoSuchFieldError: DLU2

[Felix Natter]

gregor herrmann <gre...@debian.org> writes:

hello all,

> Control: tag -1 + confirmed
>
> On Sat, 03 Dec 2016 14:50:40 +0100, Vincent Smeets wrote:
>
>> Package: freeplane
>> Version: 1.5.16-2
>> Severity: grave
>> Justification: renders package unusable
>
>> Here I started freeplane from the command line. It shows you the log
>> output and the raised exception.
>
>> STDERR: Exception in thread "AWT-EventQueue-1" 
>> STDERR: java.lang.NoSuchFieldError: DLU2
>
> Thanks for your bug report. I can reproduce it (on unstable).
>
>> -- Package-specific info:
>> ii  freeplane   1.5.16-2   allJava 
>> program for working with Mind Maps
>
>> Versions of packages freeplane depends on:
>> ii  libjgoodies-forms-java   1.9.0-3
>
> Looks like we missed a part when creating the patch for
> jgoodies-forms 1.9.0 compatibility ...
>
>
> I get past this error with
>
> +--- 
> a/freeplane/src/main/java/org/freeplane/features/styles/mindmapmode/StyleEditorPanel.java
>  
> b/freeplane/src/main/java/org/freeplane/features/styles/mindmapmode/StyleEditorPanel.java
> +@@ -113,8 +113,8 @@
> + import org.freeplane.features.ui.IMapViewManager;
> + 
> + import com.jgoodies.forms.builder.DefaultFormBuilder;
> +-import com.jgoodies.forms.factories.Borders;
> +-import com.jgoodies.forms.layout.FormLayout;
> ++import com.jgoodies.forms.factories.*;
> ++import com.jgoodies.forms.layout.*;
> + 
> + public class StyleEditorPanel extends JPanel {
> +   private static final int FONT_SIZE = 
> Math.round(UITools.FONT_SCALE_FACTOR * 8);
> +@@ -842,7 +842,7 @@
> +   final String form = "right:max(20dlu;p), 2dlu, p, 
> 1dlu,right:max(20dlu;p), 4dlu, 80dlu, 7dlu";
> +   final FormLayout rightLayout = new FormLayout(form, "");
> +   final DefaultFormBuilder rightBuilder = new 
> DefaultFormBuilder(rightLayout);
> +-  rightBuilder.border(Borders.DLU2);
> ++  rightBuilder.border(Paddings.DLU2);
> +   new 
> SeparatorProperty("OptionPanel.separator.NodeStyle").layout(rightBuilder);
> +   if (addStyleBox) {
> +   addAutomaticLayout(rightBuilder);

I just looked into it:

- Using Paddings instead of Borders seems correct [1]
  ("@deprecated Replaced by {@link Paddings}")

- I have fixed it using Borders->Paddings (1.5.16-3: I think we should
  upload it), but I don't understand it:

- the jgoodies documentation says
  (http://www.jgoodies.com/download/libraries/forms/RELEASE-NOTES.txt):
  CHANGES IN 1.12.0: "Removed the deprecated Borders class that has been 
replaced
  by the Paddings class in version 1.9.0."
--> so Borders.* is still in jgoodies-1.9
--> we use this upstream [2]
compile 'com.jgoodies:jgoodies-forms:1.9.0',
compile 'com.jgoodies:jgoodies-common:1.8.1'
and I don't see any problem with this in upstream

- seems to happen only at runtime?

[1] 
https://anonscm.debian.org/cgit/pkg-java/libjgoodies-forms-java.git/tree/src/main/java/com/jgoodies/forms/factories/Borders.java
[2] https://github.com/freeplane/freeplane/

> added to debian/patches/50_jgoodies-1.9.patch, but when starting
> freeplane I then only see an empty white windows.

I could reproduce this once after updating my sid (but not previously
when updating jgoodies but not sid). Could you please try another
desktop environment?

If that does not work, you can rename ~/.config/freeplane.
This worked for me, and I can no longer reproduce the bug
even when starting with the old ~/.config/freeplane.

> But I guess that's no hard problem to fix for someone who knows Java
> :)

I don't understand this. If you don't have an expanation, I will
probably ask on debian-java.

Cheers and Best Regards,
-- 
Felix Natter

__
This is the maintainer address of Debian's Java team
<http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-maintainers>. 
Please use
debian-j...@lists.debian.org for discussions and questions.

Bug#843702: freeplane should add standard MIME open for .mm files

[Felix Natter]

hi Oliver,

I think there is nothing to do in the freeplane package,
because I think its mime type config makes sense (see above)?

Regarding the cinnamon file manager: Can you see whether there
is configuration in ~/.config/**? I think removing that is the
best way to reset your settings.

BTW: you can just reply to this bug, no need to create a new bug report
(even if that is the same bug - how did you create this?)

Cheers and Best Regards,
-- 
Felix Natter

__
This is the maintainer address of Debian's Java team
<http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-maintainers>. 
Please use
debian-j...@lists.debian.org for discussions and questions.

Bug#843702: freeplane should add standard MIME open for .mm files

[Felix Natter]

hello Oliver,

here is how the current MIME assignments of Freeplane work
(see /usr/share/mime/packages/freeplane.xml):

- *.mm files with ". 
Please use
debian-j...@lists.debian.org for discussions and questions.

Bug#840130: libknopflerfish-osgi-framework-java: knopflerfish update breaks freeplane

[Felix Natter]

Package: libknopflerfish-osgi-framework-java
Version: 5.2.0-1
Severity: grave
Justification: renders package unusable

Dear Maintainer,

knopflerfish-osgi 5.2.0-1 breaks freeplane (see my post to debian-java:
[1]):

felix@debianunstable:~$ freeplane
org.knopflerfish.framework.readonly=true
org.knopflerfish.gosg.jars=reference:file:/usr/share/freeplane/core/
org.freeplane.basedirectory=/usr/share/freeplane
java.security.policy=/usr/share/freeplane/freeplane.policy
org.osgi.framework.storage=/usr/share/freeplane/fwdir
Knopflerfish OSGi framework launcher, version 
Copyright 2003-2016 Knopflerfish. All Rights Reserved.
See http://www.knopflerfish.org for more information.

java.lang.IllegalArgumentException: Failed to read exports: 
java.io.FileNotFoundException: /home/felix/exports (No such file or directory)
at 
org.knopflerfish.framework.SystemBundle.addSysPackagesFromFile(SystemBundle.java:699)
at 
org.knopflerfish.framework.SystemBundle.initSystemBundle(SystemBundle.java:557)
at 
org.knopflerfish.framework.FrameworkContext.init(FrameworkContext.java:402)
at org.knopflerfish.framework.SystemBundle.doInit(SystemBundle.java:622)
at org.knopflerfish.framework.SystemBundle.init(SystemBundle.java:152)
at org.knopflerfish.framework.Main.assertFramework(Main.java:446)
at org.knopflerfish.framework.Main.handleArgs(Main.java:546)
at org.knopflerfish.framework.Main.start(Main.java:224)
at org.knopflerfish.framework.Main.main(Main.java:156)
at org.freeplane.launcher.Launcher.run(Launcher.java:115)
at org.freeplane.launcher.Launcher.launch(Launcher.java:80)
at org.freeplane.launcher.Launcher.main(Launcher.java:67)
Error: Command "-istart org.freeplane.core" failed, Failed to read exports: 
java.io.FileNotFoundException: /home/felix/exports (No such file or directory)

I am creating this bug report in order to avoid that knopflerfish-osgi
5.2.0-1 migrates to testing.

[1] https://lists.debian.org/debian-java/2016/10/msg00016.html

-- System Information:
Debian Release: stretch/sid
  APT prefers unstable
  APT policy: (500, 'unstable')
Architecture: amd64 (x86_64)

Kernel: Linux 4.7.0-1-amd64 (SMP w/1 CPU core)
Locale: LANG=en_US.utf8, LC_CTYPE=en_US.utf8 (charmap=UTF-8)
Shell: /bin/sh linked to /bin/dash
Init: systemd (via /run/systemd/system)

libknopflerfish-osgi-framework-java depends on no packages.

libknopflerfish-osgi-framework-java recommends no packages.

Versions of packages libknopflerfish-osgi-framework-java suggests:
ii  libknopflerfish-osgi-java-doc  5.2.0-1

-- no debconf information


-- 
Felix Natter

__
This is the maintainer address of Debian's Java team
<http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-maintainers>. 
Please use
debian-j...@lists.debian.org for discussions and questions.

Bug#727059: RE: freeplane: Wrong icon appears on GNOME 3 main and left panels

[Felix Natter]

hello Alessio,

did you make any progress with this?

I tend to close this, because it's a Ubuntu and not a Freeplane issue
(the behavior should be the same for other java apps).

What do you think?

Best Regards,
-- 
Felix Natter

__
This is the maintainer address of Debian's Java team
<http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-maintainers>. 
Please use
debian-j...@lists.debian.org for discussions and questions.

Bug#714524: [freeplane] Keystrokes no longer recognised during use

[Felix Natter]

hi OmegaPhil,

can we close this bug now?

Best Regards,
-- 
Felix Natter

__
This is the maintainer address of Debian's Java team
<http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-maintainers>. 
Please use
debian-j...@lists.debian.org for discussions and questions.

Bug#801475: freeplane: Fails to build with JMapViewer 1.11

[Felix Natter]

Sebastiaan Couwenberg <sebas...@xs4all.nl> writes:

> On 18-10-15 17:00, tony mancill wrote:
>> On 10/18/2015 04:58 AM, Sebastiaan Couwenberg wrote:
>>> On Fri, 16 Oct 2015 20:49:12 +0200 Felix Natter wrote:
>>>> I added a patch for JMapViewer-1.11 compatibility: 
>>>> http://anonscm.debian.org/cgit/pkg-java/freeplane.git
>>>> 
>>>> I've set the distribution to experimental since it should
>>>> probably be uploaded to unstable together with jmapviewer (now
>>>> that it _requires_ jmapviewer>=1.11).
>>>> 
>>>> @Tony: Would you be willing to sponsor this and/or shall I
>>>> submit an RFS for this?
>>> 
>>> Since my upload of jmapviewer now causes freeplane to FTBFS, I'm
>>> willing to sponsor the upload of freeplane too.
>> 
>> Whoops - I'm several days behind on email.  I'll upload freeplane
>> today, if Bas doesn't beat me to it.

hello Tony,
hello Bas,

> Since I cannot commit to pkg-java freeplane git repository (due to not
> being a member of pkg-java), I think you (Tony) are in a better
> position to sponsor the upload.

Ok, that makes sense, I think :-)

> Currently freeplane (1.3.15-3) is targeted at experimental in the
> changelog, this should probably change to unstable now that jmapviewer
> (1.11+dfsg-1) is available in unstable.
>
> @Felix, can you confirm that this is also your intention?

Yes, I just changed this to unstable and uploaded to mentors:
  https://mentors.debian.net/package/freeplane

Thanks and Best Regards,
-- 
Felix Natter

__
This is the maintainer address of Debian's Java team
<http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-maintainers>. 
Please use
debian-j...@lists.debian.org for discussions and questions.

Bug#801475: freeplane: Fails to build with JMapViewer 1.11

[Felix Natter]

hi Bas,
hi Tony,

I added a patch for JMapViewer-1.11 compatibility:
  http://anonscm.debian.org/cgit/pkg-java/freeplane.git

I've set the distribution to experimental since it should probably be
uploaded to unstable together with jmapviewer (now that it _requires_
jmapviewer>=1.11).

@Tony: Would you be willing to sponsor this and/or shall I submit an RFS
for this?

Changes:

freeplane (1.3.15-3) experimental; urgency=medium

  * Upgrade JMapViewer to 1.11 (Closes: #801475)
  * Remove freeplane.menu because freeplane.desktop exists
  * Upgrade to debhelper 9
  * Fix debian/copyright (dep5-copyright-license-name-not-unique)

 -- Felix Natter <fnat...@gmx.net>  Fri, 16 Oct 2015 20:07:34 +0200

Cheers and Best Regards,
-- 
Felix Natter

__
This is the maintainer address of Debian's Java team
<http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-maintainers>. 
Please use
debian-j...@lists.debian.org for discussions and questions.

Bug#800860: knopflerfish-osgi: depends on obsolete libasm3-java library

[Felix Natter]

hello Markus,

I have just tested and pushed the necessary changes:
  
http://anonscm.debian.org/cgit/pkg-java/knopflerfish-osgi.git/commit/?id=12ba4aa41b9d566720514f351d9936d5addd58cb

A question: Is it correct that libasm4-java has a 5.x version and
installs asm4.jar? As you can see above, I am relying on the existance
of /usr/share/java/asm4.jar.

If you agree then I will seek a sponsor.

Cheers and Best Regards,
-- 
Felix Natter

__
This is the maintainer address of Debian's Java team
<http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-maintainers>. 
Please use
debian-j...@lists.debian.org for discussions and questions.

Bug#786553: libjffi-java: Incompatible change in jffi 1.2.x makes gradle fail

[Felix Natter]

(FileCopySpecVisitor.java:43)
at 
org.gradle.api.internal.file.copy.NormalizingCopySpecVisitor.maybeVisit(NormalizingCopySpecVisitor.java:65)
at 
org.gradle.api.internal.file.copy.NormalizingCopySpecVisitor.maybeVisit(NormalizingCopySpecVisitor.java:60)
at 
org.gradle.api.internal.file.copy.NormalizingCopySpecVisitor.visitFile(NormalizingCopySpecVisitor.java:69)
at 
org.gradle.api.internal.file.copy.MappingCopySpecVisitor.visitFile(MappingCopySpecVisitor.java:57)
at 
org.gradle.api.internal.file.collections.DirectoryFileTree.walkDir(DirectoryFileTree.java:156)
at 
org.gradle.api.internal.file.collections.DirectoryFileTree.walkDir(DirectoryFileTree.java:171)
at 
org.gradle.api.internal.file.collections.DirectoryFileTree.walkDir(DirectoryFileTree.java:171)
at 
org.gradle.api.internal.file.collections.DirectoryFileTree.visitFrom(DirectoryFileTree.java:124)
at 
org.gradle.api.internal.file.collections.DirectoryFileTree.visit(DirectoryFileTree.java:114)
at 
org.gradle.api.internal.file.collections.FileTreeAdapter.visit(FileTreeAdapter.java:96)
at 
org.gradle.api.internal.file.CompositeFileTree.visit(CompositeFileTree.java:54)
at 
org.gradle.api.internal.file.copy.CopyActionImpl.execute(CopyActionImpl.java:64)
at org.gradle.api.tasks.AbstractCopyTask.copy(AbstractCopyTask.java:42)
at 
org.gradle.api.internal.plugins.ProcessResources.copy(ProcessResources.java:28)
at 
org.gradle.api.internal.BeanDynamicObject$MetaClassAdapter.invokeMethod(BeanDynamicObject.java:216)
at 
org.gradle.api.internal.BeanDynamicObject.invokeMethod(BeanDynamicObject.java:122)
at 
org.gradle.api.internal.CompositeDynamicObject.invokeMethod(CompositeDynamicObject.java:147)
at 
org.gradle.api.internal.plugins.ProcessResources_Decorated.invokeMethod(Unknown 
Source)
at org.gradle.util.ReflectionUtil.invoke(ReflectionUtil.groovy:23)
at 
org.gradle.api.internal.project.taskfactory.AnnotationProcessingTaskFactory$4.execute(AnnotationProcessingTaskFactory.java:161)
at 
org.gradle.api.internal.project.taskfactory.AnnotationProcessingTaskFactory$4.execute(AnnotationProcessingTaskFactory.java:156)
at 
org.gradle.api.internal.AbstractTask$TaskActionWrapper.execute(AbstractTask.java:510)
at 
org.gradle.api.internal.AbstractTask$TaskActionWrapper.execute(AbstractTask.java:499)
at 
org.gradle.api.internal.tasks.execution.ExecuteActionsTaskExecuter.executeActions(ExecuteActionsTaskExecuter.java:64)
... 71 more

BUILD FAILED
--

I am not sure why org.jruby.ext.posix.* is called, but maybe this is
where the problem should be fixed?

Thanks and Best Regards,
Felix

-- System Information:
Debian Release: stretch/sid
  APT prefers unstable
  APT policy: (500, 'unstable')
Architecture: amd64 (x86_64)

Kernel: Linux 3.16.0-4-amd64 (SMP w/1 CPU core)
Locale: LANG=en_US.UTF-8, LC_CTYPE=en_US.UTF-8 (charmap=UTF-8)
Shell: /bin/sh linked to /bin/dash
Init: systemd (via /run/systemd/system)

Versions of packages libjffi-java depends on:
ii  libjffi-jni  1.2.7-3

libjffi-java recommends no packages.

libjffi-java suggests no packages.

-- no debconf information

-- 
Felix Natter

__
This is the maintainer address of Debian's Java team
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-maintainers. 
Please use
debian-j...@lists.debian.org for discussions and questions.

Bug#771537: freeplane: should relax to depend on default-jre | java-runtime

[Felix Natter]

hi,

@Tony:

Concerning your commit for the freeplane package:
  
http://anonscm.debian.org/cgit/pkg-java/freeplane.git/commit/?id=4e8d491742ab19f8ebad83a99cd1c8c09ea93df8

= I'd like to change this to java7-runtime because I'm not 100% sure
that freeplane 1.3.x (or 1.4.x) works with java6 and because the
jmapviewer-1.04 dependency (in experimental) requires java7:
  
http://anonscm.debian.org/cgit/pkg-grass/jmapviewer.git/commit/?id=d2d0b136fb174de943a6569e4c5360684243b582

If you agree then we do the freeplane-1.3.12-2 upload after jessie is
released.

Cheers and Great Holidays,
-- 
Felix Natter

__
This is the maintainer address of Debian's Java team
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-maintainers. 
Please use
debian-j...@lists.debian.org for discussions and questions.

Bug#771537: freeplane: should relax to depend on default-jre | java-runtime

[Felix Natter]

hello Jonas, hello Tony,

Thanks for reporting. I am the maintainer of freeplane, simplyhtml,
libidw-java and jmapviewer.

I would like to fix this in jessie+1 because it's not a critical bug
and (as you stated) it would require unblocking freeplane, simplyhtml
and jmapviewer [1].

Furthermore, the freeplane wiki page which refers to Java1.6 may not be
up-to-date, as most devs use Java7 or Java8 and might accidentally have
committed code for Java = 7.

[1] libidw-java is not affected since it uses:
  Depends: ${java:Depends}, ${misc:Depends}
and because it includes no executable jars, there is no dependency
to a JRE (from /usr/share/doc/javahelper/tutorial.txt.gz).

Cheers and Best Regards,
-- 
Felix Natter

__
This is the maintainer address of Debian's Java team
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-maintainers. 
Please use
debian-j...@lists.debian.org for discussions and questions.

Bug#714524: [freeplane] Re: Bug#714524: [freeplane] Keystrokes no longer recognised during use

[Felix Natter]

OmegaPhil omegaphi...@startmail.com writes:

 On 28/06/14 12:02, OmegaPhil wrote:
 Package: freeplane Version: 1.2.23+dfsg1-1
 
 Hi,
 
 as written on another thread, it would be good to know if you can
  reproduce the issue with another Java application like jedit 
 (packaged in Debian). This way we would know if it's a Java or 
 Freeplane/FreeMind issue.
 
 Cheers, Eric
 

hi OmegaPhil!

 I have seen this now - the only other Java editing program that I 
 knowingly use is Eclipse (which I have used for years) - this
 doesnt have the problem.

AFAIK Eclipse does not use Java Swing but rather SWT, so it may
not be the best application to use for testing. JEdit seems simple,
maybe it's even easier to debug than Freeplane, I don't know.
 
 I finally have Java progression now, so I am looking into killing
 this problem. Currenty looking into how maven works and then how to

Ok, great to hear!

 resolve dependencies in some sort of local Debian way (freeplane
 does not build from source without some local maven mangling).

Are you trying to build master from here
  https://github.com/freeplane/freeplane
?

It may be easier to fix this in 1.3.x branch, which definitely builds
with ant and without maven (IMHO master does not use maven yet, either?).


 Right, I have added debug code to
 org.freeplane.view.swing.ui.DefaultNodeKeyListener.keyPressed and
 keyTyped, and can trivially demonstrate the problem - after keeping
 freeplane busy moving nodes around on my C mindmap, at some point it
 gives up and keystrokes no longer reach DefaultNodeKeyListener.

If you can reproduce it, you will definitely get help from us!
(so far we haven't been able to reproduce it on our machines!)

 Currently due to starting Java progression with a different Java
 project, my main IDE for Java is NetBeans. freeplane defines maven
 dependencies that are not in the central repository (and don't appear
 to be made to work with the Debian maven-helper stuff):

 forms-1.0.5.jar: Very old

Where do you get forms-1.0.5.jar from?
I think we're using 1.2.1:
  
https://github.com/freeplane/freeplane/blob/master/freeplane/lib/forms-1.2.1.jar

 freeplane-jortho-freeplane version.jar: No 'freeplane' directory
 exists in the central repository??

jortho is built from the freeplane sources.

 freeplane-simplyHTML--freeplane version.jar: Same

simplyhtml uses a versioning different from Freeplane.

 As these dependencies are unresolvable, NetBeans will not run or debug
 the project. I can see in the real installation that manifest files
 have been hacked to point to versionless jars in /usr/share/java, but
 it is too early for me to start hacking maven stuff as I've only just
 read into it today.

 How would you get NetBeans to run in this case?

Not sure whether we have NetBeans devs, but we can probably help you.

 Once I get breakpoints in, I expect to find a little bit more about
 the problem, but will probably decide Swing is screwing up. Then it is
 time to debug OpenJDK!!

I hope you only want to debug the Java part of OpenJDK :-)

 Thanks for any help.

*Please discuss all of this in our developer discussion forum*, where
all our devs listen and will (try to) help you:
  http://freeplane-developer.996965.n3.nabble.com/

(requires free registration)

Thanks for the initiative, Cheers and Best Regards,

Felix
-- 
Felix Natter

__
This is the maintainer address of Debian's Java team
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-maintainers. 
Please use
debian-j...@lists.debian.org for discussions and questions.

Bug#736106: Sourceless file

[Felix Natter]

 -- @QA: is it ok to fix this with the upcoming 1.3.x release and leave
 1.2.23-2 as is?

I fixed this in freeplane 1.2.23+dfsg1-1 which will (hopefully) soon be
uploaded by my sponsor Sylvestre Ledru.

Best Regards,
-- 
Felix Natter

__
This is the maintainer address of Debian's Java team
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-maintainers. 
Please use
debian-j...@lists.debian.org for discussions and questions.

Bug#736106: Sourceless file

[Felix Natter]

Eric Lavarde e...@lavar.de writes:

 Hi,

hello Eric,

 Why not 3. Create a separate package with a recommend/suggest relation
 between both?

That's a good idea. Can I just let the new package
(freeplane-flash-browser) put the file in
/usr/share/freeplane-flash-browser/visorFreeplane.swf,
and then create a symlink from
/usr/share/freeplane/resources/flash/visorFreeplane.swf to 
/usr/share/freeplane-flash-browser/visorFreeplane.swf
in the freeplane package?
(it must be in /usr/share/freeplane/resources/... or in freeplaneeditor.jar)

-- @QA: is it ok to fix this with the upcoming 1.3.x release and leave
1.2.23-2 as is?

Thanks and Best Regards,
Felix

 Eric

 Felix Natter fnat...@gmx.net wrote:

 Felix Natter fnat...@gmx.net writes:
 
  hello Bastien,
 
  thanks for pointing this out.
 
  Can we keep the package (in main) until I fix this in Freeplane 1.3.x
  (will be released in a few months [1]), or do I need to fix it _right
  now_?
 
  [1] Then I would fix it cleanly and disable the Flash export 
 upstream.
 
 I've talked to upstream and it turns out the source code is in another
 git repository:
   https://github.com/freeplane/misc/tree/master/flash-browser
 
 I see two solutions:
 
 1. tell upstream to include the source (~300k) in all source packages
 
 2. ZIP those files and include them as a Debian patch.
 
 (2) could easily be done for 1.2.23.
 Thanks and Best Regards,

 --
 Sent from my tablet. Please excuse my brevity.


-- 
Felix Natter

__
This is the maintainer address of Debian's Java team
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-maintainers. 
Please use
debian-j...@lists.debian.org for discussions and questions.

Bug#736106: Sourceless file

[Felix Natter]

hello Bastien,

thanks for pointing this out.

Can we keep the package (in main) until I fix this in Freeplane 1.3.x
(will be released in a few months [1]), or do I need to fix it _right
now_?

[1] Then I would fix it cleanly and disable the Flash export upstream.

Best Regards,
-- 
Felix Natter

__
This is the maintainer address of Debian's Java team
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-maintainers. 
Please use
debian-j...@lists.debian.org for discussions and questions.

Bug#736106: Sourceless file

[Felix Natter]

Felix Natter fnat...@gmx.net writes:

 hello Bastien,

 thanks for pointing this out.

 Can we keep the package (in main) until I fix this in Freeplane 1.3.x
 (will be released in a few months [1]), or do I need to fix it _right
 now_?

 [1] Then I would fix it cleanly and disable the Flash export upstream.

I've talked to upstream and it turns out the source code is in another
git repository:
  https://github.com/freeplane/misc/tree/master/flash-browser

I see two solutions:

1. tell upstream to include the source (~300k) in all source packages

2. ZIP those files and include them as a Debian patch.

(2) could easily be done for 1.2.23.

Thanks and Best Regards,
-- 
Felix Natter

__
This is the maintainer address of Debian's Java team
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-maintainers. 
Please use
debian-j...@lists.debian.org for discussions and questions.

Bug#730735: freeplane: Export to pdf is broken

[Felix Natter]

Denis Danilov danilovde...@yandex.ru writes:

 Hallo Felix,

 Sorry to bother you again: 1.3.x uses a different configuration
 location, so you need to set the LF to Gtk/Nimbus for 1.3.6beta before
 doing the export. Did you do that when testing?
 Yes, I did. Before the test, I've removed ~/.freeplane directory and
 started the preview
 build. New fresh freeplane config folder was created in ~/.config and I've 
 used
 the the menu entry toolspreferences to change LF as described
 before. 

OK, thank you very much :-)

Best Regards,
-- 
Felix Natter

__
This is the maintainer address of Debian's Java team
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-maintainers. 
Please use
debian-j...@lists.debian.org for discussions and questions.

Bug#730735: freeplane: Export to pdf is broken

[Felix Natter]

Denis Danilov danilovde...@yandex.ru writes:

 Hi Felix,

hello Denis,

 I've tested the fix and it does export to pdf

Sorry to bother you again: 1.3.x uses a different configuration
location, so you need to set the LF to Gtk/Nimbus for 1.3.6beta before
doing the export. Did you do that when testing?

Thanks and Best Regards,
Felix

 Thanks,
 Denis

 Here is a preview so that you can confirm the fix:
 http://sourceforge.net/projects/freeplane/files/freeplane%20debian%20preview/freeplane_bin-1.3.6-beta_pre03_01.zip/download
 
 Just unzip the file and run ./freeplane.sh from inside the extracted
 directory.
 
 Thanks again for spotting the bug!
 Best Regards,
 -- 
 Felix Natter
 


-- 
Felix Natter

__
This is the maintainer address of Debian's Java team
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-maintainers. 
Please use
debian-j...@lists.debian.org for discussions and questions.

Bug#730735: freeplane: Export to pdf is broken

[Felix Natter]

Denis Danilov danilovde...@yandex.ru writes:

 Hi Felix,

hello Denis,

 I've tested the fix and it does export to pdf

That's good, thanks for testing.
We will close this bug with the 1.3.x release.

Best Regards,
-- 
Felix Natter

__
This is the maintainer address of Debian's Java team
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-maintainers. 
Please use
debian-j...@lists.debian.org for discussions and questions.

Bug#730735: freeplane: Export to pdf is broken

[Felix Natter]

Denis Danilov danilovde...@yandex.ru writes:

 Hi Felix,

hello Denis,

 that a good point, it gives me a temporary solution. True, with a fresh
 ~/.freeplane directory, the pdf export did work. But, if I change LF in the
 settings, the error is back.  Could you do few additional steps before the
 steps in the original bug report?
 1. start freeplane with a fresh ~/.freeplane
 2. in menu - Tools - Preferences - Appearances - Look and Feel
select GTK+, press OK
 3. exit freeplane
 4. start it again and proceed with the steps from the original report
 For me it leads to the error again (and the Nimbus LF too, but
 CDE/Motif is fine)

I fixed this upstream by switching to metal LF during PDF/SVG export
(https://github.com/freeplane/freeplane/commit/a804a173a14630c4d62ee0b1dce039830948cef5).
and the fix will be part of the 1.3.x release which should be available
fairly soon.

Here is a preview so that you can confirm the fix:
http://sourceforge.net/projects/freeplane/files/freeplane%20debian%20preview/freeplane_bin-1.3.6-beta_pre03_01.zip/download

Just unzip the file and run ./freeplane.sh from inside the extracted
directory.

Thanks again for spotting the bug!
Best Regards,
-- 
Felix Natter

__
This is the maintainer address of Debian's Java team
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-maintainers. 
Please use
debian-j...@lists.debian.org for discussions and questions.

Bug#714524: [freeplane] Keystrokes no longer recognised during use

[Felix Natter]

hi,

@Martin: unfortunately I cannot reproduce your problem (same JDK, same
Freeplane, same kernel/architecture; I am also using jessie) from your
description.
(Upstream can only try to fix this if it's reproducible)

Just to be sure: did you try to press ESC when this happens?

Best Regards,
-- 
Felix Natter

__
This is the maintainer address of Debian's Java team
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-maintainers. 
Please use
debian-j...@lists.debian.org for discussions and questions.

Bug#722356: simplyhtml: random font is used for text

[Felix Natter]

Tags: pending

due to the minor nauture of the bug I will upload a new package at least
when Freeplane 1.3.x is released.

Best Regards,
-- 
Felix Natter

__
This is the maintainer address of Debian's Java team
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-maintainers. 
Please use
debian-j...@lists.debian.org for discussions and questions.

Bug#727059: RE: freeplane: Wrong icon appears on GNOME 3 main and left panels

[Felix Natter]

Alessio Paonessa livm...@hotmail.com writes:

 Hi Felix,

hello Alessio,

 I already tried both, but it doesn't work. It seems a different problem and I 
 don't
 know if it's inside the 'freplane.desktop' or in the main program.

 In threads they talk about an issue in the java machine linked to wrong 
 headers,
 but I'm not able to verify it.

If you are able/willing to build a patched version of Freeplane (1.3.x),
then we could try this:

  http://bugs.sun.com/bugdatabase/view_bug.do?bug_id=6528430

Does the description match what you're seeing? On the other hand, if the
above didn't work, I don't see high chances that this will work...

How about trying to find help on one of the openjdk lists?
  
  http://gmane.org/find.php?list=openjdk

(probably http://dir.gmane.org/gmane.comp.java.openjdk.awt.devel)

(gmane.org is mail2news and news2mail gateway, pretty cool thing :-)

Best Regards,
-- 
Felix Natter

__
This is the maintainer address of Debian's Java team
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-maintainers. 
Please use
debian-j...@lists.debian.org for discussions and questions.

Bug#727059: RE: freeplane: Wrong icon appears on GNOME 3 main and left panels

[Felix Natter]

Alessio Paonessa livm...@hotmail.com writes:

 Hi Felix,

hello Alessio,

 If you are able/willing to build a patched version of Freeplane (1.3.x),
 then we could try this:

 I'm sorry, but I don't study IT and I don't know what I'd make to the source 
 code.
 That's why I stopped at the 'freeplane.desktop' file. It's too far from my
 knowledge in IT.

Ok, cool that you're into free software then :-)

 How about trying to find help on one of the openjdk lists?

 I thought about writing a post in Freeplane forum. Maybe program developers 
 could
 be the best choice to try the solution listed above. It's the best I can do 
 with my
 technical skills ;)

I am part of the upstream team, and most of the other developers are
using Windows. You can try anyway though, there is a (small) chance that
other users or devs are experiencing your problem.

Best Regards,
-- 
Felix Natter

__
This is the maintainer address of Debian's Java team
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-maintainers. 
Please use
debian-j...@lists.debian.org for discussions and questions.

Bug#722356: simplyhtml: random font is used for text

[Felix Natter]

hi Michel,

 It might be nicer if it somehow remembered used font but you can
 probably make a template for that.

Most people use simplyhtml only within Freeplane for FreeMind,
and these mind mapping programs have templates, a default font,
and much more.

I will make a new simplyhtml release once Freeplane 1.3.x is released.

= can I close this bug?

Best Regards,
-- 
Felix Natter

__
This is the maintainer address of Debian's Java team
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-maintainers. 
Please use
debian-j...@lists.debian.org for discussions and questions.

Bug#726641: Re: freeplane: No lcdfilter applied on displayed fonts

[Felix Natter]

hi Alessio,

glad that this works for you.

Just wanted to make you aware that these lines overwrite one another, so
in your case, only
  export _JAVA_OPTIONS='-Dawt.useSystemAAFontSettings=gasp'
has an effect.

I would like to invite you to join the Freeplane community at
  https://sourceforge.net/apps/phpbb/freeplane/viewforum.php?f=1

Can I close this bug?

Best Regards,
-- 
Felix Natter

__
This is the maintainer address of Debian's Java team
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-maintainers. 
Please use
debian-j...@lists.debian.org for discussions and questions.

Bug#727059: freeplane: Wrong icon appears on GNOME 3 main and left panels

[Felix Natter]

hi Alessio,

from the link you posted:
  
http://askubuntu.com/questions/36434/how-can-i-remove-duplicate-icons-for-launched-java-programs-in-the-launcher

# run this, then select the freeplane window:
$ xprop | grep WM_CLASS

# on my system:
WM_CLASS(STRING) = sun-awt-X11-XFramePeer, java-lang-Thread

= have you tried to modify: 
 
  /usr/share/applications/freeplane.desktop

to add a line:

StartupWMClass=sun-awt-X11-XFramePeer
or
StartupWMClass=java-lang-Thread

and logout+login?

Best Regards!
-- 
Felix Natter

__
This is the maintainer address of Debian's Java team
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-maintainers. 
Please use
debian-j...@lists.debian.org for discussions and questions.

Bug#726641: freeplane: No lcdfilter applied on displayed fonts

[Felix Natter]

hi Alessio,

could you please try to set this:
  export _JAVA_OPTIONS=-Dawt.useSystemAAFontSettings=on
and then start /usr/bin/freeplane from the same console?

You may also want to try OpenJDK7, users have reported several problems
with OpenJDK6. This is much more likely a JDK than a Freeplane issue.

Finally, 1.2.23 is in testing (but in order to be able to
compile/install it on wheezy, you also need libjgoodies-forms-java 1.6).

Best Regards,
-- 
Felix Natter

__
This is the maintainer address of Debian's Java team
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-maintainers. 
Please use
debian-j...@lists.debian.org for discussions and questions.

Bug#714524: Try different JDK?

[Felix Natter]

hi Omega,

could an OpenJDK7-update (7u21 in testing, 7u25 in unstable) help?

Otherwise, as a last resort, try to install Oracle-JDK7
(and use update-alternatives-java to activate it).

Best Regards,
-- 
Felix Natter

__
This is the maintainer address of Debian's Java team
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-maintainers. 
Please use
debian-j...@lists.debian.org for discussions and questions.

Bug#669712: [freeplane] RE: freeplane: Visual corruption after scrolling mindmap

[Felix Natter]

Omega Weapon omegap...@gmail.com writes:

 Package: freeplane
 Version: 1.2.23-1

 The situation has now degraded again... I opened a mindmap today, and now
 with the software rendering, ends of words are disappearing! See the
 attached splash and new mindmap screenshots!

 Any idea where I should report this? Its clear changes are being made in
 the Java setup without testing.

I don't think this is specific to Freeplane, it looks more like a
general openjdk issue.

If it persists with the suggestions (see below!), you can ask at the
xrender mailing list (since it failed with -Dsun.java2d.xrender=True),
see here:
  
http://sourceforge.net/apps/phpbb/freeplane/viewtopic.php?f=1t=681p=3364hilit=xrender#p3370


 Going back to hardware rendering now - I can work around the horizontal
 scroll corruption with 'Center highlighted node' somewhat.


 --- System information. ---
 Architecture: amd64
 Kernel:   Linux 3.9-1-amd64

 Debian Release: jessie/sid
   990 testing security.debian.org
   990 testing ftp.uk.debian.org
   500 unstableignorantguru.github.com
   500 stable  www.getgnash.org
   500 quodlibet-unstable www.student.tugraz.at
 1 experimentalftp.uk.debian.org

 --- Package information. ---
 Depends   (Version) | Installed
 ===-+-
 default-jre | 1:1.6-47
  OR sun-java6-jre   |
 javahelp2   | 2.0.05.ds1-6
 groovy  | 1.8.6-1
 libcommons-lang-java| 2.6-3
 libcommons-io-java  | 2.4-2
 libjgoodies-forms-java   (= 1.6.0) | 1.6.0-4
 simplyhtml (= 0.16.07) | 0.16.07-1
 libbatik-java   | 1.7+dfsg-3
 librhino-java   | 1.7R3-5
 libfop-java | 1:1.1.dfsg-2
 libxerces2-java | 2.11.0-6
 libxml-commons-external-java| 1.4.01-2
 libjaxp1.3-java | 1.3.05-2
 libjlatexmath-java  | 1.0.2-1
 libknopflerfish-osgi-framework-java | 2.3.3-2
 libjsyntaxpane-java (= 0.9.6~r156) | 0.9.6~r156-2
 libjortho-freeplane-java   (= 1.2.23-1) | 1.2.23-1


 Recommends (Version) | Installed
 -+-===
 xdg-utils| 1.1.0~rc1+git20111210-7
 java-wrappers| 0.1.26


 Package's Suggests field is empty.


 --- Output from package bug script ---
 [debug] /usr/bin/freeplane: Found JAVA_HOME =
 /usr/lib/jvm/java-6-openjdk-amd64'
 [debug] /usr/bin/freeplane: Found JAVA_CMD =
 /usr/lib/jvm/java-6-openjdk-amd64/bin/java'

This looks like you're still using OpenJDK6! You should definitely try
openjdk-7:
  
http://packages.debian.org/search?keywords=openjdk-7-jresearchon=namessuite=allsection=all

You can switch to openjdk-7 by using (on my i386 jessie system):

$ update-java-alternatives --list
java-1.6.0-openjdk-i386 1061 /usr/lib/jvm/java-1.6.0-openjdk-i386
java-1.7.0-openjdk-i386 1071 /usr/lib/jvm/java-1.7.0-openjdk-i386
java-6-sun 63 /usr/lib/jvm/java-6-sun
java-gcj-4.6 /usr/lib/jvm/java-gcj-4.6
java-gcj-4.7 /usr/lib/jvm/java-gcj-4.7
$ update-java-alternatives --set java-1.7.0-openjdk-i386

If that doesn't work, you could try a 32bit- or an Oracle-JDK.

Best Regards,
-- 
Felix Natter

__
This is the maintainer address of Debian's Java team
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-maintainers. 
Please use
debian-j...@lists.debian.org for discussions and questions.

Bug#669712: [freeplane] RE: freeplane: Visual corruption after scrolling mindmap

[Felix Natter]

Omega Weapon omegap...@gmail.com writes:

hi Omega,

 On 22/06/13 11:07, Felix Natter wrote:

 I talked to Dimitry, the project lead, about the issue. _Roughly_ it's
 like this:

 - there is an EventQueue to make sure that the input order is preserved
 - an EventBuffer/KeyEventDispatcher waits for the component to get focus
or for an ESCAPE key press
 - There is only one Thread, so it's not a multi-threading issue.

 = *a workaround is to press ESCAPE in this case :-)*

 Excellent, a workaround! I'll be looking forward to the next instance
 now. I'm grateful for Dimitry's efforts!

Freeplane 1.2.23 has just hit testing :-)


 I had hoped to learn Java and then hook into keypresses - some completely
 clueless notes:

 Dimitry tried hard to reproduce this with a fixed set of steps, and he
 didn't succeed, so it may be hard to do :-(

 Sorry to cause such trouble - I'm due to get C++ progression hopefully
 within a few weeks, so maybe I'm 0.5y away from reading into Java. Then at
 least I will be able to add debugging code to prove what is/isn't
 happening.


 

 grep -iInr 'getNodeKeyListener'
 src/org/freeplane/view/swing/ui/UserInputListenerFactory.java:192: public
 KeyListener getNodeKeyListener() {
 src/org/freeplane/view/swing/map/NodeView.java:1126:
 mainView.addKeyListener(userInputListenerFactory.getNodeKeyListener());
 src/org/freeplane/core/ui/IUserInputListenerFactory.java:58: KeyListener
 getNodeKeyListener();

 These are under the freeplane source
 directory. 'src/org/freeplane/core/ui/IUserInputListenerFactory.java' looks
 to be the initial interface which ties Java functionality (KeyListener)
 with a method. It looks like
 src/org/freeplane/view/swing/ui/UserInputListenerFactory.java' might allow
 me to insert code on keypresses, but theres nothing about keypress events,
 just method calls - so it might not be doable without creating my own
 KeyListener method?

 I am a Java dev myself, and I don't know how to fix this. I think you
 have to dive really deeply into swing _and_ into the freeplane codebase
 (like Dimitry does) in order to fix this.

 Sounds like more of a hope for me than fighting OpenJDK 7!

Now that we've got the two workarounds, do you think we can close this
bug? You can open a new report if you have problems (with 1.2.23).

Best Regards,
-- 
Felix Natter

__
This is the maintainer address of Debian's Java team
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-maintainers. 
Please use
debian-j...@lists.debian.org for discussions and questions.

Bug#669712: [freeplane] RE: freeplane: Visual corruption after scrolling mindmap

[Felix Natter]

Omega Weapon omegap...@gmail.com writes:

hello Omega,

 On 18/06/13 19:39, Felix Natter wrote:

 Since it might not be a Freeplane issue, I cannot promise that your
 keyboard issue gets better (or even that it doesn't get worse) :-/ But
 if it's a reproducible Freeplane issue, then Dimitry will probably (at
 least try to) fix it.

 I have tried to make a test case to reproduce it, but its not happening -
 both fast node creation and node moving hasn't triggered the problem in a
 new or old mindmap (my experience with the issue is its pretty
 non-deterministic, but at times it hits frequently - i.e. happens, restart
 freeplane, happens again in a minute).

 The problem started at some point last year, here are my notes up until
 February, where I gave up tracking it:

 30.12.12: Just had my first failure under OpenJDK v7 - have to assume its
 Freeplane's problem.
 08.02.13: Seems to be more easily triggerable when I am using a chord with
 the keyboard - e.g. Cntrl + Up/down to move nodes up/down etc. Had this
 twice quickly in a row when this happened.
 12.02.13: Happened repeatedly whilst I was making C mindmap Language data
 types char*/string escapes nodes.
 15.02.13: Probably happens if you press a key between node creation and
 finalisation - i.e. create a node or type text into a node and enter then
 press another key before the node is 'fixed'.
 27.02.13: Search on 'sizeof' in C programming mindmap - a few Cntrl+Gs
 leads to this issue

I talked to Dimitry, the project lead, about the issue. _Roughly_ it's
like this:

- there is an EventQueue to make sure that the input order is preserved
- an EventBuffer/KeyEventDispatcher waits for the component to get focus
  or for an ESCAPE key press
- There is only one Thread, so it's not a multi-threading issue.

= *a workaround is to press ESCAPE in this case :-)*

 I had hoped to learn Java and then hook into keypresses - some completely
 clueless notes:

Dimitry tried hard to reproduce this with a fixed set of steps, and he
didn't succeed, so it may be hard to do :-(

 

 grep -iInr 'getNodeKeyListener'
 src/org/freeplane/view/swing/ui/UserInputListenerFactory.java:192: public
 KeyListener getNodeKeyListener() {
 src/org/freeplane/view/swing/map/NodeView.java:1126:
 mainView.addKeyListener(userInputListenerFactory.getNodeKeyListener());
 src/org/freeplane/core/ui/IUserInputListenerFactory.java:58: KeyListener
 getNodeKeyListener();

 These are under the freeplane source
 directory. 'src/org/freeplane/core/ui/IUserInputListenerFactory.java' looks
 to be the initial interface which ties Java functionality (KeyListener)
 with a method. It looks like
 src/org/freeplane/view/swing/ui/UserInputListenerFactory.java' might allow
 me to insert code on keypresses, but theres nothing about keypress events,
 just method calls - so it might not be doable without creating my own
 KeyListener method?

I am a Java dev myself, and I don't know how to fix this. I think you
have to dive really deeply into swing _and_ into the freeplane codebase
(like Dimitry does) in order to fix this.

 


 (At
 work I tried a recent version and they'd changed the way things were
 rendered, making it a lot less space efficient etc - went straight back to
 the 'current' version).

 Do you refer to 1.3.x vs 1.2.x or 1.2.x vs 1.1.x?

 Anyway, IMHO this is the price for high level java programming and a
 rich feature set. Or are you referring to screen space?

 Screen space - hence visual comment. I'll stop here now since its been some
 months since I tested and my memory is hazy - quick testing right now
 on

I think you can hide every sub-window in Freeplane. Freeplane 1.3.x (not
yet released) will be even more flexible as every subwindow can be
arranged independently.

 the work Windows machine shows that nodes are no longer bubbles, automatic
 formatting style appears to have changed, icons are not on the side closest
 the centre (which is where my eyes scan), etc etc... I guess all that is
 just a project to fight to get the appearance back to normal. I also
 remember having to mess with DPI to get a similar size, but it looks OK now
 in this test.

If you have a question concerning the new features that you can't figure
out yourself, you can post here:
  http://sourceforge.net/apps/phpbb/freeplane/viewforum.php?f=1

 I was imagining I'd need to get C++ and Java progression to fight the
 keyboard issue.

 Does the issue also occur with other Java software?

 I havent seen this in anything else - freeplane is by far my most used Java
 program, but I use Eclipse + PyDev fairly often so I should have had this
 happen a few times by now if the problem was more widespread.

According to the above, the keyboard issue is not a JDK issue, but
rather a swing/freeplane issue.

 Thanks!

You're welcome :-)

Best Regards,
-- 
Felix Natter

__
This is the maintainer

Bug#669712: [freeplane] RE: freeplane: Visual corruption after scrolling mindmap

[Felix Natter]

Omega Weapon omegap...@gmail.com writes:

 On 17/06/13 19:47, Felix Natter wrote:
 Omega Weapon omegap...@gmail.com writes:

 There is a separate failure where freeplane suddenly ignores all keyboard
 input, but I later confirmed this also happened under the normal
 graphics

 You could try to update to 1.2.23, but I don't know whether that would
 fix it (probably not).

 OK, will wait till that and its dependencies hit testing. Not looking
 forward to it if this upgrade will visually trash my mindmaps though
 ;)

You will have to re-apply the change (-Dsun.java2d.xrender=True) to
/usr/bin/freeplane (see above).

Since it might not be a Freeplane issue, I cannot promise that your
keyboard issue gets better (or even that it doesn't get worse) :-/ But
if it's a reproducible Freeplane issue, then Dimitry will probably (at
least try to) fix it.

 (At
 work I tried a recent version and they'd changed the way things were
 rendered, making it a lot less space efficient etc - went straight back to
 the 'current' version).

Do you refer to 1.3.x vs 1.2.x or 1.2.x vs 1.1.x?

Anyway, IMHO this is the price for high level java programming and a
rich feature set. Or are you referring to screen space?

 I was imagining I'd need to get C++ and Java progression to fight the
 keyboard issue.

Does the issue also occur with other Java software?

Best Regards,
-- 
Felix Natter

__
This is the maintainer address of Debian's Java team
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-maintainers. 
Please use
debian-j...@lists.debian.org for discussions and questions.