[openturns] 01/02: Copy files from upstream distro/debian/ directory

Mon Nov 20 00:55:24 UTC 2017

This is an automated email from the git hooks/post-receive script.

barbier pushed a commit to branch next
in repository openturns.

commit eb00ca9060bcf3046ae25d3fe21a53e795091a60
Author: Denis Barbier <bouzim at gmail.com>
Date:   Sun Nov 19 21:33:10 2017 +0100

    Copy files from upstream distro/debian/ directory
---
 debian/changelog                                   | 25 +++++++++----------
 debian/control                                     | 28 ++++------------------
 debian/copyright                                   | 10 ++++----
 debian/libopenturns0.10-dbg.install                |  1 -
 debian/libopenturns0.10.lintian-overrides          |  1 -
 ...nturns0.10.install => libopenturns0.11.install} |  0
 debian/libopenturns0.11.lintian-overrides          |  1 +
 debian/rules                                       | 15 ++++--------
 8 files changed, 27 insertions(+), 54 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index ce9c020..6d4a523 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,25 +1,22 @@
-openturns (1.9-5) unstable; urgency=medium
+openturns (1.10-1) experimental; urgency=low
 
-  * debian/patches/discard-levelsetmesher-test.patch:  This test fails
-    on many non-Intel ports, discard it for now.
+  [ Julien Schueller ]
 
- -- Denis Barbier <barbier at debian.org>  Mon, 20 Nov 2017 00:25:04 +0100
+  * New upstream release.
 
-openturns (1.9-4) unstable; urgency=medium
+  [ Denis Barbier ]
 
-  * Upload into unstable
-  * This version builds with Python 3.6 without change. Closes: #881706
+  * Drop -dbg package, debug packages are now provided automatically.
 
- -- Denis Barbier <barbier at debian.org>  Sun, 19 Nov 2017 16:53:02 +0100
+ -- Denis Barbier <barbier at debian.org>  Mon, 13 Nov 2017 18:14:47 +0100
 
-openturns (1.9-3) experimental; urgency=medium
+openturns (1.10~rc1-1) experimental; urgency=low
 
-  * debian/copyright: Minor updates
-  * debian/rules: use SOURCE_DATE_EPOCH for reproducible builds
-  * debian/libopenturns-dev.install: Do not install openturns-config,
-    this script is obsolete.
+  [ Julien Schueller ]
+
+  * New upstream pre-release.
 
- -- Denis Barbier <barbier at debian.org>  Fri, 25 Aug 2017 23:23:45 +0200
+ -- Denis Barbier <barbier at debian.org>  Mon, 11 Oct 2017 18:14:47 +0200
 
 openturns (1.9-2) experimental; urgency=medium
 
diff --git a/debian/control b/debian/control
index 2a77329..dd4d988 100644
--- a/debian/control
+++ b/debian/control
@@ -16,7 +16,7 @@ Vcs-Git: https://anonscm.debian.org/git/debian-science/packages/openturns.git
 X-Python-Version: current
 X-Python3-Version: current
 
-Package: libopenturns0.10
+Package: libopenturns0.11
 Section: libs
 Architecture: any
 Depends: ${shlibs:Depends}, ${misc:Depends}
@@ -51,7 +51,7 @@ Description: dynamic libraries for OpenTURNS
 Package: libopenturns-dev
 Section: libdevel
 Architecture: any
-Depends: ${misc:Depends}, libopenturns0.10 (= ${binary:Version}),
+Depends: ${misc:Depends}, libopenturns0.11 (= ${binary:Version}),
   libmuparser-dev, libxml2-dev, liblapack-dev, libblas-dev, libtbb-dev [i386 amd64 ia64], libhmat-oss-dev, libnlopt-dev
 Replaces: python-openturns-dev (<< 1.5-2)
 Breaks: python-openturns-dev (<< 1.5-2)
@@ -71,30 +71,10 @@ Description: headers and development libraries for OpenTURNS
  This package provides the OpenTURNS headers should be used if one
  wants to link its application against the library.
 
