[med-svn] r17708 - in trunk/packages/libsbml/trunk/debian: . patches

Ivo Maintz ivomaintz-guest at moszumanska.debian.org
Tue Aug 12 14:28:01 UTC 2014


Author: ivomaintz-guest
Date: 2014-08-12 14:28:01 +0000 (Tue, 12 Aug 2014)
New Revision: 17708

Removed:
   trunk/packages/libsbml/trunk/debian/patches/format-security.patch
Modified:
   trunk/packages/libsbml/trunk/debian/changelog
   trunk/packages/libsbml/trunk/debian/control
   trunk/packages/libsbml/trunk/debian/control.in
   trunk/packages/libsbml/trunk/debian/copyright
   trunk/packages/libsbml/trunk/debian/rules
   trunk/packages/libsbml/trunk/debian/watch
Log:
should now work with xz tarballs
get-orig-source pulls now the current version and not necessary the newest
removed the obsolete build-dependency for python-support



Modified: trunk/packages/libsbml/trunk/debian/changelog
===================================================================
--- trunk/packages/libsbml/trunk/debian/changelog	2014-08-12 13:56:00 UTC (rev 17707)
+++ trunk/packages/libsbml/trunk/debian/changelog	2014-08-12 14:28:01 UTC (rev 17708)
@@ -1,5 +1,23 @@
 libsbml (5.10.0+dfsg-1) UNRELEASED; urgency=medium
 
+  [Ivo Maintz]
+  * debian/cmake_opts: enabled the qual extension
+  * debian/rules: added "--download-current-version" in get-orig-source target
+    added some more magic to the clean target for proper handling of xz archives
+  * debian/copyright: the path to prettify.js had changed
+    added macosx to Files-Excluded
+
+    [ Andreas Tille ]
+  * New upstream version
+  * debian/upstream -> debian/upstream/metadata
+  * debian/control: Drop explicite ruby version in Build-Dependencies
+  * debian/copyright: Files-Excluded: prettify.js (Javascript without source)
+  * debian/rules: Enable gz and xz archives in clean target
+
+ -- Ivo Maintz <ivo at maintz.de>  Mon, 14 Apr 2014 15:26:28 +0200
+
+libsbml (5.9.2+dfsg-1) UNRELEASED; urgency=medium
+
   [ Andreas Tille ]
   * New upstream version
   * debian/upstream -> debian/upstream/metadata
@@ -13,17 +31,8 @@
     Closes: #735453
   * debian/watch: readded the wildcards for *zip and other archive formats
 
-  [ Ivo Maintz ]
-  * New upstream version
-  * debian/cmake_opts: enabled the qual extension
-  * debian/rules: added "--download-current-version" to the get-orig-source target
-  * debian/copyright: remove prettify from source tarball
+ -- Ivo Maintz <ivo at maintz.de>  Wed, 05 Mar 2014 10:16:44 +0100
 
