[sbml-svn] SF.net SVN: sbml:[21769] branches/libsbml-experimental

SourceForge Headquarters 1320 Columbia Street Suite 310 San Diego, CA 92101 +1 (858) 422-6466

Revision: 21769
          http://sourceforge.net/p/sbml/code/21769
Author:   sarahkeating
Date:     2014-11-27 10:18:04 +0000 (Thu, 27 Nov 2014)
Log Message:
-----------
Merged revision(s) 21762-21768 from trunk/libsbml:

Modified Paths:
--------------
    branches/libsbml-experimental/NEWS.txt
    branches/libsbml-experimental/VERSION.txt
    branches/libsbml-experimental/configure
    branches/libsbml-experimental/dev/misc-files/headings_for_NEWS.txt
    branches/libsbml-experimental/dev/misc-files/readmes-for-downloads-new-dir-struct/experimental/binaries/linux/R_interface/README.md.in
    branches/libsbml-experimental/dev/misc-files/readmes-for-downloads-new-dir-struct/stable/linux/32-bit/README.md.in
    branches/libsbml-experimental/dev/misc-files/readmes-for-downloads-new-dir-struct/stable/linux/64-bit/README.md.in
    branches/libsbml-experimental/dev/misc-files/readmes-for-downloads-new-dir-struct/stable/macos/README.md.in
    branches/libsbml-experimental/dev/misc-files/readmes-for-downloads-new-dir-struct/stable/windows/32-bit/README.md.in
    branches/libsbml-experimental/dev/misc-files/readmes-for-downloads-new-dir-struct/stable/windows/64-bit/README.md.in
    branches/libsbml-experimental/src/sbml/common/libsbml-version.h

Property Changed:
----------------
    branches/libsbml-experimental/

Index: branches/libsbml-experimental
===================================================================

--- branches/libsbml-experimental	2014-11-27 10:14:01 UTC (rev 21768)
+++ branches/libsbml-experimental	2014-11-27 10:18:04 UTC (rev 21769)

Property changes on: branches/libsbml-experimental
___________________________________________________________________
Modified: svn:mergeinfo
## -2,4 +2,4 ##
 /branches/libsbml-4:9056-10118
 /branches/libsbml-5-conversion:14155-14227
 /branches/libsbml-ast-plugin:16251-19654
-/trunk/libsbml:18168-18171,18174-18194,18196-18201,18204,18207-18209,18211-18213,18215-18216,18226,18228-18292,18294-18388,18390-18443,18450-18454,18456-18458,18460-18462,18464,18466,18469-18520,18523-18561,18563,18565-18584,18586-18638,18640-18641,18644-18715,18717-18844,18846-19128,19130-19829,19831-21161,21163-21488,21490-21761
+/trunk/libsbml:18168-18171,18174-18194,18196-18201,18204,18207-18209,18211-18213,18215-18216,18226,18228-18292,18294-18388,18390-18443,18450-18454,18456-18458,18460-18462,18464,18466,18469-18520,18523-18561,18563,18565-18584,18586-18638,18640-18641,18644-18715,18717-18844,18846-19128,19130-19829,19831-21161,21163-21488,21490-21768
\ No newline at end of property
Modified: branches/libsbml-experimental/NEWS.txt
===================================================================
--- branches/libsbml-experimental/NEWS.txt	2014-11-27 10:14:01 UTC (rev 21768)
+++ branches/libsbml-experimental/NEWS.txt	2014-11-27 10:18:04 UTC (rev 21769)
@@ -1,6 +1,56 @@
            libSBML NEWS -- History of user-visible changes
 
+
+====================================================================
+5.11.1 (Current SVN)
+====================================================================
+
+STABLE RELEASE
+
+* New features
 	
+  - 'comp' package-specific updates:
+  - 'fbc' package-specific updates:
+  - 'layout' package-specific updates:
+  - 'qual' package-specific updates:
+
+* Bug fixes
+
+  - 'comp' package-specific bug fixes:
+  - 'fbc' package-specific bug fixes:
+  - 'layout' package-specific bug fixes:
+  - 'qual' package-specific bug fixes:
+
+* Configuration/build system changes
+
+
+* Miscellaneous
+
+
+EXPERIMENTAL RELEASE
+
+* New features
+
+  - 'arrays' package-specific updates:
+  - 'distrib' package-specific updates:
+  - 'dyn' package-specific updates:
+  - 'groups' package-specific updates:
+  - 'multi' package-specific updates:
+  - 'render' package-specific updates:
+  - 'req' package-specific updates:
+  - 'spatial' package-specific updates:
+
+ * Bug fixes
+ 
+  - 'arrays' package-specific bug fixes:
+  - 'distrib' package-specific bug fixes:
+  - 'dyn' package-specific bug fixes:
+  - 'groups' package-specific bug fixes:
+  - 'multi' package-specific bug fixes:
+  - 'render' package-specific bug fixes:
+  - 'req' package-specific bug fixes:
+  - 'spatial' package-specific bug fixes:
+		   
 ====================================================================
 5.11.0 (2014-11-27)
 ====================================================================