-Package: libopenturns0.10-dbg
-Section: debug
-Architecture: any
-Depends: libopenturns0.10 (= ${binary:Version}), ${misc:Depends}
-Description: debug symbols for 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 the debug symbols of the OpenTurns libraries to
- help with debugging either your applications or OpenTURNS
-
 Package: python-openturns
 Section: python
 Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}, libopenturns0.10 (= ${binary:Version}), ${python:Depends}
+Depends: ${shlibs:Depends}, ${misc:Depends}, libopenturns0.11 (= ${binary:Version}), ${python:Depends}
 Provides: ${python:Provides}
 Suggests: python-matplotlib, python-scipy
 Description: Python front-end of OpenTURNS (aka TUI)
@@ -116,7 +96,7 @@ Description: Python front-end of OpenTURNS (aka TUI)
 Package: python3-openturns
 Section: python
 Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}, libopenturns0.10 (= ${binary:Version}), ${python3:Depends}
+Depends: ${shlibs:Depends}, ${misc:Depends}, libopenturns0.11 (= ${binary:Version}), ${python3:Depends}
 Provides: ${python3:Provides}
 Suggests: python3-matplotlib, python3-scipy
 Description: Python3 front-end of OpenTURNS (aka TUI)
diff --git a/debian/copyright b/debian/copyright
index 2e7d57a..c50cc84 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -5,15 +5,17 @@ Source: http://switch.dl.sourceforge.net/sourceforge/openturns/
 Debianized-By: Christophe Prud'homme <prudhomm at debian.org>
 Debianized-Date: Sun, 06 Jul 2008 18:12:15 +0200.
 Comment: hmat-oss authors gave written permission to link their library
- (GPLv3) with OpenTURNS, see COPYING.hmat.
+ (GPLv3) with OpenTURNS.
 
 Files: *
