r44805 - in /packages/openturns/trunk/debian: control libopenturns0.1.install openturns-examples.install r-openturns-utils.install rules

barbier-guest at users.alioth.debian.org barbier-guest at users.alioth.debian.org
Tue May 15 20:20:17 UTC 2012 

Author: barbier-guest
Date: Tue May 15 20:20:16 2012
New Revision: 44805

URL: http://svn.debian.org/wsvn/debian-science/?sc=1&rev=44805
Log:
Avoid conflicts between libopenturns0 and libopenturns0.1

Install files into /usr/lib/openturns-1.0 and /etc/openturns-1.0
to avoid file conflicts.

Move rotRPackage into its own package.

Also add a file conflict between python-openturns-dev and previous
versions of libopenturns-dev because of swig files.  With these
changes, upgrade from openturns 0.15 packages run smoothly.

Added:
    packages/openturns/trunk/debian/r-openturns-utils.install
Modified:
    packages/openturns/trunk/debian/control
    packages/openturns/trunk/debian/libopenturns0.1.install
    packages/openturns/trunk/debian/openturns-examples.install
    packages/openturns/trunk/debian/rules

Modified: packages/openturns/trunk/debian/control
URL: http://svn.debian.org/wsvn/debian-science/packages/openturns/trunk/debian/control?rev=44805&op=diff
==============================================================================
--- packages/openturns/trunk/debian/control (original)
+++ packages/openturns/trunk/debian/control Tue May 15 20:20:16 2012
@@ -13,11 +13,10 @@
 Package: libopenturns0.1
 Section: libs
 Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}, r-base-core
+Depends: ${shlibs:Depends}, ${misc:Depends}, r-openturns-utils
 Suggests: python-openturns
-Replaces: openturns-wrapper, libopenturns0
+Replaces: openturns-wrapper
 Breaks: openturns-wrapper
-Conflicts: libopenturns0
 Description: dynamic libraries for OpenTURNS
  OpenTURNS is a powerful and generic tool to treat and quantify
  uncertainties in numerical simulations in design, optimization and
@@ -111,6 +110,8 @@
 Architecture: any
 Depends: ${shlibs:Depends}, ${misc:Depends}, libopenturns-dev, python-openturns (= ${binary:Version}), python-dev
 Provides: ${python:Provides}
+Replaces: libopenturns-dev
+Breaks: libopenturns-dev (<< 1.0)
 Description: Python front-end of OpenTURNS (aka TUI)
  OpenTURNS is a powerful and generic tool to treat and quantify
  uncertainties in numerical simulations in design, optimization and
@@ -126,11 +127,32 @@
  .
  This package provides development files for python modules.
 
+Package: r-openturns-utils
+Section: gnu-r
+Architecture: any
+Depends: ${shlibs:Depends}, ${misc:Depends}, r-base-core
+Replaces: python-openturns
+Breaks: python-openturns (<< 1.0)
+Description: GNU R package of few tools needed by OpenTURNS
+ OpenTURNS is a powerful and generic tool to treat and quantify
+ uncertainties in numerical simulations in design, optimization and
+ control. It allows both sensitivity and reliability analysis studies:
+  * defining the outputs of interest and decision criterion;
+  * quantify and model the source of uncertainties;
+  * propagate uncertainties and/or analyse sensitivity and
+  * rank the sources of uncertainty
+ .
+ OpenTURNS is a large project with more than 300 C++ classes which
+ uses well known and supported software such as R for the statistical
+ methods and BLAS/LAPACK for the linear algebra.
+ .
+ This package provides R files needed by some OpenTURNS objects.
+
 Package: openturns-examples
 Architecture: any
 Depends: ${shlibs:Depends}, ${misc:Depends}, python-openturns (= ${binary:Version}), libopenturns-dev
 Replaces: openturns-wrapper
-Breaks: openturns-wrapper (<= 0.13.2)
+Breaks: openturns-wrapper
 Description: examples of OpenTURNS functionalities
  OpenTURNS is a powerful and generic tool to treat and quantify
  uncertainties in numerical simulations in design, optimization and

