Author: ivomaintz-guest
Date: 2012-03-29 16:16:10 +0000 (Thu, 29 Mar 2012)
New Revision: 10162
Removed:
trunk/packages/libsbml/trunk/debian/dirs
trunk/packages/libsbml/trunk/debian/libsbml5-octave.install
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/lintian/libsbml5-matlab
trunk/packages/libsbml/trunk/debian/rules
Log:
a lot of changes to remove hardcoded dependencies, fix the install process for
different architectures (see debian/changelog)
Modified: trunk/packages/libsbml/trunk/debian/changelog
===================================================================
--- trunk/packages/libsbml/trunk/debian/changelog 2012-03-29 16:03:51 UTC
(rev 10161)
+++ trunk/packages/libsbml/trunk/debian/changelog 2012-03-29 16:16:10 UTC
(rev 10162)
@@ -4,7 +4,16 @@
* update from upstream (Closes: #665837)
* debian/control.in: added swig to libsbml5-python dependencies
* debian/README.source:
- added some informations
+ added some information
+ * debian/rules:
+ - added code to create a debian/libsbml5-octave.install file
+ dependent on the install dircetory of the octave files
+ - enhanced shlibdeps checking to remove the hardcoded dependency
+ to libc6
+ * debian/dirs:
+ deleted
+ * debian/libsbml5-octave.install:
+ deleted
[ Andreas Tille ]
* debian/control:
@@ -18,11 +27,11 @@
code
* mv debian/README.Debian-source debian/README.source
* debian/docs: No point in installing debian/README.source
- * delete advise about how to get the source traball in favour
+ * delete advise about how to get the source tarball in favour
of the code written in debian/rules:get-orig-source target
* debian/upstream: citation information
- -- Andreas Tille <[email protected]> Wed, 28 Mar 2012 14:38:12 +0200
+ -- Ivo Maintz <[email protected]> Thu, 29 Mar 2012 18:04:00 +0200
libsbml (5.4.0-1) UNRELEASED; urgency=low
Modified: trunk/packages/libsbml/trunk/debian/control
===================================================================
--- trunk/packages/libsbml/trunk/debian/control 2012-03-29 16:03:51 UTC (rev
10161)
+++ trunk/packages/libsbml/trunk/debian/control 2012-03-29 16:16:10 UTC (rev
10162)
@@ -38,7 +38,6 @@
Conflicts: libsbml3-dev
Architecture: any
Depends: libsbml5 (= ${binary:Version}),
- ${shlibs:Depends},
${misc:Depends}
Description: System Biology Markup Language library - development files
LibSBML is a library designed to help you read, write, manipulate,
@@ -53,9 +52,7 @@
Provides: libsbml-dbg
Conflicts: libsbml3-dbg
Architecture: any
-Depends: libsbml5 (= ${binary:Version}),
- ${shlibs:Depends},
- ${misc:Depends}
+Depends: libsbml5 (= ${binary:Version}), ${misc:Depends}
Description: System Biology Markup Language library - debug symbols
LibSBML is a library designed to help you read, write, manipulate,
translate, and validate SBML files and data streams. It is not an
@@ -78,8 +75,7 @@
Package: libsbml5-python
Section: python
-Provides: ${python:Provides},
- python-sbml,
+Provides: python-sbml,
libsbml-python
Conflicts: python-sbml3,
libsbml4-python,
@@ -87,7 +83,6 @@
Architecture: any
Depends: ${shlibs:Depends},
${misc:Depends},
- ${python:Depends},
swig (>= 2)
Description: System Biology Markup Language library - Python bindings
LibSBML is a library designed to help you read, write, manipulate,
@@ -101,9 +96,7 @@
Provides: libsbml-matlab
Conflicts: libsbml4-matlab
Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends},
- libsbml5,
- libc6 (>= 2.3)
+Depends: ${shlibs:Depends}, ${misc:Depends}
Description: System Biology Markup Language library - Matlab bindings
LibSBML is a library designed to help you read, write, manipulate,
translate, and validate SBML files and data streams. It is not an
@@ -158,9 +151,7 @@
Section: math
Provides: libsbml-octave
Depends: ${shlibs:Depends},
- ${misc:Depends},
- octave,
- libc6 (>=2.4)
+ ${misc:Depends}
Architecture: any
Description: System Biology Markup Language library - Octave binding
LibSBML is a library designed to help you read, write, manipulate,
@@ -173,8 +164,7 @@
Section: cli-mono
Provides: libsbml-cil
Depends: ${shlibs:Depends},
- ${misc:Depends},
- ${cli:Depends}
+ ${misc:Depends}
Architecture: any
Description: System Biology Markup Language library - CLR binding
LibSBML is a library designed to help you read, write, manipulate,
Modified: trunk/packages/libsbml/trunk/debian/control.in
===================================================================
--- trunk/packages/libsbml/trunk/debian/control.in 2012-03-29 16:03:51 UTC
(rev 10161)
+++ trunk/packages/libsbml/trunk/debian/control.in 2012-03-29 16:16:10 UTC
(rev 10162)
@@ -9,7 +9,7 @@
Build-Depends: autoconf,
automake,
debhelper (>= 8),
- swig (>= 2),
+ swig2.0 | swig (>= 2),
ruby1.8,
libxml2-dev,
python-dev,
@@ -38,7 +38,6 @@
Conflicts: libsbml3-dev
Architecture: any
Depends: libsbml5 (= ${binary:Version}),
- ${shlibs:Depends},
${misc:Depends}
Description: System Biology Markup Language library - development files
LibSBML is a library designed to help you read, write, manipulate,
@@ -53,9 +52,7 @@
Provides: libsbml-dbg
Conflicts: libsbml3-dbg
Architecture: any
-Depends: libsbml5 (= ${binary:Version}),
- ${shlibs:Depends},
- ${misc:Depends}
+Depends: libsbml5 (= ${binary:Version}), ${misc:Depends}
Description: System Biology Markup Language library - debug symbols
LibSBML is a library designed to help you read, write, manipulate,
translate, and validate SBML files and data streams. It is not an
@@ -78,8 +75,7 @@
Package: libsbml5-python
Section: python
-Provides: ${python:Provides},
- python-sbml,
+Provides: python-sbml,
libsbml-python
Conflicts: python-sbml3,
libsbml4-python,
@@ -87,8 +83,7 @@
Architecture: any
Depends: ${shlibs:Depends},
${misc:Depends},
- ${python:Depends},
- swig (>= 2)
+ siwg2.0 | swig (>= 2)
Description: System Biology Markup Language library - Python bindings
LibSBML is a library designed to help you read, write, manipulate,
translate, and validate SBML files and data streams. It is not an
@@ -101,9 +96,7 @@
#Provides: libsbml-matlab
#Conflicts: libsbml4-matlab
#Architecture: any
-#Depends: ${shlibs:Depends}, ${misc:Depends},
-# libsbml5,
-# libc6 (>= 2.3)
+#Depends: ${shlibs:Depends}, ${misc:Depends}
#Description: System Biology Markup Language library - Matlab bindings
# LibSBML is a library designed to help you read, write, manipulate,
# translate, and validate SBML files and data streams. It is not an
@@ -158,9 +151,7 @@
Section: math
Provides: libsbml-octave
Depends: ${shlibs:Depends},
- ${misc:Depends},
- octave,
- libc6 (>=2.4)
+ ${misc:Depends}
Architecture: any
Description: System Biology Markup Language library - Octave binding
LibSBML is a library designed to help you read, write, manipulate,
@@ -173,8 +164,7 @@
Section: cli-mono
Provides: libsbml-cil
Depends: ${shlibs:Depends},
- ${misc:Depends},
- ${cli:Depends}
+ ${misc:Depends}
Architecture: any
Description: System Biology Markup Language library - CLR binding
LibSBML is a library designed to help you read, write, manipulate,
Deleted: trunk/packages/libsbml/trunk/debian/dirs
===================================================================
Deleted: trunk/packages/libsbml/trunk/debian/libsbml5-octave.install
===================================================================
--- trunk/packages/libsbml/trunk/debian/libsbml5-octave.install 2012-03-29
16:03:51 UTC (rev 10161)
+++ trunk/packages/libsbml/trunk/debian/libsbml5-octave.install 2012-03-29
16:16:10 UTC (rev 10162)
@@ -1,2 +0,0 @@
-usr/lib/x86_64-linux-gnu/octave/*
-#../lintian/libsbml5-octave usr/share/lintian/overrides
Modified: trunk/packages/libsbml/trunk/debian/lintian/libsbml5-matlab
===================================================================
--- trunk/packages/libsbml/trunk/debian/lintian/libsbml5-matlab 2012-03-29
16:03:51 UTC (rev 10161)
+++ trunk/packages/libsbml/trunk/debian/lintian/libsbml5-matlab 2012-03-29
16:16:10 UTC (rev 10162)
@@ -1,2 +1 @@
libsbml5-matlab: sharedobject-in-library-directory-missing-soname
-libsbml5-matlab: package-depends-on-hardcoded-libc
Modified: trunk/packages/libsbml/trunk/debian/rules
===================================================================
--- trunk/packages/libsbml/trunk/debian/rules 2012-03-29 16:03:51 UTC (rev
10161)
+++ trunk/packages/libsbml/trunk/debian/rules 2012-03-29 16:16:10 UTC (rev
10162)
@@ -17,7 +17,7 @@
endif
### part1 of a dirty hack for octave bindings, see install: section ###
-LOCALOCTFILEDIR ?= usr$(shell grep LOCALOCTFILEDIR
config/makefile-common-vars.mk | tr -s ' ' ' ' | cut -d\ -f3)
+OCTAVE_PATH ?= usr$(shell grep LOCALOCTFILEDIR config/makefile-common-vars.mk
| tr -s ' ' ' ' | cut -d\ -f3)
# prevent the examples from beeing compressed...
DEB_COMPRESS_EXCLUDE := .xml .pdf .py .c .h .cpp .in .cs .java .pl .rb .xsl
@@ -89,6 +89,8 @@
rm -f build-stamp
# Add here commands to clean up after the build process.
[ ! -f Makefile ] || $(MAKE) distclean
+ ### remove the during build created debian/libsbml5-octave.install ###
+ rm -f debian/libsbml5-octave.install
### the clean target of the libsbml makefile is highly b0rken ###
### verx ugly ###
find src/bindings -name "*Glyph*" -exec rm -f {} +
@@ -154,7 +156,9 @@
src/bindings/perl/Makefile.PL src/bindings/python/libsbml-doxygen.py
src/bindings/python/libsbml.py \
src/bindings/python/libsbml_wrap.cpp src/bindings/ruby/libsbml_wrap.cpp
src/sbml/common/libsbml-config-common.h \
src/bindings/perl/MYMETA.yml src/bindings/perl/Makefile-perl
src/bindings/perl/blib/lib/LibSBML.pod \
- src/bindings/python/setup.py docs/src/java-files docs/index.html
docs/src/common-text/libsbml-version.html docs/src/libsbml-installation.html
+ src/bindings/python/setup.py docs/src/java-files docs/index.html
docs/src/common-text/libsbml-version.html docs/src/libsbml-installation.html \
+ src/bindings/java/java-files/org/sbml/libsbml/*.java
src/bindings/java/javadoc.i src/bindings/perl/LibSBML.pod \
+ src/bindings/python/pydoc-doxygen.i src/bindings/python/pydoc-normal.i
dh_clean
@@ -173,13 +177,13 @@
# ### not required for python2.7 ###
[ ! -d $(debtmp)/usr/lib/python2.6/ ] || find
$(debtmp)/usr/lib/python2.6/ -type d -name site-packages -exec mv {}
$(debtmp)/usr/lib/python2.6/dist-packages \; || true
# ### _very_ dirty hack for working octave bindings ###
- mkdir -p $(debtmp)/$(LOCALOCTFILEDIR)
- cp src/bindings/matlab/buildSBML.m $(debtmp)/$(LOCALOCTFILEDIR)/
- cp src/bindings/matlab/CheckAndConvert.m $(debtmp)/$(LOCALOCTFILEDIR)/
- cp src/bindings/matlab/ConvertFormulaToMathML.m
$(debtmp)/$(LOCALOCTFILEDIR)/
- cp src/bindings/matlab/Contents.m $(debtmp)/$(LOCALOCTFILEDIR)/
- cp src/bindings/matlab/isoctave.m $(debtmp)/$(LOCALOCTFILEDIR)/
- cp src/bindings/matlab/isSBML_Model.m $(debtmp)/$(LOCALOCTFILEDIR)/
+ mkdir -p $(debtmp)/$(OCTAVE_PATH)
+ cp src/bindings/matlab/buildSBML.m $(debtmp)/$(OCTAVE_PATH)/
+ cp src/bindings/matlab/CheckAndConvert.m $(debtmp)/$(OCTAVE_PATH)/
+ cp src/bindings/matlab/ConvertFormulaToMathML.m
$(debtmp)/$(OCTAVE_PATH)/
+ cp src/bindings/matlab/Contents.m $(debtmp)/$(OCTAVE_PATH)/
+ cp src/bindings/matlab/isoctave.m $(debtmp)/$(OCTAVE_PATH)/
+ cp src/bindings/matlab/isSBML_Model.m $(debtmp)/$(OCTAVE_PATH)/
rm $(debtmp)/usr/lib/*/dist-packages/libsbml/*.pyc || true
mkdir $(debtmp)/usr/lib/perl5
mv $(debtmp)/usr/lib/perl/*/* $(debtmp)/usr/lib/perl5/
@@ -190,7 +194,9 @@
# find $(debtmp)/usr/share/doc/ -type f -name "jquery.js" -exec rm -f {} +
sed -i "/dependency_libs/ s/'.*'/''/" `find $(debtmp)/usr/lib/ -name
'*.la'`
strip --strip-unneeded $(debtmp)/usr/lib/*.mex* || true
- strip --strip-unneeded
$(debtmp)/usr/lib/x86_64-linux-gnu/octave/site/oct/*/*.mex || true
+ strip --strip-unneeded $(debtmp)/$(OCTAVE_PATH)/*.mex || true
+ strip --strip-unneeded $(debtmp)/$(OCTAVE_PATH)/*.mex || true
+ echo $(OCTAVE_PATH) >debian/libsbml5-octave.install
# Build architecture-independent files here.
binary-indep: build install
@@ -210,6 +216,8 @@
dh_compress
dh_fixperms
dh_makeshlibs
+ dpkg-shlibdeps debian/libsbml5-octave/$(OCTAVE_PATH)/*
-Tdebian/libsbml5-octave.substvars
+ dpkg-shlibdeps debian/libsbml5-matlab/usr/lib/*
-Tdebian/libsbml5-matlab.substvars
dh_makeclilibs -i -V
dh_installcligac -i
dh_perl
_______________________________________________
debian-med-commit mailing list
[email protected]
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/debian-med-commit