-Copyright: Copyright (C) 2005-2017 Airbus-EDF-IMACS-Phimeca
+Copyright: Copyright (C) 2005-2013 Électricité de France (EDF),
+  Copyright (C) 2005-2013 European Aeronautic Defence and Space
+  company (EADS), Copyright (C) 2005-2013 Phimeca
 License: LGPL-3+
 
 Files: debian/*
 Copyright: 2008 Christophe Prud'homme,
- 2012-2017 Denis Barbier
+ 2012-2013 Denis Barbier
 License: GPL-2
 
 Files: lib/include/pthread_win32/*.h
@@ -54,7 +56,7 @@ Files: lib/src/Uncertainty/Distribution/KolmogorovSmirnovDist.*
 Copyright: 2010 Université de Montréal, Richard Simard and Pierre L'Ecuyer
 License: GPL-3
 Comment: Author gave written permission to embed these files into
- OpenTURNS, see COPYING.KolmogorovSmirnovDist
+ OpenTURNS, see lib/COPYING.KolmogorovSmirnovDist
 
 License: BSD-3-clause
  Redistribution and use in source and binary forms, with or without
diff --git a/debian/libopenturns0.10-dbg.install b/debian/libopenturns0.10-dbg.install
deleted file mode 100644
index 9d62bff..0000000
--- a/debian/libopenturns0.10-dbg.install
+++ /dev/null
@@ -1 +0,0 @@
-usr/share/gdb/auto-load/usr/lib/libOT*-gdb.py
diff --git a/debian/libopenturns0.10.lintian-overrides b/debian/libopenturns0.10.lintian-overrides
deleted file mode 100644
index edfdceb..0000000
--- a/debian/libopenturns0.10.lintian-overrides
+++ /dev/null
@@ -1 +0,0 @@
-libopenturns0.10 binary: package-name-doesnt-match-sonames libOT0.10
diff --git a/debian/libopenturns0.10.install b/debian/libopenturns0.11.install
similarity index 100%
rename from debian/libopenturns0.10.install
rename to debian/libopenturns0.11.install
diff --git a/debian/libopenturns0.11.lintian-overrides b/debian/libopenturns0.11.lintian-overrides
new file mode 100644
index 0000000..954acd5
--- /dev/null
+++ b/debian/libopenturns0.11.lintian-overrides
@@ -0,0 +1 @@
+libopenturns0.11 binary: package-name-doesnt-match-sonames libOT0.11
diff --git a/debian/rules b/debian/rules
index e57fa1a..f10dfd2 100755
--- a/debian/rules
+++ b/debian/rules
@@ -43,8 +43,6 @@ PYVER = $(shell pyversions -d)
 PY3VER = $(shell py3versions -d)
 PYALL = $(PYVER) $(PY3VER)
 
-BUILD_DATE = $(shell date --utc --date="@$(SOURCE_DATE_EPOCH)" "+%a, %d %b %Y %H:%M:%S %z")
-
 %:
 ifneq (,$(findstring $(shell dpkg-architecture -qDEB_HOST_ARCH), mips mipsel))
 	$(error This package requires more than 1GB RAM; do not build on mips/mipsel)
@@ -53,14 +51,13 @@ endif
 
 debian/tmp/usr/lib/R/site-library/rot:
 	-mkdir -p $(debRlib)
-	R CMD INSTALL --library=$(debRlib) --built-timestamp='$(BUILD_DATE)' utils/rot_1.4.6.tar.gz
+	R CMD INSTALL --library=$(debRlib) utils/rot_1.4.6.tar.gz
 
 override_dh_auto_configure: debian/tmp/usr/lib/R/site-library/rot $(PYALL:python%=cmake-configure-%) \
 
 cmake-configure-%:
 	dh_auto_configure -Bbuild-python$* -- \
             $(with_tbb) \
-            -Dot_configure_date:STRING='$(BUILD_DATE)' \
             -DUSE_SPHINX:BOOL=OFF \
             -DCMAKE_CXX_COMPILER:FILEPATH=/usr/bin/g++ \
             -DCMAKE_C_COMPILER:FILEPATH=/usr/bin/gcc \
@@ -73,9 +70,9 @@ cmake-configure-%:
             -DCMAKE_SKIP_INSTALL_RPATH:BOOL=ON \
             -DCMAKE_INSTALL_PREFIX:PATH=/usr \
             -DCMAKE_INSTALL_LIBDIR:PATH=/usr/lib \
-            -DLIB_SOVERSION=0.10 \
-            -DLIB_VERSION=0.10.0 \
-            -DOPENTURNS_SYSCONFIG_PATH:PATH=/etc/openturns-1.9 \
+            -DLIB_SOVERSION=0.11 \
+            -DLIB_VERSION=0.11.0 \
+            -DOPENTURNS_SYSCONFIG_PATH:PATH=/etc/openturns-1.10 \
             -DINSTALL_DESTDIR:PATH=$(CURDIR)/debian/tmp \
             -DLINK_PYTHON_LIBRARY:BOOL=OFF \
             -DPYTHON_EXECUTABLE:FILEPATH=/usr/bin/python$* \
@@ -94,7 +91,6 @@ override_dh_auto_install: debian/tmp/usr/lib/R/site-library/rot $(PYALL:python%=
 
 cmake-install-%:
 	dh_auto_install -Bbuild-python$*
-	mkdir -p debian/libopenturns0.10-dbg/usr/lib/debug/usr/lib
 ifeq (,$(findstring nocheck,$(DEB_BUILD_OPTIONS)))
 	LD_LIBRARY_PATH=$${LD_LIBRARY_PATH:+$${LD_LIBRARY_PATH}:}$(CURDIR)/debian/tmp/usr/lib \
 	  CTEST_OUTPUT_ON_FAILURE=1 \
@@ -106,8 +102,7 @@ override_dh_makeshlibs:
 	dh_makeshlibs -Xpyshared
 
 override_dh_strip:
-	dh_strip -plibopenturns0.10 --dbg-package=libopenturns0.10-dbg
-	dh_strip
+	dh_strip -plibopenturns0.11
 
 override_dh_python2:
 	dh_python2 -p python-openturns

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-science/packages/openturns.git

