r45330 - in /packages/parmetis/trunk/debian: ./ patches/

a1kmm-guest at users.alioth.debian.org a1kmm-guest at users.alioth.debian.org
Wed Aug 22 01:46:19 UTC 2012 

Author: a1kmm-guest
Date: Wed Aug 22 01:46:18 2012
New Revision: 45330

URL: http://svn.debian.org/wsvn/debian-science/?sc=1&rev=45330
Log:
Part of the work to upgrade to parmetis4.0.2 - it still has Lintian errors that need to be fixed

Added:
    packages/parmetis/trunk/debian/libparmetis4.0.install
      - copied, changed from r45329, packages/parmetis/trunk/debian/libparmetis3.1.install
    packages/parmetis/trunk/debian/libparmetis4.0.overrides
      - copied unchanged from r45329, packages/parmetis/trunk/debian/libparmetis3.1.overrides
    packages/parmetis/trunk/debian/libparmetis4.0.postinst
    packages/parmetis/trunk/debian/patches/
    packages/parmetis/trunk/debian/patches/install_everything
    packages/parmetis/trunk/debian/patches/series
    packages/parmetis/trunk/debian/patches/shared_and_static
Removed:
    packages/parmetis/trunk/debian/libparmetis3.1.install
    packages/parmetis/trunk/debian/libparmetis3.1.overrides
Modified:
    packages/parmetis/trunk/debian/changelog
    packages/parmetis/trunk/debian/compat
    packages/parmetis/trunk/debian/control
    packages/parmetis/trunk/debian/libparmetis-dev.docs
    packages/parmetis/trunk/debian/libparmetis-dev.install
    packages/parmetis/trunk/debian/parmetis-doc.docs
    packages/parmetis/trunk/debian/parmetis-test.install
    packages/parmetis/trunk/debian/rules
    packages/parmetis/trunk/debian/watch

Modified: packages/parmetis/trunk/debian/changelog
URL: http://svn.debian.org/wsvn/debian-science/packages/parmetis/trunk/debian/changelog?rev=45330&op=diff
==============================================================================
--- packages/parmetis/trunk/debian/changelog (original)
+++ packages/parmetis/trunk/debian/changelog Wed Aug 22 01:46:18 2012
@@ -1,3 +1,12 @@
+parmetis (4.0.2-1) unstable; urgency=low
+
+  * Team upload
+  * Standards-Version updated to version 3.9.3.1
+  * Fix watch file with respect to case changes on the project.
+  * Update to parmetis-4.0.2
+
+ -- Andrew Miller <andrew at amxl.com>  Wed, 22 Aug 2012 08:47:26 +1200
+
 parmetis (3.1.1-4) unstable; urgency=low
 
   * Team upload

Modified: packages/parmetis/trunk/debian/compat
URL: http://svn.debian.org/wsvn/debian-science/packages/parmetis/trunk/debian/compat?rev=45330&op=diff
==============================================================================
--- packages/parmetis/trunk/debian/compat (original)
+++ packages/parmetis/trunk/debian/compat Wed Aug 22 01:46:18 2012
@@ -1,1 +1,1 @@
-5
+9

Modified: packages/parmetis/trunk/debian/control
URL: http://svn.debian.org/wsvn/debian-science/packages/parmetis/trunk/debian/control?rev=45330&op=diff
==============================================================================
--- packages/parmetis/trunk/debian/control (original)
+++ packages/parmetis/trunk/debian/control Wed Aug 22 01:46:18 2012
@@ -3,17 +3,17 @@
 Priority: extra
 Maintainer: Debian Science Team <debian-science-maintainers at lists.alioth.debian.org>
 Uploaders: Adam C. Powell IV <hazelsct at debian.org>, Christophe Prud'homme <prudhomm at debian.org>
-Standards-Version: 3.9.2
+Standards-Version: 3.9.3.1
 Homepage: http://glaros.dtc.umn.edu/gkhome/metis/parmetis/overview
 Vcs-Svn: svn://svn.debian.org/svn/debian-science/packages/parmetis/trunk/
 Vcs-Browser: http://svn.debian.org/viewsvn/debian-science/packages/parmetis/trunk/
