[med-svn] r23117 - in trunk/packages/biomaj/trunk/debian: . patches

[Olivier Sallou]

Author: osallou
Date: 2016-11-21 15:16:01 +0000 (Mon, 21 Nov 2016)
New Revision: 23117

Added:
   trunk/packages/biomaj/trunk/debian/patches/libjgoodies-from-java.patch
Modified:
   trunk/packages/biomaj/trunk/debian/changelog
   trunk/packages/biomaj/trunk/debian/control
   trunk/packages/biomaj/trunk/debian/patches/series
Log:
patch to use libjgoodies-form-java >= 1.6 for migration to a more recent release of this lib

Modified: trunk/packages/biomaj/trunk/debian/changelog
===================================================================
--- trunk/packages/biomaj/trunk/debian/changelog	2016-11-19 16:00:20 UTC (rev 23116)
+++ trunk/packages/biomaj/trunk/debian/changelog	2016-11-21 15:16:01 UTC (rev 23117)
@@ -1,3 +1,9 @@
+biomaj (1.2.3-10) UNRELEASED; urgency=medium
+
+  * Patch biomajlogger to match libjgoodies-forms-java >= 1.6 
+
+ -- Olivier Sallou <osallou at debian.org>  Mon, 21 Nov 2016 13:52:12 +0100
+
 biomaj (1.2.3-9) unstable; urgency=medium
 
   * Add Brazilian Portuguese translation (Closes: #825046).

Modified: trunk/packages/biomaj/trunk/debian/control
===================================================================
--- trunk/packages/biomaj/trunk/debian/control	2016-11-19 16:00:20 UTC (rev 23116)
+++ trunk/packages/biomaj/trunk/debian/control	2016-11-21 15:16:01 UTC (rev 23117)
@@ -23,7 +23,7 @@
                      libjdepend-java,
                      libjdom1-java,
                      libjets3t-java,
-                     libjgoodies-forms-java (>= 1.3),
+                     libjgoodies-forms-java (>= 1.6),
                      libjsch-java,
                      liblog4j1.2-java,
                      liboro-java,

Added: trunk/packages/biomaj/trunk/debian/patches/libjgoodies-from-java.patch
===================================================================
--- trunk/packages/biomaj/trunk/debian/patches/libjgoodies-from-java.patch	                        (rev 0)
+++ trunk/packages/biomaj/trunk/debian/patches/libjgoodies-from-java.patch	2016-11-21 15:16:01 UTC (rev 23117)
@@ -0,0 +1,58 @@
+--- a/usr/share/biomaj/src/org/inria/biomaj/exe/options/BioMAJLogger.java
++++ b/usr/share/biomaj/src/org/inria/biomaj/exe/options/BioMAJLogger.java
+@@ -728,7 +728,7 @@
+ 						{
+ 							panel1.setBorder(new CompoundBorder(
+ 									new TitledBorder("Bank"),
+-									Borders.DLU2_BORDER));
++									Paddings.DLU2));
+ 							panel1.setLayout(new FormLayout(
+ 									new ColumnSpec[] {
+ 											new ColumnSpec(Sizes.dluX(64)),
+@@ -818,27 +818,27 @@
+ //							*********************************************************************************************
+ 							/*	panel1.setBorder(new CompoundBorder(
+ 									new TitledBorder("Bank"),
+-									Borders.DLU2_BORDER));
++									Paddings.DLU2));
+ 							panel1.setLayout(new FormLayout(
+ 									new ColumnSpec[] {
+ 											new ColumnSpec(Sizes.dluX(64)),
+-											FormFactory.LABEL_COMPONENT_GAP_COLSPEC,
++											FormSpecs.LABEL_COMPONENT_GAP_COLSPEC,
+ 											new ColumnSpec(Sizes.dluX(203)),
+-											FormFactory.LABEL_COMPONENT_GAP_COLSPEC,
++											FormSpecs.LABEL_COMPONENT_GAP_COLSPEC,
+ 											new ColumnSpec(Sizes.dluX(19)),
+-											FormFactory.LABEL_COMPONENT_GAP_COLSPEC,
++											FormSpecs.LABEL_COMPONENT_GAP_COLSPEC,
+ 											new ColumnSpec(Sizes.dluX(44)),
+-											FormFactory.LABEL_COMPONENT_GAP_COLSPEC,
++											FormSpecs.LABEL_COMPONENT_GAP_COLSPEC,
+ 											new ColumnSpec(Sizes.dluX(40)),
+-											FormFactory.LABEL_COMPONENT_GAP_COLSPEC,
++											FormSpecs.LABEL_COMPONENT_GAP_COLSPEC,
+ 											new ColumnSpec(Sizes.dluX(20)),
+-											FormFactory.LABEL_COMPONENT_GAP_COLSPEC,
++											FormSpecs.LABEL_COMPONENT_GAP_COLSPEC,
+ 											new ColumnSpec(Sizes.dluX(87))
+ 									},
+ 									new RowSpec[] {
+-											FormFactory.DEFAULT_ROWSPEC,
+-											FormFactory.LINE_GAP_ROWSPEC,
+-											FormFactory.DEFAULT_ROWSPEC
++											FormSpecs.DEFAULT_ROWSPEC,
++											FormSpecs.LINE_GAP_ROWSPEC,
++											FormSpecs.DEFAULT_ROWSPEC
+ 									}));
+ 
+ 							//---- label13 ----
+@@ -972,7 +972,7 @@
+ 						{
+ 							panel3.setBorder(new CompoundBorder(
+ 									new TitledBorder("Log"),
+-									Borders.DLU2_BORDER));
++									Paddings.DLU2));
+ 							panel3.setLayout(new FormLayout(
+ 									new ColumnSpec[] {
+ 											new ColumnSpec(Sizes.dluX(66)),

Modified: trunk/packages/biomaj/trunk/debian/patches/series
===================================================================
--- trunk/packages/biomaj/trunk/debian/patches/series	2016-11-19 16:00:20 UTC (rev 23116)
+++ trunk/packages/biomaj/trunk/debian/patches/series	2016-11-21 15:16:01 UTC (rev 23117)
@@ -4,3 +4,4 @@
 javamail.patch
 use_commons_net.patch
 fix_mysql_skip
+libjgoodies-from-java.patch