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

[olivier sallou]

Author: osallou-guest
Date: 2013-08-30 10:04:35 +0000 (Fri, 30 Aug 2013)
New Revision: 14549

Removed:
   trunk/packages/biomaj/trunk/debian/patches/fix_ant_propertie_format
Modified:
   trunk/packages/biomaj/trunk/debian/changelog
   trunk/packages/biomaj/trunk/debian/patches/series
Log:
new usptream release 1.2.2

Modified: trunk/packages/biomaj/trunk/debian/changelog
===================================================================
--- trunk/packages/biomaj/trunk/debian/changelog	2013-08-29 21:19:48 UTC (rev 14548)
+++ trunk/packages/biomaj/trunk/debian/changelog	2013-08-30 10:04:35 UTC (rev 14549)
@@ -1,3 +1,10 @@
+biomaj (1.2.2-1) unstable; urgency=low
+
+  * New upstream release with minor fixes
+      d/patches/series: upstream bug 15914 fixed.
+
+ -- Olivier Sallou <osallou at debian.org>  Tue, 18 Jun 2013 14:30:28 +0200
+
 biomaj (1.2.1-3) unstable; urgency=low
 
   * Add patch to manage ant properties api change (Closes: #712328).

Deleted: trunk/packages/biomaj/trunk/debian/patches/fix_ant_propertie_format
===================================================================
--- trunk/packages/biomaj/trunk/debian/patches/fix_ant_propertie_format	2013-08-29 21:19:48 UTC (rev 14548)
+++ trunk/packages/biomaj/trunk/debian/patches/fix_ant_propertie_format	2013-08-30 10:04:35 UTC (rev 14549)
@@ -1,32 +0,0 @@
-Subject: ant API change
-Description: ant > 1.9 update the getProperties() method
- to return a different type (Object instead of String).
- this patch modifies the method to manage objects.
-Author: Olivier Sallou <osallou at debian.org>
-Forwarded: yes
-Bug: 15914
---- a/usr/share/biomaj/src/org/inria/biomaj/exe/bank/BankFactory.java
-+++ b/usr/share/biomaj/src/org/inria/biomaj/exe/bank/BankFactory.java
-@@ -384,7 +384,7 @@
- 		return value;
- 	}
- 
--	public static String getRecursiveProperty(Hashtable<String, String> prop,String keyOrigine) throws BiomajException {
-+	public static String getRecursiveProperty(Hashtable<String, Object> prop,String keyOrigine) throws BiomajException {
- 
- 		if ((prop == null)||(keyOrigine == null))
- 			throw new BiomajException("error.dev","Properties data are not set.");
-@@ -392,11 +392,11 @@
- 		if (!prop.containsKey(keyOrigine)) {
- 			String name = "";
- 			if (prop.containsKey(BiomajConst.dbNameProperty))
--				name = prop.get(BiomajConst.dbNameProperty);
-+				name = (String) prop.get(BiomajConst.dbNameProperty);
- 			throw new BiomajException("biomaj.property.define.error",name,keyOrigine);
- 		}
- 
--		String value = prop.get(keyOrigine);
-+		String value = (String) prop.get(keyOrigine);
- 
- 
- 		if (value.startsWith("${"))

Modified: trunk/packages/biomaj/trunk/debian/patches/series
===================================================================
--- trunk/packages/biomaj/trunk/debian/patches/series	2013-08-29 21:19:48 UTC (rev 14548)
+++ trunk/packages/biomaj/trunk/debian/patches/series	2013-08-30 10:04:35 UTC (rev 14549)
@@ -1,4 +1,3 @@
 removeSqlToolDependency
 set_env_file_for_debian
 useFormSpecs_from_jgoodies
-fix_ant_propertie_format