r45200 - in /packages/trilinos/trunk/debian: README.source compat control libtrilinos-dev.install patches/series patches/soname.patch python-pytrilinos.install python-pytrilinos.install.orig python-pytrilinos.pyinstall rules

trophime-guest at users.alioth.debian.org trophime-guest at users.alioth.debian.org
Tue Jul 3 07:28:04 UTC 2012 

Author: trophime-guest
Date: Tue Jul  3 07:28:03 2012
New Revision: 45200

URL: http://svn.debian.org/wsvn/debian-science/?sc=1&rev=45200
Log:
add C Trophime to uploaders

Added:
    packages/trilinos/trunk/debian/python-pytrilinos.install.orig
      - copied unchanged from r44759, packages/trilinos/trunk/debian/python-pytrilinos.install
    packages/trilinos/trunk/debian/python-pytrilinos.pyinstall
Removed:
    packages/trilinos/trunk/debian/python-pytrilinos.install
Modified:
    packages/trilinos/trunk/debian/README.source
    packages/trilinos/trunk/debian/compat
    packages/trilinos/trunk/debian/control
    packages/trilinos/trunk/debian/libtrilinos-dev.install
    packages/trilinos/trunk/debian/patches/series
    packages/trilinos/trunk/debian/patches/soname.patch
    packages/trilinos/trunk/debian/rules

Modified: packages/trilinos/trunk/debian/README.source
URL: http://svn.debian.org/wsvn/debian-science/packages/trilinos/trunk/debian/README.source?rev=45200&op=diff
==============================================================================
--- packages/trilinos/trunk/debian/README.source (original)
+++ packages/trilinos/trunk/debian/README.source Tue Jul  3 07:28:03 2012
@@ -6,7 +6,7 @@
 1 - The pdf files have been
     removed from the archive.
 
-2 - Packaging makes use of CDBS and quilt. For the latter see
-`/usr/share/doc/quilt/README.source'.
+2 - Packaging makes use of quilt. 
+See `/usr/share/doc/quilt/README.source'.
 
- -- Christophe Trophime <christophe.trophime at grenoble.cnrs.fr>  Fri, 02 Dec 2011 10:55:54 +0200
+ -- Christophe Trophime <christophe.trophime at grenoble.cnrs.fr>  Wed, 09 May 2012 08:55:54 +0200

Modified: packages/trilinos/trunk/debian/compat
URL: http://svn.debian.org/wsvn/debian-science/packages/trilinos/trunk/debian/compat?rev=45200&op=diff
==============================================================================
--- packages/trilinos/trunk/debian/compat (original)
+++ packages/trilinos/trunk/debian/compat Tue Jul  3 07:28:03 2012
@@ -1,1 +1,1 @@
-7
+9

Modified: packages/trilinos/trunk/debian/control
URL: http://svn.debian.org/wsvn/debian-science/packages/trilinos/trunk/debian/control?rev=45200&op=diff
==============================================================================
--- packages/trilinos/trunk/debian/control (original)
+++ packages/trilinos/trunk/debian/control Tue Jul  3 07:28:03 2012
@@ -2,11 +2,13 @@
 Section: math
 Priority: extra
 Maintainer: Debian Science Maintainers <debian-science-maintainers at lists.alioth.debian.org>
-Uploaders: Christophe Prud'homme <prudhomm at debian.org>
-Build-Depends: quilt (>=0.46-7), debhelper (>= 7.0.50~), cmake, gfortran,
+Uploaders: Christophe Prud'homme <prudhomm at debian.org>,
+ Christophe Trophime <christophe.trophime at lncmi.cnrs.fr>
+Build-Depends: quilt (>=0.46-7), debhelper (>= 9), cmake, gfortran,
  mpi-default-dev, mpi-default-bin, libsuperlu3-dev, libsuitesparse-dev,
- python-dev (>= 2.6.6-3~), swig2.0, python-numpy, libexpat1-dev, libxml2-dev
-Standards-Version: 3.9.2
+ python-dev (>= 2.6.6-3~), swig2.0, python-numpy, libexpat1-dev, libxml2-dev,
+ chrpath
+Standards-Version: 3.9.3
 X-Python-Version: >= 2.5
 Homepage: http://trilinos.sandia.gov/
 Vcs-Svn: svn://svn.debian.org/svn/debian-science/packages/trilinos/trunk

Modified: packages/trilinos/trunk/debian/libtrilinos-dev.install
URL: http://svn.debian.org/wsvn/debian-science/packages/trilinos/trunk/debian/libtrilinos-dev.install?rev=45200&op=diff
==============================================================================
--- packages/trilinos/trunk/debian/libtrilinos-dev.install (original)
+++ packages/trilinos/trunk/debian/libtrilinos-dev.install Tue Jul  3 07:28:03 2012
@@ -1,3 +1,3 @@
-debian/tmp/usr/lib/libtrilinos*.so
+debian/tmp/usr/lib/lib*.so
 debian/tmp/usr/include/trilinos
 debian/tmp/usr/lib/cmake

