[med-svn] r13645 - in trunk/packages/biomaj/trunk/debian: . patches
olivier sallou
osallou-guest at alioth.debian.org
Sun May 19 11:32:24 UTC 2013
Author: osallou-guest
Date: 2013-05-19 11:32:24 +0000 (Sun, 19 May 2013)
New Revision: 13645
Added:
trunk/packages/biomaj/trunk/debian/patches/useFormSpecs_from_jgoodies
Modified:
trunk/packages/biomaj/trunk/debian/changelog
trunk/packages/biomaj/trunk/debian/control
trunk/packages/biomaj/trunk/debian/patches/series
Log:
add patches to fix API changed in jgoodies-form
Modified: trunk/packages/biomaj/trunk/debian/changelog
===================================================================
--- trunk/packages/biomaj/trunk/debian/changelog 2013-05-18 14:48:35 UTC (rev 13644)
+++ trunk/packages/biomaj/trunk/debian/changelog 2013-05-19 11:32:24 UTC (rev 13645)
@@ -1,3 +1,11 @@
+biomaj (1.2.1-2) UNRELEASED; urgency=low
+
+ * Add patch to match libjgoodies-form-java >1.3,
+ FormFactory replaced by FormSpecs (Closes: 708454)
+ d/control: Depends on libjgoodies-form-java > 1.3
+
+ -- Olivier Sallou <osallou at debian.org> Sun, 19 May 2013 13:21:55 +0200
+
biomaj (1.2.1-1) unstable; urgency=low
* New usptream release
Modified: trunk/packages/biomaj/trunk/debian/control
===================================================================
--- trunk/packages/biomaj/trunk/debian/control 2013-05-18 14:48:35 UTC (rev 13644)
+++ trunk/packages/biomaj/trunk/debian/control 2013-05-19 11:32:24 UTC (rev 13645)
@@ -10,7 +10,7 @@
Build-Depends: debhelper (>= 7.1)
Build-Depends-Indep: debconf, po-debconf, default-jdk, ant, libhsqldb-java, ant-contrib,
liblog4j1.2-java, libcommons-net2-java, libcommons-dbcp-java, libgnumail-java, libcommons-pool-java,
- libgnujaf-java, libjgoodies-forms-java, liboro-java, libregexp-java,
+ libgnujaf-java, libjgoodies-forms-java (>= 1.3), liboro-java, libregexp-java,
libjcommon-java, libjsch-java, libjdom1-java, junit4, libsaxonb-java, libjdepend-java,
javahelper (>=0.25), libcommons-cli-java, libcommons-codec-java, libcommons-httpclient-java, libcommons-logging-java,
libjets3t-java
@@ -21,7 +21,7 @@
Depends: ${misc:Depends}, ${java:Depends},
default-jre | java6-runtime, ant, libmysql-java, debconf,
libhsqldb-java,ant-contrib,liblog4j1.2-java,libcommons-net2-java (>= 2.2),libcommons-dbcp-java (>= 1.2),
- libgnumail-java, libcommons-pool-java (>= 1.5), libgnujaf-java, libjgoodies-forms-java (>= 1.2),
+ libgnumail-java, libcommons-pool-java (>= 1.5), libgnujaf-java, libjgoodies-forms-java (>= 1.3),
liboro-java (>= 2.0),libregexp-java (>= 1.4),libjcommon-java (>= 1.0),libjsch-java (>= 0.1.42),
libjdom1-java (>= 1.1),junit4,libsaxonb-java (>= 0.9), libcommons-cli-java, libcommons-codec-java,
libcommons-httpclient-java, libcommons-logging-java,libjets3t-java, perl,
Modified: trunk/packages/biomaj/trunk/debian/patches/series
===================================================================
--- trunk/packages/biomaj/trunk/debian/patches/series 2013-05-18 14:48:35 UTC (rev 13644)
+++ trunk/packages/biomaj/trunk/debian/patches/series 2013-05-19 11:32:24 UTC (rev 13645)
@@ -1,2 +1,3 @@
removeSqlToolDependency
set_env_file_for_debian
+useFormSpecs_from_jgoodies
Added: trunk/packages/biomaj/trunk/debian/patches/useFormSpecs_from_jgoodies
===================================================================
--- trunk/packages/biomaj/trunk/debian/patches/useFormSpecs_from_jgoodies (rev 0)
+++ trunk/packages/biomaj/trunk/debian/patches/useFormSpecs_from_jgoodies 2013-05-19 11:32:24 UTC (rev 13645)
@@ -0,0 +1,107 @@
+Subject: replace FormFactory by FormSpecs
+Description: jgoodies-form >1.3 has changed its
+ API, changed FormFactory to FormSpecs
+Author: Olivier Sallou
+Last-Updated: 2013-05-19
+Forwarded: No
+--- a/usr/share/biomaj/src/org/inria/biomaj/exe/options/BioMAJLogger.java
++++ b/usr/share/biomaj/src/org/inria/biomaj/exe/options/BioMAJLogger.java
+@@ -714,12 +714,12 @@
+ setLayout(new FormLayout(
+ ColumnSpec.decodeSpecs("default:grow"),
+ new RowSpec[] {
+- FormFactory.DEFAULT_ROWSPEC,
+- FormFactory.LINE_GAP_ROWSPEC,
+- FormFactory.DEFAULT_ROWSPEC,
+- FormFactory.LINE_GAP_ROWSPEC,
+- FormFactory.DEFAULT_ROWSPEC,
+- FormFactory.LINE_GAP_ROWSPEC,
++ FormSpecs.DEFAULT_ROWSPEC,
++ FormSpecs.LINE_GAP_ROWSPEC,
++ FormSpecs.DEFAULT_ROWSPEC,
++ FormSpecs.LINE_GAP_ROWSPEC,
++ FormSpecs.DEFAULT_ROWSPEC,
++ FormSpecs.LINE_GAP_ROWSPEC,
+ new RowSpec(RowSpec.CENTER, Sizes.dluY(171), FormSpec.DEFAULT_GROW)
+ }));
+
+@@ -732,25 +732,25 @@
+ 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(75)),
+- FormFactory.LABEL_COMPONENT_GAP_COLSPEC,
++ FormSpecs.LABEL_COMPONENT_GAP_COLSPEC,
+ new ColumnSpec(Sizes.dluX(57)),
+- 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,
+- FormFactory.LINE_GAP_ROWSPEC,
+- FormFactory.DEFAULT_ROWSPEC
++ FormSpecs.DEFAULT_ROWSPEC,
++ FormSpecs.LINE_GAP_ROWSPEC,
++ FormSpecs.DEFAULT_ROWSPEC,
++ FormSpecs.LINE_GAP_ROWSPEC,
++ FormSpecs.DEFAULT_ROWSPEC
+ }));
+
+ //---- label13 ----
+@@ -912,11 +912,11 @@
+ panel2.setLayout(new FormLayout(
+ new ColumnSpec[] {
+ new ColumnSpec(Sizes.dluX(64)),
+- FormFactory.LABEL_COMPONENT_GAP_COLSPEC,
++ FormSpecs.LABEL_COMPONENT_GAP_COLSPEC,
+ new ColumnSpec(Sizes.dluX(198)),
+- FormFactory.LABEL_COMPONENT_GAP_COLSPEC,
+- FormFactory.DEFAULT_COLSPEC,
+- FormFactory.LABEL_COMPONENT_GAP_COLSPEC,
++ FormSpecs.LABEL_COMPONENT_GAP_COLSPEC,
++ FormSpecs.DEFAULT_COLSPEC,
++ FormSpecs.LABEL_COMPONENT_GAP_COLSPEC,
+ new ColumnSpec(Sizes.dluX(195))
+ },
+ RowSpec.decodeSpecs("default, default, default, default, default")));
+@@ -976,19 +976,19 @@
+ panel3.setLayout(new FormLayout(
+ new ColumnSpec[] {
+ new ColumnSpec(Sizes.dluX(66)),
+- FormFactory.LABEL_COMPONENT_GAP_COLSPEC,
++ FormSpecs.LABEL_COMPONENT_GAP_COLSPEC,
+ new ColumnSpec(Sizes.dluX(197)),
+- FormFactory.LABEL_COMPONENT_GAP_COLSPEC,
++ FormSpecs.LABEL_COMPONENT_GAP_COLSPEC,
+ new ColumnSpec(Sizes.dluX(50)),
+- FormFactory.LABEL_COMPONENT_GAP_COLSPEC,
++ FormSpecs.LABEL_COMPONENT_GAP_COLSPEC,
+ new ColumnSpec(Sizes.dluX(34)),
+- 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(30)),
+- FormFactory.LABEL_COMPONENT_GAP_COLSPEC,
++ FormSpecs.LABEL_COMPONENT_GAP_COLSPEC,
+ new ColumnSpec(Sizes.dluX(42)),
+- FormFactory.LABEL_COMPONENT_GAP_COLSPEC,
++ FormSpecs.LABEL_COMPONENT_GAP_COLSPEC,
+ new ColumnSpec(Sizes.dluX(43))
+ },
+ RowSpec.decodeSpecs("default")));
More information about the debian-med-commit
mailing list