[med-svn] r17844 - in trunk/packages/libsbml/trunk/debian: . bin

Ivo Maintz ivomaintz-guest at moszumanska.debian.org
Mon Aug 25 12:18:38 UTC 2014 

Author: ivomaintz-guest
Date: 2014-08-25 12:18:38 +0000 (Mon, 25 Aug 2014)
New Revision: 17844

Modified:
   trunk/packages/libsbml/trunk/debian/bin/mexext
   trunk/packages/libsbml/trunk/debian/changelog
   trunk/packages/libsbml/trunk/debian/cmake_opts
   trunk/packages/libsbml/trunk/debian/libsbml5-dev.links
   trunk/packages/libsbml/trunk/debian/libsbml5-octave.install
   trunk/packages/libsbml/trunk/debian/libsbml5-octave.links.amd64
   trunk/packages/libsbml/trunk/debian/libsbml5-octave.links.i386
   trunk/packages/libsbml/trunk/debian/rules
   trunk/packages/libsbml/trunk/debian/watch
Log:
fixed some links, updated cmake_opts, cleared up debian/rules



Modified: trunk/packages/libsbml/trunk/debian/bin/mexext
===================================================================
--- trunk/packages/libsbml/trunk/debian/bin/mexext	2014-08-25 11:39:40 UTC (rev 17843)
+++ trunk/packages/libsbml/trunk/debian/bin/mexext	2014-08-25 12:18:38 UTC (rev 17844)
@@ -1,4 +1,6 @@
 #!/bin/sh
 
 ### simply uses matlab to get the correct mex extension ###
-matlab -nosplash -nodesktop -nojvm -r "fprintf(2 , '%s\n', mexext); quit" 2>&1 | grep mex
+MAT_ARCH=glnxa64
+test $(dpkg-architecture -qDEB_BUILD_ARCH) = i386 && MAT_ARCH=glnx86
+matlab -arch=$MAT_ARCH -nosplash -nodesktop -nojvm -r "fprintf(2 , '%s\n', mexext); quit" 2>&1 | grep mex

Modified: trunk/packages/libsbml/trunk/debian/changelog
===================================================================
--- trunk/packages/libsbml/trunk/debian/changelog	2014-08-25 11:39:40 UTC (rev 17843)
+++ trunk/packages/libsbml/trunk/debian/changelog	2014-08-25 12:18:38 UTC (rev 17844)
@@ -8,6 +8,9 @@
     debian/source/options
   * debian/copyright: the path to prettify.js had changed
     added macosx to Files-Excluded
+  * debian/watch: changed the name of the source from the bare "core" package
+    to the full source pack, containing some more extensions.
+  * debian/*links: updated some links to the version of libsbml
 
   [ Andreas Tille ]
   * New upstream version
@@ -16,7 +19,7 @@
   * 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
+ -- Ivo Maintz <ivo at maintz.de>  Mon, 25 Aug 2014 14:16:04 +0200
 
 libsbml (5.9.2+dfsg-1) UNRELEASED; urgency=medium
 

Modified: trunk/packages/libsbml/trunk/debian/cmake_opts
===================================================================
--- trunk/packages/libsbml/trunk/debian/cmake_opts	2014-08-25 11:39:40 UTC (rev 17843)
+++ trunk/packages/libsbml/trunk/debian/cmake_opts	2014-08-25 12:18:38 UTC (rev 17844)
@@ -1,14 +1,16 @@
 -DCMAKE_BINARY_DIR=build
+-DCMAKE_COLOR_MAKEFILE:BOOL=ON
 -DCMAKE_INSTALL_PREFIX:PATH=/usr
--DCMAKE_COLOR_MAKEFILE:BOOL=ON
 -DENABLE_COMP:BOOL=ON
 -DENABLE_FBC:BOOL=ON
+-DENABLE_GROUPS:BOOL=ON
 -DENABLE_LAYOUT:BOOL=ON
--DENABLE_GROUPS:BOOL=ON
 -DENABLE_QUAL:BOOL=ON
+-DENABLE_RENDER:BOOL=ON
+-DMATLAB_ROOT_PATH:PATH=/usr/share/matlab
 -DWITH_BZIP2:BOOL=ON
 -DWITH_CHECK:BOOL=OFF
--DWITH_CPP_NAMESPACE:BOOL=ON
+-DWITH_CPP_NAMESPACE:BOOL=OFF
 -DWITH_CSHARP:BOOL=ON
 -DWITH_DOXYGEN:BOOL=ON
 -DWITH_EXAMPLES:BOOL=OFF
@@ -17,7 +19,6 @@
 -DWITH_LIBXML:BOOL=ON
 -DWITH_MATLAB:BOOL=ON
 -DWITH_MATLAB_MEX:BOOL=ON
--DMATLAB_ROOT_PATH:PATH=/usr/share/matlab
 -DWITH_OCTAVE:BOOL=ON
 -DWITH_PERL:BOOL=ON
 -DWITH_PYTHON:BOOL=ON
@@ -28,4 +29,3 @@
 -DWITH_WALL:BOOL=ON
 -DWITH_XERCES:BOOL=OFF
 -DWITH_ZLIB:BOOL=ON
--DWITH_RENDER:BOOL=ON

Modified: trunk/packages/libsbml/trunk/debian/libsbml5-dev.links
===================================================================
--- trunk/packages/libsbml/trunk/debian/libsbml5-dev.links	2014-08-25 11:39:40 UTC (rev 17843)
+++ trunk/packages/libsbml/trunk/debian/libsbml5-dev.links	2014-08-25 12:18:38 UTC (rev 17844)
@@ -1 +1 @@
-usr/lib/libsbml.so.5.8.0 usr/lib/libsbml.so
+usr/lib/libsbml.so.5 usr/lib/libsbml.so

Modified: trunk/packages/libsbml/trunk/debian/libsbml5-octave.install
===================================================================
--- trunk/packages/libsbml/trunk/debian/libsbml5-octave.install	2014-08-25 11:39:40 UTC (rev 17843)
+++ trunk/packages/libsbml/trunk/debian/libsbml5-octave.install	2014-08-25 12:18:38 UTC (rev 17844)
@@ -1,2 +1,2 @@
 usr/lib/octave/site/oct/*/*.mex