Modified: packages/trilinos/trunk/debian/patches/series
URL: http://svn.debian.org/wsvn/debian-science/packages/trilinos/trunk/debian/patches/series?rev=45200&op=diff
==============================================================================
--- packages/trilinos/trunk/debian/patches/series (original)
+++ packages/trilinos/trunk/debian/patches/series Tue Jul  3 07:28:03 2012
@@ -1,2 +1,2 @@
 soname.patch
-libname.patch
+#libname.patch

Modified: packages/trilinos/trunk/debian/patches/soname.patch
URL: http://svn.debian.org/wsvn/debian-science/packages/trilinos/trunk/debian/patches/soname.patch?rev=45200&op=diff
==============================================================================
--- packages/trilinos/trunk/debian/patches/soname.patch (original)
+++ packages/trilinos/trunk/debian/patches/soname.patch Tue Jul  3 07:28:03 2012
@@ -1,7 +1,7 @@
-diff -Nru trilinos-10.8.5.dfsg.orig/cmake/package_arch/PackageLibraryMacros.cmake trilinos-10.8.5.dfsg/cmake/package_arch/PackageLibraryMacros.cmake
---- trilinos-10.8.5.dfsg.orig/cmake/package_arch/PackageLibraryMacros.cmake	2012-01-09 18:08:07.000000000 +0100
-+++ trilinos-10.8.5.dfsg/cmake/package_arch/PackageLibraryMacros.cmake	2012-02-06 12:41:29.407281506 +0100
-@@ -255,6 +255,12 @@
+diff -Nru trilinos-10.8.5.dfsg.orig/tribits/cmake/package_arch/TribitsLibraryMacros.cmake trilinos-10.8.5.dfsg/tribits/cmake/package_arch/TribitsLibraryMacros.cmake
+--- trilinos-10.8.5.dfsg.orig/cmake/tribits/package_arch/TribitsLibraryMacros.cmake	2012-01-09 18:08:07.000000000 +0100
++++ trilinos-10.8.5.dfsg/cmake/tribits/package_arch/TribitsLibraryMacros.cmake	2012-02-06 12:41:29.407281506 +0100
+@@ -298,6 +298,12 @@
      SET_PROPERTY(TARGET ${LIBRARY_NAME} APPEND PROPERTY
        LABELS ${PACKAGE_NAME})
  
@@ -11,23 +11,26 @@
 +	${Trilinos_LIBRARY_PROPERTIES})                     
 +    ENDIF(Trilinos_LIBRARY_PROPERTIES)                      
 +
-     PREPEND_GLOBAL_SET(${PACKAGE_NAME}_LIB_TARGETS ${LIBRARY_NAME})
-     PREPEND_GLOBAL_SET(${PACKAGE_NAME}_ALL_TARGETS ${LIBRARY_NAME})
+     PREPEND_GLOBAL_SET(${PARENT_PACKAGE_NAME}_LIB_TARGETS ${LIBRARY_NAME})
+     PREPEND_GLOBAL_SET(${PARENT_PACKAGE_NAME}_ALL_TARGETS ${LIBRARY_NAME})
  
-diff -Nru trilinos-10.8.5.dfsg.orig/cmake/TrilinosVersion.cmake trilinos-10.8.5.dfsg/cmake/TrilinosVersion.cmake
---- trilinos-10.8.5.dfsg.orig/cmake/TrilinosVersion.cmake	2012-01-09 18:08:07.000000000 +0100
-+++ trilinos-10.8.5.dfsg/cmake/TrilinosVersion.cmake	2012-02-06 12:45:47.471272379 +0100
-@@ -72,3 +72,13 @@
- SET(TRILINOS_MAJOR_VERSION TRUE)
- SET(TRILINOS_MAJOR_MINOR_VERSION TRUE)
- SET(TRILINOS_VERSION_STRING TRUE)
-+
+diff -Nru trilinos-10.10.2.dfsg.orig/Version.cmake trilinos-10.10.2.dfsg/Version.cmake
+--- trilinos-10.10.2.dfsg.orig/Version.cmake.orig	2012-05-09 09:43:40.000000000 +0200
++++ trilinos-10.10.2.dfsg.orig/Version.cmake	2012-05-09 09:45:55.000000000 +0200
+@@ -65,6 +65,16 @@
+ SET(Trilinos_VERSION_STRING "10.10.2")
+ SET(Trilinos_ENABLE_DEVELOPMENT_MODE_DEFAULT OFF) # Change to 'OFF' for a release
+ 
 +IF(NOT Trilinos_NO_LIBRARY_VERSION)                                                                   
 +  # This setting of SOVERSION assumes that any API change                                             