-  [ Andreas Tille ]
-  * Enable using xz compressed source tarballs
-
- -- Andreas Tille <tille at debian.org>  Mon, 05 May 2014 15:01:28 +0200
-
 libsbml (5.8.0-2) unstable; urgency=medium
 
   * Put *.m files in the Octave path (thanks for the patch to

Modified: trunk/packages/libsbml/trunk/debian/control
===================================================================
--- trunk/packages/libsbml/trunk/debian/control	2014-08-12 13:56:00 UTC (rev 17707)
+++ trunk/packages/libsbml/trunk/debian/control	2014-08-12 14:28:01 UTC (rev 17708)
@@ -18,7 +18,6 @@
  octave-pkg-dev,
  r-base-dev,
  r-base-core,
- python-support,
  graphviz,
  zlib1g-dev,
  libbz2-dev,

Modified: trunk/packages/libsbml/trunk/debian/control.in
===================================================================
--- trunk/packages/libsbml/trunk/debian/control.in	2014-08-12 13:56:00 UTC (rev 17707)
+++ trunk/packages/libsbml/trunk/debian/control.in	2014-08-12 14:28:01 UTC (rev 17708)
@@ -18,7 +18,6 @@
  octave-pkg-dev,
  r-base-dev,
  r-base-core,
- python-support,
  graphviz,
  zlib1g-dev,
  libbz2-dev,

Modified: trunk/packages/libsbml/trunk/debian/copyright
===================================================================
--- trunk/packages/libsbml/trunk/debian/copyright	2014-08-12 13:56:00 UTC (rev 17707)
+++ trunk/packages/libsbml/trunk/debian/copyright	2014-08-12 14:28:01 UTC (rev 17708)
@@ -2,7 +2,8 @@
 Upstream-Name: libsbml
 Source: http://www.sbml.org/software/libsbml/
 Files-Excluded:
-    docs/src/utilities/prettify
+ docs/src/utilities/prettify
+ macosx
 
 Files: *
 Copyright: 2005-2012 SBML-TEAM mailto:sbml-team at caltech.edu

Deleted: trunk/packages/libsbml/trunk/debian/patches/format-security.patch
===================================================================
--- trunk/packages/libsbml/trunk/debian/patches/format-security.patch	2014-08-12 13:56:00 UTC (rev 17707)
+++ trunk/packages/libsbml/trunk/debian/patches/format-security.patch	2014-08-12 14:28:01 UTC (rev 17708)
@@ -1,1088 +0,0 @@
-Author: Andreas Tille <tille at debian.org>
-Last-Update: Mon, 23 Dec 2013 21:32:47 +0100
-Description: Enable compiling with -Werror=format-security
-
---- a/src/bindings/ruby/local.i
-+++ b/src/bindings/ruby/local.i
-@@ -283,11 +283,11 @@ namespace std
-   }
-   catch (const SBMLConstructorException &e){
-     static VALUE cpperror = rb_define_class("SBMLConstructorException", rb_eArgError);
--    rb_raise(cpperror, e.what());    
-+    rb_raise(cpperror, "%s", e.what());    
-   }
-   catch (const SBMLExtensionException &e){
-     static VALUE cpperror = rb_define_class("SBMLConstructorException", rb_eArgError);
--    rb_raise(cpperror, e.what());    
-+    rb_raise(cpperror, "%s", e.what());    
-   }
- }
- %enddef
-@@ -366,7 +366,7 @@ SBMLCONSTRUCTOR_EXCEPTION(ListOfUnits)
-   }
-   catch (const XMLConstructorException &e){
-     static VALUE cpperror = rb_define_class("XMLConstructorException", rb_eArgError);
--    rb_raise(cpperror, e.what());    
-+    rb_raise(cpperror, "%s", e.what());    
-   }
- }
- %enddef
---- a/src/bindings/ruby/libsbml_wrap.cpp
-+++ b/src/bindings/ruby/libsbml_wrap.cpp
-@@ -3521,7 +3521,7 @@ SWIG_AsPtr_std_basic_string_Sl_char_Sg_
-       }
-     }
-     if (val) {
--      rb_raise( rb_eTypeError, "a string is expected");
-+      rb_raise( rb_eTypeError, "%s", "a string is expected");
-     }
-     return 0;
-   }
-@@ -4593,7 +4593,7 @@ SWIGINTERN VALUE std_basic_string_Sl_cha
-       }
- SWIGINTERN std::basic_string< char,std::char_traits< char >,std::allocator< char > > *std_basic_string_Sl_char_Sg__each(std::basic_string< char > *self){
- 	if ( !rb_block_given_p() )
--	  rb_raise( rb_eArgError, "no block given");
-+	  rb_raise( rb_eArgError, "%s", "no block given");
- 
- 	VALUE r;
- 	std::basic_string<char,std::char_traits< char >,std::allocator< char > >::const_iterator i = self->begin();
-@@ -4608,7 +4608,7 @@ SWIGINTERN std::basic_string< char,std::
-       }
- SWIGINTERN std::basic_string< char,std::char_traits< char >,std::allocator< char > > *std_basic_string_Sl_char_Sg__select(std::basic_string< char > *self){
-       if ( !rb_block_given_p() )
--	rb_raise( rb_eArgError, "no block given" );
-+	rb_raise( rb_eArgError, "%s", "no block given" );
- 
-       std::basic_string<char,std::char_traits< char >,std::allocator< char > >* r = new std::basic_string<char,std::char_traits< char >,std::allocator< char > >;
-       std::basic_string<char,std::char_traits< char >,std::allocator< char > >::const_iterator i = self->begin();
-@@ -4624,7 +4624,7 @@ SWIGINTERN std::basic_string< char,std::
-     }
- SWIGINTERN std::basic_string< char,std::char_traits< char >,std::allocator< char > > *std_basic_string_Sl_char_Sg__reject_bang(std::basic_string< char > *self){
-       if ( !rb_block_given_p() )
--	rb_raise( rb_eArgError, "no block given" );
-+	rb_raise( rb_eArgError, "%s", "no block given" );
- 
-       std::basic_string<char,std::char_traits< char >,std::allocator< char > >::iterator i = self->begin();
-       std::basic_string<char,std::char_traits< char >,std::allocator< char > >::iterator e = self->end();
-@@ -4663,7 +4663,7 @@ SWIGINTERN std::basic_string< char >::va
-     }
- SWIGINTERN std::basic_string< char,std::char_traits< char >,std::allocator< char > > *std_basic_string_Sl_char_Sg__reject(std::basic_string< char > *self){
-       if ( !rb_block_given_p() )
--	rb_raise( rb_eArgError, "no block given" );
-+	rb_raise( rb_eArgError, "%s", "no block given" );
- 
-       std::basic_string<char,std::char_traits< char >,std::allocator< char > >* r = new std::basic_string<char,std::char_traits< char >,std::allocator< char > >;
-       std::remove_copy_if( self->begin(), self->end(),              
-@@ -4709,7 +4709,7 @@ SWIGINTERN VALUE std_basic_string_Sl_cha
- SWIGINTERN VALUE std_basic_string_Sl_char_Sg____getitem____SWIG_2(std::basic_string< char > const *self,VALUE i){
-       if ( rb_obj_is_kind_of( i, rb_cRange ) == Qfalse )
- 	{
--	  rb_raise( rb_eTypeError, "not a valid index or range" );
-+	  rb_raise( rb_eTypeError, "%s", "not a valid index or range" );
- 	}
- 
-       VALUE r = Qnil;
-@@ -20922,11 +20922,11 @@ _wrap_new_ListOf__SWIG_0(int argc, VALUE
-     }
-     catch (const SBMLConstructorException &e){
-       static VALUE cpperror = rb_define_class("SBMLConstructorException", rb_eArgError);
--      rb_raise(cpperror, e.what());    
-+      rb_raise(cpperror, "%s", e.what());    
-     }
-     catch (const SBMLExtensionException &e){
-       static VALUE cpperror = rb_define_class("SBMLConstructorException", rb_eArgError);
--      rb_raise(cpperror, e.what());    
-+      rb_raise(cpperror, "%s", e.what());    
-     }
-   }
-   return self;
-@@ -20959,11 +20959,11 @@ _wrap_new_ListOf__SWIG_1(int argc, VALUE
-     }
-     catch (const SBMLConstructorException &e){
-       static VALUE cpperror = rb_define_class("SBMLConstructorException", rb_eArgError);
--      rb_raise(cpperror, e.what());    
-+      rb_raise(cpperror, "%s", e.what());    
-     }
-     catch (const SBMLExtensionException &e){
-       static VALUE cpperror = rb_define_class("SBMLConstructorException", rb_eArgError);
--      rb_raise(cpperror, e.what());    
-+      rb_raise(cpperror, "%s", e.what());    
-     }
-   }
-   return self;
-@@ -20988,11 +20988,11 @@ _wrap_new_ListOf__SWIG_2(int argc, VALUE
-     }
-     catch (const SBMLConstructorException &e){
-       static VALUE cpperror = rb_define_class("SBMLConstructorException", rb_eArgError);
--      rb_raise(cpperror, e.what());    
-+      rb_raise(cpperror, "%s", e.what());    
-     }
-     catch (const SBMLExtensionException &e){
-       static VALUE cpperror = rb_define_class("SBMLConstructorException", rb_eArgError);
--      rb_raise(cpperror, e.what());    
-+      rb_raise(cpperror, "%s", e.what());    
-     }
-   }
-   return self;
-@@ -21025,11 +21025,11 @@ _wrap_new_ListOf__SWIG_3(int argc, VALUE
-     }
-     catch (const SBMLConstructorException &e){
-       static VALUE cpperror = rb_define_class("SBMLConstructorException", rb_eArgError);
--      rb_raise(cpperror, e.what());    
-+      rb_raise(cpperror, "%s", e.what());    
-     }
-     catch (const SBMLExtensionException &e){
-       static VALUE cpperror = rb_define_class("SBMLConstructorException", rb_eArgError);
--      rb_raise(cpperror, e.what());    
-+      rb_raise(cpperror, "%s", e.what());    
-     }
-   }
-   return self;
-@@ -21088,11 +21088,11 @@ _wrap_new_ListOf__SWIG_4(int argc, VALUE
-     }
-     catch (const SBMLConstructorException &e){
-       static VALUE cpperror = rb_define_class("SBMLConstructorException", rb_eArgError);
--      rb_raise(cpperror, e.what());    
-+      rb_raise(cpperror, "%s", e.what());    
-     }
-     catch (const SBMLExtensionException &e){
-       static VALUE cpperror = rb_define_class("SBMLConstructorException", rb_eArgError);
--      rb_raise(cpperror, e.what());    
-+      rb_raise(cpperror, "%s", e.what());    
-     }
-   }
-   return self;
-@@ -22065,11 +22065,11 @@ _wrap_new_Model__SWIG_0(int argc, VALUE
-     }
-     catch (const SBMLConstructorException &e){
-       static VALUE cpperror = rb_define_class("SBMLConstructorException", rb_eArgError);
--      rb_raise(cpperror, e.what());    
-+      rb_raise(cpperror, "%s", e.what());    
-     }
-     catch (const SBMLExtensionException &e){
-       static VALUE cpperror = rb_define_class("SBMLConstructorException", rb_eArgError);
--      rb_raise(cpperror, e.what());    
-+      rb_raise(cpperror, "%s", e.what());    
-     }
-   }
-   return self;
-@@ -22102,11 +22102,11 @@ _wrap_new_Model__SWIG_1(int argc, VALUE
-     }
-     catch (const SBMLConstructorException &e){
-       static VALUE cpperror = rb_define_class("SBMLConstructorException", rb_eArgError);
--      rb_raise(cpperror, e.what());    
-+      rb_raise(cpperror, "%s", e.what());    
-     }
-     catch (const SBMLExtensionException &e){
-       static VALUE cpperror = rb_define_class("SBMLConstructorException", rb_eArgError);
--      rb_raise(cpperror, e.what());    
-+      rb_raise(cpperror, "%s", e.what());    
-     }
-   }
-   return self;
-@@ -22165,11 +22165,11 @@ _wrap_new_Model__SWIG_2(int argc, VALUE
-     }
-     catch (const SBMLConstructorException &e){
-       static VALUE cpperror = rb_define_class("SBMLConstructorException", rb_eArgError);
--      rb_raise(cpperror, e.what());    
-+      rb_raise(cpperror, "%s", e.what());    
-     }
-     catch (const SBMLExtensionException &e){
-       static VALUE cpperror = rb_define_class("SBMLConstructorException", rb_eArgError);
--      rb_raise(cpperror, e.what());    
-+      rb_raise(cpperror, "%s", e.what());    
-     }
-   }
-   return self;
-@@ -31605,11 +31605,11 @@ _wrap_new_SBMLDocument__SWIG_0(int argc,
-     }
-     catch (const SBMLConstructorException &e){
-       static VALUE cpperror = rb_define_class("SBMLConstructorException", rb_eArgError);
--      rb_raise(cpperror, e.what());    
-+      rb_raise(cpperror, "%s", e.what());    
-     }
-     catch (const SBMLExtensionException &e){
-       static VALUE cpperror = rb_define_class("SBMLConstructorException", rb_eArgError);
--      rb_raise(cpperror, e.what());    
-+      rb_raise(cpperror, "%s", e.what());    
-     }
-   }
-   return self;
-@@ -31642,11 +31642,11 @@ _wrap_new_SBMLDocument__SWIG_1(int argc,
-     }
-     catch (const SBMLConstructorException &e){
-       static VALUE cpperror = rb_define_class("SBMLConstructorException", rb_eArgError);
--      rb_raise(cpperror, e.what());    
-+      rb_raise(cpperror, "%s", e.what());    
-     }
-     catch (const SBMLExtensionException &e){
-       static VALUE cpperror = rb_define_class("SBMLConstructorException", rb_eArgError);
--      rb_raise(cpperror, e.what());    
-+      rb_raise(cpperror, "%s", e.what());    
-     }
-   }
-   return self;
-@@ -31671,11 +31671,11 @@ _wrap_new_SBMLDocument__SWIG_2(int argc,
-     }
-     catch (const SBMLConstructorException &e){
-       static VALUE cpperror = rb_define_class("SBMLConstructorException", rb_eArgError);
--      rb_raise(cpperror, e.what());    
-+      rb_raise(cpperror, "%s", e.what());    
-     }
-     catch (const SBMLExtensionException &e){
-       static VALUE cpperror = rb_define_class("SBMLConstructorException", rb_eArgError);
--      rb_raise(cpperror, e.what());    
-+      rb_raise(cpperror, "%s", e.what());    
-     }
-   }
-   return self;
-@@ -31708,11 +31708,11 @@ _wrap_new_SBMLDocument__SWIG_3(int argc,
-     }
-     catch (const SBMLConstructorException &e){
-       static VALUE cpperror = rb_define_class("SBMLConstructorException", rb_eArgError);
--      rb_raise(cpperror, e.what());    
-+      rb_raise(cpperror, "%s", e.what());    
-     }
-     catch (const SBMLExtensionException &e){
-       static VALUE cpperror = rb_define_class("SBMLConstructorException", rb_eArgError);
--      rb_raise(cpperror, e.what());    
-+      rb_raise(cpperror, "%s", e.what());    
-     }
-   }
-   return self;
-@@ -31771,11 +31771,11 @@ _wrap_new_SBMLDocument__SWIG_4(int argc,
-     }
-     catch (const SBMLConstructorException &e){
-       static VALUE cpperror = rb_define_class("SBMLConstructorException", rb_eArgError);
--      rb_raise(cpperror, e.what());    
-+      rb_raise(cpperror, "%s", e.what());    
-     }
-     catch (const SBMLExtensionException &e){
-       static VALUE cpperror = rb_define_class("SBMLConstructorException", rb_eArgError);
--      rb_raise(cpperror, e.what());    
-+      rb_raise(cpperror, "%s", e.what());    
-     }
-   }
-   return self;
-@@ -34163,11 +34163,11 @@ _wrap_new_FunctionDefinition__SWIG_0(int
-     }
-     catch (const SBMLConstructorException &e){
-       static VALUE cpperror = rb_define_class("SBMLConstructorException", rb_eArgError);
--      rb_raise(cpperror, e.what());    
-+      rb_raise(cpperror, "%s", e.what());    
-     }
-     catch (const SBMLExtensionException &e){
-       static VALUE cpperror = rb_define_class("SBMLConstructorException", rb_eArgError);
--      rb_raise(cpperror, e.what());    
-+      rb_raise(cpperror, "%s", e.what());    
-     }
-   }
-   return self;
-@@ -34200,11 +34200,11 @@ _wrap_new_FunctionDefinition__SWIG_1(int
-     }
-     catch (const SBMLConstructorException &e){
-       static VALUE cpperror = rb_define_class("SBMLConstructorException", rb_eArgError);
--      rb_raise(cpperror, e.what());    
-+      rb_raise(cpperror, "%s", e.what());    
-     }
-     catch (const SBMLExtensionException &e){
-       static VALUE cpperror = rb_define_class("SBMLConstructorException", rb_eArgError);
--      rb_raise(cpperror, e.what());    
-+      rb_raise(cpperror, "%s", e.what());    
-     }
-   }
-   return self;
-@@ -34263,11 +34263,11 @@ _wrap_new_FunctionDefinition__SWIG_2(int
-     }
-     catch (const SBMLConstructorException &e){
-       static VALUE cpperror = rb_define_class("SBMLConstructorException", rb_eArgError);
--      rb_raise(cpperror, e.what());    
-+      rb_raise(cpperror, "%s", e.what());    
-     }
-     catch (const SBMLExtensionException &e){
-       static VALUE cpperror = rb_define_class("SBMLConstructorException", rb_eArgError);
--      rb_raise(cpperror, e.what());    
-+      rb_raise(cpperror, "%s", e.what());    
-     }
-   }
-   return self;
-@@ -35078,11 +35078,11 @@ _wrap_new_ListOfFunctionDefinitions__SWI
-     }
-     catch (const SBMLConstructorException &e){
-       static VALUE cpperror = rb_define_class("SBMLConstructorException", rb_eArgError);
--      rb_raise(cpperror, e.what());    
-+      rb_raise(cpperror, "%s", e.what());    
-     }
-     catch (const SBMLExtensionException &e){
-       static VALUE cpperror = rb_define_class("SBMLConstructorException", rb_eArgError);
--      rb_raise(cpperror, e.what());    
-+      rb_raise(cpperror, "%s", e.what());    
-     }
-   }
-   return self;
-@@ -35132,11 +35132,11 @@ _wrap_new_ListOfFunctionDefinitions__SWI
-     }
-     catch (const SBMLConstructorException &e){
-       static VALUE cpperror = rb_define_class("SBMLConstructorException", rb_eArgError);
--      rb_raise(cpperror, e.what());    
-+      rb_raise(cpperror, "%s", e.what());    
-     }
-     catch (const SBMLExtensionException &e){
-       static VALUE cpperror = rb_define_class("SBMLConstructorException", rb_eArgError);
--      rb_raise(cpperror, e.what());    
-+      rb_raise(cpperror, "%s", e.what());    
-     }
-   }
-   return self;
-@@ -35815,11 +35815,11 @@ _wrap_new_Unit__SWIG_1(int argc, VALUE *
-     }
-     catch (const SBMLConstructorException &e){
-       static VALUE cpperror = rb_define_class("SBMLConstructorException", rb_eArgError);
--      rb_raise(cpperror, e.what());    
-+      rb_raise(cpperror, "%s", e.what());    
-     }
-     catch (const SBMLExtensionException &e){
-       static VALUE cpperror = rb_define_class("SBMLConstructorException", rb_eArgError);
--      rb_raise(cpperror, e.what());    
-+      rb_raise(cpperror, "%s", e.what());    
-     }
-   }
-   return self;
-@@ -35878,11 +35878,11 @@ _wrap_new_Unit__SWIG_2(int argc, VALUE *
-     }
-     catch (const SBMLConstructorException &e){
-       static VALUE cpperror = rb_define_class("SBMLConstructorException", rb_eArgError);
--      rb_raise(cpperror, e.what());    
-+      rb_raise(cpperror, "%s", e.what());    
-     }
-     catch (const SBMLExtensionException &e){
-       static VALUE cpperror = rb_define_class("SBMLConstructorException", rb_eArgError);
--      rb_raise(cpperror, e.what());    
-+      rb_raise(cpperror, "%s", e.what());    
-     }
-   }
-   return self;
-@@ -37632,11 +37632,11 @@ _wrap_new_ListOfUnits__SWIG_0(int argc,
-     }
-     catch (const SBMLConstructorException &e){
-       static VALUE cpperror = rb_define_class("SBMLConstructorException", rb_eArgError);
--      rb_raise(cpperror, e.what());    
-+      rb_raise(cpperror, "%s", e.what());    
-     }
-     catch (const SBMLExtensionException &e){
-       static VALUE cpperror = rb_define_class("SBMLConstructorException", rb_eArgError);
--      rb_raise(cpperror, e.what());    
-+      rb_raise(cpperror, "%s", e.what());    
-     }
-   }
-   return self;
-@@ -39503,11 +39503,11 @@ _wrap_new_ListOfUnitDefinitions__SWIG_0(
-     }
-     catch (const SBMLConstructorException &e){
-       static VALUE cpperror = rb_define_class("SBMLConstructorException", rb_eArgError);
--      rb_raise(cpperror, e.what());    
-+      rb_raise(cpperror, "%s", e.what());    
-     }
-     catch (const SBMLExtensionException &e){
-       static VALUE cpperror = rb_define_class("SBMLConstructorException", rb_eArgError);
--      rb_raise(cpperror, e.what());    
-+      rb_raise(cpperror, "%s", e.what());    
-     }
-   }
-   return self;
-@@ -39557,11 +39557,11 @@ _wrap_new_ListOfUnitDefinitions__SWIG_1(
-     }
-     catch (const SBMLConstructorException &e){
-       static VALUE cpperror = rb_define_class("SBMLConstructorException", rb_eArgError);
--      rb_raise(cpperror, e.what());    
-+      rb_raise(cpperror, "%s", e.what());    
-     }
-     catch (const SBMLExtensionException &e){
-       static VALUE cpperror = rb_define_class("SBMLConstructorException", rb_eArgError);
--      rb_raise(cpperror, e.what());    
-+      rb_raise(cpperror, "%s", e.what());    
-     }
-   }
-   return self;
-@@ -40118,11 +40118,11 @@ _wrap_new_CompartmentType__SWIG_0(int ar
-     }
-     catch (const SBMLConstructorException &e){
-       static VALUE cpperror = rb_define_class("SBMLConstructorException", rb_eArgError);
--      rb_raise(cpperror, e.what());    
-+      rb_raise(cpperror, "%s", e.what());    
-     }
-     catch (const SBMLExtensionException &e){
-       static VALUE cpperror = rb_define_class("SBMLConstructorException", rb_eArgError);
--      rb_raise(cpperror, e.what());    
-+      rb_raise(cpperror, "%s", e.what());    
-     }
-   }
-   return self;
-@@ -40155,11 +40155,11 @@ _wrap_new_CompartmentType__SWIG_1(int ar
-     }
-     catch (const SBMLConstructorException &e){
-       static VALUE cpperror = rb_define_class("SBMLConstructorException", rb_eArgError);
--      rb_raise(cpperror, e.what());    
-+      rb_raise(cpperror, "%s", e.what());    
-     }
-     catch (const SBMLExtensionException &e){
-       static VALUE cpperror = rb_define_class("SBMLConstructorException", rb_eArgError);
--      rb_raise(cpperror, e.what());    
-+      rb_raise(cpperror, "%s", e.what());    
-     }
-   }
-   return self;
-@@ -40218,11 +40218,11 @@ _wrap_new_CompartmentType__SWIG_2(int ar
-     }
-     catch (const SBMLConstructorException &e){
-       static VALUE cpperror = rb_define_class("SBMLConstructorException", rb_eArgError);
--      rb_raise(cpperror, e.what());    
-+      rb_raise(cpperror, "%s", e.what());    
-     }
-     catch (const SBMLExtensionException &e){
-       static VALUE cpperror = rb_define_class("SBMLConstructorException", rb_eArgError);
--      rb_raise(cpperror, e.what());    
-+      rb_raise(cpperror, "%s", e.what());    
-     }
-   }
-   return self;
-@@ -41702,11 +41702,11 @@ _wrap_new_ListOfSpeciesTypes__SWIG_0(int
-     }
-     catch (const SBMLConstructorException &e){
-       static VALUE cpperror = rb_define_class("SBMLConstructorException", rb_eArgError);
--      rb_raise(cpperror, e.what());    
-+      rb_raise(cpperror, "%s", e.what());    
-     }
-     catch (const SBMLExtensionException &e){
-       static VALUE cpperror = rb_define_class("SBMLConstructorException", rb_eArgError);
--      rb_raise(cpperror, e.what());    
-+      rb_raise(cpperror, "%s", e.what());    
-     }
-   }
-   return self;
-@@ -41756,11 +41756,11 @@ _wrap_new_ListOfSpeciesTypes__SWIG_1(int
-     }
-     catch (const SBMLConstructorException &e){
-       static VALUE cpperror = rb_define_class("SBMLConstructorException", rb_eArgError);
--      rb_raise(cpperror, e.what());    
-+      rb_raise(cpperror, "%s", e.what());    
-     }
-     catch (const SBMLExtensionException &e){
-       static VALUE cpperror = rb_define_class("SBMLConstructorException", rb_eArgError);
--      rb_raise(cpperror, e.what());    
-+      rb_raise(cpperror, "%s", e.what());    
-     }
-   }
-   return self;
-@@ -42313,11 +42313,11 @@ _wrap_new_Compartment__SWIG_1(int argc,
-     }
-     catch (const SBMLConstructorException &e){
-       static VALUE cpperror = rb_define_class("SBMLConstructorException", rb_eArgError);
--      rb_raise(cpperror, e.what());    
-+      rb_raise(cpperror, "%s", e.what());    
-     }
-     catch (const SBMLExtensionException &e){
-       static VALUE cpperror = rb_define_class("SBMLConstructorException", rb_eArgError);
--      rb_raise(cpperror, e.what());    
-+      rb_raise(cpperror, "%s", e.what());    
-     }
-   }
-   return self;
-@@ -42376,11 +42376,11 @@ _wrap_new_Compartment__SWIG_2(int argc,
-     }
-     catch (const SBMLConstructorException &e){
-       static VALUE cpperror = rb_define_class("SBMLConstructorException", rb_eArgError);
--      rb_raise(cpperror, e.what());    
-+      rb_raise(cpperror, "%s", e.what());    
-     }
-     catch (const SBMLExtensionException &e){
-       static VALUE cpperror = rb_define_class("SBMLConstructorException", rb_eArgError);
--      rb_raise(cpperror, e.what());    
-+      rb_raise(cpperror, "%s", e.what());    
-     }
-   }
-   return self;
-@@ -43823,11 +43823,11 @@ _wrap_new_ListOfCompartments__SWIG_0(int
-     }
-     catch (const SBMLConstructorException &e){
-       static VALUE cpperror = rb_define_class("SBMLConstructorException", rb_eArgError);
--      rb_raise(cpperror, e.what());    
-+      rb_raise(cpperror, "%s", e.what());    
-     }
-     catch (const SBMLExtensionException &e){
-       static VALUE cpperror = rb_define_class("SBMLConstructorException", rb_eArgError);
--      rb_raise(cpperror, e.what());    
-+      rb_raise(cpperror, "%s", e.what());    
-     }
-   }
-   return self;
-@@ -44397,11 +44397,11 @@ _wrap_new_Species__SWIG_0(int argc, VALU
-     }
-     catch (const SBMLConstructorException &e){
-       static VALUE cpperror = rb_define_class("SBMLConstructorException", rb_eArgError);
--      rb_raise(cpperror, e.what());    
-+      rb_raise(cpperror, "%s", e.what());    
-     }
-     catch (const SBMLExtensionException &e){
-       static VALUE cpperror = rb_define_class("SBMLConstructorException", rb_eArgError);
--      rb_raise(cpperror, e.what());    
-+      rb_raise(cpperror, "%s", e.what());    
-     }
-   }
-   return self;
-@@ -44434,11 +44434,11 @@ _wrap_new_Species__SWIG_1(int argc, VALU
-     }
-     catch (const SBMLConstructorException &e){
-       static VALUE cpperror = rb_define_class("SBMLConstructorException", rb_eArgError);
--      rb_raise(cpperror, e.what());    
-+      rb_raise(cpperror, "%s", e.what());    
-     }
-     catch (const SBMLExtensionException &e){
-       static VALUE cpperror = rb_define_class("SBMLConstructorException", rb_eArgError);
--      rb_raise(cpperror, e.what());    
-+      rb_raise(cpperror, "%s", e.what());    
-     }
-   }
-   return self;
-@@ -44497,11 +44497,11 @@ _wrap_new_Species__SWIG_2(int argc, VALU
-     }
-     catch (const SBMLConstructorException &e){
-       static VALUE cpperror = rb_define_class("SBMLConstructorException", rb_eArgError);
--      rb_raise(cpperror, e.what());    
-+      rb_raise(cpperror, "%s", e.what());    
-     }
-     catch (const SBMLExtensionException &e){
-       static VALUE cpperror = rb_define_class("SBMLConstructorException", rb_eArgError);
--      rb_raise(cpperror, e.what());    
-+      rb_raise(cpperror, "%s", e.what());    
-     }
-   }
-   return self;
-@@ -46306,11 +46306,11 @@ _wrap_new_ListOfSpecies__SWIG_0(int argc
-     }
-     catch (const SBMLConstructorException &e){
-       static VALUE cpperror = rb_define_class("SBMLConstructorException", rb_eArgError);
--      rb_raise(cpperror, e.what());    
-+      rb_raise(cpperror, "%s", e.what());    
-     }
-     catch (const SBMLExtensionException &e){
-       static VALUE cpperror = rb_define_class("SBMLConstructorException", rb_eArgError);
--      rb_raise(cpperror, e.what());    
-+      rb_raise(cpperror, "%s", e.what());    
-     }
-   }
-   return self;
-@@ -46360,11 +46360,11 @@ _wrap_new_ListOfSpecies__SWIG_1(int argc
-     }
-     catch (const SBMLConstructorException &e){
-       static VALUE cpperror = rb_define_class("SBMLConstructorException", rb_eArgError);
--      rb_raise(cpperror, e.what());    
-+      rb_raise(cpperror, "%s", e.what());    
-     }
-     catch (const SBMLExtensionException &e){
-       static VALUE cpperror = rb_define_class("SBMLConstructorException", rb_eArgError);
--      rb_raise(cpperror, e.what());    
-+      rb_raise(cpperror, "%s", e.what());    
-     }
-   }
-   return self;
-@@ -46880,11 +46880,11 @@ _wrap_new_Parameter__SWIG_0(int argc, VA
-     }
-     catch (const SBMLConstructorException &e){
-       static VALUE cpperror = rb_define_class("SBMLConstructorException", rb_eArgError);
--      rb_raise(cpperror, e.what());    
-+      rb_raise(cpperror, "%s", e.what());    
-     }
-     catch (const SBMLExtensionException &e){
-       static VALUE cpperror = rb_define_class("SBMLConstructorException", rb_eArgError);
--      rb_raise(cpperror, e.what());    
-+      rb_raise(cpperror, "%s", e.what());    
-     }
-   }
-   return self;
-@@ -46917,11 +46917,11 @@ _wrap_new_Parameter__SWIG_1(int argc, VA
-     }
-     catch (const SBMLConstructorException &e){
-       static VALUE cpperror = rb_define_class("SBMLConstructorException", rb_eArgError);
--      rb_raise(cpperror, e.what());    
-+      rb_raise(cpperror, "%s", e.what());    
-     }
-     catch (const SBMLExtensionException &e){
-       static VALUE cpperror = rb_define_class("SBMLConstructorException", rb_eArgError);
--      rb_raise(cpperror, e.what());    
-+      rb_raise(cpperror, "%s", e.what());    
-     }
-   }
-   return self;
-@@ -47868,11 +47868,11 @@ _wrap_new_ListOfParameters__SWIG_0(int a
-     }
-     catch (const SBMLConstructorException &e){
-       static VALUE cpperror = rb_define_class("SBMLConstructorException", rb_eArgError);
--      rb_raise(cpperror, e.what());    
-+      rb_raise(cpperror, "%s", e.what());    
-     }
-     catch (const SBMLExtensionException &e){
-       static VALUE cpperror = rb_define_class("SBMLConstructorException", rb_eArgError);
--      rb_raise(cpperror, e.what());    
-+      rb_raise(cpperror, "%s", e.what());    
-     }
-   }
-   return self;
-@@ -47922,11 +47922,11 @@ _wrap_new_ListOfParameters__SWIG_1(int a
-     }
-     catch (const SBMLConstructorException &e){
-       static VALUE cpperror = rb_define_class("SBMLConstructorException", rb_eArgError);
--      rb_raise(cpperror, e.what());    
-+      rb_raise(cpperror, "%s", e.what());    
-     }
-     catch (const SBMLExtensionException &e){
-       static VALUE cpperror = rb_define_class("SBMLConstructorException", rb_eArgError);
--      rb_raise(cpperror, e.what());    
-+      rb_raise(cpperror, "%s", e.what());    
-     }
-   }
-   return self;
-@@ -48442,11 +48442,11 @@ _wrap_new_LocalParameter__SWIG_0(int arg
-     }
-     catch (const SBMLConstructorException &e){
-       static VALUE cpperror = rb_define_class("SBMLConstructorException", rb_eArgError);
--      rb_raise(cpperror, e.what());    
-+      rb_raise(cpperror, "%s", e.what());    
-     }
-     catch (const SBMLExtensionException &e){
-       static VALUE cpperror = rb_define_class("SBMLConstructorException", rb_eArgError);
--      rb_raise(cpperror, e.what());    
-+      rb_raise(cpperror, "%s", e.what());    
-     }
-   }
-   return self;
-@@ -49601,11 +49601,11 @@ _wrap_new_InitialAssignment__SWIG_2(int
-     }
-     catch (const SBMLConstructorException &e){
-       static VALUE cpperror = rb_define_class("SBMLConstructorException", rb_eArgError);
--      rb_raise(cpperror, e.what());    
-+      rb_raise(cpperror, "%s", e.what());    
-     }
-     catch (const SBMLExtensionException &e){
-       static VALUE cpperror = rb_define_class("SBMLConstructorException", rb_eArgError);
--      rb_raise(cpperror, e.what());    
-+      rb_raise(cpperror, "%s", e.what());    
-     }
-   }
-   return self;
-@@ -50431,11 +50431,11 @@ _wrap_new_ListOfInitialAssignments__SWIG
-     }
-     catch (const SBMLConstructorException &e){
-       static VALUE cpperror = rb_define_class("SBMLConstructorException", rb_eArgError);
--      rb_raise(cpperror, e.what());    
-+      rb_raise(cpperror, "%s", e.what());    
-     }
-     catch (const SBMLExtensionException &e){
-       static VALUE cpperror = rb_define_class("SBMLConstructorException", rb_eArgError);
--      rb_raise(cpperror, e.what());    
-+      rb_raise(cpperror, "%s", e.what());    
-     }
-   }
-   return self;
-@@ -50485,11 +50485,11 @@ _wrap_new_ListOfInitialAssignments__SWIG
-     }
-     catch (const SBMLConstructorException &e){
-       static VALUE cpperror = rb_define_class("SBMLConstructorException", rb_eArgError);
--      rb_raise(cpperror, e.what());    
-+      rb_raise(cpperror, "%s", e.what());    
-     }
-     catch (const SBMLExtensionException &e){
-       static VALUE cpperror = rb_define_class("SBMLConstructorException", rb_eArgError);
--      rb_raise(cpperror, e.what());    
-+      rb_raise(cpperror, "%s", e.what());    
-     }
-   }
-   return self;
-@@ -52275,11 +52275,11 @@ _wrap_new_ListOfRules__SWIG_0(int argc,
-     }
-     catch (const SBMLConstructorException &e){
-       static VALUE cpperror = rb_define_class("SBMLConstructorException", rb_eArgError);
--      rb_raise(cpperror, e.what());    
-+      rb_raise(cpperror, "%s", e.what());    
-     }
-     catch (const SBMLExtensionException &e){
-       static VALUE cpperror = rb_define_class("SBMLConstructorException", rb_eArgError);
--      rb_raise(cpperror, e.what());    
-+      rb_raise(cpperror, "%s", e.what());    
-     }
-   }
-   return self;
-@@ -52329,11 +52329,11 @@ _wrap_new_ListOfRules__SWIG_1(int argc,
-     }
-     catch (const SBMLConstructorException &e){
-       static VALUE cpperror = rb_define_class("SBMLConstructorException", rb_eArgError);
--      rb_raise(cpperror, e.what());    
-+      rb_raise(cpperror, "%s", e.what());    
-     }
-     catch (const SBMLExtensionException &e){
-       static VALUE cpperror = rb_define_class("SBMLConstructorException", rb_eArgError);
--      rb_raise(cpperror, e.what());    
-+      rb_raise(cpperror, "%s", e.what());    
-     }
-   }
-   return self;
-@@ -54292,11 +54292,11 @@ _wrap_new_ListOfConstraints__SWIG_0(int
-     }
-     catch (const SBMLConstructorException &e){
-       static VALUE cpperror = rb_define_class("SBMLConstructorException", rb_eArgError);
--      rb_raise(cpperror, e.what());    
-+      rb_raise(cpperror, "%s", e.what());    
-     }
-     catch (const SBMLExtensionException &e){
-       static VALUE cpperror = rb_define_class("SBMLConstructorException", rb_eArgError);
--      rb_raise(cpperror, e.what());    
-+      rb_raise(cpperror, "%s", e.what());    
-     }
-   }
-   return self;
-@@ -54346,11 +54346,11 @@ _wrap_new_ListOfConstraints__SWIG_1(int
-     }
-     catch (const SBMLConstructorException &e){
-       static VALUE cpperror = rb_define_class("SBMLConstructorException", rb_eArgError);
--      rb_raise(cpperror, e.what());    
-+      rb_raise(cpperror, "%s", e.what());    
-     }
-     catch (const SBMLExtensionException &e){
-       static VALUE cpperror = rb_define_class("SBMLConstructorException", rb_eArgError);
--      rb_raise(cpperror, e.what());    
-+      rb_raise(cpperror, "%s", e.what());    
-     }
-   }
-   return self;
-@@ -54772,11 +54772,11 @@ _wrap_new_Reaction__SWIG_2(int argc, VAL
-     }
-     catch (const SBMLConstructorException &e){
-       static VALUE cpperror = rb_define_class("SBMLConstructorException", rb_eArgError);
--      rb_raise(cpperror, e.what());    
-+      rb_raise(cpperror, "%s", e.what());    
-     }
-     catch (const SBMLExtensionException &e){
-       static VALUE cpperror = rb_define_class("SBMLConstructorException", rb_eArgError);
--      rb_raise(cpperror, e.what());    
-+      rb_raise(cpperror, "%s", e.what());    
-     }
-   }
-   return self;
-@@ -57421,11 +57421,11 @@ _wrap_new_ListOfReactions__SWIG_0(int ar
-     }
-     catch (const SBMLConstructorException &e){
-       static VALUE cpperror = rb_define_class("SBMLConstructorException", rb_eArgError);
--      rb_raise(cpperror, e.what());    
-+      rb_raise(cpperror, "%s", e.what());    
-     }
-     catch (const SBMLExtensionException &e){
-       static VALUE cpperror = rb_define_class("SBMLConstructorException", rb_eArgError);
--      rb_raise(cpperror, e.what());    
-+      rb_raise(cpperror, "%s", e.what());    
-     }
-   }
-   return self;
-@@ -57475,11 +57475,11 @@ _wrap_new_ListOfReactions__SWIG_1(int ar
-     }
-     catch (const SBMLConstructorException &e){
-       static VALUE cpperror = rb_define_class("SBMLConstructorException", rb_eArgError);
--      rb_raise(cpperror, e.what());    
-+      rb_raise(cpperror, "%s", e.what());    
-     }
-     catch (const SBMLExtensionException &e){
-       static VALUE cpperror = rb_define_class("SBMLConstructorException", rb_eArgError);
--      rb_raise(cpperror, e.what());    
-+      rb_raise(cpperror, "%s", e.what());    
-     }
-   }
-   return self;
-@@ -58095,11 +58095,11 @@ _wrap_new_KineticLaw__SWIG_2(int argc, V
-     }
-     catch (const SBMLConstructorException &e){
-       static VALUE cpperror = rb_define_class("SBMLConstructorException", rb_eArgError);
--      rb_raise(cpperror, e.what());    
-+      rb_raise(cpperror, "%s", e.what());    
-     }
-     catch (const SBMLExtensionException &e){
-       static VALUE cpperror = rb_define_class("SBMLConstructorException", rb_eArgError);
--      rb_raise(cpperror, e.what());    
-+      rb_raise(cpperror, "%s", e.what());    
-     }
-   }
-   return self;
-@@ -60717,11 +60717,11 @@ _wrap_new_SpeciesReference__SWIG_0(int a
-     }
-     catch (const SBMLConstructorException &e){
-       static VALUE cpperror = rb_define_class("SBMLConstructorException", rb_eArgError);
--      rb_raise(cpperror, e.what());    
-+      rb_raise(cpperror, "%s", e.what());    
-     }
-     catch (const SBMLExtensionException &e){
-       static VALUE cpperror = rb_define_class("SBMLConstructorException", rb_eArgError);
--      rb_raise(cpperror, e.what());    
-+      rb_raise(cpperror, "%s", e.what());    
-     }
-   }
-   return self;
-@@ -60817,11 +60817,11 @@ _wrap_new_SpeciesReference__SWIG_2(int a
-     }
-     catch (const SBMLConstructorException &e){
-       static VALUE cpperror = rb_define_class("SBMLConstructorException", rb_eArgError);
--      rb_raise(cpperror, e.what());    
-+      rb_raise(cpperror, "%s", e.what());    
-     }
-     catch (const SBMLExtensionException &e){
-       static VALUE cpperror = rb_define_class("SBMLConstructorException", rb_eArgError);
--      rb_raise(cpperror, e.what());    
-+      rb_raise(cpperror, "%s", e.what());    
-     }
-   }
-   return self;
-@@ -61714,11 +61714,11 @@ _wrap_new_ListOfSpeciesReferences__SWIG_
-     }
-     catch (const SBMLConstructorException &e){
-       static VALUE cpperror = rb_define_class("SBMLConstructorException", rb_eArgError);
--      rb_raise(cpperror, e.what());    
-+      rb_raise(cpperror, "%s", e.what());    
-     }
-     catch (const SBMLExtensionException &e){
-       static VALUE cpperror = rb_define_class("SBMLConstructorException", rb_eArgError);
--      rb_raise(cpperror, e.what());    
-+      rb_raise(cpperror, "%s", e.what());    
-     }
-   }
-   return self;
-@@ -61768,11 +61768,11 @@ _wrap_new_ListOfSpeciesReferences__SWIG_
-     }
-     catch (const SBMLConstructorException &e){
-       static VALUE cpperror = rb_define_class("SBMLConstructorException", rb_eArgError);
--      rb_raise(cpperror, e.what());    
-+      rb_raise(cpperror, "%s", e.what());    
-     }
-     catch (const SBMLExtensionException &e){
-       static VALUE cpperror = rb_define_class("SBMLConstructorException", rb_eArgError);
--      rb_raise(cpperror, e.what());    
-+      rb_raise(cpperror, "%s", e.what());    
-     }
-   }
-   return self;
-@@ -62300,11 +62300,11 @@ _wrap_new_ModifierSpeciesReference__SWIG
-     }
-     catch (const SBMLConstructorException &e){
-       static VALUE cpperror = rb_define_class("SBMLConstructorException", rb_eArgError);
--      rb_raise(cpperror, e.what());    
-+      rb_raise(cpperror, "%s", e.what());    
-     }
-     catch (const SBMLExtensionException &e){
-       static VALUE cpperror = rb_define_class("SBMLConstructorException", rb_eArgError);
--      rb_raise(cpperror, e.what());    
-+      rb_raise(cpperror, "%s", e.what());    
-     }
-   }
-   return self;
-@@ -62594,11 +62594,11 @@ _wrap_new_Event__SWIG_1(int argc, VALUE
-     }
-     catch (const SBMLConstructorException &e){
-       static VALUE cpperror = rb_define_class("SBMLConstructorException", rb_eArgError);
--      rb_raise(cpperror, e.what());    
-+      rb_raise(cpperror, "%s", e.what());    
-     }
-     catch (const SBMLExtensionException &e){
-       static VALUE cpperror = rb_define_class("SBMLConstructorException", rb_eArgError);
--      rb_raise(cpperror, e.what());    
-+      rb_raise(cpperror, "%s", e.what());    
-     }
-   }
-   return self;
-@@ -62657,11 +62657,11 @@ _wrap_new_Event__SWIG_2(int argc, VALUE
-     }
-     catch (const SBMLConstructorException &e){
-       static VALUE cpperror = rb_define_class("SBMLConstructorException", rb_eArgError);
--      rb_raise(cpperror, e.what());    
-+      rb_raise(cpperror, "%s", e.what());    
-     }
-     catch (const SBMLExtensionException &e){
-       static VALUE cpperror = rb_define_class("SBMLConstructorException", rb_eArgError);
--      rb_raise(cpperror, e.what());    
-+      rb_raise(cpperror, "%s", e.what());    
-     }
-   }
-   return self;
-@@ -64544,11 +64544,11 @@ _wrap_new_ListOfEvents__SWIG_0(int argc,
-     }
-     catch (const SBMLConstructorException &e){
-       static VALUE cpperror = rb_define_class("SBMLConstructorException", rb_eArgError);
--      rb_raise(cpperror, e.what());    
-+      rb_raise(cpperror, "%s", e.what());    
-     }
-     catch (const SBMLExtensionException &e){
-       static VALUE cpperror = rb_define_class("SBMLConstructorException", rb_eArgError);
--      rb_raise(cpperror, e.what());    
-+      rb_raise(cpperror, "%s", e.what());    
-     }
-   }
-   return self;
-@@ -64598,11 +64598,11 @@ _wrap_new_ListOfEvents__SWIG_1(int argc,
-     }
-     catch (const SBMLConstructorException &e){
-       static VALUE cpperror = rb_define_class("SBMLConstructorException", rb_eArgError);
--      rb_raise(cpperror, e.what());    
-+      rb_raise(cpperror, "%s", e.what());    
-     }
-     catch (const SBMLExtensionException &e){
-       static VALUE cpperror = rb_define_class("SBMLConstructorException", rb_eArgError);
--      rb_raise(cpperror, e.what());    
-+      rb_raise(cpperror, "%s", e.what());    
-     }
-   }
-   return self;
-@@ -65118,11 +65118,11 @@ _wrap_new_EventAssignment__SWIG_0(int ar
-     }
-     catch (const SBMLConstructorException &e){
-       static VALUE cpperror = rb_define_class("SBMLConstructorException", rb_eArgError);
--      rb_raise(cpperror, e.what());    
-+      rb_raise(cpperror, "%s", e.what());    
-     }
-     catch (const SBMLExtensionException &e){
-       static VALUE cpperror = rb_define_class("SBMLConstructorException", rb_eArgError);
--      rb_raise(cpperror, e.what());    
-+      rb_raise(cpperror, "%s", e.what());    
-     }
-   }
-   return self;
-@@ -66048,11 +66048,11 @@ _wrap_new_ListOfEventAssignments__SWIG_0
-     }
-     catch (const SBMLConstructorException &e){
-       static VALUE cpperror = rb_define_class("SBMLConstructorException", rb_eArgError);
--      rb_raise(cpperror, e.what());    
-+      rb_raise(cpperror, "%s", e.what());    
-     }
-     catch (const SBMLExtensionException &e){
-       static VALUE cpperror = rb_define_class("SBMLConstructorException", rb_eArgError);
--      rb_raise(cpperror, e.what());    
-+      rb_raise(cpperror, "%s", e.what());    
-     }
-   }
-   return self;
-@@ -66102,11 +66102,11 @@ _wrap_new_ListOfEventAssignments__SWIG_1
-     }
-     catch (const SBMLConstructorException &e){
-       static VALUE cpperror = rb_define_class("SBMLConstructorException", rb_eArgError);
--      rb_raise(cpperror, e.what());    
-+      rb_raise(cpperror, "%s", e.what());    
-     }
-     catch (const SBMLExtensionException &e){
-       static VALUE cpperror = rb_define_class("SBMLConstructorException", rb_eArgError);
--      rb_raise(cpperror, e.what());    
-+      rb_raise(cpperror, "%s", e.what());    
-     }
-   }
-   return self;
-@@ -68135,11 +68135,11 @@ _wrap_new_Priority__SWIG_0(int argc, VAL
-     }
-     catch (const SBMLConstructorException &e){
-       static VALUE cpperror = rb_define_class("SBMLConstructorException", rb_eArgError);
--      rb_raise(cpperror, e.what());    
-+      rb_raise(cpperror, "%s", e.what());    
-     }
-     catch (const SBMLExtensionException &e){
-       static VALUE cpperror = rb_define_class("SBMLConstructorException", rb_eArgError);
--      rb_raise(cpperror, e.what());    
-+      rb_raise(cpperror, "%s", e.what());    
-     }
-   }
-   return self;
-@@ -68172,11 +68172,11 @@ _wrap_new_Priority__SWIG_1(int argc, VAL
-     }
-     catch (const SBMLConstructorException &e){
-       static VALUE cpperror = rb_define_class("SBMLConstructorException", rb_eArgError);
--      rb_raise(cpperror, e.what());    
-+      rb_raise(cpperror, "%s", e.what());    
-     }
-     catch (const SBMLExtensionException &e){
-       static VALUE cpperror = rb_define_class("SBMLConstructorException", rb_eArgError);
--      rb_raise(cpperror, e.what());    
-+      rb_raise(cpperror, "%s", e.what());    
-     }
-   }
-   return self;
-@@ -68235,11 +68235,11 @@ _wrap_new_Priority__SWIG_2(int argc, VAL
-     }
-     catch (const SBMLConstructorException &e){
-       static VALUE cpperror = rb_define_class("SBMLConstructorException", rb_eArgError);
--      rb_raise(cpperror, e.what());    
-+      rb_raise(cpperror, "%s", e.what());    
-     }
-     catch (const SBMLExtensionException &e){
-       static VALUE cpperror = rb_define_class("SBMLConstructorException", rb_eArgError);
--      rb_raise(cpperror, e.what());    
-+      rb_raise(cpperror, "%s", e.what());    
-     }
-   }
-   return self;
-@@ -69827,11 +69827,11 @@ _wrap_new_StoichiometryMath__SWIG_0(int
-     }
-     catch (const SBMLConstructorException &e){
-       static VALUE cpperror = rb_define_class("SBMLConstructorException", rb_eArgError);
--      rb_raise(cpperror, e.what());    
-+      rb_raise(cpperror, "%s", e.what());    
-     }
-     catch (const SBMLExtensionException &e){
-       static VALUE cpperror = rb_define_class("SBMLConstructorException", rb_eArgError);
--      rb_raise(cpperror, e.what());    
-+      rb_raise(cpperror, "%s", e.what());    
-     }
-   }
-   return self;
-@@ -69927,11 +69927,11 @@ _wrap_new_StoichiometryMath__SWIG_2(int
-     }
-     catch (const SBMLConstructorException &e){
-       static VALUE cpperror = rb_define_class("SBMLConstructorException", rb_eArgError);
--      rb_raise(cpperror, e.what());    
-+      rb_raise(cpperror, "%s", e.what());    
-     }
-     catch (const SBMLExtensionException &e){
-       static VALUE cpperror = rb_define_class("SBMLConstructorException", rb_eArgError);
--      rb_raise(cpperror, e.what());    
-+      rb_raise(cpperror, "%s", e.what());    
-     }
-   }
-   return self;
-@@ -70558,11 +70558,11 @@ _wrap_new_SBMLNamespaces__SWIG_0(int arg
-     }
-     catch (const SBMLConstructorException &e){
-       static VALUE cpperror = rb_define_class("SBMLConstructorException", rb_eArgError);
--      rb_raise(cpperror, e.what());    
-+      rb_raise(cpperror, "%s", e.what());    
-     }
-     catch (const SBMLExtensionException &e){
-       static VALUE cpperror = rb_define_class("SBMLConstructorException", rb_eArgError);
--      rb_raise(cpperror, e.what());    
-+      rb_raise(cpperror, "%s", e.what());    
-     }
-   }
-   return self;
-@@ -70838,11 +70838,11 @@ _wrap_new_SBMLNamespaces__SWIG_5(int arg
-     }
-     catch (const SBMLConstructorException &e){
-       static VALUE cpperror = rb_define_class("SBMLConstructorException", rb_eArgError);
--      rb_raise(cpperror, e.what());    
-+      rb_raise(cpperror, "%s", e.what());    
-     }
-     catch (const SBMLExtensionException &e){
-       static VALUE cpperror = rb_define_class("SBMLConstructorException", rb_eArgError);
--      rb_raise(cpperror, e.what());    
-+      rb_raise(cpperror, "%s", e.what());    
-     }
-   }
-   return self;
-@@ -95042,7 +95042,7 @@ _wrap_new_XMLError__SWIG_7(int argc, VAL
-     }
-     catch (const XMLConstructorException &e){
-       static VALUE cpperror = rb_define_class("XMLConstructorException", rb_eArgError);
--      rb_raise(cpperror, e.what());    
-+      rb_raise(cpperror, "%s", e.what());    
-     }
-   }
-   return self;