Modified: branches/libsbml-experimental/VERSION.txt
===================================================================
--- branches/libsbml-experimental/VERSION.txt	2014-11-27 10:14:01 UTC (rev 21768)
+++ branches/libsbml-experimental/VERSION.txt	2014-11-27 10:18:04 UTC (rev 21769)
@@ -1 +1 @@
-5.11.0
+5.11.1

Modified: branches/libsbml-experimental/configure
===================================================================
--- branches/libsbml-experimental/configure	2014-11-27 10:14:01 UTC (rev 21768)
+++ branches/libsbml-experimental/configure	2014-11-27 10:18:04 UTC (rev 21769)
@@ -1,7 +1,7 @@
 #! /bin/sh
 # From configure.ac Revision: 21538 .
 # Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.68 for libSBML 5.11.0.
+# Generated by GNU Autoconf 2.68 for libSBML 5.11.1.
 #
 # Report bugs to <lib...@ca...>.
 #
@@ -715,8 +715,8 @@
 # Identity of this package.
 PACKAGE_NAME='libSBML'
 PACKAGE_TARNAME='libsbml'
-PACKAGE_VERSION='5.11.0'
-PACKAGE_STRING='libSBML 5.11.0'
+PACKAGE_VERSION='5.11.1'
+PACKAGE_STRING='libSBML 5.11.1'
 PACKAGE_BUGREPORT='lib...@ca...'
 PACKAGE_URL='http://sbml.org/Software/libSBML'
 
@@ -1572,7 +1572,7 @@
   # Omit some internal or obsolete options to make the list less imposing.
   # This message is too long to be a string in the A/UX 3.1 sh.
   cat <<_ACEOF