-+  # will increment either the minor or major version number of Trilinos.                              
++ # will increment either the minor or major version number of Trilinos.                              
 +  STRING(REGEX REPLACE "(.+)\\.(.+)\\.(.+)" "\\2" Trilinos_MINOR_VERSION "${Trilinos_VERSION_STRING}")
 +  SET(Trilinos_LIBRARY_PROPERTIES                                                                     
 +    VERSION "${Trilinos_VERSION}"                                                                     
 +    SOVERSION "${Trilinos_MAJOR_VERSION}.${Trilinos_MINOR_VERSION}"                                   
 +    )                                                                                                 
 +ENDIF(NOT Trilinos_NO_LIBRARY_VERSION)                                                                
++
+ # Used by testing scripts and should not be used elsewhere
+ SET(Trilinos_REPOSITORY_BRANCH "trilinos-release-10-10-branch" CACHE INTERNAL "")
+ SET(Trilinos_TESTING_TRACK "Nightly Release 10.10" CACHE INTERNAL "")

Added: packages/trilinos/trunk/debian/python-pytrilinos.pyinstall
URL: http://svn.debian.org/wsvn/debian-science/packages/trilinos/trunk/debian/python-pytrilinos.pyinstall?rev=45200&op=file
==============================================================================
--- packages/trilinos/trunk/debian/python-pytrilinos.pyinstall (added)
+++ packages/trilinos/trunk/debian/python-pytrilinos.pyinstall Tue Jul  3 07:28:03 2012
@@ -1,0 +1,2 @@
+debian/tmp/usr/lib/python*/*-packages/PyTrilinos/*.py PyTrilinos
+debian/tmp/usr/lib/python2.7/*-packages/PyTrilinos/*.so PyTrilinos 2.7

Modified: packages/trilinos/trunk/debian/rules
URL: http://svn.debian.org/wsvn/debian-science/packages/trilinos/trunk/debian/rules?rev=45200&op=diff
==============================================================================
--- packages/trilinos/trunk/debian/rules (original)
+++ packages/trilinos/trunk/debian/rules Tue Jul  3 07:28:03 2012
@@ -15,7 +15,7 @@
 
 
 %:
-	dh $@ --buildsystem=cmake --builddirectory=$(BUILDDIR)
+	dh $@ --buildsystem=cmake --builddirectory=$(BUILDDIR)--with python2 --parallel
 
 extra_flags += \
 	-D Trilinos_ENABLE_ALL_PACKAGES:BOOL=ON \
@@ -44,11 +44,6 @@
 	-rm packages/stk/stk_percept/stk_percept/sparsehash/config.status
 	-rm -rf SIERRA/bjam
 
-# retreive backup copy of files to enable rebuild
-	-mv -f cmake/python/data/CDashSubprojectDependencies.xml.bck cmake/python/data/CDashSubprojectDependencies.xml
-	-mv -f cmake/python/data/TrilinosPackageDependencies.xml.bck cmake/python/data/TrilinosPackageDependencies.xml
-	-mv -f cmake/python/data/TrilinosPackageDependenciesTable.html.bck cmake/python/data/TrilinosPackageDependenciesTable.html
-	-mv -f packages/nox/doc/Doxyfile.bck packages/nox/doc/Doxyfile
 
 override_dh_auto_configure:
 # create a backup copy of files to enable rebuild
@@ -64,6 +59,11 @@
 	   -DPYTHON_EXECUTABLE:FILEPATH=/usr/bin/python$$v ;\
 	done
 
+	-mv -f cmake/python/data/CDashSubprojectDependencies.xml.bck cmake/python/data/CDashSubprojectDependencies.xml
+	-mv -f cmake/python/data/TrilinosPackageDependencies.xml.bck cmake/python/data/TrilinosPackageDependencies.xml
+	-mv -f cmake/python/data/TrilinosPackageDependenciesTable.html.bck cmake/python/data/TrilinosPackageDependenciesTable.html
+	-mv -f packages/nox/doc/Doxyfile.bck packages/nox/doc/Doxyfile
+
 override_dh_auto_build:
 	for v in $(PYVERS); do \
 	   dh_auto_build --builddirectory=$(BUILDDIR)$$v; \
@@ -73,10 +73,19 @@
 	for v in $(PYVERS); do \
 	   dh_auto_install --builddirectory=$(BUILDDIR)$$v; \
 	done
+	
+	find debian/tmp -name \*.so.10.10.2 | xargs -r chrpath -d
 	dh_python2 --no-guessing-versions -ppython-pytrilinos
+	
+#install/libtrilinos-doc::
+override_dh_fixperms:
+	dh_fixperms
+	-chmod -x debian/libtrilinos-doc/usr/share/doc/libtrilinos-doc/examples/didasko/doc/DoxyfileWeb
 
-#install/libtrilinos-doc::
-	-chmod -x packages/didasko/doc/DoxyfileWeb
+override_dh_strip:
+	dh_strip -a -Nlibtrilinos
+	dh_strip -plibtrilinos --dbg-package=libtrilinos-dbg
+
 
 DEB_SOURCE_PACKAGE := $(strip $(shell egrep '^Source: ' debian/control | cut -f 2 -d ':'))
 DEB_VERSION := $(shell dpkg-parsechangelog | egrep '^Version:' | cut -f 2 -d ' ')

More information about the debian-science-commits mailing list