The following commit has been merged in the master branch:
commit 09db820cc4e3dd0e38854941bb2f0fdff64c98c5
Author: Felix Natter <fnat...@gmx.net>
Date: Sun Jun 2 15:15:05 2013 +0200
add patch for libjgoodies-forms-java 1.3->1.6 transition
diff --git a/debian/changelog b/debian/changelog
index b3f85af..9836bc6 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -8,8 +8,9 @@ freeplane (1.2.23-2) unstable; urgency=low
* change freeplane.mime such that Freeplane is run by run-mailcap
on *.mm (see the comments at the top of the file!!)
* add link history_en.txt.gz->changelog.gz to satisfy lintian
+ * add patch for libjgoodies-forms-java 1.3->1.6 transition
- -- Felix Natter <fnat...@gmx.net> Sat, 11 May 2013 11:18:24 +0200
+ -- Felix Natter <fnat...@gmx.net> Sat, 02 Jun 2013 15:14:00 +0200
freeplane (1.2.23-1~exp1) experimental; urgency=low
diff --git a/debian/control b/debian/control
index e4671dd..30d9d38 100644
--- a/debian/control
+++ b/debian/control
@@ -4,7 +4,7 @@ Priority: extra
Maintainer: Debian Java Maintainers
<pkg-java-maintain...@lists.alioth.debian.org>
Uploaders: Felix Natter <fnat...@gmx.net>
Build-Depends: cdbs, debhelper (>= 7), docbook-xsl, docbook-xml, xsltproc,
imagemagick, ant, default-jdk, quilt
-Build-Depends-Indep: javahelp2, groovy, libcommons-lang-java,
libcommons-io-java, libjgoodies-forms-java, simplyhtml (>=0.16.07),
libbatik-java, librhino-java, libfop-java, libxerces2-java,
libxml-commons-external-java, libjaxp1.3-java, libjlatexmath-java,
libknopflerfish-osgi-framework-java, libjsyntaxpane-java (>=0.9.6~r156)
+Build-Depends-Indep: javahelp2, groovy, libcommons-lang-java,
libcommons-io-java, libjgoodies-forms-java(>=1.6.0), simplyhtml (>=0.16.07),
libbatik-java, librhino-java, libfop-java, libxerces2-java,
libxml-commons-external-java, libjaxp1.3-java, libjlatexmath-java,
libknopflerfish-osgi-framework-java, libjsyntaxpane-java (>=0.9.6~r156)
Standards-Version: 3.9.4
Vcs-Git: git://git.debian.org/pkg-java/freeplane.git
Vcs-Browser: http://anonscm.debian.org/gitweb/?p=pkg-java/freeplane.git
@@ -12,7 +12,7 @@ Homepage: http://freeplane.org/
Package: freeplane
Architecture: all
-Depends: ${misc:Depends}, default-jre | sun-java6-jre, javahelp2, groovy,
libcommons-lang-java, libcommons-io-java, libjgoodies-forms-java, simplyhtml
(>=0.16.07), libbatik-java, librhino-java, libfop-java, libxerces2-java,
libxml-commons-external-java, libjaxp1.3-java, libjlatexmath-java,
libknopflerfish-osgi-framework-java, libjsyntaxpane-java (>=0.9.6~r156),
libjortho-freeplane-java (= ${binary:Version})
+Depends: ${misc:Depends}, default-jre | sun-java6-jre, javahelp2, groovy,
libcommons-lang-java, libcommons-io-java, libjgoodies-forms-java(>=1.6.0),
simplyhtml (>=0.16.07), libbatik-java, librhino-java, libfop-java,
libxerces2-java, libxml-commons-external-java, libjaxp1.3-java,
libjlatexmath-java, libknopflerfish-osgi-framework-java, libjsyntaxpane-java
(>=0.9.6~r156), libjortho-freeplane-java (= ${binary:Version})
Recommends: xdg-utils, java-wrappers
Description: Java program for working with Mind Maps
Freeplane is a free and open source software application that supports
diff --git a/debian/patches/10_libraries_properties.patch
b/debian/patches/10_libraries_properties.patch
index e6eb59c..acd22df 100644
--- a/debian/patches/10_libraries_properties.patch
+++ b/debian/patches/10_libraries_properties.patch
@@ -17,7 +17,7 @@ changes paths to dependency jars to /usr/share/java/...
+commons-lang.jar = ${freeplane.ext.lib}/commons-lang.jar
+# TODO: upstream freeplane requires commons-io-2.4.jar, but debian only has
1.4 ?
+commons-io.jar = ${freeplane.ext.lib}/commons-io.jar
-+forms.jar = ${freeplane.ext.lib}/forms.jar
++forms.jar = ${freeplane.ext.lib}/jgoodies-forms.jar
SimplyHTML.jar = ${freeplane.ext.lib}/SimplyHTML.jar
-jortho.jar = ${freeplane.ext.lib}/jortho.jar
+jortho.jar = ${workspace}/JOrtho_0.4_freeplane/dist/lib/jortho-0.4+fp1.1.1.jar
diff --git a/debian/patches/15_libraries_manifest.patch
b/debian/patches/15_libraries_manifest.patch
index 82ad4e5..53ed633 100644
--- a/debian/patches/15_libraries_manifest.patch
+++ b/debian/patches/15_libraries_manifest.patch
@@ -1,7 +1,7 @@
adapts jar paths in core MANIFEST as well as plugin MANIFESTs
--- a/freeplane/META-INF/MANIFEST.MF
+++ b/freeplane/META-INF/MANIFEST.MF
-@@ -7,12 +7,12 @@
+@@ -7,12 +7,13 @@
lib/freeplaneeditor.jar,
lib/freeplanemac.jar,
lib/freeplaneosgi.jar,
@@ -13,7 +13,8 @@ adapts jar paths in core MANIFEST as well as plugin MANIFESTs
- lib/jortho.jar,
+ ../../../java/commons-lang.jar,
+ ../../../commons-io.jar,
-+ ../../../java/forms.jar,
++ ../../../java/jgoodies-forms.jar,
++ ../../../java/jgoodies-common.jar,
+ ../../../java/gnu-regexp-1.1.4.jar,
+ ../../../java/SimplyHTML.jar,
+ ../../../java/jortho.jar,
diff --git a/debian/patches/93_jgoodies1.6.patch
b/debian/patches/93_jgoodies1.6.patch
new file mode 100644
index 0000000..d57f2b6
--- /dev/null
+++ b/debian/patches/93_jgoodies1.6.patch
@@ -0,0 +1,188 @@
+fix code for libjgoodies-forms-java 1.3->1.6 transition
+--- a/freeplane/src/org/freeplane/core/resources/components/OptionPanel.java
++++ b/freeplane/src/org/freeplane/core/resources/components/OptionPanel.java
+@@ -50,7 +50,7 @@
+ import org.freeplane.features.mode.Controller;
+
+ import com.jgoodies.forms.builder.DefaultFormBuilder;
+-import com.jgoodies.forms.factories.ButtonBarFactory;
++import com.jgoodies.forms.builder.ButtonBarBuilder;
+ import com.jgoodies.forms.layout.FormLayout;
+
+ public class OptionPanel {
+@@ -99,6 +99,35 @@
+ new OptionPanelBuilder();
+ }
+
++ /**
++ * Builds and returns a right aligned button bar with the given buttons.
++ *
++ * @param buttons an array of buttons to add
++ * @return a right aligned button bar with the given buttons
++ */
++ public static JPanel buildRightAlignedBar(JButton[] buttons) {
++// ButtonBarBuilder2 builder = new ButtonBarBuilder2();
++ ButtonBarBuilder builder = new ButtonBarBuilder();
++ builder.addGlue();
++ builder.addButton(buttons);
++ return builder.getPanel();
++ }
++
++
++ /**
++ * Builds and returns a button bar with OK and Cancel.
++ *
++ * @param ok the OK button
++ * @param cancel the Cancel button
++ * @return a panel that contains the button(s)
++ */
++ public static JPanel buildOKCancelBar(
++ JButton ok, JButton cancel) {
++ return buildRightAlignedBar(new JButton[] {ok, cancel});
++ }
++
++
++
+ public void buildPanel(final DefaultMutableTreeNode controlsTree) {
+ final FormLayout leftLayout = new
FormLayout("max(80dlu;p):grow", "");
+ final DefaultFormBuilder leftBuilder = new
DefaultFormBuilder(leftLayout);
+@@ -157,7 +186,7 @@
+ }
+ });
+ topDialog.getRootPane().setDefaultButton(okButton);
+-
topDialog.getContentPane().add(ButtonBarFactory.buildOKCancelBar(cancelButton,
okButton), BorderLayout.SOUTH);
++ topDialog.getContentPane().add(buildOKCancelBar(cancelButton,
okButton), BorderLayout.SOUTH);
+ }
+
+ private boolean validate() {
+---
a/freeplane/src/org/freeplane/features/styles/mindmapmode/StyleEditorPanel.java
++++
b/freeplane/src/org/freeplane/features/styles/mindmapmode/StyleEditorPanel.java
+@@ -747,7 +747,7 @@
+ final String form = "right:max(20dlu;p), 2dlu, p,
1dlu,right:max(20dlu;p), 4dlu, 80dlu, 7dlu";
+ final FormLayout rightLayout = new FormLayout(form, "");
+ final DefaultFormBuilder rightBuilder = new
DefaultFormBuilder(rightLayout);
+- rightBuilder.setBorder(Borders.DLU2_BORDER);
++ rightBuilder.border(Borders.DLU2);
+
rightBuilder.appendSeparator(TextUtils.getText("OptionPanel.separator.NodeStyle"));
+ if (addStyleBox) {
+ addAutomaticLayout(rightBuilder);
+---
a/freeplane/src/org/freeplane/view/swing/features/time/mindmapmode/TimeManagement.java
++++
b/freeplane/src/org/freeplane/view/swing/features/time/mindmapmode/TimeManagement.java
+@@ -78,7 +78,7 @@
+ import org.freeplane.features.text.mindmapmode.MTextController;
+
+ import com.jgoodies.forms.builder.DefaultFormBuilder;
+-import com.jgoodies.forms.factories.FormFactory;
++import com.jgoodies.forms.layout.FormSpecs;
+ import com.jgoodies.forms.layout.FormLayout;
+
+ /**
+@@ -157,11 +157,11 @@
+ calendarContainer.setAlignmentX(0.5f);
+ add(calendarContainer);
+
+- DefaultFormBuilder btnBuilder = new
DefaultFormBuilder(new
FormLayout(FormFactory.GROWING_BUTTON_COLSPEC.toString(), ""));
++ DefaultFormBuilder btnBuilder = new
DefaultFormBuilder(new FormLayout(FormSpecs.GROWING_BUTTON_COLSPEC.toString(),
""));
+
btnBuilder.getLayout().addGroupedColumn(btnBuilder.getColumnCount());
+ for(int i = 1; i< colCount; i++){
+ btnBuilder.appendRelatedComponentsGapColumn();
+-
btnBuilder.appendColumn(FormFactory.GROWING_BUTTON_COLSPEC);
++
btnBuilder.appendColumn(FormSpecs.GROWING_BUTTON_COLSPEC);
+
btnBuilder.getLayout().addGroupedColumn(btnBuilder.getColumnCount());
+ }
+
+---
a/freeplane_plugin_script/src/org/freeplane/plugin/script/addons/AddOnDetailsPanel.java
++++
b/freeplane_plugin_script/src/org/freeplane/plugin/script/addons/AddOnDetailsPanel.java
+@@ -28,7 +28,7 @@
+ import org.freeplane.plugin.script.ExecuteScriptAction;
+ import org.freeplane.plugin.script.addons.ScriptAddOnProperties.Script;
+
+-import com.jgoodies.forms.factories.FormFactory;
++import com.jgoodies.forms.layout.FormSpecs;
+ import com.jgoodies.forms.layout.ColumnSpec;
+ import com.jgoodies.forms.layout.FormLayout;
+ import com.jgoodies.forms.layout.RowSpec;
+@@ -41,16 +41,16 @@
+ public AddOnDetailsPanel(final AddOnProperties addOn, final String
warning) {
+ this.warning = warning;
+ setLayout(new FormLayout(new ColumnSpec[] {
+- FormFactory.DEFAULT_COLSPEC,
+- FormFactory.RELATED_GAP_COLSPEC,
++ FormSpecs.DEFAULT_COLSPEC,
++ FormSpecs.RELATED_GAP_COLSPEC,
+ ColumnSpec.decode("default:grow"),},
+ new RowSpec[] {
+- FormFactory.RELATED_GAP_ROWSPEC,
+- FormFactory.DEFAULT_ROWSPEC,
+- FormFactory.RELATED_GAP_ROWSPEC,
+- FormFactory.DEFAULT_ROWSPEC,
+- FormFactory.RELATED_GAP_ROWSPEC,
+- FormFactory.DEFAULT_ROWSPEC,
++ FormSpecs.RELATED_GAP_ROWSPEC,
++ FormSpecs.DEFAULT_ROWSPEC,
++ FormSpecs.RELATED_GAP_ROWSPEC,
++ FormSpecs.DEFAULT_ROWSPEC,
++ FormSpecs.RELATED_GAP_ROWSPEC,
++ FormSpecs.DEFAULT_ROWSPEC,
+ RowSpec.decode("top:default:grow"),}));
+
+ JLabel imageLabel = createImageLabel(addOn);
+---
a/freeplane_plugin_script/src/org/freeplane/plugin/script/addons/AddOnInstallerPanel.java
++++
b/freeplane_plugin_script/src/org/freeplane/plugin/script/addons/AddOnInstallerPanel.java
+@@ -43,7 +43,7 @@
+ import org.freeplane.plugin.script.ScriptingPermissions;
+
+ import com.jgoodies.forms.factories.DefaultComponentFactory;
+-import com.jgoodies.forms.factories.FormFactory;
++import com.jgoodies.forms.layout.FormSpecs;
+ import com.jgoodies.forms.layout.ColumnSpec;
+ import com.jgoodies.forms.layout.FormLayout;
+ import com.jgoodies.forms.layout.RowSpec;
+@@ -62,17 +62,17 @@
+ setLayout(new FormLayout(new ColumnSpec[] {
+ ColumnSpec.decode("default:grow"),},
+ new RowSpec[] {
+- FormFactory.RELATED_GAP_ROWSPEC,
+- FormFactory.DEFAULT_ROWSPEC,
+- FormFactory.RELATED_GAP_ROWSPEC,
+- FormFactory.DEFAULT_ROWSPEC,
+- FormFactory.RELATED_GAP_ROWSPEC,
+- FormFactory.DEFAULT_ROWSPEC,
+- FormFactory.DEFAULT_ROWSPEC,
+- FormFactory.RELATED_GAP_ROWSPEC,
+- FormFactory.DEFAULT_ROWSPEC,
+- FormFactory.RELATED_GAP_ROWSPEC,
+- FormFactory.DEFAULT_ROWSPEC,}));
++ FormSpecs.RELATED_GAP_ROWSPEC,
++ FormSpecs.DEFAULT_ROWSPEC,
++ FormSpecs.RELATED_GAP_ROWSPEC,
++ FormSpecs.DEFAULT_ROWSPEC,
++ FormSpecs.RELATED_GAP_ROWSPEC,
++ FormSpecs.DEFAULT_ROWSPEC,
++ FormSpecs.DEFAULT_ROWSPEC,
++ FormSpecs.RELATED_GAP_ROWSPEC,
++ FormSpecs.DEFAULT_ROWSPEC,
++ FormSpecs.RELATED_GAP_ROWSPEC,
++ FormSpecs.DEFAULT_ROWSPEC,}));
+ //
+ // Search
+ //
+--- a/freeplane/src/org/freeplane/core/resources/components/KeyProperty.java
++++ b/freeplane/src/org/freeplane/core/resources/components/KeyProperty.java
+@@ -32,6 +32,7 @@
+
+ import com.jgoodies.forms.builder.DefaultFormBuilder;
+ import com.jgoodies.forms.layout.RowSpec;
++import com.jgoodies.forms.layout.Sizes;
+
+ /**
+ * @author Dimitry Polivaev
+@@ -77,7 +78,7 @@
+ String tooltip = TextUtils.getOptionalText(getDescription());
+ label.setToolTipText(tooltip);
+ if (KeyProperty.rowSpec == null) {
+- KeyProperty.rowSpec = new RowSpec("fill:20dlu");
++ KeyProperty.rowSpec = new RowSpec(RowSpec.FILL, Sizes.dluX(20), 0.0);
+ }
+ if (3 < builder.getColumn()) {
+ builder.appendRelatedComponentsGapRow();
diff --git a/debian/patches/series b/debian/patches/series
index 01895e3..bd22608 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -8,3 +8,4 @@
80_no_update_check.patch
90_fix_jsyntaxpane_location.patch
92_fix_old_manifest.patch
+93_jgoodies1.6.patch
--
freeplane packaging
_______________________________________________
pkg-java-commits mailing list
pkg-java-commits@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-commits