-\`configure' configures libSBML 5.11.0 to adapt to many kinds of systems.
+\`configure' configures libSBML 5.11.1 to adapt to many kinds of systems.
 
 Usage: $0 [OPTION]... [VAR=VALUE]...
 
@@ -1637,7 +1637,7 @@
 
 if test -n "$ac_init_help"; then
   case $ac_init_help in
-     short | recursive ) echo "Configuration of libSBML 5.11.0:";;
+     short | recursive ) echo "Configuration of libSBML 5.11.1:";;
    esac
   cat <<\_ACEOF
 
@@ -1789,7 +1789,7 @@
 test -n "$ac_init_help" && exit $ac_status
 if $ac_init_version; then
   cat <<\_ACEOF
-libSBML configure 5.11.0
+libSBML configure 5.11.1
 generated by GNU Autoconf 2.68
 
 Copyright (C) 2010 Free Software Foundation, Inc.
@@ -2508,7 +2508,7 @@
 This file contains any messages produced by compilers while
 running configure, to aid debugging if configure makes a mistake.
 
-It was created by libSBML $as_me 5.11.0, which was
+It was created by libSBML $as_me 5.11.1, which was
 generated by GNU Autoconf 2.68.  Invocation command line was
 
   $ $0 $@
@@ -2898,7 +2898,7 @@
 ac_config_headers="$ac_config_headers src/sbml/common/libsbml-namespace.h"
 
 
-LIBSBML_VERSION_NUMERIC=51100
+LIBSBML_VERSION_NUMERIC=51101
 
 
 
@@ -2910,7 +2910,7 @@
 
 
 
-LIBSBML_REVISION_VERSION=0
+LIBSBML_REVISION_VERSION=1
 
 
 
@@ -27391,7 +27391,7 @@
 # report actual input values of CONFIG_FILES etc. instead of their
 # values after options handling.
 ac_log="
-This file was extended by libSBML $as_me 5.11.0, which was
+This file was extended by libSBML $as_me 5.11.1, which was
 generated by GNU Autoconf 2.68.  Invocation command line was
 
   CONFIG_FILES    = $CONFIG_FILES
@@ -27454,7 +27454,7 @@
 cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
 ac_cs_version="\\
-libSBML config.status 5.11.0
+libSBML config.status 5.11.1
 configured by $0, generated by GNU Autoconf 2.68,
   with options \\"\$ac_cs_config\\"
 

Modified: branches/libsbml-experimental/dev/misc-files/headings_for_NEWS.txt
===================================================================
--- branches/libsbml-experimental/dev/misc-files/headings_for_NEWS.txt	2014-11-27 10:14:01 UTC (rev 21768)
+++ branches/libsbml-experimental/dev/misc-files/headings_for_NEWS.txt	2014-11-27 10:18:04 UTC (rev 21769)
@@ -46,6 +46,7 @@
 
   - 'arrays' package-specific updates:
   - 'distrib' package-specific updates:
+  - 'dyn' package-specific updates:
   - 'groups' package-specific updates:
   - 'multi' package-specific updates:
   - 'render' package-specific updates:
@@ -56,6 +57,7 @@
  
   - 'arrays' package-specific bug fixes:
   - 'distrib' package-specific bug fixes:
+  - 'dyn' package-specific bug fixes:
   - 'groups' package-specific bug fixes:
   - 'multi' package-specific bug fixes:
   - 'render' package-specific bug fixes:

Modified: branches/libsbml-experimental/dev/misc-files/readmes-for-downloads-new-dir-struct/experimental/binaries/linux/R_interface/README.md.in
===================================================================
--- branches/libsbml-experimental/dev/misc-files/readmes-for-downloads-new-dir-struct/experimental/binaries/linux/R_interface/README.md.in	2014-11-27 10:14:01 UTC (rev 21768)
+++ branches/libsbml-experimental/dev/misc-files/readmes-for-downloads-new-dir-struct/experimental/binaries/linux/R_interface/README.md.in	2014-11-27 10:18:04 UTC (rev 21769)
@@ -2,7 +2,7 @@
 ###R interface installer for Linux
 
 This directory contains the experimental R interface of libSBML @PACKAGE_VERSION@
-generated for R 2.15.2 on a Linux operating system. (Ubuntu 12) 
+generated for R 3 on a Linux operating system. (Ubuntu 12) 
 
 Install with: 
 

Modified: branches/libsbml-experimental/dev/misc-files/readmes-for-downloads-new-dir-struct/stable/linux/32-bit/README.md.in
===================================================================
--- branches/libsbml-experimental/dev/misc-files/readmes-for-downloads-new-dir-struct/stable/linux/32-bit/README.md.in	2014-11-27 10:14:01 UTC (rev 21768)
+++ branches/libsbml-experimental/dev/misc-files/readmes-for-downloads-new-dir-struct/stable/linux/32-bit/README.md.in	2014-11-27 10:18:04 UTC (rev 21769)
@@ -15,7 +15,7 @@
 * Perl
 * Ruby
 	
-[The directory named "R interface"](R interface) contains the standalone installer for the R libSBML library, without the other languages.  For the remaining languages listed above, download one of the following installer files and run it:
+[The directory named "R interface"](R%20interface) contains the standalone installer for the R libSBML library, without the other languages.  For the remaining languages listed above, download one of the following installer files and run it:
 
 * [libSBML-@PAC...@-L...](libSBML-@PAC...@-L...) -- for RPM-based Linux distributions (Fedora, Red Hat, CentOS)
 * [libSBML-@PAC...@-L...](libSBML-@PAC...@-L...) -- for Debian-based Linux distributions (Ubuntu & variants, Debian)

Modified: branches/libsbml-experimental/dev/misc-files/readmes-for-downloads-new-dir-struct/stable/linux/64-bit/README.md.in
===================================================================
--- branches/libsbml-experimental/dev/misc-files/readmes-for-downloads-new-dir-struct/stable/linux/64-bit/README.md.in	2014-11-27 10:14:01 UTC (rev 21768)
+++ branches/libsbml-experimental/dev/misc-files/readmes-for-downloads-new-dir-struct/stable/linux/64-bit/README.md.in	2014-11-27 10:18:04 UTC (rev 21769)
@@ -15,7 +15,7 @@
 * Perl
 * Ruby
 	
-[The directory named "R interface"](R interface) contains the standalone installer for the R libSBML library, without the other languages.  For the remaining languages listed above, download one of the following installer files and run it:
+[The directory named "R interface"](R%20interface) contains the standalone installer for the R libSBML library, without the other languages.  For the remaining languages listed above, download one of the following installer files and run it:
 
 * [libSBML-@PAC...@-L...](libSBML-@PAC...@-L...) -- for RPM-based Linux distributions (Fedora, Red Hat, CentOS)
 * [libSBML-@PAC...@-L...](libSBML-@PAC...@-L...) -- for Debian-based Linux distributions (Ubuntu & variants, Debian)

Modified: branches/libsbml-experimental/dev/misc-files/readmes-for-downloads-new-dir-struct/stable/macos/README.md.in
===================================================================
--- branches/libsbml-experimental/dev/misc-files/readmes-for-downloads-new-dir-struct/stable/macos/README.md.in	2014-11-27 10:14:01 UTC (rev 21768)
+++ branches/libsbml-experimental/dev/misc-files/readmes-for-downloads-new-dir-struct/stable/macos/README.md.in	2014-11-27 10:18:04 UTC (rev 21769)
@@ -17,7 +17,7 @@
 * Python (but see below for a better option)
 * Ruby
 
-[The directory named "R interface"](R interface) contains the standalone installer for the R libSBML library, without the other languages.
+[The directory named "R interface"](R%20interface) contains the standalone installer for the R libSBML library, without the other languages.
 
 By default, the installer will put libSBML into /usr.  Detailed information about how to make libSBML accessible to your software [is available on a separate web page](http://sbml.org/Software/libSBML/docs/cpp-api/libsbml-accessing.html).
 

Modified: branches/libsbml-experimental/dev/misc-files/readmes-for-downloads-new-dir-struct/stable/windows/32-bit/README.md.in
===================================================================
--- branches/libsbml-experimental/dev/misc-files/readmes-for-downloads-new-dir-struct/stable/windows/32-bit/README.md.in	2014-11-27 10:14:01 UTC (rev 21768)
+++ branches/libsbml-experimental/dev/misc-files/readmes-for-downloads-new-dir-struct/stable/windows/32-bit/README.md.in	2014-11-27 10:18:04 UTC (rev 21769)
@@ -3,7 +3,7 @@
 **Important**: Before you install libSBML using these installers, please **uninstall any existing copy of libSBML** located in the same destination on your computer, or you may end up with mixed versions of different libSBML components on your system.
 
 
-### **_C, C++, C#, Java, Javascript, MATLAB, Perl, and Ruby installers_**
+### **_C, C++, C#, Java, Javascript, MATLAB, Octave, Perl, and Ruby installers_**
 
 This directory contains installers for precompiled versions of libSBML @PACKAGE_VERSION@ for 32-bit Microsoft Windows systems.  They were built with the libxml2 parser library, and include accepted SBML Level 3 packages plus interfaces for the following programming languages:
 
@@ -13,6 +13,7 @@
 * Java
 * Javascript
 * MATLAB
+* Octave
 * Perl
 * Ruby
 	
@@ -29,7 +30,7 @@
 
 The [Python folder](Python) contains installers for the Python libSBML interface **only**.  Download and use one of these installers if you **only** need the Python interface.  (The interface is also included within [libSBML-@PAC...@-w...](libSBML-@PAC...@-w...), so if you downloaded that one, you do _not_ need this one too.)
 
-### **_R installer_***
+### **_R installer_**
 
 The [R interface](R%20interface) folder contains installer for the R libSBML interface **only**.
 

Modified: branches/libsbml-experimental/dev/misc-files/readmes-for-downloads-new-dir-struct/stable/windows/64-bit/README.md.in
===================================================================
--- branches/libsbml-experimental/dev/misc-files/readmes-for-downloads-new-dir-struct/stable/windows/64-bit/README.md.in	2014-11-27 10:14:01 UTC (rev 21768)
+++ branches/libsbml-experimental/dev/misc-files/readmes-for-downloads-new-dir-struct/stable/windows/64-bit/README.md.in	2014-11-27 10:18:04 UTC (rev 21769)
@@ -29,7 +29,7 @@
 
 The [Python folder](Python) contains installers for the Python libSBML interface **only**.  Download and use one of these installers if you **only** need the Python interface.  (The interface is also included within [libSBML-@PAC...@-w...](libSBML-@PAC...@-w...), so if you downloaded that one, you do _not_ need this one too.)
 
-### **_R installer_***
+### **_R installer_**
 
 The [R interface](R%20interface) folder contains installer for the R libSBML interface **only**.
 

Modified: branches/libsbml-experimental/src/sbml/common/libsbml-version.h
===================================================================
--- branches/libsbml-experimental/src/sbml/common/libsbml-version.h	2014-11-27 10:14:01 UTC (rev 21768)
+++ branches/libsbml-experimental/src/sbml/common/libsbml-version.h	2014-11-27 10:18:04 UTC (rev 21769)
@@ -42,7 +42,7 @@
  *
  * A version string of the form "1.2.3".
  */
-#define LIBSBML_DOTTED_VERSION	"5.11.0"
+#define LIBSBML_DOTTED_VERSION	"5.11.1"
 
 
 /**
@@ -53,7 +53,7 @@
  * libSBML is released, making it easy to use less-than and greater-than
  * comparisons when testing versions numbers.
  */
-#define LIBSBML_VERSION		51100
+#define LIBSBML_VERSION		51101
 
 
 /**
@@ -61,7 +61,7 @@
  *
  * The numeric version as a string: version 1.2.3 becomes "10203".
  */
-#define LIBSBML_VERSION_STRING	"51100"
+#define LIBSBML_VERSION_STRING	"51101"
 
 
 LIBSBML_CPP_NAMESPACE_BEGIN





[sbml-svn] SF.net SVN: sbml:[21769] branches/libsbml-experimental

A file format for exchanging computational models in systems biology

[sbml-svn] SF.net SVN: sbml:[21769] branches/libsbml-experimental