[openturns] 01/05: Copy files fromp upstream distro/debian/ directory
Denis Barbier
barbier-guest at moszumanska.debian.org
Sun Apr 26 21:21:31 UTC 2015
This is an automated email from the git hooks/post-receive script.
barbier-guest pushed a commit to branch db/py3
in repository openturns.
commit 492e1ae44ba6e0f258807d8fca6dbb03d907c9fb
Author: Denis Barbier <bouzim at gmail.com>
Date: Sun Jan 25 23:02:35 2015 +0000
Copy files fromp upstream distro/debian/ directory
---
debian/changelog | 9 ++
debian/control | 10 +-
debian/libOT-gdb.py | 102 ---------------------
debian/libopenturns-dbg.install | 1 +
debian/libopenturns0.5.lintian-overrides | 1 -
...penturns0.5.install => libopenturns0.6.install} | 0
debian/libopenturns0.6.lintian-overrides | 1 +
debian/patches/tests-disable-coupling_tools.patch | 2 +-
debian/rules | 12 +--
9 files changed, 22 insertions(+), 116 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index c797ca2..89a264a 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,12 @@
+openturns (1.5~rc1-1) experimental; urgency=low
+
+ [ Julien Schueller ]
+ * New upstream pre-release.
+ * Add build-dependency to libhmat-oss-dev
+ * Upstreamed libOT-gdb.py
+
+ -- Denis Barbier <barbier at debian.org> Wed, 10 Dec 2014 10:34:47 +0100
+
openturns (1.4-3) experimental; urgency=medium
* debian/rules: Disable again mips and mipsel builds.
diff --git a/debian/control b/debian/control
index 7256f76..ce23b1a 100644
--- a/debian/control
+++ b/debian/control
@@ -5,7 +5,7 @@ Maintainer: Debian Science Maintainers <debian-science-maintainers at lists.alioth.
Uploaders: Christophe Prud'homme <prudhomm at debian.org>, Denis Barbier <barbier at debian.org>
Build-Depends: debhelper (>= 8), quilt, gfortran, bison, flex, cmake, bc,
libmuparser-dev, libxml2-dev, liblapack-dev, libblas-dev,
- libboost-math-dev,
+ libboost-math-dev, libhmat-oss-dev,
libtbb-dev [i386 amd64 ia64],
r-base-core, python-dev, swig
Standards-Version: 3.9.5
@@ -14,7 +14,7 @@ Vcs-Browser: http://anonscm.debian.org/gitweb/?p=debian-science/packages/opentur
Vcs-Git: git://anonscm.debian.org/debian-science/packages/openturns.git
X-Python-Version: current
-Package: libopenturns0.5
+Package: libopenturns0.6
Section: libs
Architecture: any
Depends: ${shlibs:Depends}, ${misc:Depends}
@@ -49,8 +49,8 @@ Description: dynamic libraries for OpenTURNS
Package: libopenturns-dev
Section: libdevel
Architecture: any
-Depends: ${misc:Depends}, libopenturns0.5 (= ${binary:Version}),
- libmuparser-dev, libxml2-dev, liblapack-dev, libblas-dev, libtbb-dev [i386 amd64 ia64]
+Depends: ${misc:Depends}, libopenturns0.6 (= ${binary:Version}),
+ libmuparser-dev, libxml2-dev, liblapack-dev, libblas-dev, libtbb-dev [i386 amd64 ia64], libhmat-oss-dev
Replaces: openturns-wrapper
Breaks: openturns-wrapper
Description: headers and development libraries for OpenTURNS
@@ -92,7 +92,7 @@ Description: debug symbols for OpenTURNS
Package: python-openturns
Section: python
Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}, libopenturns0.5 (= ${binary:Version}), ${python:Depends}
+Depends: ${shlibs:Depends}, ${misc:Depends}, libopenturns0.6 (= ${binary:Version}), ${python:Depends}
Provides: ${python:Provides}
Suggests: python-matplotlib, python-scipy
Description: Python front-end of OpenTURNS (aka TUI)
diff --git a/debian/libOT-gdb.py b/debian/libOT-gdb.py
deleted file mode 100644
index b992e1e..0000000
--- a/debian/libOT-gdb.py
+++ /dev/null
@@ -1,102 +0,0 @@
-
-import gdb
-import re
-import sys
-if sys.version > '3':
- long = int
-
-objfile = gdb.current_objfile() or gdb.objfiles()[0]
-int_ptr = gdb.lookup_type('int').pointer()
-
-ot_pretty_printers = []
-
-def AddToPrettyPrinter(rx):
- def class_wrapper(cls):
- ot_pretty_printers.append( (re.compile(rx), cls) )
- return cls
- return class_wrapper
-
- at AddToPrettyPrinter(r'^OT::PersistentObject$')
-class PersistentObjectPrinter(object):
- def __init__(self, val):
- self.val = val
-
- def to_string(self):
- name = self.val['p_name_']['ptr_']['ptr_']
- if name == gdb.Value(0):
- return "[unnamed]"
- else:
- return "[name=%s]" % (str(name.dereference()))
-
- at AddToPrettyPrinter(r'^OT::Pointer<.*>$')
-class PointerPrinter(object):
- def __init__(self, val):
- self.val = val
-
- def to_string(self):
- global int_ptr
-
- pointee = self.val['ptr_']['ptr_']
- if long(pointee) == 0L:
- return "NULL"
- else:
- atomicVal = self.val['ptr_']['count_']['p_impl_']['use_count_']['val_']
- # This atomicVal points either to an int or a tbb::atomic<int>
- # The implementation of tbb::atomic depends on tbb's version, thus it is easier
- # to dereference it.
- atomicVal = atomicVal.address.cast(int_ptr).dereference()
- return "([counter=%s] %s) 0x%x = %s" % (str(atomicVal), str(pointee.type), long(pointee), str(pointee.dereference()))
-
- at AddToPrettyPrinter(r'^OT::TypedInterfaceObject<.*>$')
-class TypedInterfaceObjectPrinter(object):
- def __init__(self, val):
- self.val = val
- self.template_name = val.type.template_argument(0)
-
- def to_string(self):
- return "{ p_implementation_ -> [ %s ] }" % (str(self.val['p_implementation_']))
-
- at AddToPrettyPrinter(r'^OT::(PersistentCollection<.*>|.*PersistentCollection)$')
-class PersistentCollectionPrinter(object):
- def __init__(self, val):
- self.val = val
-
- def display_hint(self):
- return 'array'
-
- def to_string(self):
- # Dereference PersistentObject
- name = self.val['p_name_']['ptr_']['ptr_']
- if long(name) == 0L:
- decoratedName = "[unnamed]"
- else:
- decoratedName = "[name=%s]" % (str(name.dereference()))
- # Dereference Collection
- return "%s %s" % (decoratedName, self.val['coll__'])
-
- at AddToPrettyPrinter(r'^OT::(Collection<.*>|.*Collection)$')
-class CollectionPrinter(object):
- def __init__(self, val):
- self.val = val
-
- def display_hint(self):
- return 'array'
-
- def to_string(self):
- return str(self.val['coll__'])
-
-
-def lookup_function(val):
- type = val.type
- if type.code == gdb.TYPE_CODE_REF:
- type = type.target()
- type = type.unqualified().strip_typedefs()
- typename = type.tag
- if not typename or not typename.startswith('OT::'):
- return None
- for regex, pretty_printer in ot_pretty_printers:
- if regex.search(typename):
- return pretty_printer(val)
- return None
-
-objfile.pretty_printers.append(lookup_function)
diff --git a/debian/libopenturns-dbg.install b/debian/libopenturns-dbg.install
new file mode 100644
index 0000000..9d62bff
--- /dev/null
+++ b/debian/libopenturns-dbg.install
@@ -0,0 +1 @@
+usr/share/gdb/auto-load/usr/lib/libOT*-gdb.py
diff --git a/debian/libopenturns0.5.lintian-overrides b/debian/libopenturns0.5.lintian-overrides
deleted file mode 100644
index 38b84f2..0000000
--- a/debian/libopenturns0.5.lintian-overrides
+++ /dev/null
@@ -1 +0,0 @@
-libopenturns0.5 binary: package-name-doesnt-match-sonames libOT0.5 libOTbind0.5
diff --git a/debian/libopenturns0.5.install b/debian/libopenturns0.6.install
similarity index 100%
rename from debian/libopenturns0.5.install
rename to debian/libopenturns0.6.install
diff --git a/debian/libopenturns0.6.lintian-overrides b/debian/libopenturns0.6.lintian-overrides
new file mode 100644
index 0000000..1171111
--- /dev/null
+++ b/debian/libopenturns0.6.lintian-overrides
@@ -0,0 +1 @@
+libopenturns0.6 binary: package-name-doesnt-match-sonames libOT0.6 libOTbind0.6
diff --git a/debian/patches/tests-disable-coupling_tools.patch b/debian/patches/tests-disable-coupling_tools.patch
index 3534dde..28b1a1a 100644
--- a/debian/patches/tests-disable-coupling_tools.patch
+++ b/debian/patches/tests-disable-coupling_tools.patch
@@ -17,4 +17,4 @@ Index: openturns/python/test/CMakeLists.txt
+#DEB#ot_pyinstallcheck_test ( coupling_tools )
endif ()
- if (MATPLOTLIB_FOUND AND R_rot_FOUND)
+ if (MATPLOTLIB_FOUND AND SCIPY_FOUND AND R_rot_FOUND)
diff --git a/debian/rules b/debian/rules
index 8cd2f07..392152f 100755
--- a/debian/rules
+++ b/debian/rules
@@ -68,11 +68,10 @@ override_dh_auto_configure: debian/tmp/usr/lib/R/site-library/rot
-DCMAKE_SHARED_LINKER_FLAGS_RELWITHDEBINFO:STRING='$(ldflags)' \
-DCMAKE_INSTALL_PREFIX:PATH=/usr \
-DCMAKE_INSTALL_LIBDIR:PATH=/usr/lib \
- -DLIB_SOVERSION=0.5 \
- -DLIB_VERSION=0.5.0 \
- -DOPENTURNS_SYSCONFIG_PATH:PATH=/etc/openturns-1.4 \
- -DOPENTURNS_WRAPPER_PATH:PATH=lib/openturns-1.4/wrappers \
- -DSYSTEM_INSTALL:BOOL=ON \
+ -DLIB_SOVERSION=0.6 \
+ -DLIB_VERSION=0.6.0 \
+ -DOPENTURNS_SYSCONFIG_PATH:PATH=/etc/openturns-1.5 \
+ -DOPENTURNS_WRAPPER_PATH:PATH=lib/openturns-1.5/wrappers \
-DINSTALL_DESTDIR:PATH=$(CURDIR)/debian/tmp \
-DLINK_PYTHON_LIBRARY:BOOL=OFF \
-DPYTHON_EXECUTABLE:FILEPATH=/usr/bin/python \
@@ -88,7 +87,6 @@ override_dh_auto_build:
override_dh_auto_install: debian/tmp/usr/lib/R/site-library/rot
dh_auto_install
mkdir -p debian/libopenturns-dbg/usr/lib/debug/usr/lib
- cp debian/libOT-gdb.py debian/libopenturns-dbg/usr/lib/debug/usr/lib/libOT.so.0.4.0-gdb.py
ifeq (,$(findstring nocheck,$(DEB_BUILD_OPTIONS)))
# CTestTestfile.cmake sets LD_LIBRARY_PATH to find libraries in debian/tmp.
# But it overrides current value, which breaks when run by fakeroot.
@@ -102,7 +100,7 @@ override_dh_makeshlibs:
dh_makeshlibs -Xpyshared
override_dh_strip:
- dh_strip -plibopenturns0.5 --dbg-package=libopenturns-dbg
+ dh_strip -plibopenturns0.6 --dbg-package=libopenturns-dbg
dh_strip
override_dh_python2:
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-science/packages/openturns.git
More information about the debian-science-commits
mailing list