-Build-Depends: cdbs, debhelper (>> 5), mpi-default-dev, mpi-default-bin
+Build-Depends: debhelper (>> 9), mpi-default-dev, mpi-default-bin
 XS-Autobuild: yes
 
 Package: libparmetis-dev
 Architecture: any
 Section: non-free/libdevel
-Depends: libparmetis3.1 (= ${binary:Version}), ${misc:Depends}, mpi-default-dev
+Depends: libparmetis4.0 (= ${binary:Version}), ${misc:Depends}, mpi-default-dev
 Suggests: parmetis-doc
 Replaces: parmetis-dev
 Conflicts: parmetis-dev
@@ -25,7 +25,7 @@
  .
  This package contains files needed to develop programs using ParMetis.
 
-Package: libparmetis3.1
+Package: libparmetis4.0
 Architecture: any
 Section: non-free/libs
 Depends: ${shlibs:Depends}, ${misc:Depends}, mpi-default-dev
@@ -40,7 +40,7 @@
 Package: parmetis-test
 Architecture: any
 Section: non-free/math
-Depends: ${shlibs:Depends}, ${misc:Depends}, mpi-default-bin
+Depends: ${shlibs:Depends}, ${misc:Depends}, libparmetis4.0, mpi-default-bin
 Recommends: parmetis-doc
 Conflicts: pimppa
 Description: Parallel Graph Partitioning and Sparse Matrix Ordering Tests

Modified: packages/parmetis/trunk/debian/libparmetis-dev.docs
URL: http://svn.debian.org/wsvn/debian-science/packages/parmetis/trunk/debian/libparmetis-dev.docs?rev=45330&op=diff
==============================================================================
--- packages/parmetis/trunk/debian/libparmetis-dev.docs (original)
+++ packages/parmetis/trunk/debian/libparmetis-dev.docs Wed Aug 22 01:46:18 2012
@@ -1,1 +1,0 @@
-README