Modified: trunk/packages/libsbml/trunk/debian/rules
===================================================================
--- trunk/packages/libsbml/trunk/debian/rules	2014-08-12 13:56:00 UTC (rev 17707)
+++ trunk/packages/libsbml/trunk/debian/rules	2014-08-12 14:28:01 UTC (rev 17708)
@@ -26,18 +26,18 @@
 	dh  $@ --with-python2 --dbg-package=${dbgpack}
 
 get-orig-source:
-	uscan --verbose  --download-current-version --force-download --repack
+	uscan --verbose --download-current-version --force-download --repack
 
 override_dh_auto_clean:
 	### the clean target of the libsbml makefile is highly b0rken ###
 	### the switch to cmake didn't result in great approvements ###
 	### still inline changes of files ###
 	### very ugly ###
-	rm -rf .debs config docs examples macosx src config.guess config.sub build
+	rm -rf .debs .pc config docs examples macosx src config.guess config.sub build
 	find -maxdepth 1 -type f -delete
 	dh_clean
-	if [ -e ../libsbml_$(version).orig.tar.xz ] ; then COMP=xz ; else COMP=gz ; fi ; \
-	tar --no-same-owner -xaf ../libsbml_$(version).orig.tar.$${COMP} --strip-components=1
+	if [ -e ../libsbml_$(version).orig.tar.xz ] ; then COMP=xz ; TAR_OPT="-xaf" ; else COMP=gz ; TAR_OPT="-xzf" ; fi ; \
+	tar --no-same-owner $${TAR_OPT} ../libsbml_$(version).orig.tar.$${COMP} --strip-components=1
 
 override_dh_auto_configure:
 ifdef BIND_MATLAB

Modified: trunk/packages/libsbml/trunk/debian/watch
===================================================================
--- trunk/packages/libsbml/trunk/debian/watch	2014-08-12 13:56:00 UTC (rev 17707)
+++ trunk/packages/libsbml/trunk/debian/watch	2014-08-12 14:28:01 UTC (rev 17708)
@@ -1,3 +1,4 @@
 version=3
-opts=dversionmangle=s/\+dfsg// \
+
+opts=uversionmangle=s/$/+dfsg/ \
   http://sf.net/sbml/lib[Ss][Bb][Mm][Ll]-(.*)-core-plus-packages-src\.(?:zip|tgz|tbz2|txz|tar\.gz|tar\.bz2|tar\.xz)




More information about the debian-med-commit mailing list