Modified: packages/openturns/trunk/debian/libopenturns0.1.install
URL: http://svn.debian.org/wsvn/debian-science/packages/openturns/trunk/debian/libopenturns0.1.install?rev=44805&op=diff
==============================================================================
--- packages/openturns/trunk/debian/libopenturns0.1.install (original)
+++ packages/openturns/trunk/debian/libopenturns0.1.install Tue May 15 20:20:16 2012
@@ -1,5 +1,4 @@
 usr/lib/libOT*.so.0*
-usr/lib/R/site-library/rotRPackage
-usr/lib/openturns/wrappers/wrapper*.dtd
-usr/lib/openturns/wrappers/generic.*
-etc/openturns/*
+usr/lib/openturns-1.0/wrappers/wrapper*.dtd
+usr/lib/openturns-1.0/wrappers/generic.*
+etc/openturns-1.0

Modified: packages/openturns/trunk/debian/openturns-examples.install
URL: http://svn.debian.org/wsvn/debian-science/packages/openturns/trunk/debian/openturns-examples.install?rev=44805&op=diff
==============================================================================
--- packages/openturns/trunk/debian/openturns-examples.install (original)
+++ packages/openturns/trunk/debian/openturns-examples.install Tue May 15 20:20:16 2012
@@ -1,8 +1,8 @@
 usr/share/openturns/examples/* usr/lib/openturns/examples/
 usr/share/openturns/examples/*.py
-usr/lib/openturns/wrappers/external_code_threads*
-usr/lib/openturns/wrappers/minimal_wrapper*
-usr/lib/openturns/wrappers/poutre*
-usr/lib/openturns/wrappers/testwrapper*
-usr/lib/openturns/wrappers/Test*
-usr/lib/openturns/wrappers/wrapper.xml
+usr/lib/openturns-1.0/wrappers/external_code_threads*
+usr/lib/openturns-1.0/wrappers/minimal_wrapper*
+usr/lib/openturns-1.0/wrappers/poutre*
+usr/lib/openturns-1.0/wrappers/testwrapper*
+usr/lib/openturns-1.0/wrappers/Test*
+usr/lib/openturns-1.0/wrappers/wrapper.xml

Added: packages/openturns/trunk/debian/r-openturns-utils.install
URL: http://svn.debian.org/wsvn/debian-science/packages/openturns/trunk/debian/r-openturns-utils.install?rev=44805&op=file
==============================================================================
--- packages/openturns/trunk/debian/r-openturns-utils.install (added)
+++ packages/openturns/trunk/debian/r-openturns-utils.install Tue May 15 20:20:16 2012
@@ -1,0 +1,1 @@
+usr/lib/R/site-library/rotRPackage

Modified: packages/openturns/trunk/debian/rules
URL: http://svn.debian.org/wsvn/debian-science/packages/openturns/trunk/debian/rules?rev=44805&op=diff
==============================================================================
--- packages/openturns/trunk/debian/rules (original)
+++ packages/openturns/trunk/debian/rules Tue May 15 20:20:16 2012
@@ -62,7 +62,8 @@
             -DCMAKE_MODULE_LINKER_FLAGS_RELWITHDEBINFO:STRING='$(ldflags)' \
             -DCMAKE_INSTALL_PREFIX:PATH=/usr \
             -DOPENTURNS_LIBRARY_PATH:PATH=lib \
-            -DOPENTURNS_SYSCONFIG_PATH:PATH=/etc \
+            -DOPENTURNS_SYSCONFIG_PATH:PATH=/etc/openturns-1.0 \
+            -DOPENTURNS_WRAPPER_PATH:PATH=lib/openturns-1.0/wrappers \
             -DOPENTURNS_SYSTEM_INSTALL:BOOL=ON \
             -DINSTALL_DESTDIR:PATH=$(CURDIR)/debian/tmp \
             -DPYTHON_EXECUTABLE:FILEPATH=/usr/bin/python \

More information about the debian-science-commits mailing list