-usr/lib/octave/site/oct/*/*.m usr/share/octave/site/m/libsbml-5.8.0
+usr/lib/octave/site/oct/*/*.m usr/share/octave/site/m/libsbml-5.10.0

Modified: trunk/packages/libsbml/trunk/debian/libsbml5-octave.links.amd64
===================================================================
--- trunk/packages/libsbml/trunk/debian/libsbml5-octave.links.amd64	2014-08-25 11:39:40 UTC (rev 17843)
+++ trunk/packages/libsbml/trunk/debian/libsbml5-octave.links.amd64	2014-08-25 12:18:38 UTC (rev 17844)
@@ -1,2 +1,2 @@
-usr/lib/octave/site/oct/x86_64-pc-linux-gnu/OutputSBML.mex usr/share/octave/site/libsbml-5.8.0/OutputSBML.mex
-usr/lib/octave/site/oct/x86_64-pc-linux-gnu/TranslateSBML.mex usr/share/octave/site/libsbml-5.8.0/TranslateSBML.mex
+usr/lib/octave/site/oct/x86_64-pc-linux-gnu/OutputSBML.mex usr/share/octave/site/libsbml-5.10.0/OutputSBML.mex
+usr/lib/octave/site/oct/x86_64-pc-linux-gnu/TranslateSBML.mex usr/share/octave/site/libsbml-5.10.0/TranslateSBML.mex

Modified: trunk/packages/libsbml/trunk/debian/libsbml5-octave.links.i386
===================================================================
--- trunk/packages/libsbml/trunk/debian/libsbml5-octave.links.i386	2014-08-25 11:39:40 UTC (rev 17843)
+++ trunk/packages/libsbml/trunk/debian/libsbml5-octave.links.i386	2014-08-25 12:18:38 UTC (rev 17844)
@@ -1,2 +1,2 @@
-usr/lib/octave/site/oct/i386-linux-gnu/OutputSBML.mex usr/share/octave/site/libsbml-5.8.0/OutputSBML.mex
-usr/lib/octave/site/oct/i386-linux-gnu/TranslateSBML.mex usr/share/octave/site/libsbml-5.8.0/TranslateSBML.mex
+usr/lib/octave/site/oct/i386-linux-gnu/OutputSBML.mex usr/share/octave/site/libsbml-5.10.0/OutputSBML.mex
+usr/lib/octave/site/oct/i386-linux-gnu/TranslateSBML.mex usr/share/octave/site/libsbml-5.10.0/TranslateSBML.mex

Modified: trunk/packages/libsbml/trunk/debian/rules
===================================================================
--- trunk/packages/libsbml/trunk/debian/rules	2014-08-25 11:39:40 UTC (rev 17843)
+++ trunk/packages/libsbml/trunk/debian/rules	2014-08-25 12:18:38 UTC (rev 17844)
@@ -37,12 +37,8 @@
 	docs/src/doxygen-config-csharp.txt docs/src/doxygen-config-perl.txt docs/src/doxygen-config-python.txt \
 	docs/src/java-substitutions/libsbmlConstants.java docs/src/libsbml-installation.html docs/src/perlmod/DoxyDocs.pm \
 	docs/src/perlmod/DoxyStructure.pm docs/src/perlmod/Makefile docs/src/perlmod/doxyrules.make \
-	src/bindings/matlab/runTests.log docs/src/doxygen-config-c.txt
-#	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 ; TAR_OPT="-xaf" ; else COMP=gz ; TAR_OPT="-xzf" ; fi ; \
-#	tar --no-same-owner $${TAR_OPT} ../libsbml_$(version).orig.tar.$${COMP} --strip-components=1
+	src/bindings/matlab/runTests.log docs/src/doxygen-config-c.txt src/bindings/matlab/*.mex*
+	find src/bindings -name "*.pyc" -delete
 
 override_dh_auto_configure:
 ifdef BIND_MATLAB
@@ -50,7 +46,6 @@
 else
 	grep -v ^# debian/control.in > debian/control
 endif
-	sed -i 's/overriden/overridden/g'  $(shell grep -Rl overriden src/) || true
 	mkdir -p build
 	cd build ; cmake $(CMAKE_OPTS) ../
 	/bin/sh debian/bin/python_fix.sh

Modified: trunk/packages/libsbml/trunk/debian/watch
===================================================================
--- trunk/packages/libsbml/trunk/debian/watch	2014-08-25 11:39:40 UTC (rev 17843)
+++ trunk/packages/libsbml/trunk/debian/watch	2014-08-25 12:18:38 UTC (rev 17844)
@@ -1,4 +1,4 @@
 version=3
 
 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)
+  http://sf.net/sbml/lib[Ss][Bb][Mm][Ll]-(.*)-Source\.(?:zip|tgz|tbz2|txz|tar\.gz|tar\.bz2|tar\.xz)

More information about the debian-med-commit mailing list