r44800 - in /packages/openturns/trunk/debian: ./ source/

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


Author: barbier-guest
Date: Tue May 15 20:19:43 2012
New Revision: 44800

URL: http://svn.debian.org/wsvn/debian-science/?sc=1&rev=44800
Log:
Debian version 0.15-3

Added:
    packages/openturns/trunk/debian/source/
    packages/openturns/trunk/debian/source/format
Removed:
    packages/openturns/trunk/debian/dirs
    packages/openturns/trunk/debian/libopenturns0.docs
    packages/openturns/trunk/debian/openturns-doc.install
    packages/openturns/trunk/debian/pycompat
    packages/openturns/trunk/debian/python-openturns.lintian-overrides
Modified:
    packages/openturns/trunk/debian/changelog
    packages/openturns/trunk/debian/control
    packages/openturns/trunk/debian/libopenturns-dev.install
    packages/openturns/trunk/debian/libopenturns0.install
    packages/openturns/trunk/debian/openturns-doc.docs
    packages/openturns/trunk/debian/openturns-examples.install
    packages/openturns/trunk/debian/openturns-validation.install
    packages/openturns/trunk/debian/openturns-wrapper.install
    packages/openturns/trunk/debian/python-openturns.install
    packages/openturns/trunk/debian/rules

Modified: packages/openturns/trunk/debian/changelog
URL: http://svn.debian.org/wsvn/debian-science/packages/openturns/trunk/debian/changelog?rev=44800&op=diff
==============================================================================
--- packages/openturns/trunk/debian/changelog (original)
+++ packages/openturns/trunk/debian/changelog Tue May 15 20:19:43 2012
@@ -1,3 +1,12 @@
+openturns (0.15-3) unstable; urgency=low
+
+  * Team upload. (Closes: #662792).
+  * Getting rid of unneeded *.la (Closes: #622492).
+  * Transition to dh_python2 (Closes: #616928).
+  * Use dh rules.tiny, enable parallel build.
+
+ -- Aron Xu <aron at debian.org>  Mon, 26 Mar 2012 08:40:35 +0000
+
 openturns (0.15-2) unstable; urgency=low
 
   * openturns-wrappers: install wrappers, wrapper.xml and wrapper.dtd

Modified: packages/openturns/trunk/debian/control
URL: http://svn.debian.org/wsvn/debian-science/packages/openturns/trunk/debian/control?rev=44800&op=diff
==============================================================================
--- packages/openturns/trunk/debian/control (original)
+++ packages/openturns/trunk/debian/control Tue May 15 20:19:43 2012
@@ -3,8 +3,8 @@
 Priority: extra
 Maintainer: Debian Science Maintainers <debian-science-maintainers at lists.alioth.debian.org>
 Uploaders: Christophe Prud'homme <prudhomm at debian.org>
-Build-Depends: cdbs(>= 0.4.51), quilt (>= 0.46-4), debhelper (>= 7), chrpath, gcc (>= 4.2), g++ (>= 4.2), gfortran (>= 4.2), libxml2-dev, liblapack-dev, libblas-dev, r-base-core (>= 2.0), python-central (>= 0.5.6), python-dev, python-rpy2, ghostscript, graphviz, doxygen-latex, docbook-to-man, swig
-Standards-Version: 3.9.2
+Build-Depends: debhelper (>= 8), chrpath, gcc (>= 4.2), g++ (>= 4.2), gfortran (>= 4.2), libxml2-dev, liblapack-dev, libblas-dev, r-base-core (>= 2.0), python-dev (>= 2.6.6-3~), python-rpy2, ghostscript, graphviz, doxygen-latex, docbook-to-man, swig, autoconf
+Standards-Version: 3.9.3
 Homepage: http://trac.openturns.org/
 Vcs-Svn: svn://svn.debian.org/svn/debian-science/packages/openturns/trunk
 Vcs-Browser: http://svn.debian.org/wsvn/debian-science/packages/openturns/trunk
@@ -82,8 +82,6 @@
 Package: python-openturns
 Section: python
 Architecture: any
-XS-Python-Version: >= 2.4, << 3.0
-XB-Python-Version: ${python:Versions}
 Depends: ${shlibs:Depends}, ${misc:Depends}, libopenturns0, ${python:Depends}, python-rpy2, ghostscript, python-qt4
 Provides: ${python:Provides}
 Description: Python front-end of OpenTURNS (aka TUI)
@@ -103,10 +101,7 @@
  all the functionalities provided by the OpenTURNS library.
 
 Package: openturns-examples
-Section: science
 Architecture: any
-XS-Python-Version: >= 2.4, << 3.0
-XB-Python-Version: ${python:Versions}
 Depends: ${shlibs:Depends}, ${misc:Depends}, libopenturns0, python-openturns
 Description: examples of OpenTURNS functionalities
  OpenTURNS is a powerful and generic tool to treat and quantify
@@ -129,7 +124,6 @@
  beginners.
 
 Package: openturns-wrapper
-Section: science
 Architecture: any
 Depends: ${shlibs:Depends}, ${misc:Depends}, libopenturns0
 Description: example of a wrapper for OpenTURNS
@@ -157,7 +151,6 @@
  retrieved from the code.
 
 Package: openturns-validation
-Section: science
 Architecture: all
 Depends: ${misc:Depends}
 Description: validation files for OpenTURNS

Modified: packages/openturns/trunk/debian/libopenturns-dev.install
URL: http://svn.debian.org/wsvn/debian-science/packages/openturns/trunk/debian/libopenturns-dev.install?rev=44800&op=diff
==============================================================================
--- packages/openturns/trunk/debian/libopenturns-dev.install (original)
+++ packages/openturns/trunk/debian/libopenturns-dev.install Tue May 15 20:19:43 2012
@@ -1,6 +1,5 @@
-debian/tmp/usr/bin/openturns*                       usr/bin
-debian/tmp/usr/lib/openturns/libOT.so           usr/lib/
-debian/tmp/usr/lib/openturns/libOT.so           usr/lib/
-debian/tmp/usr/lib/openturns/libOT.a            usr/lib/
-debian/tmp/usr/share/openturns/m4               usr/share/openturns/m4
-debian/tmp/usr/include/openturns/*              usr/include/openturns
+usr/bin/*
+usr/lib/openturns/lib*.so usr/lib/
+usr/lib/openturns/lib*.a usr/lib/
+usr/share/openturns/m4/*
+usr/include/openturns/*

Modified: packages/openturns/trunk/debian/libopenturns0.install
URL: http://svn.debian.org/wsvn/debian-science/packages/openturns/trunk/debian/libopenturns0.install?rev=44800&op=diff
==============================================================================
--- packages/openturns/trunk/debian/libopenturns0.install (original)
+++ packages/openturns/trunk/debian/libopenturns0.install Tue May 15 20:19:43 2012
@@ -1,2 +1,2 @@
-debian/tmp/usr/lib/openturns/libOT.so.0*        usr/lib/
-debian/tmp/etc/openturns/*                      etc/openturns
+usr/lib/openturns/libOT.so.0*        usr/lib/
+etc/openturns/*

Modified: packages/openturns/trunk/debian/openturns-doc.docs
URL: http://svn.debian.org/wsvn/debian-science/packages/openturns/trunk/debian/openturns-doc.docs?rev=44800&op=diff
==============================================================================
--- packages/openturns/trunk/debian/openturns-doc.docs (original)
+++ packages/openturns/trunk/debian/openturns-doc.docs Tue May 15 20:19:43 2012
@@ -1,1 +1,4 @@
-debian/tmp/usr/share/doc/openturns/*
+usr/share/doc/openturns/*
+AUTHORS
+README
+TODO

Modified: packages/openturns/trunk/debian/openturns-examples.install
URL: http://svn.debian.org/wsvn/debian-science/packages/openturns/trunk/debian/openturns-examples.install?rev=44800&op=diff
==============================================================================
--- packages/openturns/trunk/debian/openturns-examples.install (original)
+++ packages/openturns/trunk/debian/openturns-examples.install Tue May 15 20:19:43 2012
@@ -1,1 +1,1 @@
-debian/tmp/usr/share/openturns/examples/*     usr/lib/openturns/examples
+usr/share/openturns/examples/* usr/lib/openturns/examples/

Modified: packages/openturns/trunk/debian/openturns-validation.install
URL: http://svn.debian.org/wsvn/debian-science/packages/openturns/trunk/debian/openturns-validation.install?rev=44800&op=diff
==============================================================================
--- packages/openturns/trunk/debian/openturns-validation.install (original)
+++ packages/openturns/trunk/debian/openturns-validation.install Tue May 15 20:19:43 2012
@@ -1,2 +1,2 @@
-debian/tmp/usr/share/openturns/validation/* usr/share/openturns/validation
+usr/share/openturns/validation/*
 

Modified: packages/openturns/trunk/debian/openturns-wrapper.install
URL: http://svn.debian.org/wsvn/debian-science/packages/openturns/trunk/debian/openturns-wrapper.install?rev=44800&op=diff
==============================================================================
--- packages/openturns/trunk/debian/openturns-wrapper.install (original)
+++ packages/openturns/trunk/debian/openturns-wrapper.install Tue May 15 20:19:43 2012
@@ -1,3 +1,2 @@
-debian/tmp/usr/share/openturns/WrapperTemplates/*    usr/share/openturns/WrapperTemplates
-debian/tmp/usr/lib/openturns/wrappers    usr/lib/openturns/
-
+usr/share/openturns/WrapperTemplates/*
+usr/lib/openturns/wrappers    usr/lib/openturns/

Modified: packages/openturns/trunk/debian/python-openturns.install
URL: http://svn.debian.org/wsvn/debian-science/packages/openturns/trunk/debian/python-openturns.install?rev=44800&op=diff
==============================================================================
--- packages/openturns/trunk/debian/python-openturns.install (original)
+++ packages/openturns/trunk/debian/python-openturns.install Tue May 15 20:19:43 2012
@@ -1,3 +1,2 @@
-debian/tmp/usr/lib/python*/*-packages/openturns/*.py
-debian/tmp/usr/lib/python*/*-packages/openturns/_*
-debian/tmp/usr/lib/python*/*-packages/openturns/openturns_preload*
+usr/lib/python*/*-packages/openturns/*.py usr/share/pyshared/openturns/
+usr/lib/python2.7/*-packages/openturns/*.so* usr/lib/pyshared/python2.7/openturns/

Modified: packages/openturns/trunk/debian/rules
URL: http://svn.debian.org/wsvn/debian-science/packages/openturns/trunk/debian/rules?rev=44800&op=diff
==============================================================================
--- packages/openturns/trunk/debian/rules (original)
+++ packages/openturns/trunk/debian/rules Tue May 15 20:19:43 2012
@@ -1,82 +1,82 @@
 #!/usr/bin/make -f
 
-DEB_PYTHON_SYSTEM=pycentral
+ifeq ($(findstring parallel=,$(DEB_BUILD_OPTIONS)),)
+	export DEB_BUILD_OPTIONS+=parallel=$(shell getconf _NPROCESSORS_ONLN)
+endif
+$(info DEB_BUILD_OPTIONS:$(origin DEB_BUILD_OPTIONS)=$(DEB_BUILD_OPTIONS))
 
-include /usr/share/cdbs/1/rules/debhelper.mk
-include /usr/share/cdbs/1/class/autotools.mk
-include /usr/share/cdbs/1/class/python-module.mk
-include /usr/share/cdbs/1/rules/patchsys-quilt.mk
-
-DEB_AUTO_CLEANUP_RCS     := yes
-DEB_MAKE_CLEAN_TARGET    := clean
-DEB_COMPRESS_EXCLUDE     := .pdf .svn .py
-PYVER     = $(shell pyversions -dv)
-
-DEB_CONFIGURE_EXTRA_FLAGS := --enable-lib --enable-python --enable-doc  --disable-debug \
-  --host=$(DEB_HOST_GNU_TYPE)      \
-  --build=$(DEB_BUILD_GNU_TYPE)    \
-  --prefix=/usr                    \
-  --mandir=\$${prefix}/share/man   \
-  --infodir=\$${prefix}/share/info \
-
-
-#export CXX=g++-4.2
-#export CC=gcc-4.2
-#export CFLAGS= -O3 -I/usr/include/opencascade
-#export CXXFLAGS= -O3 -I/usr/include/opencascade
 export CFLAGS= -g -O2
 export CXXFLAGS= -g -O2
 export FFLAGS= -g -O2
 
 export CPPFLAGS= -DOT_DEBUG_LEVEL=3
 ifeq ($(shell dpkg --print-architecture),hppa)
-CPPFLAGS += -DBOOST_SP_USE_PTHREADS
+	CPPFLAGS += -DBOOST_SP_USE_PTHREADS
 endif
 ifeq ($(shell dpkg --print-architecture),arm)
-CPPFLAGS += -DBOOST_SP_USE_PTHREADS
+	CPPFLAGS += -DBOOST_SP_USE_PTHREADS
 endif
 ifeq ($(shell dpkg --print-architecture),armel)
-CPPFLAGS += -DBOOST_SP_USE_PTHREADS
-export CFLAGS= -g -O1
-export CXXFLAGS= -g -O1
-export FFLAGS= -g -O1
+	CPPFLAGS += -DBOOST_SP_USE_PTHREADS
+	CFLAGS= -g -O1
+	CXXFLAGS= -g -O1
+	FFLAGS= -g -O1
+endif
+ifeq ($(shell dpkg --print-architecture),armhf)
+	CPPFLAGS += -DBOOST_SP_USE_PTHREADS
+	CFLAGS= -g -O1
+	CXXFLAGS= -g -O1
+	FFLAGS= -g -O1
 endif
 ifeq ($(shell dpkg --print-architecture),sparc)
-CPPFLAGS += -DBOOST_SP_USE_PTHREADS
+	CPPFLAGS += -DBOOST_SP_USE_PTHREADS
 endif
 
+LDFLAGS += -Wl,--as-needed
 
+export CPPFLAGS CFLAGS CXXFLAGS FFLAGS LDFLAGS
 
 # see include /usr/share/R/debian/r-cran.mk
 debRlib := $(CURDIR)/debian/python-openturns/usr/lib/R/site-library
+PYVER = $(shell pyversions -dv)
 
-install/python-openturns::
-	mkdir -p $(debRlib)
-	R CMD INSTALL -l $(debRlib) --clean $(extraInstallFlags) debian/rotRPackage
+%:
+	dh $@ --with python2 --parallel
 
-binary-install/python-openturns::
-	-rm debian/python-openturns/usr/lib/python$(PYVER)/site-packages/openturns/*.pyc
-	-for i in debian/python-openturns/usr/lib/python$(PYVER)/site-packages/openturns/*.so; do \
-	  chrpath -d $$i; \
-         done
-	-for i in debian/python-openturns/usr/lib/python$(PYVER)/dist-packages/openturns/*.so; do \
-	  chrpath -d $$i; \
-         done
+override_dh_auto_configure:
+	dh_auto_configure -- \
+		--enable-lib --enable-python --enable-doc  --disable-debug \
+		--host=$(DEB_HOST_GNU_TYPE)      \
+		--build=$(DEB_BUILD_GNU_TYPE)    \
+		--prefix=/usr                    \
+		--mandir=\$${prefix}/share/man   \
+		--infodir=\$${prefix}/share/info
 
-binary-install/openturns-wrapper::
-	-chmod a+x debian/openturns-wrapper/usr/share/openturns/WrapperTemplates/wrapper_calling_shell_command/bootstrap
-	-chmod a+x debian/openturns-wrapper/usr/share/openturns/WrapperTemplates/wrapper_calling_shell_command/customize
-	-chmod a+x debian/openturns-wrapper/usr/share/openturns/WrapperTemplates/wrapper_linked_with_C_function/bootstrap
-	-chmod a+x debian/openturns-wrapper/usr/share/openturns/WrapperTemplates/wrapper_linked_with_C_function/customize
-	-chmod a+x debian/openturns-wrapper/usr/share/openturns/WrapperTemplates/wrapper_linked_with_F77_function/bootstrap
-	-chmod a+x debian/openturns-wrapper/usr/share/openturns/WrapperTemplates/wrapper_linked_with_F77_function/customize
-	-chmod a+x debian/openturns-wrapper/usr/lib/openturns/examples/bootstrap
+override_dh_auto_install:
+	dh_auto_install
+	find debian/ -name *.pyc -delete
+	find debian/ -name *.pyo -delete
+	find debian/ -name *.la -delete
+	find debian/ -name COPYING* -delete
+	find debian/ -name bootstrap -exec chmod a+x {} \;
+	find debian/ -name customize -exec chmod a+x {} \;
+	find debian/python-openturns/ -name *.so -exec chrpath -d {} \;
 
-	-rm -f debian/openturns-wrapper/usr/lib/openturns/wrappers/*.la
-	-rm -f debian/openturns-wrapper/usr/share/openturns/WrapperTemplates/wrapper_calling_shell_command/COPYING
-	-rm -f debian/openturns-wrapper/usr/share/openturns/WrapperTemplates/wrapper_linked_with_C_function/COPYING
-	-rm -f debian/openturns-wrapper/usr/share/openturns/WrapperTemplates/wrapper_linked_with_F77_function/COPYING
+override_dh_makeshlibs:
+	dh_makeshlibs -Xpyshared
 
+override_dh_strip:
+	dh_strip -plibopenturns0 --dbg-package=libopenturns-dbg
+	dh_strip
+
+override_dh_python2:
+	dh_python2 --no-guessing-versions
+
+override_dh_compress:
+	dh_compress -X.pdf -X.svn -X.py
+
+override_dh_auto_test:
+	-dh_auto_test
 
 get-orig-source:
 	uscan --force-download --verbose

Added: packages/openturns/trunk/debian/source/format
URL: http://svn.debian.org/wsvn/debian-science/packages/openturns/trunk/debian/source/format?rev=44800&op=file
==============================================================================
--- packages/openturns/trunk/debian/source/format (added)
+++ packages/openturns/trunk/debian/source/format Tue May 15 20:19:43 2012
@@ -1,0 +1,1 @@
+3.0 (quilt)




More information about the debian-science-commits mailing list