Modified: packages/parmetis/trunk/debian/libparmetis-dev.install
URL: http://svn.debian.org/wsvn/debian-science/packages/parmetis/trunk/debian/libparmetis-dev.install?rev=45330&op=diff
==============================================================================
--- packages/parmetis/trunk/debian/libparmetis-dev.install (original)
+++ packages/parmetis/trunk/debian/libparmetis-dev.install Wed Aug 22 01:46:18 2012
@@ -1,7 +1,3 @@
-*.h             /usr/include
-METISLib/*.h    /usr/include/metis
-ParMETISLib/*.h /usr/include/parmetis
-libmetis.a      /usr/lib
-libparmetis.a   /usr/lib
-libmetis.so     /usr/lib
-libparmetis.so  /usr/lib
+usr/include/*.h        /usr/include
+usr/lib/libparmetis.a  /usr/lib
+usr/lib/libmetis.a     /usr/lib

Copied: packages/parmetis/trunk/debian/libparmetis4.0.install (from r45329, packages/parmetis/trunk/debian/libparmetis3.1.install)
URL: http://svn.debian.org/wsvn/debian-science/packages/parmetis/trunk/debian/libparmetis4.0.install?rev=45330&op=diff
==============================================================================
--- packages/parmetis/trunk/debian/libparmetis3.1.install (original)
+++ packages/parmetis/trunk/debian/libparmetis4.0.install Wed Aug 22 01:46:18 2012
@@ -1,2 +1,2 @@
-libmetis.so.*     /usr/lib
-libparmetis.so.*  /usr/lib
+usr/lib/libmetis.so     /usr/lib
+usr/lib/libparmetis.so  /usr/lib

Added: packages/parmetis/trunk/debian/libparmetis4.0.postinst
URL: http://svn.debian.org/wsvn/debian-science/packages/parmetis/trunk/debian/libparmetis4.0.postinst?rev=45330&op=file
==============================================================================
--- packages/parmetis/trunk/debian/libparmetis4.0.postinst (added)
+++ packages/parmetis/trunk/debian/libparmetis4.0.postinst Wed Aug 22 01:46:18 2012
@@ -1,0 +1,1 @@
+#DEBHELPER#

Modified: packages/parmetis/trunk/debian/parmetis-doc.docs
URL: http://svn.debian.org/wsvn/debian-science/packages/parmetis/trunk/debian/parmetis-doc.docs?rev=45330&op=diff
==============================================================================
--- packages/parmetis/trunk/debian/parmetis-doc.docs (original)
+++ packages/parmetis/trunk/debian/parmetis-doc.docs Wed Aug 22 01:46:18 2012
@@ -1,2 +1,1 @@
-README
 Manual/*

Modified: packages/parmetis/trunk/debian/parmetis-test.install
URL: http://svn.debian.org/wsvn/debian-science/packages/parmetis/trunk/debian/parmetis-test.install?rev=45330&op=diff
==============================================================================
--- packages/parmetis/trunk/debian/parmetis-test.install (original)
+++ packages/parmetis/trunk/debian/parmetis-test.install Wed Aug 22 01:46:18 2012
@@ -1,4 +1,4 @@
-Graphs/ptest   /usr/bin
-Graphs/mtest   /usr/bin
+usr/bin/ptest   /usr/bin
+usr/bin/mtest   /usr/bin
 debian/mtest.1 /usr/share/man/man1
 debian/ptest.1 /usr/share/man/man1

Added: packages/parmetis/trunk/debian/patches/install_everything
URL: http://svn.debian.org/wsvn/debian-science/packages/parmetis/trunk/debian/patches/install_everything?rev=45330&op=file
==============================================================================
--- packages/parmetis/trunk/debian/patches/install_everything (added)
+++ packages/parmetis/trunk/debian/patches/install_everything Wed Aug 22 01:46:18 2012
@@ -1,0 +1,27 @@
+Index: parmetis/CMakeLists.txt
+===================================================================
+--- parmetis.orig/CMakeLists.txt	2012-08-22 12:42:17.910939909 +1200
++++ parmetis/CMakeLists.txt	2012-08-22 12:58:42.286575627 +1200
+@@ -33,9 +33,9 @@
+ include_directories(${METIS_PATH}/include)
+ 
+ # List of directories that cmake will look for CMakeLists.txt
+-add_subdirectory(${METIS_PATH}/libmetis ${CMAKE_BINARY_DIR}/libmetis)
+-add_subdirectory(include)
++add_subdirectory(metis)
+ add_subdirectory(libparmetis)
++add_subdirectory(include)
+ add_subdirectory(programs)
+ 
+ # This is for testing during development and is not being distributed
+Index: parmetis/metis/CMakeLists.txt
+===================================================================
+--- parmetis.orig/metis/CMakeLists.txt	2012-08-22 12:42:17.910939909 +1200
++++ parmetis/metis/CMakeLists.txt	2012-08-22 12:49:01.223252418 +1200
+@@ -23,5 +23,6 @@
+ include_directories(include)
+ # Recursively look for CMakeLists.txt in subdirs.
+ add_subdirectory("include")
++add_subdirectory(GKlib)
+ add_subdirectory("libmetis")
+ add_subdirectory("programs")

Added: packages/parmetis/trunk/debian/patches/series
URL: http://svn.debian.org/wsvn/debian-science/packages/parmetis/trunk/debian/patches/series?rev=45330&op=file
==============================================================================
--- packages/parmetis/trunk/debian/patches/series (added)
+++ packages/parmetis/trunk/debian/patches/series Wed Aug 22 01:46:18 2012
@@ -1,0 +1,2 @@
+install_everything
+shared_and_static

Added: packages/parmetis/trunk/debian/patches/shared_and_static
URL: http://svn.debian.org/wsvn/debian-science/packages/parmetis/trunk/debian/patches/shared_and_static?rev=45330&op=file
==============================================================================
--- packages/parmetis/trunk/debian/patches/shared_and_static (added)
+++ packages/parmetis/trunk/debian/patches/shared_and_static Wed Aug 22 01:46:18 2012
@@ -1,0 +1,65 @@
+Index: parmetis/libparmetis/CMakeLists.txt
+===================================================================
+--- parmetis.orig/libparmetis/CMakeLists.txt	2011-07-26 08:59:07.000000000 +1200
++++ parmetis/libparmetis/CMakeLists.txt	2012-08-22 13:12:52.801407858 +1200
+@@ -3,12 +3,17 @@
+ # Find sources.
+ file(GLOB parmetis_sources *.c)
+ # Create libparmetis
+-add_library(parmetis ${ParMETIS_LIBRARY_TYPE} ${parmetis_sources})
++add_library(parmetis SHARED ${parmetis_sources})
++add_library(parmetis_static STATIC ${parmetis_sources})
++set_target_properties(parmetis_static PROPERTIES OUTPUT_NAME parmetis)
++
+ # Link with metis and MPI libraries.
+ target_link_libraries(parmetis metis ${MPI_LIBRARIES})
+ set_target_properties(parmetis PROPERTIES LINK_FLAGS "${MPI_LINK_FLAGS}")
++target_link_libraries(parmetis_static metis_static ${MPI_LIBRARIES})
++set_target_properties(parmetis_static PROPERTIES LINK_FLAGS "${MPI_LINK_FLAGS}")
+ 
+-install(TARGETS parmetis
++install(TARGETS parmetis parmetis_static
+   LIBRARY DESTINATION lib
+   RUNTIME DESTINATION lib
+   ARCHIVE DESTINATION lib)
+Index: parmetis/metis/GKlib/CMakeLists.txt
+===================================================================
+--- parmetis.orig/metis/GKlib/CMakeLists.txt	2011-09-01 10:23:04.000000000 +1200
++++ parmetis/metis/GKlib/CMakeLists.txt	2012-08-22 13:10:13.630504371 +1200
+@@ -7,12 +7,5 @@
+ include(GKlibSystem.cmake)
+ 
+ include_directories(".")
+-add_library(GKlib STATIC ${GKlib_sources})
+-if(UNIX)
+-  target_link_libraries(GKlib m)
+-endif(UNIX)
+ 
+-install(TARGETS GKlib
+-  ARCHIVE DESTINATION lib
+-  LIBRARY DESTINATION lib)
+ install(FILES ${GKlib_includes} DESTINATION include)
+Index: parmetis/metis/libmetis/CMakeLists.txt
+===================================================================
+--- parmetis.orig/metis/libmetis/CMakeLists.txt	2012-08-22 12:42:17.910939909 +1200
++++ parmetis/metis/libmetis/CMakeLists.txt	2012-08-22 13:14:22.781918446 +1200
+@@ -3,13 +3,17 @@
+ # Find sources.
+ file(GLOB metis_sources *.c)
+ # Build libmetis.
+-add_library(metis ${METIS_LIBRARY_TYPE} ${GKlib_sources} ${metis_sources})
++add_library(metis SHARED ${GKlib_sources} ${metis_sources})
++add_library(metis_static STATIC ${GKlib_sources} ${metis_sources})
++
++set_target_properties(metis_static PROPERTIES OUTPUT_NAME metis)
+ if(UNIX)
+   target_link_libraries(metis m)
++  target_link_libraries(metis_static m)
+ endif()
+ 
+ if(METIS_INSTALL)
+-  install(TARGETS metis
++  install(TARGETS metis metis_static
+     LIBRARY DESTINATION lib
+     RUNTIME DESTINATION lib
+     ARCHIVE DESTINATION lib)

Modified: packages/parmetis/trunk/debian/rules
URL: http://svn.debian.org/wsvn/debian-science/packages/parmetis/trunk/debian/rules?rev=45330&op=diff
==============================================================================
--- packages/parmetis/trunk/debian/rules (original)
+++ packages/parmetis/trunk/debian/rules Wed Aug 22 01:46:18 2012
@@ -1,50 +1,39 @@
 #!/usr/bin/make -f
 # This file is public domain.
 
-# where sources are
-DEB_SRCDIR = $(CURDIR)/
-# in which directory to build
-DEB_BUILDDIR = $(DEB_SRCDIR)/
-# in which directory to install the sofware
-DEB_DESTDIR = $(CURDIR)/debian/tmp
+.PHONY : build
 
-#DEB_TAR_SRCDIR                  := parmetis-3.1
-DEB_AUTO_CLEANUP_RCS            := yes
+CMAKE_OPTIONS=-DCMAKE_C_COMPILER=mpicc -DCMAKE_C_FLAGS:STRING="-O3 -Wall" -DCMAKE_CXX_FLAGS="-O3 -Wall" -DGKLIB_PATH=../metis/GKlib -DMETIS_PATH=../metis -DMETIS_INSTALL:BOOL=TRUE -DSHARED:BOOL=TRUE
 
-export MACHINE=LINUX
+build: # Because there is a build directory in source tree.
+	dh_testdir
+	dh_auto_configure --buildsystem=cmake -- ${CMAKE_OPTIONS}
+	dh_auto_build --buildsystem=cmake
+	dh_auto_test --buildsystem=cmake
 
+%:
+	dh $@ --buildsystem=cmake --with-quilt
 
-DEB_MAKE_CLEAN_TARGET    := clean
-DEB_MAKE_INSTALL_TARGET  := #install DESTDIR=$(CURDIR)/debian/tmp/
-# no check for this software
-DEB_MAKE_CHECK_TARGET :=
+override_dh_auto_configure:
+	dh_auto_configure -- ${CMAKE_OPTIONS}
 
-DEB_DH_COMPRESS_ARGS := -X pdf
+override_dh_auto_clean:
+	rm -f metis/programs/cmpfillin metis/programs/gpmetis metis/programs/graphchk \
+	  metis/programs/m2gmetis metis/programs/mpmetis metis/programs/ndmetis \
+	  metis/GKlib/libGKlib.* metis/libmetis/libmetis.* \
+	  metis/GKlib/Makefile \
+          metis/GKlib/cmake_install.cmake \
+          metis/Makefile \
+          metis/cmake_install.cmake \
+          metis/include/CMakeFiles/CMakeDirectoryInformation.cmake \
+          metis/include/CMakeFiles/progress.marks \
+          metis/include/Makefile \
+          metis/include/cmake_install.cmake \
+          metis/libmetis/Makefile \
+          metis/libmetis/cmake_install.cmake \
+          metis/programs/Makefile \
+          metis/programs/cmake_install.cmake \
+	rm -fr metis/CMakeFiles metis/programs/CMakeFiles metis/GKlib/CMakeFiles metis/libmetis/CMakeFiles obj-*
 
-
-include /usr/share/cdbs/1/class/makefile.mk
-include /usr/share/cdbs/1/rules/debhelper.mk
-#include /usr/share/cdbs/1/rules/tarball.mk
-#include /usr/share/cdbs/1/rules/simple-patchsys.mk
-
-INSTALL_PROG=install -D
-INSTALL_DATA=install -m 644 -D
-
-
-#DEB_MAKE_ENVVARS :=
-CFLAGS=-O3 -Wall
-CXXFLAGS=-O3 -Wall
-
-XTRALIBS=-lmpi
-LIBS=-lmpi
-LIBDIR=
-
-CPPFLAGS=-I. -I.. -I$(DEB_SRCDIR) -I/usr/include/mpi
-
-makebuilddir::
-	-ln -s METISLib metis
-	-ln -s ParMETISLib parmetis
-
-clean::
-	-rm metis parmetis
-	-rm ParMETISLib/ParMETISLib METISLib/METISLib
+override_dh_auto_install:
+	dh_auto_install --buildsystem=cmake

Modified: packages/parmetis/trunk/debian/watch
URL: http://svn.debian.org/wsvn/debian-science/packages/parmetis/trunk/debian/watch?rev=45330&op=diff
==============================================================================
--- packages/parmetis/trunk/debian/watch (original)
+++ packages/parmetis/trunk/debian/watch Wed Aug 22 01:46:18 2012
@@ -1,3 +1,3 @@
 version=3
 http://glaros.dtc.umn.edu/gkhome/metis/parmetis/download \
- /gkhome/fetch/sw/parmetis/ParMetis-([\d.]+)\.tar\.gz
+ /gkhome/fetch/sw/parmetis/parmetis-([\d.]+)\.tar\.gz

More information about the debian-science-commits mailing list