[byte-buddy] branch master updated (a1301a2 -> d84316d)
This is an automated email from the git hooks/post-receive script. fnatter-guest pushed a change to branch master in repository byte-buddy. from a1301a2 Add watch file new d84316d fix watch file (uses releases instead of tags, add dversionmangle) 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/watch | 7 ++- 1 file changed, 2 insertions(+), 5 deletions(-) -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/byte-buddy.git ___ pkg-java-commits mailing list pkg-java-commits@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-commits
[byte-buddy] 01/01: fix watch file (uses releases instead of tags, add dversionmangle)
This is an automated email from the git hooks/post-receive script. fnatter-guest pushed a commit to branch master in repository byte-buddy. commit d84316d42c65ac489918e534c512dd8ed2d5a008 Author: Felix Natter Date: Sat Jul 29 12:05:07 2017 +0200 fix watch file (uses releases instead of tags, add dversionmangle) --- debian/watch | 7 ++- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/debian/watch b/debian/watch index d3f4620..53fa0a8 100644 --- a/debian/watch +++ b/debian/watch @@ -1,6 +1,3 @@ -# Compulsory line, this is a version 4 file version=4 -# GitHub hosted projects -opts="filenamemangle=s%(?:.*?)?v?(\d[\d.]*)\.tar\.gz%byte-buddy-$1.tar.gz%" \ - https://github.com/raphw/byte-buddy/tags \ - (?:.*-)(\d[\d.]*)\.tar\.gz debian uupdate +opts=dversionmangle=s/\+dfsg\d// \ +https://github.com/raphw/byte-buddy/releases/ .*/(?:.*?)([\d\.]+)\.tar\.gz -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/byte-buddy.git ___ pkg-java-commits mailing list pkg-java-commits@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-commits
[byte-buddy] branch master updated (d84316d -> ca0aa51)
This is an automated email from the git hooks/post-receive script. fnatter-guest pushed a change to branch master in repository byte-buddy. from d84316d fix watch file (uses releases instead of tags, add dversionmangle) new 5f999b8 exclude precompiled content new 4d7a151 New upstream version 1.7.1+dfsg1 new 9f93c0e Updated version 1.7.1+dfsg1 from 'upstream/1.7.1+dfsg1' new ca0aa51 build 1.7.1+dfsg1-1 The 4 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: .mvn/wrapper/maven-wrapper.jar | Bin 47624 -> 0 bytes .mvn/wrapper/maven-wrapper.properties | 1 - .../test/precompiled/ArgumentBootstrap$SampleEnum.class | Bin 1234 -> 0 bytes .../bytebuddy/test/precompiled/ArgumentBootstrap.class | Bin 4465 -> 0 bytes .../test/precompiled/DelegationDefaultInterface.class | Bin 429 -> 0 bytes .../test/precompiled/DelegationDefaultTarget.class | Bin 1306 -> 0 bytes .../precompiled/DelegationDefaultTargetExplicit.class | Bin 1688 -> 0 bytes .../DelegationDefaultTargetSerializable.class | Bin 1304 -> 0 bytes .../test/precompiled/LambdaSampleFactory.class | Bin 4891 -> 0 bytes .../bytebuddy/test/precompiled/LegacyInterface.class| Bin 142 -> 0 bytes .../MorphDefaultDelegationTargetExplicit.class | Bin 1412 -> 0 bytes .../MorphDefaultDelegationTargetImplicit.class | Bin 1360 -> 0 bytes .../test/precompiled/MorphDefaultInterface.class| Bin 632 -> 0 bytes .../bytebuddy/test/precompiled/OriginExecutable.class | Bin 677 -> 0 bytes .../test/precompiled/OriginExecutableWithCache.class| Bin 704 -> 0 bytes .../bytebuddy/test/precompiled/OriginMethodHandle.class | Bin 793 -> 0 bytes .../bytebuddy/test/precompiled/OriginMethodType.class | Bin 779 -> 0 bytes .../test/precompiled/OtherTypeAnnotation.class | Bin 460 -> 0 bytes .../bytebuddy/test/precompiled/ParameterBootstrap.class | Bin 2494 -> 0 bytes .../net/bytebuddy/test/precompiled/ParameterNames.class | Bin 444 -> 0 bytes .../precompiled/ReceiverTypeSample$Generic$Inner.class | Bin 1127 -> 0 bytes .../precompiled/ReceiverTypeSample$Generic$Nested.class | Bin 877 -> 0 bytes .../test/precompiled/ReceiverTypeSample$Generic.class | Bin 948 -> 0 bytes .../test/precompiled/ReceiverTypeSample$Inner.class | Bin 758 -> 0 bytes .../test/precompiled/ReceiverTypeSample$Nested.class| Bin 582 -> 0 bytes .../bytebuddy/test/precompiled/ReceiverTypeSample.class | Bin 733 -> 0 bytes .../test/precompiled/ReturnTypeInterfaceBridge.class| Bin 596 -> 0 bytes .../precompiled/ReturnTypeInterfaceBridgeBase.class | Bin 438 -> 0 bytes .../test/precompiled/SimpleTypeAnnotatedType.class | Bin 709 -> 0 bytes .../test/precompiled/SingleDefaultMethodClass.class | Bin 426 -> 0 bytes .../SingleDefaultMethodConflictingInterface.class | Bin 474 -> 0 bytes ...eDefaultMethodConflictingPreferringInterceptor.class | Bin 1092 -> 0 bytes .../test/precompiled/SingleDefaultMethodInterface.class | Bin 435 -> 0 bytes .../SingleDefaultMethodNonOverridingInterface.class | Bin 261 -> 0 bytes .../SingleDefaultMethodPreferringInterceptor.class | Bin 1048 -> 0 bytes .../test/precompiled/StandardArgumentBootstrap.class| Bin 2522 -> 0 bytes .../net/bytebuddy/test/precompiled/TypeAnnotation.class | Bin 450 -> 0 bytes .../precompiled/TypeAnnotationOtherSamples$Bar.class| Bin 824 -> 0 bytes .../TypeAnnotationOtherSamples$Qux$Baz.class| Bin 739 -> 0 bytes .../precompiled/TypeAnnotationOtherSamples$Qux.class| Bin 562 -> 0 bytes .../test/precompiled/TypeAnnotationOtherSamples.class | Bin 1616 -> 0 bytes .../test/precompiled/TypeAnnotationSamples.class| Bin 2273 -> 0 bytes .../bytebuddy/test/precompiled/TypeConstantSample.class | Bin 817 -> 0 bytes .../test/precompiled/TypeVariableInterfaceBridge.class | Bin 799 -> 0 bytes .../precompiled/TypeVariableInterfaceBridgeBase.class | Bin 647 -> 0 bytes .../gradle/wrapper/gradle-wrapper.jar | Bin 53324 -> 0 bytes .../gradle/wrapper/gradle-wrapper.properties| 6 -- debian/changelog| 7 +++ debian/copyright| 6 +- debian/rules| 2 +- 50 files changed, 13 insertions(+), 9 deletions(-) delete mode 100644 .mvn/wrapper/maven-wrapper.jar delete mode 100644 .mvn/wrapper/maven-wrapper.properties delete mode 100644 byte-buddy-dep/src/test/resources/net/bytebuddy/test/precompiled/ArgumentBootstrap$SampleEnum.class delete mode 100644 byte-buddy-dep/src/test/resources/net/bytebuddy/test/precompiled/ArgumentBootstrap.class delete mode 100644 byte
[byte-buddy] 04/04: build 1.7.1+dfsg1-1
This is an automated email from the git hooks/post-receive script. fnatter-guest pushed a commit to branch master in repository byte-buddy. commit ca0aa5166e32748aff07b4030746b84d1f2fcbc7 Author: Felix Natter Date: Sat Jul 29 13:17:05 2017 +0200 build 1.7.1+dfsg1-1 --- debian/changelog | 7 +++ 1 file changed, 7 insertions(+) diff --git a/debian/changelog b/debian/changelog index dcc63ac..76087ea 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,10 @@ +byte-buddy (1.7.1+dfsg1-1) UNRELEASED; urgency=medium + + * fix watch file (releases instead of tags, dversionmangle) + * remove precompiled content from orig-source + + -- Felix Natter Sat, 29 Jul 2017 13:03:14 +0200 + byte-buddy (1.7.1-1) unstable; urgency=low * Initial release (Closes: #860325) -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/byte-buddy.git ___ pkg-java-commits mailing list pkg-java-commits@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-commits
[byte-buddy] 02/04: New upstream version 1.7.1+dfsg1
This is an automated email from the git hooks/post-receive script. fnatter-guest pushed a commit to branch master in repository byte-buddy. commit 4d7a1516cf4b6c2a52f53e2103accfed8ab97cf4 Author: Felix Natter Date: Sat Jul 29 13:02:41 2017 +0200 New upstream version 1.7.1+dfsg1 --- .mvn/wrapper/maven-wrapper.jar | Bin 47624 -> 0 bytes .mvn/wrapper/maven-wrapper.properties | 1 - .../test/precompiled/ArgumentBootstrap$SampleEnum.class | Bin 1234 -> 0 bytes .../bytebuddy/test/precompiled/ArgumentBootstrap.class | Bin 4465 -> 0 bytes .../test/precompiled/DelegationDefaultInterface.class | Bin 429 -> 0 bytes .../test/precompiled/DelegationDefaultTarget.class | Bin 1306 -> 0 bytes .../precompiled/DelegationDefaultTargetExplicit.class | Bin 1688 -> 0 bytes .../DelegationDefaultTargetSerializable.class | Bin 1304 -> 0 bytes .../test/precompiled/LambdaSampleFactory.class | Bin 4891 -> 0 bytes .../bytebuddy/test/precompiled/LegacyInterface.class| Bin 142 -> 0 bytes .../MorphDefaultDelegationTargetExplicit.class | Bin 1412 -> 0 bytes .../MorphDefaultDelegationTargetImplicit.class | Bin 1360 -> 0 bytes .../test/precompiled/MorphDefaultInterface.class| Bin 632 -> 0 bytes .../bytebuddy/test/precompiled/OriginExecutable.class | Bin 677 -> 0 bytes .../test/precompiled/OriginExecutableWithCache.class| Bin 704 -> 0 bytes .../bytebuddy/test/precompiled/OriginMethodHandle.class | Bin 793 -> 0 bytes .../bytebuddy/test/precompiled/OriginMethodType.class | Bin 779 -> 0 bytes .../test/precompiled/OtherTypeAnnotation.class | Bin 460 -> 0 bytes .../bytebuddy/test/precompiled/ParameterBootstrap.class | Bin 2494 -> 0 bytes .../net/bytebuddy/test/precompiled/ParameterNames.class | Bin 444 -> 0 bytes .../precompiled/ReceiverTypeSample$Generic$Inner.class | Bin 1127 -> 0 bytes .../precompiled/ReceiverTypeSample$Generic$Nested.class | Bin 877 -> 0 bytes .../test/precompiled/ReceiverTypeSample$Generic.class | Bin 948 -> 0 bytes .../test/precompiled/ReceiverTypeSample$Inner.class | Bin 758 -> 0 bytes .../test/precompiled/ReceiverTypeSample$Nested.class| Bin 582 -> 0 bytes .../bytebuddy/test/precompiled/ReceiverTypeSample.class | Bin 733 -> 0 bytes .../test/precompiled/ReturnTypeInterfaceBridge.class| Bin 596 -> 0 bytes .../precompiled/ReturnTypeInterfaceBridgeBase.class | Bin 438 -> 0 bytes .../test/precompiled/SimpleTypeAnnotatedType.class | Bin 709 -> 0 bytes .../test/precompiled/SingleDefaultMethodClass.class | Bin 426 -> 0 bytes .../SingleDefaultMethodConflictingInterface.class | Bin 474 -> 0 bytes ...eDefaultMethodConflictingPreferringInterceptor.class | Bin 1092 -> 0 bytes .../test/precompiled/SingleDefaultMethodInterface.class | Bin 435 -> 0 bytes .../SingleDefaultMethodNonOverridingInterface.class | Bin 261 -> 0 bytes .../SingleDefaultMethodPreferringInterceptor.class | Bin 1048 -> 0 bytes .../test/precompiled/StandardArgumentBootstrap.class| Bin 2522 -> 0 bytes .../net/bytebuddy/test/precompiled/TypeAnnotation.class | Bin 450 -> 0 bytes .../precompiled/TypeAnnotationOtherSamples$Bar.class| Bin 824 -> 0 bytes .../TypeAnnotationOtherSamples$Qux$Baz.class| Bin 739 -> 0 bytes .../precompiled/TypeAnnotationOtherSamples$Qux.class| Bin 562 -> 0 bytes .../test/precompiled/TypeAnnotationOtherSamples.class | Bin 1616 -> 0 bytes .../test/precompiled/TypeAnnotationSamples.class| Bin 2273 -> 0 bytes .../bytebuddy/test/precompiled/TypeConstantSample.class | Bin 817 -> 0 bytes .../test/precompiled/TypeVariableInterfaceBridge.class | Bin 799 -> 0 bytes .../precompiled/TypeVariableInterfaceBridgeBase.class | Bin 647 -> 0 bytes .../gradle/wrapper/gradle-wrapper.jar | Bin 53324 -> 0 bytes .../gradle/wrapper/gradle-wrapper.properties| 6 -- 47 files changed, 7 deletions(-) diff --git a/.mvn/wrapper/maven-wrapper.jar b/.mvn/wrapper/maven-wrapper.jar deleted file mode 100644 index cd16a00..000 Binary files a/.mvn/wrapper/maven-wrapper.jar and /dev/null differ diff --git a/.mvn/wrapper/maven-wrapper.properties b/.mvn/wrapper/maven-wrapper.properties deleted file mode 100644 index 7c3a925..000 --- a/.mvn/wrapper/maven-wrapper.properties +++ /dev/null @@ -1 +0,0 @@ -distributionUrl=https://repo1.maven.org/maven2/org/apache/maven/apache-maven/3.2.5/apache-maven-3.2.5-bin.zip \ No newline at end of file diff --git a/byte-buddy-dep/src/test/resources/net/bytebuddy/test/precompiled/ArgumentBootstrap$SampleEnum.class b/byte-buddy-dep/src/test/resources/net/bytebuddy/test/precompiled/ArgumentBootstrap$SampleEnum.class deleted file mode 100644 index 5228067..000 Binary files a/byte-buddy-dep/src/test/resources/net/
[byte-buddy] 03/04: Updated version 1.7.1+dfsg1 from 'upstream/1.7.1+dfsg1'
This is an automated email from the git hooks/post-receive script. fnatter-guest pushed a commit to branch master in repository byte-buddy. commit 9f93c0e88c1e2aa3a9fd48e3342f95a5eebba8a5 Merge: 5f999b8 4d7a151 Author: Felix Natter Date: Sat Jul 29 13:02:47 2017 +0200 Updated version 1.7.1+dfsg1 from 'upstream/1.7.1+dfsg1' with Debian dir 6c1a9fb9bd3206129792aa784bbdd673ba4c0cdf .mvn/wrapper/maven-wrapper.jar | Bin 47624 -> 0 bytes .mvn/wrapper/maven-wrapper.properties | 1 - .../test/precompiled/ArgumentBootstrap$SampleEnum.class | Bin 1234 -> 0 bytes .../bytebuddy/test/precompiled/ArgumentBootstrap.class | Bin 4465 -> 0 bytes .../test/precompiled/DelegationDefaultInterface.class | Bin 429 -> 0 bytes .../test/precompiled/DelegationDefaultTarget.class | Bin 1306 -> 0 bytes .../precompiled/DelegationDefaultTargetExplicit.class | Bin 1688 -> 0 bytes .../DelegationDefaultTargetSerializable.class | Bin 1304 -> 0 bytes .../test/precompiled/LambdaSampleFactory.class | Bin 4891 -> 0 bytes .../bytebuddy/test/precompiled/LegacyInterface.class| Bin 142 -> 0 bytes .../MorphDefaultDelegationTargetExplicit.class | Bin 1412 -> 0 bytes .../MorphDefaultDelegationTargetImplicit.class | Bin 1360 -> 0 bytes .../test/precompiled/MorphDefaultInterface.class| Bin 632 -> 0 bytes .../bytebuddy/test/precompiled/OriginExecutable.class | Bin 677 -> 0 bytes .../test/precompiled/OriginExecutableWithCache.class| Bin 704 -> 0 bytes .../bytebuddy/test/precompiled/OriginMethodHandle.class | Bin 793 -> 0 bytes .../bytebuddy/test/precompiled/OriginMethodType.class | Bin 779 -> 0 bytes .../test/precompiled/OtherTypeAnnotation.class | Bin 460 -> 0 bytes .../bytebuddy/test/precompiled/ParameterBootstrap.class | Bin 2494 -> 0 bytes .../net/bytebuddy/test/precompiled/ParameterNames.class | Bin 444 -> 0 bytes .../precompiled/ReceiverTypeSample$Generic$Inner.class | Bin 1127 -> 0 bytes .../precompiled/ReceiverTypeSample$Generic$Nested.class | Bin 877 -> 0 bytes .../test/precompiled/ReceiverTypeSample$Generic.class | Bin 948 -> 0 bytes .../test/precompiled/ReceiverTypeSample$Inner.class | Bin 758 -> 0 bytes .../test/precompiled/ReceiverTypeSample$Nested.class| Bin 582 -> 0 bytes .../bytebuddy/test/precompiled/ReceiverTypeSample.class | Bin 733 -> 0 bytes .../test/precompiled/ReturnTypeInterfaceBridge.class| Bin 596 -> 0 bytes .../precompiled/ReturnTypeInterfaceBridgeBase.class | Bin 438 -> 0 bytes .../test/precompiled/SimpleTypeAnnotatedType.class | Bin 709 -> 0 bytes .../test/precompiled/SingleDefaultMethodClass.class | Bin 426 -> 0 bytes .../SingleDefaultMethodConflictingInterface.class | Bin 474 -> 0 bytes ...eDefaultMethodConflictingPreferringInterceptor.class | Bin 1092 -> 0 bytes .../test/precompiled/SingleDefaultMethodInterface.class | Bin 435 -> 0 bytes .../SingleDefaultMethodNonOverridingInterface.class | Bin 261 -> 0 bytes .../SingleDefaultMethodPreferringInterceptor.class | Bin 1048 -> 0 bytes .../test/precompiled/StandardArgumentBootstrap.class| Bin 2522 -> 0 bytes .../net/bytebuddy/test/precompiled/TypeAnnotation.class | Bin 450 -> 0 bytes .../precompiled/TypeAnnotationOtherSamples$Bar.class| Bin 824 -> 0 bytes .../TypeAnnotationOtherSamples$Qux$Baz.class| Bin 739 -> 0 bytes .../precompiled/TypeAnnotationOtherSamples$Qux.class| Bin 562 -> 0 bytes .../test/precompiled/TypeAnnotationOtherSamples.class | Bin 1616 -> 0 bytes .../test/precompiled/TypeAnnotationSamples.class| Bin 2273 -> 0 bytes .../bytebuddy/test/precompiled/TypeConstantSample.class | Bin 817 -> 0 bytes .../test/precompiled/TypeVariableInterfaceBridge.class | Bin 799 -> 0 bytes .../precompiled/TypeVariableInterfaceBridgeBase.class | Bin 647 -> 0 bytes .../gradle/wrapper/gradle-wrapper.jar | Bin 53324 -> 0 bytes .../gradle/wrapper/gradle-wrapper.properties| 6 -- 47 files changed, 7 deletions(-) -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/byte-buddy.git ___ pkg-java-commits mailing list pkg-java-commits@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-commits
[byte-buddy] 01/04: exclude precompiled content
This is an automated email from the git hooks/post-receive script. fnatter-guest pushed a commit to branch master in repository byte-buddy. commit 5f999b8db040ad202759b38ec9105ff1e8444e29 Author: Felix Natter Date: Sat Jul 29 12:59:31 2017 +0200 exclude precompiled content --- debian/copyright | 6 +- debian/rules | 2 +- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/debian/copyright b/debian/copyright index aa0c6de..ac1cc9f 100644 --- a/debian/copyright +++ b/debian/copyright @@ -1,6 +1,9 @@ Format: https://www.debian.org/doc/packaging-manuals/copyright-format/1.0/ -Upstream-Name: Byte Buddy (parent) +Upstream-Name: Rafael Winterhalter Source: http://bytebuddy.net +Files-Excluded: .mvn/* +byte-buddy-gradle-plugin/gradle/wrapper/* + byte-buddy-dep/src/test/resources/net/bytebuddy/test/precompiled/*.class Files: * Copyright: 2014-2017 Rafael Winterhalter @@ -9,6 +12,7 @@ License: Apache-2.0 Files: debian/* Copyright: 2017 Ying-Chun Liu (PaulLiu) 2017 DT42.io + 2017 Felix Natter License: Apache-2.0 License: Apache-2.0 diff --git a/debian/rules b/debian/rules index 5985cac..d7a1619 100755 --- a/debian/rules +++ b/debian/rules @@ -4,4 +4,4 @@ dh $@ get-orig-source: - uscan --download-current-version --force-download --no-symlink + uscan --force-download --rename --repack -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/byte-buddy.git ___ pkg-java-commits mailing list pkg-java-commits@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-commits
[byte-buddy] 01/01: pristine-tar data for byte-buddy_1.7.1+dfsg1.orig.tar.gz
This is an automated email from the git hooks/post-receive script. fnatter-guest pushed a commit to branch pristine-tar in repository byte-buddy. commit 1b72bb09e7f53085c62ab7475c63476fa61a4e96 Author: Felix Natter Date: Sat Jul 29 13:02:47 2017 +0200 pristine-tar data for byte-buddy_1.7.1+dfsg1.orig.tar.gz --- byte-buddy_1.7.1+dfsg1.orig.tar.gz.delta | Bin 0 -> 978727 bytes byte-buddy_1.7.1+dfsg1.orig.tar.gz.id| 1 + 2 files changed, 1 insertion(+) diff --git a/byte-buddy_1.7.1+dfsg1.orig.tar.gz.delta b/byte-buddy_1.7.1+dfsg1.orig.tar.gz.delta new file mode 100644 index 000..f1c3a07 Binary files /dev/null and b/byte-buddy_1.7.1+dfsg1.orig.tar.gz.delta differ diff --git a/byte-buddy_1.7.1+dfsg1.orig.tar.gz.id b/byte-buddy_1.7.1+dfsg1.orig.tar.gz.id new file mode 100644 index 000..706e620 --- /dev/null +++ b/byte-buddy_1.7.1+dfsg1.orig.tar.gz.id @@ -0,0 +1 @@ +6263f720ccdfb3e80cb6ec61aaaee4ebe6c344e9 -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/byte-buddy.git ___ pkg-java-commits mailing list pkg-java-commits@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-commits
[byte-buddy] branch pristine-tar updated (e58dc16 -> 1b72bb0)
This is an automated email from the git hooks/post-receive script. fnatter-guest pushed a change to branch pristine-tar in repository byte-buddy. from e58dc16 pristine-tar data for byte-buddy_1.7.1.orig.tar.gz new 1b72bb0 pristine-tar data for byte-buddy_1.7.1+dfsg1.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: byte-buddy_1.7.1+dfsg1.orig.tar.gz.delta | Bin 0 -> 978727 bytes byte-buddy_1.7.1+dfsg1.orig.tar.gz.id| 1 + 2 files changed, 1 insertion(+) create mode 100644 byte-buddy_1.7.1+dfsg1.orig.tar.gz.delta create mode 100644 byte-buddy_1.7.1+dfsg1.orig.tar.gz.id -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/byte-buddy.git ___ pkg-java-commits mailing list pkg-java-commits@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-commits
[byte-buddy] annotated tag upstream/1.7.1+dfsg1 created (now b8be28b)
This is an automated email from the git hooks/post-receive script. fnatter-guest pushed a change to annotated tag upstream/1.7.1+dfsg1 in repository byte-buddy. at b8be28b (tag) tagging 4d7a1516cf4b6c2a52f53e2103accfed8ab97cf4 (commit) replaces upstream/1.7.1 tagged by Felix Natter on Sat Jul 29 13:02:47 2017 +0200 - Log - Upstream version 1.7.1+dfsg1 Felix Natter (1): New upstream version 1.7.1+dfsg1 --- No new revisions were added by this update. -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/byte-buddy.git ___ pkg-java-commits mailing list pkg-java-commits@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-commits
[simplyhtml] 04/05: refresh patch 01
This is an automated email from the git hooks/post-receive script. fnatter-guest pushed a commit to branch master in repository simplyhtml. commit c5f1272aa9a1d6305cd696a1002b02ecd544c1bb Author: Felix Natter Date: Thu Aug 24 17:15:22 2017 +0200 refresh patch 01 --- debian/patches/01_build.patch | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/debian/patches/01_build.patch b/debian/patches/01_build.patch index 70afb44..b75e515 100644 --- a/debian/patches/01_build.patch +++ b/debian/patches/01_build.patch @@ -21,7 +21,7 @@ Last-Update: 2016-07-10 +apply plugin: 'maven' group 'com.lightdev.app.shtm.simplyhtml' - version = '0.16.18' + version = '0.17.3' @@ -13,24 +14,8 @@ sourceCompatibility='1.7' -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/simplyhtml.git ___ pkg-java-commits mailing list pkg-java-commits@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-commits
[simplyhtml] 02/05: Updated version 0.17.3 from 'upstream/0.17.3'
This is an automated email from the git hooks/post-receive script.
fnatter-guest pushed a commit to branch master
in repository simplyhtml.
commit c5f2fc344abfc982e17acd97c6e7a8b44f82b77d
Merge: 0b5e633 4010388
Author: Felix Natter
Date: Thu Aug 24 17:07:02 2017 +0200
Updated version 0.17.3 from 'upstream/0.17.3'
with Debian dir 28029b4f1568f2febbba655e29422bc8486fbb27
.gitignore | 2 -
build.gradle | 2 +-
src/com/lightdev/app/shtm/AbstractPlugin.java | 10 +-
src/com/lightdev/app/shtm/DynamicResource.java | 46 +-
src/com/lightdev/app/shtm/FrmMain.java | 6 +-
...TextResources.java => InternalUiResources.java} | 29 +-
src/com/lightdev/app/shtm/ManagePluginsAction.java | 10 +-
src/com/lightdev/app/shtm/SHTMLEditorKit.java | 4 -
.../lightdev/app/shtm/SHTMLEditorKitActions.java | 499 +
src/com/lightdev/app/shtm/SHTMLEditorPane.java | 1 -
src/com/lightdev/app/shtm/SHTMLHelpBroker.java | 2 +-
src/com/lightdev/app/shtm/SHTMLPanel.java | 10 +-
src/com/lightdev/app/shtm/SHTMLPanelImpl.java | 133 ++
.../app/shtm/SHTMLPanelMultipleDocImpl.java| 4 +-
.../shtm/{TextResources.java => UIResources.java} | 5 +-
src/com/lightdev/app/shtm/Util.java| 4 +-
.../app/shtm/resources/SimplyHTML.properties | 2 -
.../shtm/resources/SimplyHTML_common.properties| 7 -
.../app/shtm/resources/SimplyHTML_de.properties| 12 +-
src/com/lightdev/app/shtm/resources/algnCtr_on.gif | Bin 1007 -> 0 bytes
src/com/lightdev/app/shtm/resources/algnLft_on.gif | Bin 1007 -> 0 bytes
src/com/lightdev/app/shtm/resources/algnRt_on.gif | Bin 1009 -> 0 bytes
src/com/lightdev/app/shtm/resources/bold_on.gif| Bin 1024 -> 0 bytes
src/com/lightdev/app/shtm/resources/bold_on_de.gif | Bin 1022 -> 0 bytes
src/com/lightdev/app/shtm/resources/italic_on.gif | Bin 1021 -> 0 bytes
.../lightdev/app/shtm/resources/italic_on_de.gif | Bin 1028 -> 0 bytes
src/com/lightdev/app/shtm/resources/ol_on.gif | Bin 1032 -> 0 bytes
src/de/calcom/cclib/text/FindReplaceDialog.java| 5 -
.../cclib/text/PseudoDamerauLevenshtein.java | 4 -
29 files changed, 210 insertions(+), 587 deletions(-)
--
Alioth's /usr/local/bin/git-commit-notice on
/srv/git.debian.org/git/pkg-java/simplyhtml.git
___
pkg-java-commits mailing list
pkg-java-commits@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-commits
[simplyhtml] 05/05: fix patch, upgrade standards-version, update copyright
This is an automated email from the git hooks/post-receive script.
fnatter-guest pushed a commit to branch master
in repository simplyhtml.
commit 48f773bdda6bb3dd4b5f9c7ce426f22d3e5b990d
Author: Felix Natter
Date: Thu Aug 24 17:35:14 2017 +0200
fix patch, upgrade standards-version, update copyright
---
debian/changelog | 3 +++
debian/control| 2 +-
debian/copyright | 4 ++--
debian/patches/01_build.patch | 30 --
4 files changed, 22 insertions(+), 17 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index b22b401..545da08 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,9 @@
simplyhtml (0.17.3-1) UNRELEASED; urgency=medium
* New upstream version
+ * Refresh 01_build.patch, remove deprecated gradle feature (<<)
+ * Upgrade standards-version to 4.0.0 (no changes)
+ * Update copyright years
-- Felix Natter Thu, 24 Aug 2017 17:07:40 +0200
diff --git a/debian/control b/debian/control
index b49cddf..f3f9a0e 100644
--- a/debian/control
+++ b/debian/control
@@ -11,7 +11,7 @@ Build-Depends-Indep: default-jdk,
gradle,
gradle-debian-helper,
maven-repo-helper
-Standards-Version: 3.9.8
+Standards-Version: 4.0.0
Vcs-Git: https://anonscm.debian.org/git/pkg-java/simplyhtml.git
Vcs-Browser: https://anonscm.debian.org/cgit/pkg-java/simplyhtml.git
Homepage: http://sf.net/projects/simplyhtml
diff --git a/debian/copyright b/debian/copyright
index b93047d..90c1d5f 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -4,7 +4,7 @@ Source: http://simplyhtml.sf.net/
Upstream-Contact: Felix Natter
Files: *
-Copyright: 2006-2016 Dimitri Polivaev
+Copyright: 2006-2017 Dimitri Polivaev
2012-2016 Felix Natter
2002,2003 Ulrich Hilger
License: GPL-2+
@@ -66,7 +66,7 @@ License: GPL-2+
Public License version 2 can be found in "/usr/share/common-licenses/GPL-2".
Files: debian/*
-Copyright: 2013-2016 Felix Natter
+Copyright: 2013-2017 Felix Natter
2008-2012 Eric Lavarde
License: GPL-2+ or BSD-2-clause
This package is free software; you can redistribute it and/or modify
diff --git a/debian/patches/01_build.patch b/debian/patches/01_build.patch
index b75e515..2e065de 100644
--- a/debian/patches/01_build.patch
+++ b/debian/patches/01_build.patch
@@ -95,32 +95,34 @@ Last-Update: 2016-07-10
publishing {
publications {
simplyhtml(MavenPublication) {
-@@ -104,6 +96,24 @@
+@@ -104,6 +96,26 @@
}
}
}
+*/
+
-+task createPom << {
-+pom {
-+artifactId = 'SimplyHTML'
-+project {
-+inceptionYear '2011'
-+licenses {
-+license {
-+name 'GNU General Public License, Version 2'
-+url 'http://www.gnu.org/licenses/gpl-2.0.html'
-+distribution 'repo'
++task createPom {
++doLast {
++pom {
++ artifactId = 'SimplyHTML'
++project {
++inceptionYear '2011'
++licenses {
++license {
++name 'GNU General Public License, Version 2'
++url 'http://www.gnu.org/licenses/gpl-2.0.html'
++distribution 'repo'
++}
+}
+}
-+}
-+}.writeTo("pom.xml")
++}.writeTo("pom.xml")
++}
+}
+
javadoc {
enabled = true
-@@ -111,4 +121,9 @@
+@@ -111,4 +123,9 @@
failOnError = false
}
--
Alioth's /usr/local/bin/git-commit-notice on
/srv/git.debian.org/git/pkg-java/simplyhtml.git
___
pkg-java-commits mailing list
pkg-java-commits@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-commits
[simplyhtml] annotated tag upstream/0.17.3 created (now bf5f144)
This is an automated email from the git hooks/post-receive script. fnatter-guest pushed a change to annotated tag upstream/0.17.3 in repository simplyhtml. at bf5f144 (tag) tagging 40103884adf19f62555dfe6486d6252791c463cb (commit) replaces upstream/0.16.18 tagged by Felix Natter on Thu Aug 24 17:07:02 2017 +0200 - Log - Upstream version 0.17.3 Felix Natter (1): New upstream version 0.17.3 --- No new revisions were added by this update. -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/simplyhtml.git ___ pkg-java-commits mailing list pkg-java-commits@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-commits
[simplyhtml] 03/05: build 0.17.3-1
This is an automated email from the git hooks/post-receive script. fnatter-guest pushed a commit to branch master in repository simplyhtml. commit cea229190a5667f07e43566b7525c3280529bc92 Author: Felix Natter Date: Thu Aug 24 17:08:09 2017 +0200 build 0.17.3-1 --- debian/changelog | 6 ++ 1 file changed, 6 insertions(+) diff --git a/debian/changelog b/debian/changelog index c329f04..b22b401 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +simplyhtml (0.17.3-1) UNRELEASED; urgency=medium + + * New upstream version + + -- Felix Natter Thu, 24 Aug 2017 17:07:40 +0200 + simplyhtml (0.16.18-1) unstable; urgency=medium * New upstream version. -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/simplyhtml.git ___ pkg-java-commits mailing list pkg-java-commits@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-commits
[simplyhtml] 01/05: New upstream version 0.17.3
This is an automated email from the git hooks/post-receive script.
fnatter-guest pushed a commit to branch master
in repository simplyhtml.
commit 40103884adf19f62555dfe6486d6252791c463cb
Author: Felix Natter
Date: Thu Aug 24 17:07:00 2017 +0200
New upstream version 0.17.3
---
build.gradle | 2 +-
src/com/lightdev/app/shtm/AbstractPlugin.java | 10 +-
src/com/lightdev/app/shtm/DynamicResource.java | 46 +-
src/com/lightdev/app/shtm/FrmMain.java | 6 +-
...TextResources.java => InternalUiResources.java} | 29 +-
src/com/lightdev/app/shtm/ManagePluginsAction.java | 10 +-
src/com/lightdev/app/shtm/SHTMLEditorKit.java | 4 -
.../lightdev/app/shtm/SHTMLEditorKitActions.java | 499 +
src/com/lightdev/app/shtm/SHTMLEditorPane.java | 1 -
src/com/lightdev/app/shtm/SHTMLHelpBroker.java | 2 +-
src/com/lightdev/app/shtm/SHTMLPanel.java | 10 +-
src/com/lightdev/app/shtm/SHTMLPanelImpl.java | 133 ++
.../app/shtm/SHTMLPanelMultipleDocImpl.java| 4 +-
.../shtm/{TextResources.java => UIResources.java} | 5 +-
src/com/lightdev/app/shtm/Util.java| 4 +-
.../app/shtm/resources/SimplyHTML.properties | 2 -
.../shtm/resources/SimplyHTML_common.properties| 7 -
.../app/shtm/resources/SimplyHTML_de.properties| 12 +-
src/com/lightdev/app/shtm/resources/algnCtr_on.gif | Bin 1007 -> 0 bytes
src/com/lightdev/app/shtm/resources/algnLft_on.gif | Bin 1007 -> 0 bytes
src/com/lightdev/app/shtm/resources/algnRt_on.gif | Bin 1009 -> 0 bytes
src/com/lightdev/app/shtm/resources/bold_on.gif| Bin 1024 -> 0 bytes
src/com/lightdev/app/shtm/resources/bold_on_de.gif | Bin 1022 -> 0 bytes
src/com/lightdev/app/shtm/resources/italic_on.gif | Bin 1021 -> 0 bytes
.../lightdev/app/shtm/resources/italic_on_de.gif | Bin 1028 -> 0 bytes
src/com/lightdev/app/shtm/resources/ol_on.gif | Bin 1032 -> 0 bytes
src/de/calcom/cclib/text/FindReplaceDialog.java| 5 -
.../cclib/text/PseudoDamerauLevenshtein.java | 4 -
28 files changed, 210 insertions(+), 585 deletions(-)
diff --git a/build.gradle b/build.gradle
index 4f6d945..00c97ed 100644
--- a/build.gradle
+++ b/build.gradle
@@ -7,7 +7,7 @@ apply plugin: 'eclipse'
apply plugin: 'maven-publish'
group 'com.lightdev.app.shtm.simplyhtml'
-version = '0.16.18'
+version = '0.17.3'
targetCompatibility='1.7'
sourceCompatibility='1.7'
diff --git a/src/com/lightdev/app/shtm/AbstractPlugin.java
b/src/com/lightdev/app/shtm/AbstractPlugin.java
index d991599..00c2338 100644
--- a/src/com/lightdev/app/shtm/AbstractPlugin.java
+++ b/src/com/lightdev/app/shtm/AbstractPlugin.java
@@ -169,18 +169,18 @@ public abstract class AbstractPlugin implements
SHTMLPlugin {
if (plLoader != null) {
final ResourceBundle resourceBundle =
ResourceBundle.getBundle(this.getClass().getName(),
Locale.getDefault(), plLoader);
-textResources = new DefaultTextResources(resourceBundle);
+textResources = new InternalUiResources(resourceBundle);
//System.out.println("AbstractPlugin plLoader != null,
resources=" + resources);
}
else {
-final DefaultTextResources instance = new
DefaultTextResources(ResourceBundle.getBundle(this
+final InternalUiResources instance = new
InternalUiResources(ResourceBundle.getBundle(this
.getClass().getName(), Locale.getDefault()));
textResources = instance;
//System.out.println("AbstractPlugin plLoader == null,
resources=" + resources);
}
}
else {
-final DefaultTextResources instance = new
DefaultTextResources(ResourceBundle.getBundle(this.getClass()
+final InternalUiResources instance = new
InternalUiResources(ResourceBundle.getBundle(this.getClass()
.getName(), Locale.getDefault()));
textResources = instance;
//System.out.println("AbstractPlugin pluginManager = null,
resources=" + resources);
@@ -335,7 +335,7 @@ public abstract class AbstractPlugin implements SHTMLPlugin
{
* @return the string with the given name or null, if none is found
*/
public String getOwnerResString(final String nm) {
-return Util.getResourceString(SHTMLPanelImpl.getResources(), nm);
+return Util.getResourceString(SHTMLPanelImpl.getUiResources(), nm);
}
/**
@@ -352,7 +352,7 @@ public abstract class AbstractPlugin implements SHTMLPlugin
{
/* --- SimplyHTML plugin interface implementation end - */
/* -
[simplyhtml] branch master updated (0b5e633 -> 48f773b)
This is an automated email from the git hooks/post-receive script.
fnatter-guest pushed a change to branch master
in repository simplyhtml.
from 0b5e633 build 0.16.18
new 4010388 New upstream version 0.17.3
new c5f2fc3 Updated version 0.17.3 from 'upstream/0.17.3'
new cea2291 build 0.17.3-1
new c5f1272 refresh patch 01
new 48f773b fix patch, upgrade standards-version, update copyright
The 5 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:
.gitignore | 2 -
build.gradle | 2 +-
debian/changelog | 9 +
debian/control | 2 +-
debian/copyright | 4 +-
debian/patches/01_build.patch | 32 +-
src/com/lightdev/app/shtm/AbstractPlugin.java | 10 +-
src/com/lightdev/app/shtm/DynamicResource.java | 46 +-
src/com/lightdev/app/shtm/FrmMain.java | 6 +-
...TextResources.java => InternalUiResources.java} | 29 +-
src/com/lightdev/app/shtm/ManagePluginsAction.java | 10 +-
src/com/lightdev/app/shtm/SHTMLEditorKit.java | 4 -
.../lightdev/app/shtm/SHTMLEditorKitActions.java | 499 +
src/com/lightdev/app/shtm/SHTMLEditorPane.java | 1 -
src/com/lightdev/app/shtm/SHTMLHelpBroker.java | 2 +-
src/com/lightdev/app/shtm/SHTMLPanel.java | 10 +-
src/com/lightdev/app/shtm/SHTMLPanelImpl.java | 133 ++
.../app/shtm/SHTMLPanelMultipleDocImpl.java| 4 +-
.../shtm/{TextResources.java => UIResources.java} | 5 +-
src/com/lightdev/app/shtm/Util.java| 4 +-
.../app/shtm/resources/SimplyHTML.properties | 2 -
.../shtm/resources/SimplyHTML_common.properties| 7 -
.../app/shtm/resources/SimplyHTML_de.properties| 12 +-
src/com/lightdev/app/shtm/resources/algnCtr_on.gif | Bin 1007 -> 0 bytes
src/com/lightdev/app/shtm/resources/algnLft_on.gif | Bin 1007 -> 0 bytes
src/com/lightdev/app/shtm/resources/algnRt_on.gif | Bin 1009 -> 0 bytes
src/com/lightdev/app/shtm/resources/bold_on.gif| Bin 1024 -> 0 bytes
src/com/lightdev/app/shtm/resources/bold_on_de.gif | Bin 1022 -> 0 bytes
src/com/lightdev/app/shtm/resources/italic_on.gif | Bin 1021 -> 0 bytes
.../lightdev/app/shtm/resources/italic_on_de.gif | Bin 1028 -> 0 bytes
src/com/lightdev/app/shtm/resources/ol_on.gif | Bin 1032 -> 0 bytes
src/de/calcom/cclib/text/FindReplaceDialog.java| 5 -
.../cclib/text/PseudoDamerauLevenshtein.java | 4 -
33 files changed, 239 insertions(+), 605 deletions(-)
delete mode 100644 .gitignore
rename src/com/lightdev/app/shtm/{DefaultTextResources.java =>
InternalUiResources.java} (65%)
rename src/com/lightdev/app/shtm/{TextResources.java => UIResources.java} (92%)
delete mode 100644 src/com/lightdev/app/shtm/resources/algnCtr_on.gif
delete mode 100644 src/com/lightdev/app/shtm/resources/algnLft_on.gif
delete mode 100644 src/com/lightdev/app/shtm/resources/algnRt_on.gif
delete mode 100644 src/com/lightdev/app/shtm/resources/bold_on.gif
delete mode 100644 src/com/lightdev/app/shtm/resources/bold_on_de.gif
delete mode 100644 src/com/lightdev/app/shtm/resources/italic_on.gif
delete mode 100644 src/com/lightdev/app/shtm/resources/italic_on_de.gif
delete mode 100644 src/com/lightdev/app/shtm/resources/ol_on.gif
--
Alioth's /usr/local/bin/git-commit-notice on
/srv/git.debian.org/git/pkg-java/simplyhtml.git
___
pkg-java-commits mailing list
pkg-java-commits@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-commits
[simplyhtml] 01/01: pristine-tar data for simplyhtml_0.17.3.orig.tar.gz
This is an automated email from the git hooks/post-receive script. fnatter-guest pushed a commit to branch pristine-tar in repository simplyhtml. commit 84d615a7aadf69f526d817c818d95a5e0d777f17 Author: Felix Natter Date: Thu Aug 24 17:07:02 2017 +0200 pristine-tar data for simplyhtml_0.17.3.orig.tar.gz --- simplyhtml_0.17.3.orig.tar.gz.delta | Bin 0 -> 8904 bytes simplyhtml_0.17.3.orig.tar.gz.id| 1 + 2 files changed, 1 insertion(+) diff --git a/simplyhtml_0.17.3.orig.tar.gz.delta b/simplyhtml_0.17.3.orig.tar.gz.delta new file mode 100644 index 000..73378b5 Binary files /dev/null and b/simplyhtml_0.17.3.orig.tar.gz.delta differ diff --git a/simplyhtml_0.17.3.orig.tar.gz.id b/simplyhtml_0.17.3.orig.tar.gz.id new file mode 100644 index 000..24b7b16 --- /dev/null +++ b/simplyhtml_0.17.3.orig.tar.gz.id @@ -0,0 +1 @@ +4e88f134c397a64f42e8ffce9d972ec12e1fedcb -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/simplyhtml.git ___ pkg-java-commits mailing list pkg-java-commits@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-commits
[simplyhtml] branch pristine-tar updated (44dae7a -> 84d615a)
This is an automated email from the git hooks/post-receive script. fnatter-guest pushed a change to branch pristine-tar in repository simplyhtml. from 44dae7a pristine-tar data for simplyhtml_0.16.18.orig.tar.gz new 84d615a pristine-tar data for simplyhtml_0.17.3.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: simplyhtml_0.17.3.orig.tar.gz.delta | Bin 0 -> 8904 bytes simplyhtml_0.17.3.orig.tar.gz.id| 1 + 2 files changed, 1 insertion(+) create mode 100644 simplyhtml_0.17.3.orig.tar.gz.delta create mode 100644 simplyhtml_0.17.3.orig.tar.gz.id -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/simplyhtml.git ___ pkg-java-commits mailing list pkg-java-commits@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-commits
[groovy] 01/02: backport GROOVY-8163 sandbox fix
This is an automated email from the git hooks/post-receive script.
fnatter-guest pushed a commit to branch master
in repository groovy.
commit ced0ef139e0487f011650ca7894ba7936e659ddd
Author: Felix Natter
Date: Thu Sep 7 20:09:42 2017 +0200
backport GROOVY-8163 sandbox fix
---
debian/patches/08_GROOVY-8163.patch | 477
debian/patches/series | 1 +
2 files changed, 478 insertions(+)
diff --git a/debian/patches/08_GROOVY-8163.patch
b/debian/patches/08_GROOVY-8163.patch
new file mode 100644
index 000..088ec5f
--- /dev/null
+++ b/debian/patches/08_GROOVY-8163.patch
@@ -0,0 +1,477 @@
+From 0305a38a0cc8f4190a1486c460ebc6f712ad1a07 Mon Sep 17 00:00:00 2001
+From: Dimitry Polivaev
+Date: Sat, 3 Jun 2017 20:03:18 +0200
+Subject: [PATCH] GROOVY-8163: Prevent CachedField and CachedMethod from
+ leaking access permissions (closes #532)
+
+---
+ src/main/groovy/lang/MetaClassImpl.java| 3 +
+ .../groovy/reflection/AccessPermissionChecker.java | 83 +++
+ .../reflection/CacheAccessControlException.java| 27 ++
+ .../codehaus/groovy/reflection/CachedField.java| 2 +
+ .../codehaus/groovy/reflection/CachedMethod.java | 8 +
+ .../codehaus/groovy/reflection/SecurityTest.java | 271 +
+ 6 files changed, 394 insertions(+)
+ create mode 100644
src/main/org/codehaus/groovy/reflection/AccessPermissionChecker.java
+ create mode 100644
src/main/org/codehaus/groovy/reflection/CacheAccessControlException.java
+ create mode 100644 src/test/org/codehaus/groovy/reflection/SecurityTest.java
+
+--- a/src/main/groovy/lang/MetaClassImpl.java
b/src/main/groovy/lang/MetaClassImpl.java
+@@ -23,6 +23,7 @@
+ import org.codehaus.groovy.classgen.asm.BytecodeHelper;
+ import org.codehaus.groovy.control.CompilationUnit;
+ import org.codehaus.groovy.control.Phases;
++import org.codehaus.groovy.reflection.CacheAccessControlException;
+ import org.codehaus.groovy.reflection.CachedClass;
+ import org.codehaus.groovy.reflection.CachedConstructor;
+ import org.codehaus.groovy.reflection.CachedField;
+@@ -1809,6 +1810,9 @@
+ } catch (IllegalArgumentException e) {
+ // can't access the field directly but there may be a getter
+ mp = null;
++} catch (CacheAccessControlException e) {
++// can't access the field directly but there may be a getter
++mp = null;
+ }
+ }
+
+--- /dev/null
b/src/main/org/codehaus/groovy/reflection/AccessPermissionChecker.java
+@@ -0,0 +1,83 @@
++/*
++ * Licensed to the Apache Software Foundation (ASF) under one
++ * or more contributor license agreements. See the NOTICE file
++ * distributed with this work for additional information
++ * regarding copyright ownership. The ASF licenses this file
++ * to you under the Apache License, Version 2.0 (the
++ * "License"); you may not use this file except in compliance
++ * with the License. You may obtain a copy of the License at
++ *
++ *http://www.apache.org/licenses/LICENSE-2.0
++ *
++ * Unless required by applicable law or agreed to in writing,
++ * software distributed under the License is distributed on an
++ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
++ * KIND, either express or implied. See the License for the
++ * specific language governing permissions and limitations
++ * under the License.
++ */
++package org.codehaus.groovy.reflection;
++
++import java.lang.reflect.Field;
++import java.lang.reflect.Method;
++import java.lang.reflect.Modifier;
++import java.lang.reflect.ReflectPermission;
++import java.security.AccessControlException;
++
++import groovy.lang.GroovyObject;
++
++class AccessPermissionChecker {
++
++private static final ReflectPermission REFLECT_PERMISSION = new
ReflectPermission("suppressAccessChecks");
++
++private static void checkAccessPermission(Class declaringClass, final
int modifiers, boolean isAccessible) {
++final SecurityManager securityManager = System.getSecurityManager();
++if (securityManager != null && isAccessible) {
++if (((modifiers & Modifier.PRIVATE) != 0
++|| ((modifiers & (Modifier.PUBLIC |
Modifier.PROTECTED)) == 0
++ &&
packageCanNotBeAddedAnotherClass(declaringClass)))
++&&
!GroovyObject.class.isAssignableFrom(declaringClass)) {
++securityManager.checkPermission(REFLECT_PERMISSION);
++}
++else if ((modifiers & (Modifier.PROTECTED)) != 0
++&& declaringClass.equals(ClassLoader.class)){
++securityManager.checkCreateClassLoader();
++}
++}
++}
++
++private static boolean packageCanNotBeAddedAnotherClass(Class
declaringClass) {
++
[groovy] 02/02: prepare QA upload
This is an automated email from the git hooks/post-receive script. fnatter-guest pushed a commit to branch master in repository groovy. commit 50deb53b8d818840b0290b2bace40b2fc1911216 Author: Felix Natter Date: Thu Sep 7 20:10:03 2017 +0200 prepare QA upload --- debian/changelog | 9 ++--- debian/control | 2 +- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/debian/changelog b/debian/changelog index 8b15943..a890317 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,10 +1,13 @@ -groovy (2.4.8-2) UNRELEASED; urgency=high +groovy (2.4.8-2) unstable; urgency=high - * Team upload. + * QA upload. + [ Miguel Landaeta ] * Remove myself from uploaders list. (Closes: #871857) * Update copyright info. + [ Felix Natter ] + * Backport GROOVY-8163 fix from groovy 2.5.x - -- Miguel Landaeta Mon, 07 Aug 2017 10:16:06 +0100 + -- Felix Natter Thu, 07 Sep 2017 19:30:12 +0200 groovy (2.4.8-1) unstable; urgency=high diff --git a/debian/control b/debian/control index a901b02..6fc9cca 100644 --- a/debian/control +++ b/debian/control @@ -1,7 +1,7 @@ Source: groovy Section: java Priority: optional -Maintainer: Debian Java Maintainers +Maintainer: Debian QA Group Build-Depends: ant, ant-optional, -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/groovy.git ___ pkg-java-commits mailing list pkg-java-commits@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-commits
[groovy] branch master updated (5c14277 -> 50deb53)
This is an automated email from the git hooks/post-receive script. fnatter-guest pushed a change to branch master in repository groovy. from 5c14277 Add missing bug number new ced0ef1 backport GROOVY-8163 sandbox fix new 50deb53 prepare QA upload 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| 9 +- debian/control | 2 +- debian/patches/08_GROOVY-8163.patch | 477 debian/patches/series | 1 + 4 files changed, 485 insertions(+), 4 deletions(-) create mode 100644 debian/patches/08_GROOVY-8163.patch -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/groovy.git ___ pkg-java-commits mailing list pkg-java-commits@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-commits
[groovy] branch master updated (50deb53 -> b7674d9)
This is an automated email from the git hooks/post-receive script. fnatter-guest pushed a change to branch master in repository groovy. from 50deb53 prepare QA upload new b7674d9 revert to Team upload 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 | 2 +- debian/control | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/groovy.git ___ pkg-java-commits mailing list pkg-java-commits@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-commits
[groovy] 01/01: revert to Team upload
This is an automated email from the git hooks/post-receive script. fnatter-guest pushed a commit to branch master in repository groovy. commit b7674d9c8434718bf4b35a5bb91c63cd07829e4f Author: Felix Natter Date: Thu Sep 7 21:09:12 2017 +0200 revert to Team upload --- debian/changelog | 2 +- debian/control | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/debian/changelog b/debian/changelog index a890317..a0cad66 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,6 +1,6 @@ groovy (2.4.8-2) unstable; urgency=high - * QA upload. + * Team upload. [ Miguel Landaeta ] * Remove myself from uploaders list. (Closes: #871857) * Update copyright info. diff --git a/debian/control b/debian/control index 6fc9cca..d9d1178 100644 --- a/debian/control +++ b/debian/control @@ -1,7 +1,8 @@ Source: groovy Section: java Priority: optional -Maintainer: Debian QA Group +Maintainer: Debian Java Maintainers +Uploaders: Felix Natter Build-Depends: ant, ant-optional, -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/groovy.git ___ pkg-java-commits mailing list pkg-java-commits@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-commits
[knopflerfish-osgi] branch master updated (a9b7baf -> 227d4f0)
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 a9b7baf Upload to unstable
new b2511e0 New upstream version 6.1.1
new c28f05d Updated version 6.1.1 from 'upstream/6.1.1'
new c8409f9 update patches for 6.1.1
new 8f39ad3 build 6.1.1-1
new 227d4f0 update changelog for 6.1.1-1
The 5 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:
.gitignore | 44 ++
.travis.yml| 52 ++
BUILD.txt | 10 +-
NOTICE.txt | 2 +-
README.txt | 17 +-
ant/build.xml | 8 +-
ant/bundlebuild.xml| 108 +---
ant/bundletasks.xml| 116 +++-
.../ant/taskdefs/bundle/BundleArchives.java| 4 +-
.../taskdefs/bundle/BundleHTMLExtractorTask.java | 2 +-
.../ant/taskdefs/bundle/BundleLocator.java | 6 +-
.../ant/taskdefs/bundle/BundleManifestTask.java| 73 ++-
.../ant/taskdefs/bundle/BundleMvnAntTask.java | 287 +-
.../knopflerfish/ant/taskdefs/bundle/FileUtil.java | 2 +-
.../ant/taskdefs/bundle/MakeHTMLTask.java | 10 +-
.../ant/taskdefs/util/Markdown2HtmlTask.java | 145 +
.../org/knopflerfish/ant/taskdefs/util/antlib.xml | 5 +
build.xml | 181 ++-
changelog.txt | 593 -
debian/changelog | 11 +
debian/control | 4 +-
debian/libknopflerfish-osgi-framework-java.install | 2 +-
debian/libknopflerfish-osgi-framework-java.links | 6 +-
debian/patches/10_javac_encoding.patch | 14 +
debian/patches/20_versioned_jar.patch | 15 -
debian/patches/40_ignore_android.patch | 35 +-
debian/patches/series | 2 +-
debian/rules | 8 +-
htdocs/build.xml | 40 +-
htdocs/css/knopflerfish.css| 38 +-
htdocs/html_src/building.html | 30 +-
htdocs/html_src/components_main.html | 424 ---
htdocs/html_src/desktop_main.html | 7 +-
htdocs/html_src/index_main.html| 4 +-
htdocs/html_src/installing.html| 2 +-
htdocs/html_src/osgi_service_tutorial.html | 2 +-
htdocs/html_src/programming_main.html | 4 +-
htdocs/html_src/release_page.html.in | 6 +-
htdocs/html_src/remote_howto.html | 86 ---
htdocs/html_src/services_main.html | 2 +-
htdocs/html_templates/blank| 1 +
htdocs/html_templates/template.html| 5 +-
osgi/build.xml | 21 +
osgi/framework/TODO| 1 -
osgi/framework/build.xml | 124 +
osgi/framework/doc/index.html | 24 +-
osgi/framework/resources/android_packages.txt | 6 +
.../src/org/knopflerfish/framework/Alias.java | 3 +-
.../framework/BundleCapabilityImpl.java| 137 -
.../knopflerfish/framework/BundleClassLoader.java | 33 +-
.../knopflerfish/framework/BundleClassPath.java| 268 ++
.../knopflerfish/framework/BundleContextImpl.java | 107 +++-
.../knopflerfish/framework/BundleGeneration.java | 85 +--
.../org/knopflerfish/framework/BundleHooks.java| 22 +-
.../src/org/knopflerfish/framework/BundleImpl.java | 166 --
.../framework/BundleNameVersionCapability.java | 4 +-
.../org/knopflerfish/framework/BundlePackages.java | 103 ++--
.../framework/BundleReferenceImpl.java | 16 +-
.../framework/BundleRequirementImpl.java | 63 ++-
.../knopflerfish/framework/BundleRevisionImpl.java | 79 ++-
.../org/knopflerfish/framework/BundleWireImpl.java | 16 +-
.../knopflerfish/framework/BundleWiringImpl.java | 124 -
.../src/org/knopflerfish/framework/Bundles.java| 29 +-
.../{BundleReferenceImpl.java => DTOId.java} | 25 +-
.../src/org/knopflerfish/framework/ExportPkg.java | 5 +-
.../knopflerfish/framework/ExtensionContext.java | 161 --
.../src/org/knopflerfish/framework/FWProps.java| 48 +-
.../src/org/knopflerfish/framework/Fragment.java | 28 +-
.../knopflerfish/framework/FrameworkContext.java | 85 +--
.../framework/Fra
[knopflerfish-osgi] 05/05: update changelog for 6.1.1-1
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 227d4f08c27fbf52934e4f7b571dea397c01191d Author: Felix Natter Date: Sat Sep 16 10:22:22 2017 +0200 update changelog for 6.1.1-1 --- debian/changelog | 11 +++ 1 file changed, 11 insertions(+) diff --git a/debian/changelog b/debian/changelog index 514b26e..123542e 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,14 @@ +knopflerfish-osgi (6.1.1-1) unstable; urgency=medium + + * New upstream release + * Java9 support + * Update standards-version (no changes) + * Drop 20_versioned_jar.patch (no longer necessary) + * Add 10_javac_encoding.patch + * Build with libosgi-annotation-java + + -- Felix Natter Sat, 16 Sep 2017 10:10:35 +0200 + knopflerfish-osgi (5.2.0-2) unstable; urgency=medium * Team upload. -- 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-commits@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-commits
[knopflerfish-osgi] annotated tag upstream/6.1.1 created (now b9be449)
This is an automated email from the git hooks/post-receive script. fnatter-guest pushed a change to annotated tag upstream/6.1.1 in repository knopflerfish-osgi. at b9be449 (tag) tagging b2511e0431fdc9acbd2895bac3702f863de0944e (commit) replaces upstream/5.1.0+dfsg1 tagged by Felix Natter on Sat Sep 16 10:05:54 2017 +0200 - Log - Upstream version 6.1.1 Felix Natter (1): New upstream version 6.1.1 --- 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-commits@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-commits
[knopflerfish-osgi] 03/05: update patches for 6.1.1
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 c8409f9929f7077156ac3b1fd5e7fc90df9525a1
Author: Felix Natter
Date: Sat Sep 16 10:20:15 2017 +0200
update patches for 6.1.1
---
debian/patches/10_javac_encoding.patch | 14 ++
debian/patches/20_versioned_jar.patch | 15 ---
debian/patches/40_ignore_android.patch | 35 ++
debian/patches/series | 2 +-
4 files changed, 34 insertions(+), 32 deletions(-)
diff --git a/debian/patches/10_javac_encoding.patch
b/debian/patches/10_javac_encoding.patch
new file mode 100644
index 000..6e29618
--- /dev/null
+++ b/debian/patches/10_javac_encoding.patch
@@ -0,0 +1,14 @@
+Description: Set encoding for javac run
+Author: Felix Natter
+Forwarded: no
+Last-Update: 2017-08-25
+--- a/osgi/framework/build.xml
b/osgi/framework/build.xml
+@@ -88,6 +88,7 @@
+includes = "**/*.java"
+excludes = "${androidSrcs},**/package-info.java"
+classpathref = "compile.path"
++ encoding = "UTF-8"
+>
+
+
diff --git a/debian/patches/20_versioned_jar.patch
b/debian/patches/20_versioned_jar.patch
deleted file mode 100644
index f3cf337..000
--- a/debian/patches/20_versioned_jar.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-Description: Generate a versioned jar
-Author: Felix Natter
-Forwarded: not-needed
-Last-Update: 2015-02-21
a/osgi/framework/build.xml
-+++ b/osgi/framework/build.xml
-@@ -21,7 +21,7 @@
-
-
-
-+location="${topdir}/${ant.project.name}-5.2.0.jar"/>
-
-
Forwarded: not-needed
--- a/osgi/framework/build.xml
+++ b/osgi/framework/build.xml
-@@ -157,21 +157,6 @@
+@@ -38,7 +38,7 @@
+
+
+-
++
+
+
+
+@@ -93,6 +93,7 @@
+
+
+
++
--
--
--
++-->
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-commits
[knopflerfish-osgi] 04/05: build 6.1.1-1
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 8f39ad3b0af17e97fbb133e0e7abf2e43429a440 Author: Felix Natter Date: Sat Sep 16 10:21:55 2017 +0200 build 6.1.1-1 --- debian/control | 4 ++-- debian/libknopflerfish-osgi-framework-java.install | 2 +- debian/libknopflerfish-osgi-framework-java.links | 6 +++--- debian/rules | 8 ++-- 4 files changed, 12 insertions(+), 8 deletions(-) diff --git a/debian/control b/debian/control index 5a62f44..fe4f272 100644 --- a/debian/control +++ b/debian/control @@ -3,9 +3,9 @@ Section: java Priority: extra Maintainer: Debian Java Maintainers Uploaders: Felix Natter -Build-Depends-Indep: libasm-java (>= 5.0), default-jdk +Build-Depends-Indep: libasm-java (>= 5.0), default-jdk, libosgi-annotation-java Build-Depends: debhelper (>= 9), ant -Standards-Version: 3.9.8 +Standards-Version: 4.0.0 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/ diff --git a/debian/libknopflerfish-osgi-framework-java.install b/debian/libknopflerfish-osgi-framework-java.install index 050647c..742316e 100644 --- a/debian/libknopflerfish-osgi-framework-java.install +++ b/debian/libknopflerfish-osgi-framework-java.install @@ -1 +1 @@ -osgi/framework-5.2.0.jar usr/share/knopflerfish/ +osgi/jars/framework-8.0.5.jar usr/share/knopflerfish/ diff --git a/debian/libknopflerfish-osgi-framework-java.links b/debian/libknopflerfish-osgi-framework-java.links index 64ec5f6..805ff98 100644 --- a/debian/libknopflerfish-osgi-framework-java.links +++ b/debian/libknopflerfish-osgi-framework-java.links @@ -1,3 +1,3 @@ -usr/share/knopflerfish/framework-5.2.0.jar usr/share/knopflerfish/framework.jar -usr/share/knopflerfish/framework-5.2.0.jar usr/share/java/knopflerfish-framework.jar -usr/share/knopflerfish/framework-5.2.0.jar usr/share/java/knopflerfish-framework-5.2.0.jar +usr/share/knopflerfish/framework-8.0.5.jar usr/share/knopflerfish/framework.jar +usr/share/knopflerfish/framework-8.0.5.jar usr/share/java/knopflerfish-framework.jar +usr/share/knopflerfish/framework-8.0.5.jar usr/share/java/knopflerfish-framework-8.0.5.jar diff --git a/debian/rules b/debian/rules index cd824f8..63e26fc 100755 --- a/debian/rules +++ b/debian/rules @@ -6,6 +6,8 @@ override_dh_auto_build: mkdir -p osgi/framework/libs ln -s /usr/share/java/asm-all.jar osgi/framework/libs/asm-3.2.jar + mkdir -p osgi/annotations + ln -s /usr/share/java/osgi.annotation.jar osgi/annotations/osgi.annotation-6.0.1.jar dh_auto_build -- -f ant/bundletasks.xml build_bundle_tasks -Dasm.jar=/usr/share/java/asm-all.jar dh_auto_build -- -f osgi/framework/build.xml jar @@ -17,12 +19,14 @@ override_dh_auto_clean: -rm -Rf ant/classes -rm -Rf ant/lib -rm -Rf osgi/framework/libs/*.jar + -rm -Rf osgi/annotations/*.jar -rm -f osgi/framework/resources/tstamp -rm -f osgi/framework/resources/version -rm -f osgi/framework/resources/exports -rm -fr api/ osgi/out - -rm -f osgi/framework-*.jar + -rm -f osgi/jars/framework-*.jar + -rm -f osgi/framework.jar -rm -f framework.html get-orig-source: - uscan --force-download --download-current-version --rename --repack --compression xz + uscan --force-download --rename --repack --compression xz -- 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-commits@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-commits
[knopflerfish-osgi] 02/05: Updated version 6.1.1 from 'upstream/6.1.1'
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 c28f05d8227b521ca84f7f187869f0dc86703a82
Merge: a9b7baf b2511e0
Author: Felix Natter
Date: Sat Sep 16 10:05:54 2017 +0200
Updated version 6.1.1 from 'upstream/6.1.1'
with Debian dir 8b873415e2a87a4790173d4152f7a73544501590
.gitignore | 44 ++
.travis.yml| 52 ++
BUILD.txt | 10 +-
NOTICE.txt | 2 +-
README.txt | 17 +-
ant/build.xml | 8 +-
ant/bundlebuild.xml| 108 +---
ant/bundletasks.xml| 116 +++-
.../ant/taskdefs/bundle/BundleArchives.java| 4 +-
.../taskdefs/bundle/BundleHTMLExtractorTask.java | 2 +-
.../ant/taskdefs/bundle/BundleLocator.java | 6 +-
.../ant/taskdefs/bundle/BundleManifestTask.java| 73 ++-
.../ant/taskdefs/bundle/BundleMvnAntTask.java | 287 +-
.../knopflerfish/ant/taskdefs/bundle/FileUtil.java | 2 +-
.../ant/taskdefs/bundle/MakeHTMLTask.java | 10 +-
.../ant/taskdefs/util/Markdown2HtmlTask.java | 145 +
.../org/knopflerfish/ant/taskdefs/util/antlib.xml | 5 +
build.xml | 181 ++-
changelog.txt | 593 -
htdocs/build.xml | 40 +-
htdocs/css/knopflerfish.css| 38 +-
htdocs/html_src/building.html | 30 +-
htdocs/html_src/components_main.html | 424 ---
htdocs/html_src/desktop_main.html | 7 +-
htdocs/html_src/index_main.html| 4 +-
htdocs/html_src/installing.html| 2 +-
htdocs/html_src/osgi_service_tutorial.html | 2 +-
htdocs/html_src/programming_main.html | 4 +-
htdocs/html_src/release_page.html.in | 6 +-
htdocs/html_src/remote_howto.html | 86 ---
htdocs/html_src/services_main.html | 2 +-
htdocs/html_templates/blank| 1 +
htdocs/html_templates/template.html| 5 +-
osgi/build.xml | 21 +
osgi/framework/TODO| 1 -
osgi/framework/build.xml | 124 +
osgi/framework/doc/index.html | 24 +-
osgi/framework/resources/android_packages.txt | 6 +
.../src/org/knopflerfish/framework/Alias.java | 3 +-
.../framework/BundleCapabilityImpl.java| 137 -
.../knopflerfish/framework/BundleClassLoader.java | 33 +-
.../knopflerfish/framework/BundleClassPath.java| 268 ++
.../knopflerfish/framework/BundleContextImpl.java | 107 +++-
.../knopflerfish/framework/BundleGeneration.java | 85 +--
.../org/knopflerfish/framework/BundleHooks.java| 22 +-
.../src/org/knopflerfish/framework/BundleImpl.java | 166 --
.../framework/BundleNameVersionCapability.java | 4 +-
.../org/knopflerfish/framework/BundlePackages.java | 103 ++--
.../framework/BundleReferenceImpl.java | 16 +-
.../framework/BundleRequirementImpl.java | 63 ++-
.../knopflerfish/framework/BundleRevisionImpl.java | 79 ++-
.../org/knopflerfish/framework/BundleWireImpl.java | 16 +-
.../knopflerfish/framework/BundleWiringImpl.java | 124 -
.../src/org/knopflerfish/framework/Bundles.java| 29 +-
.../{BundleReferenceImpl.java => DTOId.java} | 25 +-
.../src/org/knopflerfish/framework/ExportPkg.java | 5 +-
.../knopflerfish/framework/ExtensionContext.java | 161 --
.../src/org/knopflerfish/framework/FWProps.java| 48 +-
.../src/org/knopflerfish/framework/Fragment.java | 28 +-
.../knopflerfish/framework/FrameworkContext.java | 85 +--
.../framework/FrameworkWiringImpl.java | 38 +-
.../src/org/knopflerfish/framework/ImportPkg.java | 11 +-
.../src/org/knopflerfish/framework/Listeners.java | 45 +-
.../src/org/knopflerfish/framework/Main.java | 11 +-
.../knopflerfish/framework/NativeRequirement.java | 364 +
.../knopflerfish/framework/PackageAdminImpl.java | 6 +-
.../org/knopflerfish/framework/PermissionOps.java | 9 +
.../src/org/knopflerfish/framework/Pkg.java| 9 +-
.../framework/PropertiesDictionary.java| 77 +--
.../org/knopflerfish/framework/RequireBundle.java | 3 +-
.../src/org/knopflerfish/framework/Resolver.java | 409 ++
.../framework/SecurePermissionOps.java | 15 +
.../framework/ServiceContentHandlerFactory.java| 4 +-
.../org/knopflerf
[knopflerfish-osgi] 01/02: pristine-tar data for knopflerfish-osgi_6.1.1.orig.tar.xz
This is an automated email from the git hooks/post-receive script. fnatter-guest pushed a commit to branch pristine-tar in repository knopflerfish-osgi. commit c31b5d00075d788e2a62726a917fe26247cccb8a Author: Felix Natter Date: Sat Sep 16 10:05:54 2017 +0200 pristine-tar data for knopflerfish-osgi_6.1.1.orig.tar.xz --- knopflerfish-osgi_6.1.1.orig.tar.xz.delta | Bin 0 -> 14616 bytes knopflerfish-osgi_6.1.1.orig.tar.xz.id| 1 + 2 files changed, 1 insertion(+) diff --git a/knopflerfish-osgi_6.1.1.orig.tar.xz.delta b/knopflerfish-osgi_6.1.1.orig.tar.xz.delta new file mode 100644 index 000..ed6ced6 Binary files /dev/null and b/knopflerfish-osgi_6.1.1.orig.tar.xz.delta differ diff --git a/knopflerfish-osgi_6.1.1.orig.tar.xz.id b/knopflerfish-osgi_6.1.1.orig.tar.xz.id new file mode 100644 index 000..932be4c --- /dev/null +++ b/knopflerfish-osgi_6.1.1.orig.tar.xz.id @@ -0,0 +1 @@ +dc58ed7b531c1e7b584d072d5f8c29dc48573336 -- 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-commits@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-commits
[knopflerfish-osgi] 02/02: Merge branch 'pristine-tar' of git+ssh://git.debian.org/git/pkg-java/knopflerfish-osgi into pristine-tar
This is an automated email from the git hooks/post-receive script. fnatter-guest pushed a commit to branch pristine-tar in repository knopflerfish-osgi. commit eb4dd6e36e3f8885fbcfb4d794eadd28dc0ff2d0 Merge: c31b5d0 2e575ca Author: Felix Natter Date: Sat Sep 16 10:58:51 2017 +0200 Merge branch 'pristine-tar' of git+ssh://git.debian.org/git/pkg-java/knopflerfish-osgi into pristine-tar knopflerfish-osgi_5.2.0.orig.tar.xz.delta | Bin 0 -> 20295 bytes knopflerfish-osgi_5.2.0.orig.tar.xz.id| 1 + 2 files changed, 1 insertion(+) -- 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-commits@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-commits
[knopflerfish-osgi] branch pristine-tar updated (2e575ca -> eb4dd6e)
This is an automated email from the git hooks/post-receive script. fnatter-guest pushed a change to branch pristine-tar in repository knopflerfish-osgi. from 2e575ca pristine-tar data for knopflerfish-osgi_5.2.0.orig.tar.xz new c31b5d0 pristine-tar data for knopflerfish-osgi_6.1.1.orig.tar.xz new eb4dd6e Merge branch 'pristine-tar' of git+ssh://git.debian.org/git/pkg-java/knopflerfish-osgi into pristine-tar 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: knopflerfish-osgi_6.1.1.orig.tar.xz.delta | Bin 0 -> 14616 bytes knopflerfish-osgi_6.1.1.orig.tar.xz.id| 1 + 2 files changed, 1 insertion(+) create mode 100644 knopflerfish-osgi_6.1.1.orig.tar.xz.delta create mode 100644 knopflerfish-osgi_6.1.1.orig.tar.xz.id -- 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-commits@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-commits
[freeplane] branch master updated (111410f -> f717946)
This is an automated email from the git hooks/post-receive script. fnatter-guest pushed a change to branch master in repository freeplane. from 111410f Revert "1.5.18-2: include runtime dependencies for SVG plugin" new a4d65da New upstream version 1.6.6 new 213980a Updated version 1.6.6 from 'upstream/1.6.6' new db85719 fix patches for 1.6.6 new 739abc2 change dependencies new c74e72a update copyright new e19b75a binaries are in BIN/, not BUILD/ any more new 294ef83 add changelog for 1.6.6-1 new f717946 update man page for 1.6.6 The 8 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: .gitignore |2 - JOrtho_0.4_freeplane/build.gradle | 52 +- bin.dist.gradle|4 +- build.gradle | 28 +- debian/README.source |4 +- debian/changelog | 15 + debian/control | 23 +- debian/copyright |7 +- debian/freeplane.1.xml | 25 +- debian/freeplane.install |2 +- debian/patches/10_build_usr_share_java.patch | 100 +- debian/patches/30_disable_update_check.patch |4 +- debian/patches/40_allow_usj_codebase.patch | 11 +- debian/patches/50_disable_secure_groovy.patch | 28 + debian/patches/series |1 + debian/rules |6 +- dist.gradle|8 +- freeplane/build.gradle | 21 +- freeplane/doc/FilterConsumer.jpg | Bin 269826 -> 0 bytes freeplane/doc/FilterConsumerEnd.jpg| Bin 317954 -> 0 bytes freeplane/doc/FilterConsumerUnfold.jpg | Bin 190335 -> 0 bytes freeplane/doc/Freeplane_LaTeX.mm |2 +- freeplane/doc/Images/Preferences_Joining nodes.png | Bin 0 -> 1892 bytes .../doc/Images/doc/In-lineEditContextMenu.png | Bin 3127 -> 0 bytes freeplane/doc/Images/doc/NodeContextMenu.png | Bin 20425 -> 0 bytes freeplane/doc/Images/doc/goto node with ID.png | Bin 0 -> 4454 bytes freeplane/doc/Images/doc/key mapping dialog.png| Bin 0 -> 1404 bytes freeplane/doc/Images/doc/mapView v outlineView.png | Bin 0 -> 1779266 bytes .../Images/doc/right-click menu - open maps.png| Bin 0 -> 170479 bytes freeplane/doc/Images/doc/tabs in workspace.png | Bin 0 -> 4128 bytes freeplane/doc/Images/examples.png | Bin 0 -> 1844 bytes freeplane/doc/Images/eyes.png | Bin 0 -> 835 bytes freeplane/doc/Images/icons toolbar - collapsed.png | Bin 0 -> 163 bytes freeplane/doc/Images/key/F1.png| Bin 1134 -> 0 bytes freeplane/doc/Images/key/F2.png| Bin 1250 -> 0 bytes freeplane/doc/Images/key/Ins.png | Bin 1118 -> 0 bytes freeplane/doc/Images/key/alt.png | Bin 1333 -> 0 bytes freeplane/doc/Images/key/ctrl.png | Bin 1404 -> 0 bytes freeplane/doc/Images/key/delete.png| Bin 1141 -> 0 bytes freeplane/doc/Images/key/down.png | Bin 830 -> 0 bytes freeplane/doc/Images/key/end.png | Bin 1128 -> 0 bytes freeplane/doc/Images/key/enter.png | Bin 1387 -> 0 bytes freeplane/doc/Images/key/esc.png | Bin 1116 -> 0 bytes freeplane/doc/Images/key/home.png | Bin 1366 -> 0 bytes freeplane/doc/Images/key/insert.png| Bin 1512 -> 0 bytes freeplane/doc/Images/key/left.png | Bin 834 -> 0 bytes freeplane/doc/Images/key/pgdn.png | Bin 1222 -> 0 bytes freeplane/doc/Images/key/pgup.png | Bin 1213 -> 0 bytes freeplane/doc/Images/key/right.png | Bin 832 -> 0 bytes freeplane/doc/Images/key/shift.png | Bin 1637 -> 0 bytes freeplane/doc/Images/key/space.png | Bin 2064 -> 0 bytes freeplane/doc/Images/key/tab.png | Bin 1388 -> 0 bytes freeplane/doc/Images/key/up.png| Bin 793 -> 0 bytes freeplane/doc/Images/mouse/mouse.png | Bin 1419 -> 0 bytes freeplane/doc/Images/mouse/mouse_LB.png| Bin 1363 -> 0 bytes freeplane/doc/Images/mouse/mouse_LB_2x.png | Bin 1759 -> 0 bytes freeplane/doc/Images/mouse/mouse_SB_click.png | Bin 1451 -> 0 bytes freeplane/doc/Images/mouse/mouse_SB_scroll.png | Bin 1726 -> 0 bytes .../workspac
[freeplane] 04/08: change dependencies
This is an automated email from the git hooks/post-receive script.
fnatter-guest pushed a commit to branch master
in repository freeplane.
commit 739abc27d1d000986472e647c56e55e142586003
Author: Felix Natter
Date: Sat Sep 16 15:29:40 2017 +0200
change dependencies
---
debian/control | 23 +--
1 file changed, 13 insertions(+), 10 deletions(-)
diff --git a/debian/control b/debian/control
index b568512..2b2f4bd 100644
--- a/debian/control
+++ b/debian/control
@@ -11,28 +11,30 @@ Build-Depends: debhelper (>= 9),
librsvg2-bin,
gradle,
default-jdk,
- jflex
+ jflex,
+ jython
Build-Depends-Indep: javahelp2,
- groovy,
+ groovy (>= 2.4.8-2),
+ libsvgsalamander-java (>= 1.1.1),
libcommons-lang-java (>= 2.6),
libcommons-io-java,
libjgoodies-forms-java (>= 1.9.0),
- simplyhtml (>= 0.16.18),
- libbatik-java,
+ simplyhtml (>= 0.17.3),
+ libbatik-java (>= 1.9-2),
librhino-java,
libfop-java,
libxerces2-java,
libxml-commons-external-java,
libjaxp1.3-java,
libjlatexmath-java (>= 1.0.2),
- libknopflerfish-osgi-framework-java (>= 5.1.0),
+ libknopflerfish-osgi-framework-java (>= 6.1.1),
libjsyntaxpane-java (>= 0.9.6~r156),
libcommons-codec-java (>= 1.7),
libidw-java,
jmapviewer (>= 1.11),
libmnemonicsetter-java (>= 0.5),
gradle-debian-helper
-Standards-Version: 3.9.8
+Standards-Version: 4.0.0
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/
@@ -42,19 +44,20 @@ Architecture: all
Depends: ${misc:Depends},
default-jre | java7-runtime,
javahelp2,
- groovy,
+ groovy (>= 2.4.8-2),
+ libsvgsalamander-java (>= 1.1.1),
libcommons-lang-java (>= 2.6),
libcommons-io-java,
libjgoodies-forms-java (>= 1.9.0),
- simplyhtml (>= 0.16.18),
- libbatik-java,
+ simplyhtml (>= 0.17.3),
+ libbatik-java (>= 1.9-2),
librhino-java,
libfop-java,
libxerces2-java,
libxml-commons-external-java,
libjaxp1.3-java,
libjlatexmath-java (>= 1.0.2),
- libknopflerfish-osgi-framework-java (>= 5.1.0),
+ libknopflerfish-osgi-framework-java (>= 6.1.1),
libjsyntaxpane-java (>= 0.9.6~r156),
libcommons-codec-java (>= 1.7),
libidw-java,
--
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-commits@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-commits
[freeplane] 06/08: binaries are in BIN/, not BUILD/ any more
This is an automated email from the git hooks/post-receive script. fnatter-guest pushed a commit to branch master in repository freeplane. commit e19b75ae6c0351fc5503076370d4eef4d72b8028 Author: Felix Natter Date: Sat Sep 16 15:31:16 2017 +0200 binaries are in BIN/, not BUILD/ any more --- debian/README.source | 4 ++-- debian/freeplane.install | 2 +- debian/rules | 6 +++--- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/debian/README.source b/debian/README.source index a86fa88..06a861e 100644 --- a/debian/README.source +++ b/debian/README.source @@ -14,11 +14,11 @@ The freeplane gradle build system - - there is one core OSGi bundle (freeplane) and plugin bundles (freeplane_plugin_*) -- the upstream build system copies ALL jars (dependencies + built) to BUILD/** +- the upstream build system copies ALL jars (dependencies + built) to BIN/** - the MANIFEST.MFs (for the bundles) are generated using gradle dependency info - ALL jars are copied to build/libs so that they can be used in eclipse --> changes for Debian (see 10_build_usr_share_java.patch): - do not copy all jars to build/libs (that would mix up built jars with deps) - - only copy the jars just built to BUILD/** + - only copy the jars just built to BIN/** - for Debian jars (deps), create relative paths in the MANIFEST.MFs to /usr/share/java/*.jar or /usr/share/maven-repo/**.jar diff --git a/debian/freeplane.install b/debian/freeplane.install index 7e3fe7e..5978927 100644 --- a/debian/freeplane.install +++ b/debian/freeplane.install @@ -1,4 +1,4 @@ -BUILD/* usr/share/freeplane +BIN/* usr/share/freeplane DOC/* usr/share/doc/freeplane DOC/* usr/share/freeplane/doc diff --git a/debian/rules b/debian/rules index 34a1d68..d9ab650 100755 --- a/debian/rules +++ b/debian/rules @@ -28,13 +28,13 @@ override_dh_auto_build: mkdir 128x128 convert -background none -geometry !128x128 freeplane_framework/script/freeplane.svg 128x128/freeplane.png - mv BUILD/doc/api API - mv BUILD/doc DOC + mv BIN/doc/api API + mv BIN/doc DOC override_dh_clean: dh_clean # directories cannot be removed via debian/clean - rm -rf BUILD/ + rm -rf BIN/ rm -rf API/ rm -rf DOC/ if [ -d 48x48 ]; then rmdir 48x48; fi -- 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-commits@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-commits
[freeplane] branch pristine-tar updated (c3421ea -> cd7d060)
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 c3421ea pristine-tar data for freeplane_1.5.18.orig.tar.gz new cd7d060 pristine-tar data for freeplane_1.6.6.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.6.orig.tar.gz.delta | Bin 0 -> 93712 bytes freeplane_1.6.6.orig.tar.gz.id| 1 + 2 files changed, 1 insertion(+) create mode 100644 freeplane_1.6.6.orig.tar.gz.delta create mode 100644 freeplane_1.6.6.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-commits@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-commits
[freeplane] 02/08: Updated version 1.6.6 from 'upstream/1.6.6'
This is an automated email from the git hooks/post-receive script. fnatter-guest pushed a commit to branch master in repository freeplane. commit 213980aa638ac8bc1a00aa3ed021b20af0b3fd4d Merge: 111410f a4d65da Author: Felix Natter Date: Sat Sep 16 15:11:23 2017 +0200 Updated version 1.6.6 from 'upstream/1.6.6' with Debian dir d4b0068eae0332658c9ad7db774205a5713a3359 .gitignore |2 - JOrtho_0.4_freeplane/build.gradle | 52 +- bin.dist.gradle|4 +- build.gradle | 28 +- dist.gradle|8 +- freeplane/build.gradle | 21 +- freeplane/doc/FilterConsumer.jpg | Bin 269826 -> 0 bytes freeplane/doc/FilterConsumerEnd.jpg| Bin 317954 -> 0 bytes freeplane/doc/FilterConsumerUnfold.jpg | Bin 190335 -> 0 bytes freeplane/doc/Freeplane_LaTeX.mm |2 +- freeplane/doc/Images/Preferences_Joining nodes.png | Bin 0 -> 1892 bytes .../doc/Images/doc/In-lineEditContextMenu.png | Bin 3127 -> 0 bytes freeplane/doc/Images/doc/NodeContextMenu.png | Bin 20425 -> 0 bytes freeplane/doc/Images/doc/goto node with ID.png | Bin 0 -> 4454 bytes freeplane/doc/Images/doc/key mapping dialog.png| Bin 0 -> 1404 bytes freeplane/doc/Images/doc/mapView v outlineView.png | Bin 0 -> 1779266 bytes .../Images/doc/right-click menu - open maps.png| Bin 0 -> 170479 bytes freeplane/doc/Images/doc/tabs in workspace.png | Bin 0 -> 4128 bytes freeplane/doc/Images/examples.png | Bin 0 -> 1844 bytes freeplane/doc/Images/eyes.png | Bin 0 -> 835 bytes freeplane/doc/Images/icons toolbar - collapsed.png | Bin 0 -> 163 bytes freeplane/doc/Images/key/F1.png| Bin 1134 -> 0 bytes freeplane/doc/Images/key/F2.png| Bin 1250 -> 0 bytes freeplane/doc/Images/key/Ins.png | Bin 1118 -> 0 bytes freeplane/doc/Images/key/alt.png | Bin 1333 -> 0 bytes freeplane/doc/Images/key/ctrl.png | Bin 1404 -> 0 bytes freeplane/doc/Images/key/delete.png| Bin 1141 -> 0 bytes freeplane/doc/Images/key/down.png | Bin 830 -> 0 bytes freeplane/doc/Images/key/end.png | Bin 1128 -> 0 bytes freeplane/doc/Images/key/enter.png | Bin 1387 -> 0 bytes freeplane/doc/Images/key/esc.png | Bin 1116 -> 0 bytes freeplane/doc/Images/key/home.png | Bin 1366 -> 0 bytes freeplane/doc/Images/key/insert.png| Bin 1512 -> 0 bytes freeplane/doc/Images/key/left.png | Bin 834 -> 0 bytes freeplane/doc/Images/key/pgdn.png | Bin 1222 -> 0 bytes freeplane/doc/Images/key/pgup.png | Bin 1213 -> 0 bytes freeplane/doc/Images/key/right.png | Bin 832 -> 0 bytes freeplane/doc/Images/key/shift.png | Bin 1637 -> 0 bytes freeplane/doc/Images/key/space.png | Bin 2064 -> 0 bytes freeplane/doc/Images/key/tab.png | Bin 1388 -> 0 bytes freeplane/doc/Images/key/up.png| Bin 793 -> 0 bytes freeplane/doc/Images/mouse/mouse.png | Bin 1419 -> 0 bytes freeplane/doc/Images/mouse/mouse_LB.png| Bin 1363 -> 0 bytes freeplane/doc/Images/mouse/mouse_LB_2x.png | Bin 1759 -> 0 bytes freeplane/doc/Images/mouse/mouse_SB_click.png | Bin 1451 -> 0 bytes freeplane/doc/Images/mouse/mouse_SB_scroll.png | Bin 1726 -> 0 bytes .../workspace/Freeplane workspace (annotated).png | Bin 0 -> 10210426 bytes .../Images/other/workspace/Freeplane workspace.png | Bin 0 -> 10210426 bytes .../doc/Images/other/workspace/details arrow_.png | Bin 0 -> 1823 bytes .../doc/Images/other/workspace/f bar - split.png | Bin 0 -> 253010 bytes freeplane/doc/Images/other/workspace/f bar.png | Bin 0 -> 610450 bytes .../other/workspace/filter toolbar - split.png | Bin 0 -> 184464 bytes .../doc/Images/other/workspace/filter toolbar.png | Bin 0 -> 470123 bytes .../doc/Images/other/workspace/icons toolbar.png | Bin 0 -> 336075 bytes freeplane/doc/Images/other/workspace/menubar.png | Bin 0 -> 102000 bytes .../doc/Images/other/workspace/notes panel.png | Bin 0 -> 3105048 bytes .../Images/other/workspace/properties panel.png| Bin 0 -> 2952621 bytes .../doc/Images/other/workspace/resize arrows.png | Bin 0 -> 103324 bytes .../Images/other/workspace/right-click menu.png| Bin 0 -> 291593 bytes .../doc/Images/other/workspace/scroll bars.png | Bin 0 -> 2639262
[freeplane] 05/08: update copyright
This is an automated email from the git hooks/post-receive script. fnatter-guest pushed a commit to branch master in repository freeplane. commit c74e72ac337aaf01b709ca2e6c1902c17778d621 Author: Felix Natter Date: Sat Sep 16 15:30:00 2017 +0200 update copyright --- debian/copyright | 7 +++ 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/debian/copyright b/debian/copyright index ade46ff..dd81927 100644 --- a/debian/copyright +++ b/debian/copyright @@ -5,13 +5,13 @@ Upstream-Contact: Felix Natter Files: * Copyright: 2000-2008 Joerg Mueller, Daniel Polansky, Christian Foltin, Dimitry Polivaev - 2008-2016 Dimitry Polivaev , Volker Börchers , Felix Natter - 2008-2016 Others + 2008-2017 Dimitry Polivaev , Volker Börchers , Felix Natter + 2008-2017 Others License: GPL-2+ Files: debian/* Copyright: 2010-2012 Eric Lavarde - 2013-2016 Felix Natter + 2013-2017 Felix Natter License: GPL-2+ Files: ./freeplane/resources/fonts/intuitive-subset.ttf @@ -23,7 +23,6 @@ Files: ./freeplane_framework/script/freeplane.svg ./freeplane/resources/images/Freeplane_splash.png ./freeplane/resources/images/Freeplane_frame_icon_32x32.png ./freeplane/resources/images/Freeplane_frame_icon.png - ./freeplane/resources/images/Freeplane_frame_icon_64x64.png ./freeplane/resources/images/freeplane_app_128x128.png ./freeplane_framework/windows-icons/Freeplane_doc.ico ./freeplane_framework/mac-appbundler/freeplane.icns -- 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-commits@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-commits
[freeplane] annotated tag upstream/1.6.6 created (now 9552410)
This is an automated email from the git hooks/post-receive script. fnatter-guest pushed a change to annotated tag upstream/1.6.6 in repository freeplane. at 9552410 (tag) tagging a4d65da6dc48a16523e056c22a49c8d6b48a3769 (commit) replaces upstream/1.5.18 tagged by Felix Natter on Sat Sep 16 15:11:23 2017 +0200 - Log - Upstream version 1.6.6 Felix Natter (1): New upstream version 1.6.6 --- 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-commits@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-commits
[freeplane] 08/08: update man page for 1.6.6
This is an automated email from the git hooks/post-receive script. fnatter-guest pushed a commit to branch master in repository freeplane. commit f71794664f50cde1654bb845e6cb65979ad9c789 Author: Felix Natter Date: Sat Sep 16 15:34:17 2017 +0200 update man page for 1.6.6 --- debian/freeplane.1.xml | 25 +++-- 1 file changed, 23 insertions(+), 2 deletions(-) diff --git a/debian/freeplane.1.xml b/debian/freeplane.1.xml index 4e83469..c747a00 100644 --- a/debian/freeplane.1.xml +++ b/debian/freeplane.1.xml @@ -7,7 +7,7 @@ Eric"> Lavarde"> - December, 10th, 2016"> + September, 15th, 2017"> 1"> @@ -19,7 +19,7 @@ Debian"> GNU"> GPL"> - + ]> @@ -197,6 +197,27 @@ +NEW FEATURES IN 1.6.x + + +SVG Icons + + All icons are SVGs, the size can be changed per node + via the Tools panel. + + + +Presentations + + Very powerful presentations can be created via the + Tools panel. If you have questions about the usage, + post in the discussion forum. + + + + + + NEW FEATURES IN 1.5.x Please open the what's new map: Help->Whats new in Freeplane 1.5.x. -- 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-commits@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-commits
[freeplane] 03/08: fix patches for 1.6.6
This is an automated email from the git hooks/post-receive script.
fnatter-guest pushed a commit to branch master
in repository freeplane.
commit db85719ae9fc75f44177a9f8b3a41d77a6744bac
Author: Felix Natter
Date: Sat Sep 16 15:26:10 2017 +0200
fix patches for 1.6.6
---
debian/patches/10_build_usr_share_java.patch | 100 +++---
debian/patches/30_disable_update_check.patch | 4 +-
debian/patches/40_allow_usj_codebase.patch| 11 ++-
debian/patches/50_disable_secure_groovy.patch | 28
debian/patches/series | 1 +
5 files changed, 108 insertions(+), 36 deletions(-)
diff --git a/debian/patches/10_build_usr_share_java.patch
b/debian/patches/10_build_usr_share_java.patch
index fbfc6f6..fb6befc 100644
--- a/debian/patches/10_build_usr_share_java.patch
+++ b/debian/patches/10_build_usr_share_java.patch
@@ -9,7 +9,17 @@ Forwarded: not-needed
Last-Update: 2016-02-04
--- a/build.gradle
+++ b/build.gradle
-@@ -15,23 +15,45 @@
+@@ -1,6 +1,6 @@
+-plugins {
+- id "nebula.ospackage" version "4.4.0"
+-}
++//plugins {
++// id "nebula.ospackage" version "4.4.0"
++//}
+
+ 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"]
@@ -60,7 +70,7 @@ Last-Update: 2016-02-04
}
def filterAndExternalizePluginDependencies(runtime_files) {
-@@ -77,12 +99,6 @@
+@@ -82,12 +104,6 @@
failOnError = false
}
@@ -71,9 +81,9 @@ Last-Update: 2016-02-04
-}
-
dependencies {
- testCompile group: 'junit', name: 'junit', version: '4.11'
- }
-@@ -104,14 +120,9 @@
+ testCompile 'junit:junit:4.11'
+ testCompile 'org.assertj:assertj-core:2.6.0'
+@@ -110,14 +126,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$/}){
@@ -84,13 +94,13 @@ Last-Update: 2016-02-04
-}
-
dependencies {
--compile group: 'org.knopflerfish', name:'framework', version: '7.1.2'
-+//compile group: 'org.knopflerfish', name:'framework', version:
'7.1.2'
+-compile group: 'org.knopflerfish.kf6', name:'framework', version:
'8.0.4'
++//compile group: 'org.knopflerfish.kf6', name:'framework', version:
'8.0.4'
+ compile ':knopflerfish-framework'
}
}
-@@ -124,11 +135,13 @@
+@@ -130,11 +141,13 @@
else
ext.pluginid = project.name.replace("freeplane_plugin_",
"org.freeplane.plugin.")
@@ -109,7 +119,7 @@ Last-Update: 2016-02-04
task filterOSGiManifestForEclipse(type: Copy) {
from('build/tmp/jar/MANIFEST.MF') {
-@@ -180,18 +193,11 @@
+@@ -186,18 +199,9 @@
configure(subprojects.findAll {it.name =~ /plugin/ }) {
task copyOSGiJars(type: Copy) {
@@ -125,37 +135,36 @@ Last-Update: 2016-02-04
-include("*.jar")
-exclude('*-sources.jar')
-}
-+
+ from ("$buildDir/libs") {
+ include("plugin-${project.version}.jar")
+ }
-+
- into(globalBuild + '/plugins/' + pluginid + '/lib/')
+ into(globalBin + '/plugins/' + pluginid + '/lib/')
}
--- a/freeplane/build.gradle
+++ b/freeplane/build.gradle
-@@ -4,8 +4,9 @@
- }
+@@ -5,8 +5,10 @@
dependencies {
--
+
- mergedViewerDependencies
'org.dpolivaev.mnemonicsetter:mnemonicsetter:0.5'
-+
-+// no not use mergedViewerDependencies to avoid Debian upgrade problems
-+compile 'org.dpolivaev.mnemonicsetter:mnemonicsetter:0.5'
+- mergedViewerDependencies ':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 ':svgSalamander'
compile project(':JOrtho_0.4_freeplane')
-@@ -13,19 +14,18 @@
+@@ -14,19 +16,17 @@
'commons-io:commons-io:2.4',
'commons-codec:commons-codec:1.7',
'com.jgoodies:jgoodies-forms:1.9.0',
-'com.jgoodies:jgoodie
[freeplane] 07/08: add changelog for 1.6.6-1
This is an automated email from the git hooks/post-receive script. fnatter-guest pushed a commit to branch master in repository freeplane. commit 294ef831c57dbfdc2287edb54783b718250cce60 Author: Felix Natter Date: Sat Sep 16 15:33:54 2017 +0200 add changelog for 1.6.6-1 --- debian/changelog | 15 +++ 1 file changed, 15 insertions(+) diff --git a/debian/changelog b/debian/changelog index db00a6f..5083e60 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,18 @@ +freeplane (1.6.6-1) UNRELEASED; urgency=medium + + * New upstream release. +* PDF/SVG export disabled upstream due to incompatibility with svgSalamander + (Closes: #856058, LP: #172) +* Java9 compatible (Closes: #873220) + * Fix patches + * Depend on groovy-2.4.8-2 with security fix for GROOVY-8163 +(and remove the upstream "securegroovy" invocation) + * Add jython build dep which is needed for compiling against libbatik-java-1.9 + * Update man page + * Update standards-version (no changes) + + -- Felix Natter Fri, 15 Sep 2017 20:19:16 +0200 + freeplane (1.5.18-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-commits@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.6.orig.tar.gz
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 cd7d060a328cb270c3020fcae6f06884870258e4 Author: Felix Natter Date: Sat Sep 16 15:11:23 2017 +0200 pristine-tar data for freeplane_1.6.6.orig.tar.gz --- freeplane_1.6.6.orig.tar.gz.delta | Bin 0 -> 93712 bytes freeplane_1.6.6.orig.tar.gz.id| 1 + 2 files changed, 1 insertion(+) diff --git a/freeplane_1.6.6.orig.tar.gz.delta b/freeplane_1.6.6.orig.tar.gz.delta new file mode 100644 index 000..e8d9a77 Binary files /dev/null and b/freeplane_1.6.6.orig.tar.gz.delta differ diff --git a/freeplane_1.6.6.orig.tar.gz.id b/freeplane_1.6.6.orig.tar.gz.id new file mode 100644 index 000..58002eb --- /dev/null +++ b/freeplane_1.6.6.orig.tar.gz.id @@ -0,0 +1 @@ +1dccb93ff9e604b7451b4f5bc1d40c87351f425d -- 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-commits@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-commits
[simplyhtml] 01/04: exclude JavaHelpTOC.jar
This is an automated email from the git hooks/post-receive script. fnatter-guest pushed a commit to branch master in repository simplyhtml. commit e6a7b4363cfb34c117344e1c968320b80224a796 Author: Felix Natter Date: Sun Sep 17 15:48:52 2017 +0200 exclude JavaHelpTOC.jar --- debian/copyright | 1 + 1 file changed, 1 insertion(+) diff --git a/debian/copyright b/debian/copyright index 1a8076a..cf2ec3b 100644 --- a/debian/copyright +++ b/debian/copyright @@ -2,6 +2,7 @@ Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/ Upstream-Name: simplyhtml Source: http://simplyhtml.sf.net/ Upstream-Contact: Felix Natter +Files-Excluded: src/com/lightdev/app/shtm/help/JavaHelpTOC.jar Files: * Copyright: 2006-2017 Dimitri Polivaev -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/simplyhtml.git ___ pkg-java-commits mailing list pkg-java-commits@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-commits
[simplyhtml] 04/04: src/com/lightdev/app/shtm/help/JavaHelpTOC.jar
This is an automated email from the git hooks/post-receive script. fnatter-guest pushed a commit to branch master in repository simplyhtml. commit 4374cb4247056a6cc967acf34d65f51b5e32e6cd Author: Felix Natter Date: Sun Sep 17 15:58:00 2017 +0200 src/com/lightdev/app/shtm/help/JavaHelpTOC.jar --- debian/changelog | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/debian/changelog b/debian/changelog index 12cc8dc..a52641a 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,9 +1,11 @@ -simplyhtml (0.17.3-1) unstable; urgency=medium +simplyhtml (0.17.3+dfsg1-1) unstable; urgency=medium [ Felix Natter ] * New upstream version * Refresh 01_build.patch, remove deprecated gradle feature (<<) * Update copyright years + * exclude src/com/lightdev/app/shtm/help/JavaHelpTOC.jar +(not needed to build or display help menu) [ Markus Koschany ] * Switch to compat level 10. -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/simplyhtml.git ___ pkg-java-commits mailing list pkg-java-commits@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-commits
[simplyhtml] 03/04: Updated version 0.17.3+dfsg1 from 'upstream/0.17.3+dfsg1'
This is an automated email from the git hooks/post-receive script. fnatter-guest pushed a commit to branch master in repository simplyhtml. commit 0433c24313de7ef4f870ba1cd337f4af75be7b9d Merge: e6a7b43 3ff50a5 Author: Felix Natter Date: Sun Sep 17 15:49:59 2017 +0200 Updated version 0.17.3+dfsg1 from 'upstream/0.17.3+dfsg1' with Debian dir 87ff40043bab08cb1ddbe9f8127f1eb409fd7cf2 src/com/lightdev/app/shtm/help/JavaHelpTOC.jar | Bin 35599 -> 0 bytes 1 file changed, 0 insertions(+), 0 deletions(-) -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/simplyhtml.git ___ pkg-java-commits mailing list pkg-java-commits@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-commits
[simplyhtml] branch pristine-tar updated (84d615a -> c57cc83)
This is an automated email from the git hooks/post-receive script. fnatter-guest pushed a change to branch pristine-tar in repository simplyhtml. from 84d615a pristine-tar data for simplyhtml_0.17.3.orig.tar.gz new c57cc83 pristine-tar data for simplyhtml_0.17.3+dfsg1.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: simplyhtml_0.17.3+dfsg1.orig.tar.gz.delta | Bin 0 -> 8558 bytes simplyhtml_0.17.3+dfsg1.orig.tar.gz.id| 1 + 2 files changed, 1 insertion(+) create mode 100644 simplyhtml_0.17.3+dfsg1.orig.tar.gz.delta create mode 100644 simplyhtml_0.17.3+dfsg1.orig.tar.gz.id -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/simplyhtml.git ___ pkg-java-commits mailing list pkg-java-commits@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-commits
[simplyhtml] 01/01: pristine-tar data for simplyhtml_0.17.3+dfsg1.orig.tar.gz
This is an automated email from the git hooks/post-receive script. fnatter-guest pushed a commit to branch pristine-tar in repository simplyhtml. commit c57cc831ce249faba8190c11b461f1b2d2de6bce Author: Felix Natter Date: Sun Sep 17 15:49:59 2017 +0200 pristine-tar data for simplyhtml_0.17.3+dfsg1.orig.tar.gz --- simplyhtml_0.17.3+dfsg1.orig.tar.gz.delta | Bin 0 -> 8558 bytes simplyhtml_0.17.3+dfsg1.orig.tar.gz.id| 1 + 2 files changed, 1 insertion(+) diff --git a/simplyhtml_0.17.3+dfsg1.orig.tar.gz.delta b/simplyhtml_0.17.3+dfsg1.orig.tar.gz.delta new file mode 100644 index 000..c33a67f Binary files /dev/null and b/simplyhtml_0.17.3+dfsg1.orig.tar.gz.delta differ diff --git a/simplyhtml_0.17.3+dfsg1.orig.tar.gz.id b/simplyhtml_0.17.3+dfsg1.orig.tar.gz.id new file mode 100644 index 000..1cee932 --- /dev/null +++ b/simplyhtml_0.17.3+dfsg1.orig.tar.gz.id @@ -0,0 +1 @@ +eeafae156691b7897f46cba0c866c0b7ab85464d -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/simplyhtml.git ___ pkg-java-commits mailing list pkg-java-commits@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-commits
[simplyhtml] annotated tag upstream/0.17.3+dfsg1 created (now 44cf952)
This is an automated email from the git hooks/post-receive script. fnatter-guest pushed a change to annotated tag upstream/0.17.3+dfsg1 in repository simplyhtml. at 44cf952 (tag) tagging 3ff50a5ba3a4b498f59ca53c22e8556fa5e1cc06 (commit) replaces upstream/0.17.3 tagged by Felix Natter on Sun Sep 17 15:49:59 2017 +0200 - Log - Upstream version 0.17.3+dfsg1 Felix Natter (1): New upstream version 0.17.3+dfsg1 --- No new revisions were added by this update. -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/simplyhtml.git ___ pkg-java-commits mailing list pkg-java-commits@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-commits
[simplyhtml] branch master updated (34381f1 -> 4374cb4)
This is an automated email from the git hooks/post-receive script. fnatter-guest pushed a change to branch master in repository simplyhtml. from 34381f1 Remove trailing whitespace. new e6a7b43 exclude JavaHelpTOC.jar new 3ff50a5 New upstream version 0.17.3+dfsg1 new 0433c24 Updated version 0.17.3+dfsg1 from 'upstream/0.17.3+dfsg1' new 4374cb4 src/com/lightdev/app/shtm/help/JavaHelpTOC.jar The 4 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 +++- debian/copyright | 1 + src/com/lightdev/app/shtm/help/JavaHelpTOC.jar | Bin 35599 -> 0 bytes 3 files changed, 4 insertions(+), 1 deletion(-) delete mode 100644 src/com/lightdev/app/shtm/help/JavaHelpTOC.jar -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/simplyhtml.git ___ pkg-java-commits mailing list pkg-java-commits@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-commits
[simplyhtml] 02/04: New upstream version 0.17.3+dfsg1
This is an automated email from the git hooks/post-receive script. fnatter-guest pushed a commit to branch master in repository simplyhtml. commit 3ff50a5ba3a4b498f59ca53c22e8556fa5e1cc06 Author: Felix Natter Date: Sun Sep 17 15:49:56 2017 +0200 New upstream version 0.17.3+dfsg1 --- src/com/lightdev/app/shtm/help/JavaHelpTOC.jar | Bin 35599 -> 0 bytes 1 file changed, 0 insertions(+), 0 deletions(-) diff --git a/src/com/lightdev/app/shtm/help/JavaHelpTOC.jar b/src/com/lightdev/app/shtm/help/JavaHelpTOC.jar deleted file mode 100644 index a437129..000 Binary files a/src/com/lightdev/app/shtm/help/JavaHelpTOC.jar and /dev/null differ -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/simplyhtml.git ___ pkg-java-commits mailing list pkg-java-commits@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-commits
[freeplane] branch master updated (f717946 -> f29362b)
This is an automated email from the git hooks/post-receive script. fnatter-guest pushed a change to branch master in repository freeplane. from f717946 update man page for 1.6.6 new ca6b1e8 Switch to compat level 10 new f29362b bump standards-version to 4.0.1 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/compat| 2 +- debian/control | 4 ++-- 3 files changed, 7 insertions(+), 6 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-commits@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-commits
[freeplane] 01/02: Switch to compat level 10
This is an automated email from the git hooks/post-receive script. fnatter-guest pushed a commit to branch master in repository freeplane. commit ca6b1e83ca2739b242ade299d8e4d9b045967996 Author: Felix Natter Date: Sun Sep 17 16:15:35 2017 +0200 Switch to compat level 10 --- debian/changelog | 1 + debian/compat| 2 +- debian/control | 2 +- 3 files changed, 3 insertions(+), 2 deletions(-) diff --git a/debian/changelog b/debian/changelog index 5083e60..ee370f6 100644 --- a/debian/changelog +++ b/debian/changelog @@ -9,6 +9,7 @@ freeplane (1.6.6-1) UNRELEASED; urgency=medium (and remove the upstream "securegroovy" invocation) * Add jython build dep which is needed for compiling against libbatik-java-1.9 * Update man page + * Switch to compat level 10 * Update standards-version (no changes) -- Felix Natter Fri, 15 Sep 2017 20:19:16 +0200 diff --git a/debian/compat b/debian/compat index ec63514..f599e28 100644 --- a/debian/compat +++ b/debian/compat @@ -1 +1 @@ -9 +10 diff --git a/debian/control b/debian/control index 2b2f4bd..ad0acb2 100644 --- a/debian/control +++ b/debian/control @@ -3,7 +3,7 @@ Maintainer: Debian Java Maintainers Section: editors Priority: extra -Build-Depends: debhelper (>= 9), +Build-Depends: debhelper (>= 10), docbook-xsl, docbook-xml, xsltproc, -- 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-commits@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-commits
[freeplane] 02/02: bump standards-version to 4.0.1
This is an automated email from the git hooks/post-receive script. fnatter-guest pushed a commit to branch master in repository freeplane. commit f29362baa24213ec8b0e0b7d973bf6ff240280bb Author: Felix Natter Date: Sun Sep 17 16:42:42 2017 +0200 bump standards-version to 4.0.1 --- debian/changelog | 6 +++--- debian/control | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/debian/changelog b/debian/changelog index ee370f6..180acb5 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,4 +1,4 @@ -freeplane (1.6.6-1) UNRELEASED; urgency=medium +freeplane (1.6.6-1) unstable; urgency=medium * New upstream release. * PDF/SVG export disabled upstream due to incompatibility with svgSalamander @@ -10,9 +10,9 @@ freeplane (1.6.6-1) UNRELEASED; urgency=medium * Add jython build dep which is needed for compiling against libbatik-java-1.9 * Update man page * Switch to compat level 10 - * Update standards-version (no changes) + * Update standards-version to 4.0.1 (no changes) - -- Felix Natter Fri, 15 Sep 2017 20:19:16 +0200 + -- Felix Natter Sun, 17 Sep 2017 16:41:53 +0200 freeplane (1.5.18-1) unstable; urgency=medium diff --git a/debian/control b/debian/control index ad0acb2..e694503 100644 --- a/debian/control +++ b/debian/control @@ -34,7 +34,7 @@ Build-Depends-Indep: javahelp2, jmapviewer (>= 1.11), libmnemonicsetter-java (>= 0.5), gradle-debian-helper -Standards-Version: 4.0.0 +Standards-Version: 4.0.1 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-commits@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-commits
[freeplane] 03/06: update/refresh patches for 1.5.18
This is an automated email from the git hooks/post-receive script.
fnatter-guest pushed a commit to branch master
in repository freeplane.
commit 49f5f8ac6654c2b453b454541e16b68b852e9570
Author: Felix Natter
Date: Sat Dec 10 17:39:59 2016 +0100
update/refresh patches for 1.5.18
---
debian/patches/10_build_usr_share_java.patch | 100 +--
debian/patches/20_freeplane_sh.patch | 6 +-
debian/patches/30_disable_update_check.patch | 2 +-
debian/patches/40_allow_usj_codebase.patch | 2 +-
debian/patches/50_jgoodies-1.9.patch | 47 -
debian/patches/series| 1 -
6 files changed, 55 insertions(+), 103 deletions(-)
diff --git a/debian/patches/10_build_usr_share_java.patch
b/debian/patches/10_build_usr_share_java.patch
index 03adeaf..3f5b52e 100644
--- a/debian/patches/10_build_usr_share_java.patch
+++ b/debian/patches/10_build_usr_share_java.patch
@@ -9,42 +9,21 @@ Forwarded: not-needed
Last-Update: 2016-02-04
--- a/build.gradle
+++ b/build.gradle
-@@ -7,30 +7,46 @@
- ext.globalBuild = rootDir.path + '/BUILD'
-
- repositories {
-- maven { url "http://dl.bintray.com/freeplane/freeplane"; }
--// 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",
-- rootDir.path + "/freeplane_plugin_svg/lib"]
+@@ -1,3 +1,5 @@
++apply from: 'debian.gradle'
++
+ allprojects {
+ // in a multi-project setup, all projects must have the same version
number!
+ // the real (specific) version number is in
freeplane/viewer-resources/version.properties!
+@@ -15,6 +17,7 @@
+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'
}
}
-
-+def isDebianJar(File jar) {
-+def ret = jar.path.startsWith("/usr/share/java/") ||
-+ jar.path.startsWith("/usr/share/maven-repo/")
-+return ret;
-+}
-+
-+def relpath(File basePath, File targetPath) {
-+def relPath = ""
-+// targetPath is either '/usr/share/java/**' or
'/usr/share/maven-repo/**'!
-+def commonPrefix = '/usr/share'
-+def parent = basePath
-+while (parent.path != commonPrefix) {
-+parent = parent.parentFile
-+relPath += '../'
-+}
-+def targetPathRel = targetPath.path.replaceFirst(/^${commonPrefix}/,
'').substring(1)
-+relPath += targetPathRel
-+}
-+
-+
+@@ -22,16 +25,18 @@
// this is used for (linux) packages, where the dependencies
// live on the file system (/usr/share/java/*.jar on Debian):
def externalizeJar(File jar) {
@@ -68,7 +47,7 @@ Last-Update: 2016-02-04
}
def filterAndExternalizePluginDependencies(runtime_files) {
-@@ -76,12 +92,6 @@
+@@ -77,12 +82,6 @@
failOnError = false
}
@@ -81,16 +60,16 @@ Last-Update: 2016-02-04
dependencies {
testCompile group: 'junit', name: 'junit', version: '4.11'
}
-@@ -103,14 +113,10 @@
+@@ -104,14 +103,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$/}){
-repositories {
-maven {
--url 'http://www.knopflerfish.org/maven2/'
+-url 'https://dl.bintray.com/knopflerfish/knopflerfish-maven/'
-}
-}
-
+-
dependencies {
-compile group: 'org.knopflerfish', name:'framework', version: '7.1.2'
+//compile group: 'org.knopflerfish', name:'framework', version:
'7.1.2'
@@ -98,7 +77,7 @@ Last-Update: 2016-02-04
}
}
-@@ -123,11 +129,13 @@
+@@ -124,11 +118,13 @@
else
ext.pluginid = project.name.replace("freeplane_plugin_",
"org.freeplane.plugin.")
@@ -117,7 +96,7 @@ Last-Update: 2016-02-04
task filterOSGiManifestForEclipse(type: Copy) {
from('build/tmp/jar/MANIFEST.MF') {
-@@ -179,18 +187,11 @@
+@@ -180,18 +176,11 @@
configure(subprojects.findAll {it.name =~ /plugin/ }) {
task copyOSGiJars(type: Copy) {
@@ -155,12 +134,12 @@ Last-Update: 2016-02-04
compile project(':JOrtho_0.4_freepla
[freeplane] 05/06: update man page for 1.5.18
This is an automated email from the git hooks/post-receive script. fnatter-guest pushed a commit to branch master in repository freeplane. commit 8734b64e702e17ca00bf028d187a3c5028822042 Author: Felix Natter Date: Sat Dec 10 18:06:40 2016 +0100 update man page for 1.5.18 --- debian/freeplane.1.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/debian/freeplane.1.xml b/debian/freeplane.1.xml index 49aa5b5..4e83469 100644 --- a/debian/freeplane.1.xml +++ b/debian/freeplane.1.xml @@ -7,7 +7,7 @@ Eric"> Lavarde"> - February, 4th, 2016"> + December, 10th, 2016"> 1"> @@ -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-commits@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-commits
[freeplane] branch master updated (e3bb7ec -> 70ba8dc)
This is an automated email from the git hooks/post-receive script. fnatter-guest pushed a change to branch master in repository freeplane. from e3bb7ec jgoodies-forms 1.9.0 is required by last change new 83217fe New upstream version 1.5.18 new b17f9f4 Merge tag 'upstream/1.5.18' new 49f5f8a update/refresh patches for 1.5.18 new 0d5ad44 do not extract debian.gradle new 8734b64 update man page for 1.5.18 new 70ba8dc build 1.5.18-1 The 6 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 | 3 +- debian/changelog | 7 + debian/freeplane.1.xml | 4 +- debian/patches/10_build_usr_share_java.patch | 52 +- debian/patches/20_freeplane_sh.patch | 6 +- debian/patches/30_disable_update_check.patch | 2 +- debian/patches/40_allow_usj_codebase.patch | 2 +- debian/patches/50_jgoodies-1.9.patch | 47 - debian/patches/series | 1 - freeplane/build.gradle | 4 +- freeplane/doc/freeplaneTutorial.mm | 157 ++-- freeplane/doc/history_en.txt | 11 + freeplane/external-resources/xml/filemodemenu.xml | 7 +- freeplane/external-resources/xml/preferences.xml | 3 + freeplane/external-resources/xml/stylemodemenu.xml | 3 + ...ropertyAction.png => ShowPreferencesAction.png} | Bin .../resources/translations/Resources_cs.properties | 7 +- .../resources/translations/Resources_da.properties | 1 - .../resources/translations/Resources_de.properties | 114 ++- .../resources/translations/Resources_el.properties | 1 - .../resources/translations/Resources_es.properties | 1 - .../resources/translations/Resources_fr.properties | 14 +- .../resources/translations/Resources_hr.properties | 4 +- .../resources/translations/Resources_hu.properties | 69 +- .../resources/translations/Resources_id.properties | 12 +- .../resources/translations/Resources_it.properties | 1 - .../resources/translations/Resources_ja.properties | 5 +- .../resources/translations/Resources_ko.properties | 13 +- .../resources/translations/Resources_nl.properties | 48 +- .../resources/translations/Resources_pl.properties | 1 - .../translations/Resources_pt_BR.properties| 231 ++--- .../translations/Resources_pt_PT.properties| 956 +++-- .../resources/translations/Resources_ru.properties | 122 ++- .../resources/translations/Resources_sr.properties | 1 - .../resources/translations/Resources_sv.properties | 52 +- .../translations/Resources_uk_UA.properties| 4 +- .../translations/Resources_zh_CN.properties| 41 +- .../translations/Resources_zh_TW.properties| 1 - .../core/resources/ResourceController.java | 6 +- .../core/resources/components/OptionPanel.java | 3 +- ...pertyAction.java => ShowPreferencesAction.java} | 24 +- .../freeplane/core/ui/AccelerateableAction.java| 2 +- .../core/ui/ActionAcceleratorManager.java | 59 +- .../core/ui/components/html/CssRuleBuilder.java| 50 +- .../core/ui/components/html/ScaledEditorKit.java | 2 +- .../java/org/freeplane/core/util/MenuUtils.java| 4 +- .../features/attribute/AttributeController.java| 2 +- .../features/clipboard/MindMapHTMLWriter.java | 69 +- .../mindmapmode/MClipboardController.java | 8 +- .../freeplane/features/link/LinkController.java| 120 +-- .../features/link/mindmapmode/MLinkController.java | 5 +- .../link/mindmapmode/MakeLinkFromAnchorAction.java | 25 +- .../link/mindmapmode/MakeLinkToAnchorAction.java | 2 +- .../org/freeplane/features/map/MapController.java | 2 +- .../freeplane/features/map/MapNavigationUtils.java | 6 +- .../freeplane/features/map/ToggleFoldedAction.java | 3 +- .../features/map/filemode/CenterAction.java| 9 +- .../features/map/filemode/FMapController.java | 9 +- .../freeplane/features/map/filemode/FMapModel.java | 7 +- .../features/map/filemode/FNodeModel.java | 25 +- .../features/map/mindmapmode/MMapController.java | 2 +- .../org/freeplane/features/mode/Controller.java| 19 +- .../features/mode/filemode/FModeController.java| 2 +- .../features/mode/mindmapmode/MModeController.java | 8 +- .../freeplane/features/note/NoteController.java| 13 +- .../features/styles/mindmapmode/MUIFactory.java| 8 +- .../styles/mindmapmode/StyleEditorPanel.java | 4 +- .../freeplane/features/text/TextController.java| 4 +- .../features/text/mindmapmode/EditNodeDialog.java | 2 +- .../features/text/mi
[freeplane] 06/06: build 1.5.18-1
This is an automated email from the git hooks/post-receive script. fnatter-guest pushed a commit to branch master in repository freeplane. commit 70ba8dc1632995a24c0189382c4770b8f378ceea Author: Felix Natter Date: Sat Dec 10 18:09:30 2016 +0100 build 1.5.18-1 --- debian/changelog | 7 +++ 1 file changed, 7 insertions(+) diff --git a/debian/changelog b/debian/changelog index 8c7e9b0..db00a6f 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,10 @@ +freeplane (1.5.18-1) unstable; urgency=medium + + * New upstream release. + * Update patches for 1.5.18. + + -- Felix Natter Sat, 10 Dec 2016 18:08:55 +0100 + freeplane (1.5.16-3) unstable; urgency=medium * fix runtime problem with jgoodies-forms-1.9 (50_jgoodies-1.9.patch) -- 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-commits@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-commits
[freeplane] 04/06: do not extract debian.gradle
This is an automated email from the git hooks/post-receive script.
fnatter-guest pushed a commit to branch master
in repository freeplane.
commit 0d5ad44167f17b35ee02759a8a9e8b0e61aa97b6
Author: Felix Natter
Date: Sat Dec 10 18:03:09 2016 +0100
do not extract debian.gradle
---
debian/patches/10_build_usr_share_java.patch | 58
1 file changed, 25 insertions(+), 33 deletions(-)
diff --git a/debian/patches/10_build_usr_share_java.patch
b/debian/patches/10_build_usr_share_java.patch
index 3f5b52e..fbfc6f6 100644
--- a/debian/patches/10_build_usr_share_java.patch
+++ b/debian/patches/10_build_usr_share_java.patch
@@ -9,13 +9,7 @@ Forwarded: not-needed
Last-Update: 2016-02-04
--- a/build.gradle
+++ b/build.gradle
-@@ -1,3 +1,5 @@
-+apply from: 'debian.gradle'
-+
- allprojects {
- // in a multi-project setup, all projects must have the same version
number!
- // the real (specific) version number is in
freeplane/viewer-resources/version.properties!
-@@ -15,6 +17,7 @@
+@@ -15,23 +15,45 @@
rootDir.path + "/freeplane_plugin_jsyntaxpane/lib",
rootDir.path + "/freeplane_plugin_latex/lib",
rootDir.path + "/freeplane_plugin_svg/lib"]
@@ -23,7 +17,26 @@ Last-Update: 2016-02-04
}
}
-@@ -22,16 +25,18 @@
+
++def isDebianJar(File jar) {
++def ret = jar.path.startsWith("/usr/share/java/") ||
++ jar.path.startsWith("/usr/share/maven-repo/")
++return ret;
++}
++
++def relpath(File basePath, File targetPath) {
++def relPath = ""
++// targetPath is either '/usr/share/java/**' or
'/usr/share/maven-repo/**'!
++def commonPrefix = '/usr/share'
++def parent = basePath
++while (parent.path != commonPrefix) {
++parent = parent.parentFile
++relPath += '../'
++}
++def targetPathRel = targetPath.path.replaceFirst(/^${commonPrefix}/,
'').substring(1)
++relPath += targetPathRel
++}
++
// this is used for (linux) packages, where the dependencies
// live on the file system (/usr/share/java/*.jar on Debian):
def externalizeJar(File jar) {
@@ -47,7 +60,7 @@ Last-Update: 2016-02-04
}
def filterAndExternalizePluginDependencies(runtime_files) {
-@@ -77,12 +82,6 @@
+@@ -77,12 +99,6 @@
failOnError = false
}
@@ -60,7 +73,7 @@ Last-Update: 2016-02-04
dependencies {
testCompile group: 'junit', name: 'junit', version: '4.11'
}
-@@ -104,14 +103,9 @@
+@@ -104,14 +120,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$/}){
@@ -77,7 +90,7 @@ Last-Update: 2016-02-04
}
}
-@@ -124,11 +118,13 @@
+@@ -124,11 +135,13 @@
else
ext.pluginid = project.name.replace("freeplane_plugin_",
"org.freeplane.plugin.")
@@ -96,7 +109,7 @@ Last-Update: 2016-02-04
task filterOSGiManifestForEclipse(type: Copy) {
from('build/tmp/jar/MANIFEST.MF') {
-@@ -180,18 +176,11 @@
+@@ -180,18 +193,11 @@
configure(subprojects.findAll {it.name =~ /plugin/ }) {
task copyOSGiJars(type: Copy) {
@@ -260,24 +273,3 @@ Last-Update: 2016-02-04
}
jar {
/dev/null
-+++ b/debian.gradle
-@@ -0,0 +1,18 @@
-+def isDebianJar(File jar) {
-+def ret = jar.path.startsWith("/usr/share/java/") ||
-+ jar.path.startsWith("/usr/share/maven-repo/")
-+return ret;
-+}
-+
-+def relpath(File basePath, File targetPath) {
-+def relPath = ""
-+// targetPath is either '/usr/share/java/**' or
'/usr/share/maven-repo/**'!
-+def commonPrefix = '/usr/share'
-+def parent = basePath
-+while (parent.path != commonPrefix) {
-+parent = parent.parentFile
-+relPath += '../'
-+}
-+def targetPathRel = targetPath.path.replaceFirst(/^${commonPrefix}/,
'').substring(1)
-+relPath += targetPathRel
-+}
--
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-commits@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-commits
[freeplane] 02/06: Merge tag 'upstream/1.5.18'
This is an automated email from the git hooks/post-receive script. fnatter-guest pushed a commit to branch master in repository freeplane. commit b17f9f427770a769545cfd3ed871da867c156993 Merge: e3bb7ec 83217fe Author: Felix Natter Date: Sat Dec 10 17:02:24 2016 +0100 Merge tag 'upstream/1.5.18' Upstream version 1.5.18 build.gradle | 3 +- freeplane/build.gradle | 4 +- freeplane/doc/freeplaneTutorial.mm | 157 ++-- freeplane/doc/history_en.txt | 11 + freeplane/external-resources/xml/filemodemenu.xml | 7 +- freeplane/external-resources/xml/preferences.xml | 3 + freeplane/external-resources/xml/stylemodemenu.xml | 3 + ...ropertyAction.png => ShowPreferencesAction.png} | Bin .../resources/translations/Resources_cs.properties | 7 +- .../resources/translations/Resources_da.properties | 1 - .../resources/translations/Resources_de.properties | 114 ++- .../resources/translations/Resources_el.properties | 1 - .../resources/translations/Resources_es.properties | 1 - .../resources/translations/Resources_fr.properties | 14 +- .../resources/translations/Resources_hr.properties | 4 +- .../resources/translations/Resources_hu.properties | 69 +- .../resources/translations/Resources_id.properties | 12 +- .../resources/translations/Resources_it.properties | 1 - .../resources/translations/Resources_ja.properties | 5 +- .../resources/translations/Resources_ko.properties | 13 +- .../resources/translations/Resources_nl.properties | 48 +- .../resources/translations/Resources_pl.properties | 1 - .../translations/Resources_pt_BR.properties| 231 ++--- .../translations/Resources_pt_PT.properties| 956 +++-- .../resources/translations/Resources_ru.properties | 122 ++- .../resources/translations/Resources_sr.properties | 1 - .../resources/translations/Resources_sv.properties | 52 +- .../translations/Resources_uk_UA.properties| 4 +- .../translations/Resources_zh_CN.properties| 41 +- .../translations/Resources_zh_TW.properties| 1 - .../core/resources/ResourceController.java | 6 +- .../core/resources/components/OptionPanel.java | 3 +- ...pertyAction.java => ShowPreferencesAction.java} | 24 +- .../freeplane/core/ui/AccelerateableAction.java| 2 +- .../core/ui/ActionAcceleratorManager.java | 59 +- .../core/ui/components/html/CssRuleBuilder.java| 50 +- .../core/ui/components/html/ScaledEditorKit.java | 2 +- .../java/org/freeplane/core/util/MenuUtils.java| 4 +- .../features/attribute/AttributeController.java| 2 +- .../features/clipboard/MindMapHTMLWriter.java | 69 +- .../mindmapmode/MClipboardController.java | 8 +- .../freeplane/features/link/LinkController.java| 120 +-- .../features/link/mindmapmode/MLinkController.java | 5 +- .../link/mindmapmode/MakeLinkFromAnchorAction.java | 25 +- .../link/mindmapmode/MakeLinkToAnchorAction.java | 2 +- .../org/freeplane/features/map/MapController.java | 2 +- .../freeplane/features/map/MapNavigationUtils.java | 6 +- .../freeplane/features/map/ToggleFoldedAction.java | 3 +- .../features/map/filemode/CenterAction.java| 9 +- .../features/map/filemode/FMapController.java | 9 +- .../freeplane/features/map/filemode/FMapModel.java | 7 +- .../features/map/filemode/FNodeModel.java | 25 +- .../features/map/mindmapmode/MMapController.java | 2 +- .../org/freeplane/features/mode/Controller.java| 19 +- .../features/mode/filemode/FModeController.java| 2 +- .../features/mode/mindmapmode/MModeController.java | 8 +- .../freeplane/features/note/NoteController.java| 13 +- .../features/styles/mindmapmode/MUIFactory.java| 8 +- .../styles/mindmapmode/StyleEditorPanel.java | 4 +- .../freeplane/features/text/TextController.java| 4 +- .../features/text/mindmapmode/EditNodeDialog.java | 2 +- .../features/text/mindmapmode/EditNodeWYSIWYG.java | 2 +- .../org/freeplane/main/applet/FreeplaneApplet.java | 12 +- .../application/ApplicationLifecycleListener.java | 1 + .../application/ApplicationResourceController.java | 98 +-- .../application/ApplicationViewController.java | 6 +- .../main/application/FreeplaneGUIStarter.java | 14 +- .../freeplane/main/application/LastOpenedList.java | 37 +- .../main/application/MapViewDockingWindows.java| 4 + .../survey/FreeplaneSurveyProperties.java | 94 ++ .../main/application/survey/SurveyRunner.java | 136 +++ .../main/application/survey/SurveyStarter.java | 81 ++ .../main/mindmapmode/MModeControllerFactory.java | 3 - .../stylemode/SModeControllerFactory.java | 2 + .../org/freeplane/main/osgi/ActivatorImpl.java | 3 + .../filepreview/BitmapViewerComponent.java |
[freeplane] annotated tag upstream/1.5.18 created (now 854e9a1)
This is an automated email from the git hooks/post-receive script. fnatter-guest pushed a change to annotated tag upstream/1.5.18 in repository freeplane. at 854e9a1 (tag) tagging 83217fee1ca0daa3fe21701b53f651375208d746 (commit) replaces upstream/1.5.16 tagged by Felix Natter on Sat Dec 10 17:02:23 2016 +0100 - Log - Upstream version 1.5.18 Felix Natter (1): New upstream version 1.5.18 --- 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-commits@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-commits
[freeplane] branch pristine-tar updated (893c46e -> c3421ea)
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 893c46e pristine-tar data for freeplane_1.5.16.orig.tar.gz new c3421ea pristine-tar data for freeplane_1.5.18.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.5.18.orig.tar.gz.delta | Bin 0 -> 106068 bytes freeplane_1.5.18.orig.tar.gz.id| 1 + 2 files changed, 1 insertion(+) create mode 100644 freeplane_1.5.18.orig.tar.gz.delta create mode 100644 freeplane_1.5.18.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-commits@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.5.18.orig.tar.gz
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 c3421ea92b9a42bc29769b0379324d154e1aea14 Author: Felix Natter Date: Sat Dec 10 17:02:23 2016 +0100 pristine-tar data for freeplane_1.5.18.orig.tar.gz --- freeplane_1.5.18.orig.tar.gz.delta | Bin 0 -> 106068 bytes freeplane_1.5.18.orig.tar.gz.id| 1 + 2 files changed, 1 insertion(+) diff --git a/freeplane_1.5.18.orig.tar.gz.delta b/freeplane_1.5.18.orig.tar.gz.delta new file mode 100644 index 000..f0e24de Binary files /dev/null and b/freeplane_1.5.18.orig.tar.gz.delta differ diff --git a/freeplane_1.5.18.orig.tar.gz.id b/freeplane_1.5.18.orig.tar.gz.id new file mode 100644 index 000..f1a6620 --- /dev/null +++ b/freeplane_1.5.18.orig.tar.gz.id @@ -0,0 +1 @@ +55fb2f63873fef012015637cfdd4c9bd6063806d -- 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-commits@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-commits
[jajuk] branch master updated (3f7679a -> 580e7cd)
This is an automated email from the git hooks/post-receive script. fnatter-guest pushed a change to branch master in repository jajuk. from 3f7679a Tighten dependency on libjgoodies-animation-java. new 580e7cd fix LP:1650019 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/MANIFEST.MF | 2 +- debian/changelog | 6 ++ 2 files changed, 7 insertions(+), 1 deletion(-) -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/jajuk.git ___ pkg-java-commits mailing list pkg-java-commits@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-commits
[jajuk] 01/01: fix LP:1650019
This is an automated email from the git hooks/post-receive script. fnatter-guest pushed a commit to branch master in repository jajuk. commit 580e7cd22a15d51df070d32bec4a4cc99ad2a401 Author: Felix Natter Date: Fri Feb 3 14:42:12 2017 +0100 fix LP:1650019 --- debian/MANIFEST.MF | 2 +- debian/changelog | 6 ++ 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/debian/MANIFEST.MF b/debian/MANIFEST.MF index f8d20b4..8009225 100644 --- a/debian/MANIFEST.MF +++ b/debian/MANIFEST.MF @@ -1,5 +1,5 @@ Manifest-Version: 2.0 Main-Class: org.jajuk.Main Created-By: Jajuk team -Class-Path: animation.jar basicplayer.jar cobra.jar commons-codec.jar commons-collections3.jar commons-logging.jar jaudiotagger.jar jcommon.jar jfreechart.jar jl.jar jmactritonusspi.jar jogg.jar jorbis.jar jspeex.jar laf-plugin.jar laf-widget.jar log4j-1.2.jar mp3spi.jar substance.jar swingx.jar tritonus_share.jar vldocking.jar vorbisspi.jar jajuk-help.jar jajuk-help_fr.jar dbus.jar miglayout.jar jhlabs-filters.jar lastfm.jar commons-io.jar commons-lang.jar xstream.jar jna.jar js.jar gua [...] +Class-Path: animation.jar basicplayer.jar cobra.jar commons-codec.jar commons-collections3.jar commons-logging.jar jaudiotagger.jar jcommon.jar jfreechart.jar jl.jar jmactritonusspi.jar jogg.jar jorbis.jar jspeex.jar laf-plugin.jar laf-widget.jar log4j-1.2.jar mp3spi.jar substance.jar swingx.jar tritonus_share.jar vldocking.jar vorbisspi.jar jajuk-help.jar jajuk-help_fr.jar dbus.jar miglayout.jar jhlabs-filters.jar lastfm.jar commons-io.jar commons-lang.jar xstream.jar jna.jar js.jar gua [...] Specification-Title: Jajuk diff --git a/debian/changelog b/debian/changelog index 18537f3..b01e4a0 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +jajuk (1:1.10.9+dfsg2-3) UNRELEASED; urgency=medium + + * Include jgoodies-common.jar in classpath (LP: #1650019) + + -- Felix Natter Fri, 03 Feb 2017 14:19:43 +0100 + jajuk (1:1.10.9+dfsg2-2) unstable; urgency=medium * Team upload. -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/jajuk.git ___ pkg-java-commits mailing list pkg-java-commits@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-commits
[freeplane] 01/01: 1.5.18-2: include runtime dependencies for SVG plugin
This is an automated email from the git hooks/post-receive script.
fnatter-guest pushed a commit to branch master
in repository freeplane.
commit bd9473fe5de7cd81487de27b717462277df737cf
Author: Felix Natter
Date: Sun Mar 12 17:03:54 2017 +0100
1.5.18-2: include runtime dependencies for SVG plugin
---
debian/changelog | 8
debian/patches/10_build_usr_share_java.patch | 24 ++--
2 files changed, 30 insertions(+), 2 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index db00a6f..56bb9b6 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+freeplane (1.5.18-2) experimental; urgency=medium
+
+ * include avalon-framework.jar and ... explicitly in svg plugin
+dependencies so that they are included in the generated MANIFEST
+(Closes: #856058, LP: #172)
+
+ -- Felix Natter Sun, 12 Mar 2017 17:00:17 +0100
+
freeplane (1.5.18-1) unstable; urgency=medium
* New upstream release.
diff --git a/debian/patches/10_build_usr_share_java.patch
b/debian/patches/10_build_usr_share_java.patch
index fbfc6f6..7686279 100644
--- a/debian/patches/10_build_usr_share_java.patch
+++ b/debian/patches/10_build_usr_share_java.patch
@@ -246,7 +246,7 @@ Last-Update: 2016-02-04
jar {
--- a/freeplane_plugin_svg/build.gradle
+++ b/freeplane_plugin_svg/build.gradle
-@@ -20,11 +20,13 @@
+@@ -20,11 +20,18 @@
'org.apache.xmlgraphics:batik-util:1.7',
'org.apache.xmlgraphics:batik-xml:1.7',
@@ -258,10 +258,15 @@ Last-Update: 2016-02-04
// (replaced by ./lib/pdf-transcoder.jar below):
//'org.apache.xmlgraphics:fop:1.1', // "fop.jar"/libfop-java
+ ':fop',
++ // these have to be loaded explicitly on Debian/Ubuntu,
++ // otherwise you get runtime errors on PDF export!
++ ':avalon-framework', // dep of libfop-java??
++ ':commons-logging', // dep of libbatik-java??
++ ':xmlgraphics-commons', // dep of libfop-java??
// libxml-commons-external-java 1.4.01
//WRONG: 'org.apache.xmlgraphics:xmlgraphics-commons:1.4'
-@@ -34,10 +36,8 @@
+@@ -34,10 +41,8 @@
// need to fix javax.xml.parsers.FactoryConfigurationError:
// Provider org.apache.xerces.jaxp.SAXParserFactoryImpl not found
// when starting from elipse:
@@ -273,3 +278,18 @@ Last-Update: 2016-02-04
}
jar {
+@@ -62,7 +67,13 @@
+ org.freeplane.features.*,
+ org.freeplane.main.*,
+ org.freeplane.n3.*,
+- org.freeplane.view.*
++ org.freeplane.view.*,
++ org.apache.commons.io,
++ org.apache.commons.io.comparator,
++ org.apache.commons.io.filefilter,
++ org.apache.commons.io.input,
++ org.apache.commons.io.monitor,
++ org.apache.commons.io.output
+ """
+ instruction 'Import-Package', imports.replaceAll("\\s+", "")
+ instruction 'Export-Package', ''
--
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-commits@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-commits
[freeplane] branch master updated (70ba8dc -> bd9473f)
This is an automated email from the git hooks/post-receive script. fnatter-guest pushed a change to branch master in repository freeplane. from 70ba8dc build 1.5.18-1 new bd9473f 1.5.18-2: include runtime dependencies for SVG plugin 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 | 8 debian/patches/10_build_usr_share_java.patch | 24 ++-- 2 files changed, 30 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-commits@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-commits
[freeplane] branch master updated (4e8d491 -> 7f8ddbb)
This is an automated email from the git hooks/post-receive script. fnatter-guest pushed a change to branch master in repository freeplane. from 4e8d491 list java6-runtime as an alternative to default-jre new 7f8ddbb java6-runtime->java7-runtime 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 debian/control | 2 +- 2 files changed, 5 insertions(+), 1 deletion(-) -- 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-commits@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-commits
[freeplane] 01/01: java6-runtime->java7-runtime
This is an automated email from the git hooks/post-receive script.
fnatter-guest pushed a commit to branch master
in repository freeplane.
commit 7f8ddbb8c00143c942ef1d31b221882ea4bb0040
Author: Felix Natter
Date: Sat Jan 10 12:22:42 2015 +0100
java6-runtime->java7-runtime
---
debian/changelog | 4
debian/control | 2 +-
2 files changed, 5 insertions(+), 1 deletion(-)
diff --git a/debian/changelog b/debian/changelog
index b5401b5..e754084 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,9 +1,13 @@
freeplane (1.3.12-2) UNRELEASED; urgency=medium
+ [ tony mancill ]
* Team upload.
* Add java6-runtime as alternative to default-jre for runtime JRE
dependency. (Closes: #771537)
* Bump Standards-Version to 3.9.6.
+ [ Felix Natter ]
+ * change to java7-runtime because the jmapviewer dependency requires
+java7 (and I am unsure whether freeplane 1.3 really works with java6)
-- tony mancill Sun, 30 Nov 2014 09:55:52 -0800
diff --git a/debian/control b/debian/control
index 4c71c98..6f0979e 100644
--- a/debian/control
+++ b/debian/control
@@ -40,7 +40,7 @@ Homepage: http://freeplane.org/
Package: freeplane
Architecture: all
Depends: ${misc:Depends},
- default-jre | java6-runtime,
+ default-jre | java7-runtime,
javahelp2,
groovy,
libcommons-lang-java (>= 2.6),
--
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-commits@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-commits
[pkg-java] r18645 - trunk/knopflerfish-osgi
Author: fnatter-guest Date: 2015-02-13 18:52:49 + (Fri, 13 Feb 2015) New Revision: 18645 Added: trunk/knopflerfish-osgi/MOVED_TO_GIT.txt Log: Moved knopflerfish-osgi to Git Added: trunk/knopflerfish-osgi/MOVED_TO_GIT.txt === --- trunk/knopflerfish-osgi/MOVED_TO_GIT.txt(rev 0) +++ trunk/knopflerfish-osgi/MOVED_TO_GIT.txt2015-02-13 18:52:49 UTC (rev 18645) @@ -0,0 +1,3 @@ +The knopflerfish-osgi package is now maintained in a Git repository. +Please clone git+ssh://anonscm.debian.org/git/pkg-java/knopflerfish-osgi to work on this package. + ___ pkg-java-commits mailing list pkg-java-commits@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-commits
[freeplane] 01/02: drop jython build dep which requires batik 1.9-3, update standards-version
This is an automated email from the git hooks/post-receive script.
fnatter-guest pushed a commit to branch master
in repository freeplane.
commit f4674f5eaec16f4962d75839d583fd5de64f2df4
Author: Felix Natter
Date: Tue Oct 3 14:48:04 2017 +0200
drop jython build dep which requires batik 1.9-3, update standards-version
---
debian/control | 9 -
1 file changed, 4 insertions(+), 5 deletions(-)
diff --git a/debian/control b/debian/control
index 6e3442a..01bf44c 100644
--- a/debian/control
+++ b/debian/control
@@ -11,8 +11,7 @@ Build-Depends: debhelper (>= 10),
librsvg2-bin,
gradle,
default-jdk,
- jflex,
- jython
+ jflex
Build-Depends-Indep: javahelp2,
groovy (>= 2.4.8-2),
libsvgsalamander-java (>= 1.1.1),
@@ -20,7 +19,7 @@ Build-Depends-Indep: javahelp2,
libcommons-io-java,
libjgoodies-forms-java (>= 1.9.0),
simplyhtml (>= 0.17.3),
- libbatik-java (>= 1.9-2),
+ libbatik-java (>= 1.9-3),
librhino-java,
libfop-java,
libxerces2-java,
@@ -34,7 +33,7 @@ Build-Depends-Indep: javahelp2,
jmapviewer (>= 1.11),
libmnemonicsetter-java (>= 0.5),
gradle-debian-helper
-Standards-Version: 4.1.0
+Standards-Version: 4.1.1
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/
@@ -50,7 +49,7 @@ Depends: ${misc:Depends},
libcommons-io-java,
libjgoodies-forms-java (>= 1.9.0),
simplyhtml (>= 0.17.3),
- libbatik-java (>= 1.9-2),
+ libbatik-java (>= 1.9-3),
librhino-java,
libfop-java,
libxerces2-java,
--
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-commits@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-commits
[freeplane] 02/02: changelog for 1.6.6-2
This is an automated email from the git hooks/post-receive script. fnatter-guest pushed a commit to branch master in repository freeplane. commit bdd77b06ef9e0250f3b9429a8a07bb7d84764c1b Author: Felix Natter Date: Tue Oct 3 14:48:42 2017 +0200 changelog for 1.6.6-2 --- debian/changelog | 8 1 file changed, 8 insertions(+) diff --git a/debian/changelog b/debian/changelog index f17f417..7f14360 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,11 @@ +freeplane (1.6.6-2) unstable; urgency=medium + + * Minor update to trigger rebuild because 1.6.6-1 in archive seems broken + * Update standards-version to 4.1.1 (no changes) + * Remove jython build dep which is not needed with libbatik-java >= 1.9-3 + + -- Felix Natter Tue, 03 Oct 2017 14:33:17 +0200 + freeplane (1.6.6-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-commits@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-commits
[freeplane] branch master updated (0314c74 -> bdd77b0)
This is an automated email from the git hooks/post-receive script. fnatter-guest pushed a change to branch master in repository freeplane. from 0314c74 Change priority to optional. new f4674f5 drop jython build dep which requires batik 1.9-3, update standards-version new bdd77b0 changelog for 1.6.6-2 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 | 8 debian/control | 9 - 2 files changed, 12 insertions(+), 5 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-commits@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-commits
[freeplane] branch master updated (bdd77b0 -> 48b7e43)
This is an automated email from the git hooks/post-receive script. fnatter-guest pushed a change to branch master in repository freeplane. from bdd77b0 changelog for 1.6.6-2 new 48b7e43 disable broken parallel build 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 | 6 ++ debian/rules | 2 +- 2 files changed, 7 insertions(+), 1 deletion(-) -- 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-commits@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-commits
[freeplane] 01/01: disable broken parallel build
This is an automated email from the git hooks/post-receive script. fnatter-guest pushed a commit to branch master in repository freeplane. commit 48b7e433715de338b8605c6d2ae20e7af9f5b4e1 Author: Felix Natter Date: Wed Oct 4 21:21:09 2017 +0200 disable broken parallel build --- debian/changelog | 6 ++ debian/rules | 2 +- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/debian/changelog b/debian/changelog index 7f14360..af3c56e 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +freeplane (1.6.6-3) unstable; urgency=medium + + * Fix broken build on buildds by disabling parallel build + + -- Felix Natter Wed, 04 Oct 2017 21:14:57 +0200 + freeplane (1.6.6-2) unstable; urgency=medium * Minor update to trigger rebuild because 1.6.6-1 in archive seems broken diff --git a/debian/rules b/debian/rules index d9ab650..ade58e0 100755 --- a/debian/rules +++ b/debian/rules @@ -8,7 +8,7 @@ DEB_COMPRESS_EXCLUDE := .mm .pdf %: - dh $@ --buildsystem=gradle + dh $@ --buildsystem=gradle --no-parallel override_dh_auto_build: dh_auto_build -- build -x test -x check_translation -- 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-commits@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-commits
[libjsyntaxpane-java] 01/01: Fix java 9 problem (ported from https://github.com/nordfalk/jsyntaxpane)
This is an automated email from the git hooks/post-receive script.
fnatter-guest pushed a commit to branch master
in repository libjsyntaxpane-java.
commit 5747a30a4467f996ddf864fe0472c9cb6a309559
Author: Felix Natter
Date: Tue Apr 24 21:32:24 2018 +0200
Fix java 9 problem (ported from https://github.com/nordfalk/jsyntaxpane)
---
debian/changelog | 7
debian/compat | 2 +-
debian/control | 2 +-
debian/patches/disable-pom | 85 ++
debian/patches/java9-fix | 100 +
debian/patches/series | 2 +
6 files changed, 196 insertions(+), 2 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index 7bd5fcc..2430a62 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+libjsyntaxpane-java (0.9.6~r156-7) UNRELEASED; urgency=medium
+
+ * Fix java 9 problem (ported from https://github.com/nordfalk/jsyntaxpane)
+ * Patch out pom.xml to avoid maven build
+
+ -- Felix Natter Tue, 24 Apr 2018 19:43:37 +0200
+
libjsyntaxpane-java (0.9.6~r156-6) unstable; urgency=medium
* Remove myself from the uploaders.
diff --git a/debian/compat b/debian/compat
index 7f8f011..b4de394 100644
--- a/debian/compat
+++ b/debian/compat
@@ -1 +1 @@
-7
+11
diff --git a/debian/control b/debian/control
index cdf1314..6f2a7fe 100644
--- a/debian/control
+++ b/debian/control
@@ -2,7 +2,7 @@ Source: libjsyntaxpane-java
Section: java
Priority: optional
Maintainer: Debian Java Maintainers
-Build-Depends: debhelper (>= 7.0.50~), javahelper (>= 0.32), jflex
+Build-Depends: debhelper (>= 11), javahelper (>= 0.32), jflex
Build-Depends-Indep: default-jdk
Standards-Version: 3.9.4
Vcs-Git: git://anonscm.debian.org/pkg-java/libjsyntaxpane-java.git
diff --git a/debian/patches/disable-pom b/debian/patches/disable-pom
new file mode 100644
index 000..cf9c278
--- /dev/null
+++ b/debian/patches/disable-pom
@@ -0,0 +1,85 @@
+--- a/pom.xml
/dev/null
+@@ -1,82 +0,0 @@
+-
+-http://maven.apache.org/POM/4.0.0";
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0
http://maven.apache.org/maven-v4_0_0.xsd";>
+- 4.0.0
+- jsyntaxpane
+- jsyntaxpane
+- jar
+- 0.9.6
+- jsyntaxpane
+- A very simple to use and extend JEditorKit that supports few
languages. The main goal is to make it easy to have nice looking Java Swing
Editors with support for Syntax Highlighting.
+- http://jsyntaxpane.googlecode.com/
+-
+-
+-
+- The Apache Software License, Version 2.0
+- http://www.apache.org/licenses/LICENSE-2.0
+- repo
+-
+-
+-
+-
+-http://jsyntaxpane.googlecode.com/svn/
+-
+-
+-
+-
+- jflex
+- JFlex repository
+- http://jflex.sourceforge.net/repo/
+-
+-
+-
+-
+-
+-
+-maven-compiler-plugin
+-2.3
+-
+- 1.6
+- 1.6
+-
+-
+-
+-org.apache.maven.plugins
+-maven-jar-plugin
+-
+-
+-**/Thumbs.db
+-
+-
+-
+- jsyntaxpane.SyntaxTester
+- jsyntaxpane
+- true
+-
+-
+-
+- development
+- ${pom.url}
+-
+-
+-
+-
+-
+-de.jflex
+-maven-jflex-plugin
+-
+-
+-
+-
+- generate
+-
+-
+-
+-
+-
+-
+-
+-
+-UTF-8
+-
+-
+-
diff --git a/debian/patches/java9-fix b/debian/patches/java9-fix
new file mode 100644
index 000..fff7b4d
--- /dev/null
+++ b/debian/patches/java9-fix
@@ -0,0 +1,100 @@
+Description: Fix issue with java9
+Author: Jacob Nordfalk
+Origin:
https://github.com/nordfalk/jsyntaxpane/commit/5fc75594f8bc4df6e8f7096d4a440490b768fd46
+Forwarded: not-needed
+Reviewed-by: Felix Natter
+Last-Update: 2018-04-24
+--- a/src/main/java/jsyntaxpane/CompoundUndoMan.java
b/src/main/java/jsyntaxpane/CompoundUndoMan.java
+@@ -20,6 +20,7 @@
+ import javax.swing.undo.CompoundEdit;
+ import javax.swing.undo.UndoManager;
+ import javax.swing.undo.UndoableEdit;
++import javax.swing.undo.*;
+
+ /**
+ * A revised UndoManager that groups undos based on positions. If the change
is relatively next to the
+@@ -37,6 +38,8 @@
+ */
+ public class CompoundUndoMan extends UndoManager {
+
++ private final SyntaxDocument doc;
++
+ private CompoundEdit compoundEdit;
+ // This allows us to start combining operations.
+ // it will be reset after the first change.
+@@ -46,6 +49,7 @@
+ private int lastLine = -1;
+
+ public CompoundUndoMan(SyntaxDocument doc) {
++ this.doc = doc;
+ doc.addUndoableEditListener(this);
+ lastLine = doc.getStartPosition(
[libjsyntaxpane-java] branch master updated (4bf1bca -> 5747a30)
This is an automated email from the git hooks/post-receive script. fnatter-guest pushed a change to branch master in repository libjsyntaxpane-java. from 4bf1bca Remove myself from the uploaders new 5747a30 Fix java 9 problem (ported from https://github.com/nordfalk/jsyntaxpane) 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 | 7 debian/compat | 2 +- debian/control | 2 +- debian/patches/disable-pom | 85 ++ debian/patches/java9-fix | 100 + debian/patches/series | 2 + 6 files changed, 196 insertions(+), 2 deletions(-) create mode 100644 debian/patches/disable-pom create mode 100644 debian/patches/java9-fix -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/libjsyntaxpane-java.git ___ pkg-java-commits mailing list pkg-java-comm...@alioth-lists.debian.net https://alioth-lists.debian.net/cgi-bin/mailman/listinfo/pkg-java-commits
[knopflerfish-osgi] 01/01: fix #895885
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 b18acd564dec54c7fc326e8bb7a0d8c6f10839b4
Author: Felix Natter
Date: Sat Apr 28 14:23:01 2018 +0200
fix #895885
---
debian/changelog| 6 ++
...c_encoding.patch => 10_javac_encoding_source_target_level.patch} | 4 +++-
debian/patches/series | 2 +-
3 files changed, 10 insertions(+), 2 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index d94da35..ec30de9 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+knopflerfish-osgi (6.1.1-3) unstable; urgency=medium
+
+ * Build with source=1.7 and target=1.7 (Closes: #895885)
+
+ -- Felix Natter Sat, 28 Apr 2018 14:19:59 +0200
+
knopflerfish-osgi (6.1.1-2) unstable; urgency=medium
* Team upload.
diff --git a/debian/patches/10_javac_encoding.patch
b/debian/patches/10_javac_encoding_source_target_level.patch
similarity index 83%
rename from debian/patches/10_javac_encoding.patch
rename to debian/patches/10_javac_encoding_source_target_level.patch
index 6e29618..74137c9 100644
--- a/debian/patches/10_javac_encoding.patch
+++ b/debian/patches/10_javac_encoding_source_target_level.patch
@@ -4,11 +4,13 @@ Forwarded: no
Last-Update: 2017-08-25
--- a/osgi/framework/build.xml
+++ b/osgi/framework/build.xml
-@@ -88,6 +88,7 @@
+@@ -88,6 +88,9 @@
includes = "**/*.java"
excludes = "${androidSrcs},**/package-info.java"
classpathref = "compile.path"
+ encoding = "UTF-8"
++ source= "1.7"
++ target= "1.7"
>
diff --git a/debian/patches/series b/debian/patches/series
index f3880f2..2678ad2 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,3 +1,3 @@
-10_javac_encoding.patch
+10_javac_encoding_source_target_level.patch
40_ignore_android.patch
50_asm_compatibility.patch
--
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...@alioth-lists.debian.net
https://alioth-lists.debian.net/cgi-bin/mailman/listinfo/pkg-java-commits
[knopflerfish-osgi] branch master updated (1dde7a4 -> b18acd5)
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 1dde7a4 Upload to unstable
new b18acd5 fix #895885
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| 6 ++
...c_encoding.patch => 10_javac_encoding_source_target_level.patch} | 4 +++-
debian/patches/series | 2 +-
3 files changed, 10 insertions(+), 2 deletions(-)
rename debian/patches/{10_javac_encoding.patch =>
10_javac_encoding_source_target_level.patch} (83%)
--
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...@alioth-lists.debian.net
https://alioth-lists.debian.net/cgi-bin/mailman/listinfo/pkg-java-commits
[Git][java-team/libjsyntaxpane-java][master] fix lintians, clean up
Felix Natter pushed to branch master at Debian Java Maintainers / libjsyntaxpane-java Commits: ec233bc8 by Felix Natter at 2018-05-01T13:38:00+02:00 fix lintians, clean up - - - - - 4 changed files: - debian/changelog - debian/control - debian/rules - + debian/source/lintian-overrides Changes: = debian/changelog = --- a/debian/changelog +++ b/debian/changelog @@ -1,7 +1,10 @@ -libjsyntaxpane-java (0.9.6~r156-7) UNRELEASED; urgency=medium +libjsyntaxpane-java (0.9.6~r156-7) unstable; urgency=medium * Fix java 9 problem (ported from https://github.com/nordfalk/jsyntaxpane) * Patch out pom.xml to avoid maven build + * Add myself to Uploaders: + * Declare conformance with standards-version 4.1.4 + * Update Vcs-* to point to salsa -- Felix Natter Tue, 24 Apr 2018 19:43:37 +0200 = debian/control = --- a/debian/control +++ b/debian/control @@ -2,11 +2,12 @@ Source: libjsyntaxpane-java Section: java Priority: optional Maintainer: Debian Java Maintainers +Uploaders: Felix Natter Build-Depends: debhelper (>= 11), javahelper (>= 0.32), jflex Build-Depends-Indep: default-jdk -Standards-Version: 3.9.4 -Vcs-Git: git://anonscm.debian.org/pkg-java/libjsyntaxpane-java.git -Vcs-Browser: http://anonscm.debian.org/gitweb/?p=pkg-java/libjsyntaxpane-java.git +Standards-Version: 4.1.4 +Vcs-Git: https://salsa.debian.org/java-team/libjsyntaxpane-java.git +Vcs-Browser: https://salsa.debian.org/java-team/libjsyntaxpane-java Homepage: http://code.google.com/p/jsyntaxpane/ Package: libjsyntaxpane-java = debian/rules = --- a/debian/rules +++ b/debian/rules @@ -6,7 +6,7 @@ export JAVA_HOME=/usr/lib/jvm/default-java # export CLASSPATH= %: - dh --with javahelper $@ + dh $@ --with javahelper override_dh_auto_build: jflex -d src/main/java/jsyntaxpane/lexers/ src/main/jflex/jsyntaxpane/lexers/*flex = debian/source/lintian-overrides = --- /dev/null +++ b/debian/source/lintian-overrides @@ -0,0 +1,3 @@ +# upstream is no longer maintained; if there are severe problems, we may need to switch to a fork +libjsyntaxpane-java source: obsolete-url-in-packaging debian/control http://code.google.com/p/jsyntaxpane/ +libjsyntaxpane-java source: obsolete-url-in-packaging debian/copyright http://code.google.com/p/jsyntaxpane/ View it on GitLab: https://salsa.debian.org/java-team/libjsyntaxpane-java/commit/ec233bc8240d0ad0e899812107c784d3e2de348d --- View it on GitLab: https://salsa.debian.org/java-team/libjsyntaxpane-java/commit/ec233bc8240d0ad0e899812107c784d3e2de348d You're receiving this email because of your account on salsa.debian.org. ___ pkg-java-commits mailing list pkg-java-comm...@alioth-lists.debian.net https://alioth-lists.debian.net/cgi-bin/mailman/listinfo/pkg-java-commits
[Git][java-team/libjsyntaxpane-java][master] finish changelog, add override
Felix Natter pushed to branch master at Debian Java Maintainers / libjsyntaxpane-java Commits: f77d2a6b by Felix Natter at 2018-05-01T15:39:48+02:00 finish changelog, add override - - - - - 2 changed files: - debian/changelog - + debian/libjsyntaxpane-java.lintian-overrides Changes: = debian/changelog = --- a/debian/changelog +++ b/debian/changelog @@ -2,9 +2,13 @@ libjsyntaxpane-java (0.9.6~r156-7) unstable; urgency=medium * Fix java 9 problem (ported from https://github.com/nordfalk/jsyntaxpane) * Patch out pom.xml to avoid maven build + * Use debhelper compat level 11 * Add myself to Uploaders: * Declare conformance with standards-version 4.1.4 * Update Vcs-* to point to salsa + * Overide bad-jar-name and obsolete-url-in-packaging lintians + * Ignore embedded-javascript-library lintian for javadoc output +for now, see #883981 -- Felix Natter Tue, 24 Apr 2018 19:43:37 +0200 = debian/libjsyntaxpane-java.lintian-overrides = --- /dev/null +++ b/debian/libjsyntaxpane-java.lintian-overrides @@ -0,0 +1,2 @@ +# the source package was named wrongly, I don't think it's worth changing this +libjsyntaxpane-java: bad-jar-name usr/share/java/jsyntaxpane-0.9.6~r156.jar View it on GitLab: https://salsa.debian.org/java-team/libjsyntaxpane-java/commit/f77d2a6b858824521c6cfd6b279aa5e4ed0bd961 --- View it on GitLab: https://salsa.debian.org/java-team/libjsyntaxpane-java/commit/f77d2a6b858824521c6cfd6b279aa5e4ed0bd961 You're receiving this email because of your account on salsa.debian.org. ___ pkg-java-commits mailing list pkg-java-comm...@alioth-lists.debian.net https://alioth-lists.debian.net/cgi-bin/mailman/listinfo/pkg-java-commits
[Git][java-team/libjsyntaxpane-java] Pushed new branch bionic-SRU
Felix Natter pushed new branch bionic-SRU at Debian Java Maintainers / libjsyntaxpane-java --- View it on GitLab: https://salsa.debian.org/java-team/libjsyntaxpane-java/tree/bionic-SRU You're receiving this email because of your account on salsa.debian.org. ___ pkg-java-commits mailing list pkg-java-comm...@alioth-lists.debian.net https://alioth-lists.debian.net/cgi-bin/mailman/listinfo/pkg-java-commits
[Git][java-team/freeplane][pristine-tar] pristine-tar data for freeplane_1.6.15.orig.tar.gz
Felix Natter pushed to branch pristine-tar at Debian Java Maintainers / freeplane Commits: a8b02eb8 by Felix Natter at 2018-05-31T19:18:22+02:00 pristine-tar data for freeplane_1.6.15.orig.tar.gz - - - - - 2 changed files: - + freeplane_1.6.15.orig.tar.gz.delta - + freeplane_1.6.15.orig.tar.gz.id Changes: = freeplane_1.6.15.orig.tar.gz.delta = Binary files /dev/null and b/freeplane_1.6.15.orig.tar.gz.delta differ = freeplane_1.6.15.orig.tar.gz.id = --- /dev/null +++ b/freeplane_1.6.15.orig.tar.gz.id @@ -0,0 +1 @@ +f00f4679da7ced3986d5d4db552511cc1892c93e View it on GitLab: https://salsa.debian.org/java-team/freeplane/commit/a8b02eb82b08b8f80ed9ac8db65fc5d045a48dcd -- View it on GitLab: https://salsa.debian.org/java-team/freeplane/commit/a8b02eb82b08b8f80ed9ac8db65fc5d045a48dcd You're receiving this email because of your account on salsa.debian.org. ___ pkg-java-commits mailing list pkg-java-comm...@alioth-lists.debian.net https://alioth-lists.debian.net/cgi-bin/mailman/listinfo/pkg-java-commits
[Git][java-team/libjsyntaxpane-java][bionic-SRU] add DEP3 patch header for 'disable-pom'
Felix Natter pushed to branch bionic-SRU at Debian Java Maintainers / libjsyntaxpane-java Commits: ae883b99 by Felix Natter at 2018-06-23T10:24:32+02:00 add DEP3 patch header for 'disable-pom' - - - - - 1 changed file: - debian/patches/disable-pom Changes: = debian/patches/disable-pom = --- a/debian/patches/disable-pom +++ b/debian/patches/disable-pom @@ -1,3 +1,7 @@ +Description: Simply patch out pom.xml in order to avoid triggering maven build system +Author: Felix Natter +Forwarded: not-needed +Last-Update: 2018-06-23 --- a/pom.xml +++ /dev/null @@ -1,82 +0,0 @@ View it on GitLab: https://salsa.debian.org/java-team/libjsyntaxpane-java/commit/ae883b994805f9b55f8531278cad0b65c4119b7f -- View it on GitLab: https://salsa.debian.org/java-team/libjsyntaxpane-java/commit/ae883b994805f9b55f8531278cad0b65c4119b7f You're receiving this email because of your account on salsa.debian.org. ___ pkg-java-commits mailing list pkg-java-comm...@alioth-lists.debian.net https://alioth-lists.debian.net/cgi-bin/mailman/listinfo/pkg-java-commits
[Git][java-team/knopflerfish-osgi] Pushed new branch bionic-sru
Felix Natter pushed new branch bionic-sru at Debian Java Maintainers / knopflerfish-osgi -- View it on GitLab: https://salsa.debian.org/java-team/knopflerfish-osgi/tree/bionic-sru You're receiving this email because of your account on salsa.debian.org. ___ pkg-java-commits mailing list pkg-java-comm...@alioth-lists.debian.net https://alioth-lists.debian.net/cgi-bin/mailman/listinfo/pkg-java-commits
[Git][java-team/knopflerfish-osgi][bionic-sru] clarify patch description
Felix Natter pushed to branch bionic-sru at Debian Java Maintainers / knopflerfish-osgi Commits: 0ce7ed8b by Felix Natter at 2018-11-12T13:49:10Z clarify patch description - - - - - 1 changed file: - debian/patches/10_javac_encoding_source_target_level.patch Changes: = debian/patches/10_javac_encoding_source_target_level.patch = @@ -1,4 +1,4 @@ -Description: Set encoding for javac run +Description: Set encoding and source/target version for javac run Author: Felix Natter Forwarded: no Last-Update: 2017-08-25 View it on GitLab: https://salsa.debian.org/java-team/knopflerfish-osgi/commit/0ce7ed8bd9c439f439d4b4734d26859b0c2ded3a -- View it on GitLab: https://salsa.debian.org/java-team/knopflerfish-osgi/commit/0ce7ed8bd9c439f439d4b4734d26859b0c2ded3a You're receiving this email because of your account on salsa.debian.org. ___ pkg-java-commits mailing list pkg-java-comm...@alioth-lists.debian.net https://alioth-lists.debian.net/cgi-bin/mailman/listinfo/pkg-java-commits
[Git][java-team/freeplane] Pushed new tag upstream/1.7.2
Felix Natter pushed new tag upstream/1.7.2 at Debian Java Maintainers / freeplane -- View it on GitLab: https://salsa.debian.org/java-team/freeplane/tree/upstream/1.7.2 You're receiving this email because of your account on salsa.debian.org. ___ pkg-java-commits mailing list pkg-java-comm...@alioth-lists.debian.net https://alioth-lists.debian.net/cgi-bin/mailman/listinfo/pkg-java-commits
[Git][java-team/freeplane][master] 9 commits: New upstream version 1.7.2
Felix Natter pushed to branch master at Debian Java Maintainers / freeplane Commits: 940a14af by Felix Natter at 2018-11-22T18:58:52Z New upstream version 1.7.2 - - - - - 92f13149 by Felix Natter at 2018-11-22T18:59:13Z Update upstream source from tag 'upstream/1.7.2' Update to upstream version '1.7.2' with Debian dir 56ca45898a109c401b30841a74165ee865f2da6b - - - - - 5c14d542 by Felix Natter at 2018-11-22T19:13:14Z drop securegroovy patch - - - - - c90c35c6 by Felix Natter at 2018-11-22T19:14:59Z bump version in man page - - - - - d369a1f9 by Felix Natter at 2018-11-22T19:15:51Z depend on java8 runtime - - - - - e9b9e130 by Felix Natter at 2018-11-22T19:16:40Z update patches - - - - - 8daee38e by Felix Natter at 2018-11-22T19:24:40Z bump standards-version - - - - - 15dc8a0c by Felix Natter at 2018-11-22T19:25:06Z build 1.7.2-1 - - - - - 08012c1b by Felix Natter at 2018-11-22T19:30:11Z update patches, again - - - - - 30 changed files: - + JOrtho_0.4_freeplane/out/production/classes/SampleApplet.class - + JOrtho_0.4_freeplane/out/production/classes/SampleApplication.class - + JOrtho_0.4_freeplane/out/production/classes/com/inet/jortho/AutoSpellChecker$1.class - + JOrtho_0.4_freeplane/out/production/classes/com/inet/jortho/AutoSpellChecker$2.class - + JOrtho_0.4_freeplane/out/production/classes/com/inet/jortho/AutoSpellChecker.class - + JOrtho_0.4_freeplane/out/production/classes/com/inet/jortho/CheckerListener$1.class - + JOrtho_0.4_freeplane/out/production/classes/com/inet/jortho/CheckerListener$2.class - + JOrtho_0.4_freeplane/out/production/classes/com/inet/jortho/CheckerListener.class - + JOrtho_0.4_freeplane/out/production/classes/com/inet/jortho/CheckerMenu.class - + JOrtho_0.4_freeplane/out/production/classes/com/inet/jortho/CheckerPopup.class - + JOrtho_0.4_freeplane/out/production/classes/com/inet/jortho/Dictionary.class - + JOrtho_0.4_freeplane/out/production/classes/com/inet/jortho/DictionaryBase.class - + JOrtho_0.4_freeplane/out/production/classes/com/inet/jortho/DictionaryEditDialog$1.class - + JOrtho_0.4_freeplane/out/production/classes/com/inet/jortho/DictionaryEditDialog$DeleteAction.class - + JOrtho_0.4_freeplane/out/production/classes/com/inet/jortho/DictionaryEditDialog.class - + JOrtho_0.4_freeplane/out/production/classes/com/inet/jortho/DictionaryFactory$Node.class - + JOrtho_0.4_freeplane/out/production/classes/com/inet/jortho/DictionaryFactory$NodeEntry.class - + JOrtho_0.4_freeplane/out/production/classes/com/inet/jortho/DictionaryFactory.class - + JOrtho_0.4_freeplane/out/production/classes/com/inet/jortho/FileUserDictionary.class - + JOrtho_0.4_freeplane/out/production/classes/com/inet/jortho/LanguageChangeEvent.class - + JOrtho_0.4_freeplane/out/production/classes/com/inet/jortho/LanguageChangeListener.class - + JOrtho_0.4_freeplane/out/production/classes/com/inet/jortho/LetterBasedBreakIterator.class - + JOrtho_0.4_freeplane/out/production/classes/com/inet/jortho/PopupListener.class - + JOrtho_0.4_freeplane/out/production/classes/com/inet/jortho/RedZigZagPainter.class - + JOrtho_0.4_freeplane/out/production/classes/com/inet/jortho/SpellChecker$1.class - + JOrtho_0.4_freeplane/out/production/classes/com/inet/jortho/SpellChecker$ActionToggleButtonModel.class - + JOrtho_0.4_freeplane/out/production/classes/com/inet/jortho/SpellChecker$DisableLanguageAction.class - + JOrtho_0.4_freeplane/out/production/classes/com/inet/jortho/SpellChecker$LanguageAction$1$1.class - + JOrtho_0.4_freeplane/out/production/classes/com/inet/jortho/SpellChecker$LanguageAction$1.class - + JOrtho_0.4_freeplane/out/production/classes/com/inet/jortho/SpellChecker$LanguageAction.class The diff was not included because it is too large. View it on GitLab: https://salsa.debian.org/java-team/freeplane/compare/5a7e6356836c7cf37cac4d84fa7d285c3826dd51...08012c1bf68035386cda66716c2b6dd15455b02e -- View it on GitLab: https://salsa.debian.org/java-team/freeplane/compare/5a7e6356836c7cf37cac4d84fa7d285c3826dd51...08012c1bf68035386cda66716c2b6dd15455b02e You're receiving this email because of your account on salsa.debian.org. ___ pkg-java-commits mailing list pkg-java-comm...@alioth-lists.debian.net https://alioth-lists.debian.net/cgi-bin/mailman/listinfo/pkg-java-commits
[Git][java-team/freeplane][upstream] New upstream version 1.7.2
Felix Natter pushed to branch upstream at Debian Java Maintainers / freeplane Commits: 940a14af by Felix Natter at 2018-11-22T18:58:52Z New upstream version 1.7.2 - - - - - 30 changed files: - + JOrtho_0.4_freeplane/out/production/classes/SampleApplet.class - + JOrtho_0.4_freeplane/out/production/classes/SampleApplication.class - + JOrtho_0.4_freeplane/out/production/classes/com/inet/jortho/AutoSpellChecker$1.class - + JOrtho_0.4_freeplane/out/production/classes/com/inet/jortho/AutoSpellChecker$2.class - + JOrtho_0.4_freeplane/out/production/classes/com/inet/jortho/AutoSpellChecker.class - + JOrtho_0.4_freeplane/out/production/classes/com/inet/jortho/CheckerListener$1.class - + JOrtho_0.4_freeplane/out/production/classes/com/inet/jortho/CheckerListener$2.class - + JOrtho_0.4_freeplane/out/production/classes/com/inet/jortho/CheckerListener.class - + JOrtho_0.4_freeplane/out/production/classes/com/inet/jortho/CheckerMenu.class - + JOrtho_0.4_freeplane/out/production/classes/com/inet/jortho/CheckerPopup.class - + JOrtho_0.4_freeplane/out/production/classes/com/inet/jortho/Dictionary.class - + JOrtho_0.4_freeplane/out/production/classes/com/inet/jortho/DictionaryBase.class - + JOrtho_0.4_freeplane/out/production/classes/com/inet/jortho/DictionaryEditDialog$1.class - + JOrtho_0.4_freeplane/out/production/classes/com/inet/jortho/DictionaryEditDialog$DeleteAction.class - + JOrtho_0.4_freeplane/out/production/classes/com/inet/jortho/DictionaryEditDialog.class - + JOrtho_0.4_freeplane/out/production/classes/com/inet/jortho/DictionaryFactory$Node.class - + JOrtho_0.4_freeplane/out/production/classes/com/inet/jortho/DictionaryFactory$NodeEntry.class - + JOrtho_0.4_freeplane/out/production/classes/com/inet/jortho/DictionaryFactory.class - + JOrtho_0.4_freeplane/out/production/classes/com/inet/jortho/FileUserDictionary.class - + JOrtho_0.4_freeplane/out/production/classes/com/inet/jortho/LanguageChangeEvent.class - + JOrtho_0.4_freeplane/out/production/classes/com/inet/jortho/LanguageChangeListener.class - + JOrtho_0.4_freeplane/out/production/classes/com/inet/jortho/LetterBasedBreakIterator.class - + JOrtho_0.4_freeplane/out/production/classes/com/inet/jortho/PopupListener.class - + JOrtho_0.4_freeplane/out/production/classes/com/inet/jortho/RedZigZagPainter.class - + JOrtho_0.4_freeplane/out/production/classes/com/inet/jortho/SpellChecker$1.class - + JOrtho_0.4_freeplane/out/production/classes/com/inet/jortho/SpellChecker$ActionToggleButtonModel.class - + JOrtho_0.4_freeplane/out/production/classes/com/inet/jortho/SpellChecker$DisableLanguageAction.class - + JOrtho_0.4_freeplane/out/production/classes/com/inet/jortho/SpellChecker$LanguageAction$1$1.class - + JOrtho_0.4_freeplane/out/production/classes/com/inet/jortho/SpellChecker$LanguageAction$1.class - + JOrtho_0.4_freeplane/out/production/classes/com/inet/jortho/SpellChecker$LanguageAction.class The diff was not included because it is too large. View it on GitLab: https://salsa.debian.org/java-team/freeplane/commit/940a14afef3aa74ed5b8880f42c8994b977a8752 -- View it on GitLab: https://salsa.debian.org/java-team/freeplane/commit/940a14afef3aa74ed5b8880f42c8994b977a8752 You're receiving this email because of your account on salsa.debian.org. ___ pkg-java-commits mailing list pkg-java-comm...@alioth-lists.debian.net https://alioth-lists.debian.net/cgi-bin/mailman/listinfo/pkg-java-commits
[Git][java-team/freeplane][pristine-tar] pristine-tar data for freeplane_1.7.2.orig.tar.xz
Felix Natter pushed to branch pristine-tar at Debian Java Maintainers / freeplane Commits: fcaf7609 by Felix Natter at 2018-11-22T18:59:12Z pristine-tar data for freeplane_1.7.2.orig.tar.xz - - - - - 2 changed files: - + freeplane_1.7.2.orig.tar.xz.delta - + freeplane_1.7.2.orig.tar.xz.id Changes: = freeplane_1.7.2.orig.tar.xz.delta = Binary files /dev/null and b/freeplane_1.7.2.orig.tar.xz.delta differ = freeplane_1.7.2.orig.tar.xz.id = @@ -0,0 +1 @@ +8dc4f4cfe94ff12fad8a102d80756d4d1af96b5e View it on GitLab: https://salsa.debian.org/java-team/freeplane/commit/fcaf760996700750a8915ae369c86d22672f33be -- View it on GitLab: https://salsa.debian.org/java-team/freeplane/commit/fcaf760996700750a8915ae369c86d22672f33be You're receiving this email because of your account on salsa.debian.org. ___ pkg-java-commits mailing list pkg-java-comm...@alioth-lists.debian.net https://alioth-lists.debian.net/cgi-bin/mailman/listinfo/pkg-java-commits
[Git][java-team/freeplane][master] update man page
Felix Natter pushed to branch master at Debian Java Maintainers / freeplane Commits: 6bdeb49a by Felix Natter at 2018-11-24T17:56:12Z update man page - - - - - 2 changed files: - debian/changelog - debian/freeplane.1.xml Changes: = debian/changelog = @@ -5,7 +5,8 @@ freeplane (1.7.2-1) unstable; urgency=medium * Drop secure groovy patch (securegroovy no longer used upstream; upstream updated to groovy 2.5.x, Debian also has patched groovy) * Update all patches (major build system update) - * bump standards-version to 4.2.1 (no changes) + * Bump standards-version to 4.2.1 (no changes) + * Update man page -- Felix Natter Thu, 22 Nov 2018 20:06:14 +0100 = debian/freeplane.1.xml = @@ -192,10 +192,55 @@ + +FREEPLANE_JAVA_HOME + + Prefix of Java(>=8) installation to use (Freeplane only) + + + + +JAVA_HOME + + Prefix of Java(>=8) installation to use (many Java applications) + + + + +NEW FEATURES IN 1.7.x + + +Full Java11 support, requires Java8 + + + + + +Freeplane API + + There is a comprehensive API layer for manipulation + of Freeplane files (supports headless mode) + + + +References to other mind maps from formulas and scripts + + + + + +Node aliases, global nodes, export for selected branches only, URLs like #at(:~someNodeAlias), ... + + + + + + + NEW FEATURES IN 1.6.x View it on GitLab: https://salsa.debian.org/java-team/freeplane/commit/6bdeb49a3208b21a1045452947702617b76e6b60 -- View it on GitLab: https://salsa.debian.org/java-team/freeplane/commit/6bdeb49a3208b21a1045452947702617b76e6b60 You're receiving this email because of your account on salsa.debian.org. ___ pkg-java-commits mailing list pkg-java-comm...@alioth-lists.debian.net https://alioth-lists.debian.net/cgi-bin/mailman/listinfo/pkg-java-commits
[Git][java-team/freeplane][master] dch -r
Felix Natter pushed to branch master at Debian Java Maintainers / freeplane Commits: 3c6ab093 by Felix Natter at 2018-11-24T18:07:43Z dch -r - - - - - 1 changed file: - debian/changelog Changes: = debian/changelog = @@ -8,7 +8,7 @@ freeplane (1.7.2-1) unstable; urgency=medium * Bump standards-version to 4.2.1 (no changes) * Update man page - -- Felix Natter Thu, 22 Nov 2018 20:06:14 +0100 + -- Felix Natter Sat, 24 Nov 2018 19:07:20 +0100 freeplane (1.6.15-1) unstable; urgency=medium View it on GitLab: https://salsa.debian.org/java-team/freeplane/commit/3c6ab09394ba8407840d978bde3f8b4217f34f59 -- View it on GitLab: https://salsa.debian.org/java-team/freeplane/commit/3c6ab09394ba8407840d978bde3f8b4217f34f59 You're receiving this email because of your account on salsa.debian.org. ___ pkg-java-commits mailing list pkg-java-comm...@alioth-lists.debian.net https://alioth-lists.debian.net/cgi-bin/mailman/listinfo/pkg-java-commits
[Git][java-team/freeplane][master] fix #915889
Felix Natter pushed to branch master at Debian Java Maintainers / freeplane Commits: e0b43c04 by Felix Natter at 2018-12-21T20:47:44Z fix #915889 - - - - - 2 changed files: - debian/changelog - + debian/maven.rules Changes: = debian/changelog = @@ -1,3 +1,10 @@ +freeplane (1.7.2-2) unstable; urgency=medium + + * Add maven rule for pulling javax.servlet:javax.servlet-api:3.1 +instead of javax.servlet:javax.servlet-api:debian (Closes: #915889) + + -- Felix Natter Fri, 21 Dec 2018 21:31:46 +0100 + freeplane (1.7.2-1) unstable; urgency=medium * New upstream release, compatible with Java11 = debian/maven.rules = @@ -0,0 +1,2 @@ +javax.servlet javax.servlet-api * s/.*/3.1/ * * + View it on GitLab: https://salsa.debian.org/java-team/freeplane/commit/e0b43c04ed6d3fe74f1da09f6507bcfba5a9378a -- View it on GitLab: https://salsa.debian.org/java-team/freeplane/commit/e0b43c04ed6d3fe74f1da09f6507bcfba5a9378a You're receiving this email because of your account on salsa.debian.org. ___ pkg-java-commits mailing list pkg-java-comm...@alioth-lists.debian.net https://alioth-lists.debian.net/cgi-bin/mailman/listinfo/pkg-java-commits
[Git][java-team/freeplane] Pushed new tag upstream/1.7.5
Felix Natter pushed new tag upstream/1.7.5 at Debian Java Maintainers / freeplane -- View it on GitLab: https://salsa.debian.org/java-team/freeplane/tree/upstream/1.7.5 You're receiving this email because of your account on salsa.debian.org. ___ pkg-java-commits mailing list pkg-java-comm...@alioth-lists.debian.net https://alioth-lists.debian.net/cgi-bin/mailman/listinfo/pkg-java-commits
[Git][java-team/freeplane][master] 6 commits: New upstream version 1.7.5
Felix Natter pushed to branch master at Debian Java Maintainers / freeplane Commits: a0c3a98c by Felix Natter at 2019-02-03T14:42:00Z New upstream version 1.7.5 - - - - - a235c104 by Felix Natter at 2019-02-03T14:42:49Z Update upstream source from tag 'upstream/1.7.5' Update to upstream version '1.7.5' with Debian dir 67e981687fd45a7abb8c131eef0231bd3fe804ae - - - - - 3a6f5d7f by Felix Natter at 2019-02-03T14:56:04Z update patches for 1.7.5 - - - - - 1f68dc19 by Felix Natter at 2019-02-03T14:56:38Z update man page - - - - - c3b7e1be by Felix Natter at 2019-02-03T15:03:53Z add ivy dependency, bump standards-version - - - - - bca25222 by Felix Natter at 2019-02-03T15:04:36Z update changelog - - - - - 30 changed files: - − JOrtho_0.4_freeplane/out/production/classes/SampleApplet.class - − JOrtho_0.4_freeplane/out/production/classes/SampleApplication.class - − JOrtho_0.4_freeplane/out/production/classes/com/inet/jortho/AutoSpellChecker$1.class - − JOrtho_0.4_freeplane/out/production/classes/com/inet/jortho/AutoSpellChecker$2.class - − JOrtho_0.4_freeplane/out/production/classes/com/inet/jortho/AutoSpellChecker.class - − JOrtho_0.4_freeplane/out/production/classes/com/inet/jortho/CheckerListener$1.class - − JOrtho_0.4_freeplane/out/production/classes/com/inet/jortho/CheckerListener$2.class - − JOrtho_0.4_freeplane/out/production/classes/com/inet/jortho/CheckerListener.class - − JOrtho_0.4_freeplane/out/production/classes/com/inet/jortho/CheckerMenu.class - − JOrtho_0.4_freeplane/out/production/classes/com/inet/jortho/CheckerPopup.class - − JOrtho_0.4_freeplane/out/production/classes/com/inet/jortho/Dictionary.class - − JOrtho_0.4_freeplane/out/production/classes/com/inet/jortho/DictionaryBase.class - − JOrtho_0.4_freeplane/out/production/classes/com/inet/jortho/DictionaryEditDialog$1.class - − JOrtho_0.4_freeplane/out/production/classes/com/inet/jortho/DictionaryEditDialog$DeleteAction.class - − JOrtho_0.4_freeplane/out/production/classes/com/inet/jortho/DictionaryEditDialog.class - − JOrtho_0.4_freeplane/out/production/classes/com/inet/jortho/DictionaryFactory$Node.class - − JOrtho_0.4_freeplane/out/production/classes/com/inet/jortho/DictionaryFactory$NodeEntry.class - − JOrtho_0.4_freeplane/out/production/classes/com/inet/jortho/DictionaryFactory.class - − JOrtho_0.4_freeplane/out/production/classes/com/inet/jortho/FileUserDictionary.class - − JOrtho_0.4_freeplane/out/production/classes/com/inet/jortho/LanguageChangeEvent.class - − JOrtho_0.4_freeplane/out/production/classes/com/inet/jortho/LanguageChangeListener.class - − JOrtho_0.4_freeplane/out/production/classes/com/inet/jortho/LetterBasedBreakIterator.class - − JOrtho_0.4_freeplane/out/production/classes/com/inet/jortho/PopupListener.class - − JOrtho_0.4_freeplane/out/production/classes/com/inet/jortho/RedZigZagPainter.class - − JOrtho_0.4_freeplane/out/production/classes/com/inet/jortho/SpellChecker$1.class - − JOrtho_0.4_freeplane/out/production/classes/com/inet/jortho/SpellChecker$ActionToggleButtonModel.class - − JOrtho_0.4_freeplane/out/production/classes/com/inet/jortho/SpellChecker$DisableLanguageAction.class - − JOrtho_0.4_freeplane/out/production/classes/com/inet/jortho/SpellChecker$LanguageAction$1$1.class - − JOrtho_0.4_freeplane/out/production/classes/com/inet/jortho/SpellChecker$LanguageAction$1.class - − JOrtho_0.4_freeplane/out/production/classes/com/inet/jortho/SpellChecker$LanguageAction.class The diff was not included because it is too large. View it on GitLab: https://salsa.debian.org/java-team/freeplane/compare/e0b43c04ed6d3fe74f1da09f6507bcfba5a9378a...bca2522296de5b78c50cff00c21bf6a889c57df9 -- View it on GitLab: https://salsa.debian.org/java-team/freeplane/compare/e0b43c04ed6d3fe74f1da09f6507bcfba5a9378a...bca2522296de5b78c50cff00c21bf6a889c57df9 You're receiving this email because of your account on salsa.debian.org. ___ pkg-java-commits mailing list pkg-java-comm...@alioth-lists.debian.net https://alioth-lists.debian.net/cgi-bin/mailman/listinfo/pkg-java-commits
[Git][java-team/freeplane][pristine-tar] pristine-tar data for freeplane_1.7.5.orig.tar.gz
Felix Natter pushed to branch pristine-tar at Debian Java Maintainers / freeplane Commits: 3cfa9f82 by Felix Natter at 2019-02-03T14:42:49Z pristine-tar data for freeplane_1.7.5.orig.tar.gz - - - - - 2 changed files: - + freeplane_1.7.5.orig.tar.gz.delta - + freeplane_1.7.5.orig.tar.gz.id Changes: = freeplane_1.7.5.orig.tar.gz.delta = Binary files /dev/null and b/freeplane_1.7.5.orig.tar.gz.delta differ = freeplane_1.7.5.orig.tar.gz.id = @@ -0,0 +1 @@ +09017b64802c52b27a8e75dc0eaea184886cc547 View it on GitLab: https://salsa.debian.org/java-team/freeplane/commit/3cfa9f82db30b3439805356cd676bea99838e6f0 -- View it on GitLab: https://salsa.debian.org/java-team/freeplane/commit/3cfa9f82db30b3439805356cd676bea99838e6f0 You're receiving this email because of your account on salsa.debian.org. ___ pkg-java-commits mailing list pkg-java-comm...@alioth-lists.debian.net https://alioth-lists.debian.net/cgi-bin/mailman/listinfo/pkg-java-commits
[Git][java-team/freeplane][upstream] New upstream version 1.7.5
Felix Natter pushed to branch upstream at Debian Java Maintainers / freeplane Commits: a0c3a98c by Felix Natter at 2019-02-03T14:42:00Z New upstream version 1.7.5 - - - - - 30 changed files: - − JOrtho_0.4_freeplane/out/production/classes/SampleApplet.class - − JOrtho_0.4_freeplane/out/production/classes/SampleApplication.class - − JOrtho_0.4_freeplane/out/production/classes/com/inet/jortho/AutoSpellChecker$1.class - − JOrtho_0.4_freeplane/out/production/classes/com/inet/jortho/AutoSpellChecker$2.class - − JOrtho_0.4_freeplane/out/production/classes/com/inet/jortho/AutoSpellChecker.class - − JOrtho_0.4_freeplane/out/production/classes/com/inet/jortho/CheckerListener$1.class - − JOrtho_0.4_freeplane/out/production/classes/com/inet/jortho/CheckerListener$2.class - − JOrtho_0.4_freeplane/out/production/classes/com/inet/jortho/CheckerListener.class - − JOrtho_0.4_freeplane/out/production/classes/com/inet/jortho/CheckerMenu.class - − JOrtho_0.4_freeplane/out/production/classes/com/inet/jortho/CheckerPopup.class - − JOrtho_0.4_freeplane/out/production/classes/com/inet/jortho/Dictionary.class - − JOrtho_0.4_freeplane/out/production/classes/com/inet/jortho/DictionaryBase.class - − JOrtho_0.4_freeplane/out/production/classes/com/inet/jortho/DictionaryEditDialog$1.class - − JOrtho_0.4_freeplane/out/production/classes/com/inet/jortho/DictionaryEditDialog$DeleteAction.class - − JOrtho_0.4_freeplane/out/production/classes/com/inet/jortho/DictionaryEditDialog.class - − JOrtho_0.4_freeplane/out/production/classes/com/inet/jortho/DictionaryFactory$Node.class - − JOrtho_0.4_freeplane/out/production/classes/com/inet/jortho/DictionaryFactory$NodeEntry.class - − JOrtho_0.4_freeplane/out/production/classes/com/inet/jortho/DictionaryFactory.class - − JOrtho_0.4_freeplane/out/production/classes/com/inet/jortho/FileUserDictionary.class - − JOrtho_0.4_freeplane/out/production/classes/com/inet/jortho/LanguageChangeEvent.class - − JOrtho_0.4_freeplane/out/production/classes/com/inet/jortho/LanguageChangeListener.class - − JOrtho_0.4_freeplane/out/production/classes/com/inet/jortho/LetterBasedBreakIterator.class - − JOrtho_0.4_freeplane/out/production/classes/com/inet/jortho/PopupListener.class - − JOrtho_0.4_freeplane/out/production/classes/com/inet/jortho/RedZigZagPainter.class - − JOrtho_0.4_freeplane/out/production/classes/com/inet/jortho/SpellChecker$1.class - − JOrtho_0.4_freeplane/out/production/classes/com/inet/jortho/SpellChecker$ActionToggleButtonModel.class - − JOrtho_0.4_freeplane/out/production/classes/com/inet/jortho/SpellChecker$DisableLanguageAction.class - − JOrtho_0.4_freeplane/out/production/classes/com/inet/jortho/SpellChecker$LanguageAction$1$1.class - − JOrtho_0.4_freeplane/out/production/classes/com/inet/jortho/SpellChecker$LanguageAction$1.class - − JOrtho_0.4_freeplane/out/production/classes/com/inet/jortho/SpellChecker$LanguageAction.class The diff was not included because it is too large. View it on GitLab: https://salsa.debian.org/java-team/freeplane/commit/a0c3a98c384b3997ed75145b6f02c5cf86fe940d -- View it on GitLab: https://salsa.debian.org/java-team/freeplane/commit/a0c3a98c384b3997ed75145b6f02c5cf86fe940d You're receiving this email because of your account on salsa.debian.org. ___ pkg-java-commits mailing list pkg-java-comm...@alioth-lists.debian.net https://alioth-lists.debian.net/cgi-bin/mailman/listinfo/pkg-java-commits
[Git][java-team/libiconloader-java] Pushed new tag upstream/0.0+git20170615
Felix Natter pushed new tag upstream/0.0+git20170615 at Debian Java Maintainers / libiconloader-java -- View it on GitLab: https://salsa.debian.org/java-team/libiconloader-java/tree/upstream/0.0+git20170615 You're receiving this email because of your account on salsa.debian.org. ___ pkg-java-commits mailing list pkg-java-comm...@alioth-lists.debian.net https://alioth-lists.debian.net/cgi-bin/mailman/listinfo/pkg-java-commits
[Git][java-team/libiconloader-java] Pushed new branch master
Felix Natter pushed new branch master at Debian Java Maintainers / libiconloader-java -- View it on GitLab: https://salsa.debian.org/java-team/libiconloader-java/tree/master You're receiving this email because of your account on salsa.debian.org. ___ pkg-java-commits mailing list pkg-java-comm...@alioth-lists.debian.net https://alioth-lists.debian.net/cgi-bin/mailman/listinfo/pkg-java-commits
