r46471 - in /packages/tetgen/trunk/debian: changelog control libtet1.5-dev.install patches/cmake.patch patches/series rules tetgen.install
trophime-guest at users.alioth.debian.org
trophime-guest at users.alioth.debian.org
Tue Jan 21 17:07:29 UTC 2014
Author: trophime-guest
Date: Tue Jan 21 17:07:29 2014
New Revision: 46471
URL: http://svn.debian.org/wsvn/debian-science/?sc=1&rev=46471
Log:
switch to cmake
Added:
packages/tetgen/trunk/debian/patches/cmake.patch
Modified:
packages/tetgen/trunk/debian/changelog
packages/tetgen/trunk/debian/control
packages/tetgen/trunk/debian/libtet1.5-dev.install
packages/tetgen/trunk/debian/patches/series
packages/tetgen/trunk/debian/rules
packages/tetgen/trunk/debian/tetgen.install
Modified: packages/tetgen/trunk/debian/changelog
URL: http://svn.debian.org/wsvn/debian-science/packages/tetgen/trunk/debian/changelog?rev=46471&op=diff
==============================================================================
--- packages/tetgen/trunk/debian/changelog (original)
+++ packages/tetgen/trunk/debian/changelog Tue Jan 21 17:07:29 2014
@@ -9,7 +9,8 @@
* debian/copyright:
change of license
* debian/rules
- rewritte using dh
+ switch to cmake
+ switch to dh
* Add .install files
* Standards-Version updated to version 3.9.5
Modified: packages/tetgen/trunk/debian/control
URL: http://svn.debian.org/wsvn/debian-science/packages/tetgen/trunk/debian/control?rev=46471&op=diff
==============================================================================
--- packages/tetgen/trunk/debian/control (original)
+++ packages/tetgen/trunk/debian/control Tue Jan 21 17:07:29 2014
@@ -3,7 +3,7 @@
Section: math
Maintainer: Debian Science Team <debian-science-maintainers at lists.alioth.debian.org>
Uploaders: Christophe Prud'homme <prudhomm at debian.org>
-Build-Depends: debhelper (>= 9), docbook-to-man
+Build-Depends: debhelper (>= 9), docbook-to-man, cmake
Standards-Version: 3.9.5
Vcs-Svn: svn://svn.debian.org/svn/debian-science/packages/tetgen/trunk/
Vcs-Browser: http://svn.debian.org/viewsvn/debian-science/packages/tetgen/trunk/
Modified: packages/tetgen/trunk/debian/libtet1.5-dev.install
URL: http://svn.debian.org/wsvn/debian-science/packages/tetgen/trunk/debian/libtet1.5-dev.install?rev=46471&op=diff
==============================================================================
--- packages/tetgen/trunk/debian/libtet1.5-dev.install (original)
+++ packages/tetgen/trunk/debian/libtet1.5-dev.install Tue Jan 21 17:07:29 2014
@@ -1,2 +1,3 @@
-tetgen.h usr/include
-libtet.a usr/liblibtet.a
+usr/include/tetgen.h
+usr/lib/libtet.a
+usr/lib/libtet.so
Added: packages/tetgen/trunk/debian/patches/cmake.patch
URL: http://svn.debian.org/wsvn/debian-science/packages/tetgen/trunk/debian/patches/cmake.patch?rev=46471&op=file
==============================================================================
--- packages/tetgen/trunk/debian/patches/cmake.patch (added)
+++ packages/tetgen/trunk/debian/patches/cmake.patch Tue Jan 21 17:07:29 2014
@@ -0,0 +1,43 @@
+Index: tetgen-1.5.0/CMakeLists.txt
+===================================================================
+--- tetgen-1.5.0.orig/CMakeLists.txt 2014-01-21 17:34:41.425844628 +0100
++++ tetgen-1.5.0/CMakeLists.txt 2014-01-21 18:04:11.959439851 +0100
+@@ -1,8 +1,13 @@
+ # Set the minimum required version of cmake for a project.
+ cmake_minimum_required(VERSION 2.6)
+
+-# Add an executable to the project using the specified source files.
+-add_executable(tetgen tetgen.cxx predicates.cxx)
++set(TET_MAJOR_VERSION 1)
++set(TET_MINOR_VERSION 5)
++set(TET_PATCH_VERSION 0)
++
++set(TETGEN_BIN bin)
++set(TETGEN_LIB lib)
++set(TETGEN_INCLUDE include)
+
+ #Add a library to the project using the specified source files.
+ # In Linux/Unix, it will creates the libtet.a
+@@ -11,4 +16,20 @@
+ #Set properties on a target.
+ #We use this here to set -DTETLIBRARY for when compiling the
+ #library
+-set_target_properties(tet PROPERTIES "COMPILE_DEFINITIONS" TETLIBRARY)
+\ No newline at end of file
++set_target_properties(tet PROPERTIES "COMPILE_DEFINITIONS" TETLIBRARY)
++
++#Add a shared library to the project using the specified source files.
++add_library(shared SHARED tetgen.cxx predicates.cxx)
++set_target_properties(shared PROPERTIES OUTPUT_NAME tet)
++set_target_properties(shared PROPERTIES
++ VERSION ${TET_MAJOR_VERSION}.${TET_MINOR_VERSION}.${TET_PATCH_VERSION}
++ SOVERSION ${TET_MAJOR_VERSION}.${TET_MINOR_VERSION})
++
++# Add an executable to the project using the specified source files.
++add_executable(tetgen tetgen.cxx predicates.cxx)
++
++# Install
++install(TARGETS tetgen DESTINATION ${TETGEN_BIN} OPTIONAL)
++install(TARGETS tet DESTINATION ${TETGEN_LIB} OPTIONAL)
++install(TARGETS shared DESTINATION ${TETGEN_LIB} OPTIONAL)
++install(FILES tetgen.h DESTINATION ${TETGEN_INCLUDE} OPTIONAL)
Modified: packages/tetgen/trunk/debian/patches/series
URL: http://svn.debian.org/wsvn/debian-science/packages/tetgen/trunk/debian/patches/series?rev=46471&op=diff
==============================================================================
--- packages/tetgen/trunk/debian/patches/series (original)
+++ packages/tetgen/trunk/debian/patches/series Tue Jan 21 17:07:29 2014
@@ -1 +1 @@
-
+cmake.patch
Modified: packages/tetgen/trunk/debian/rules
URL: http://svn.debian.org/wsvn/debian-science/packages/tetgen/trunk/debian/rules?rev=46471&op=diff
==============================================================================
--- packages/tetgen/trunk/debian/rules (original)
+++ packages/tetgen/trunk/debian/rules Tue Jan 21 17:07:29 2014
@@ -8,47 +8,11 @@
export DEB_HOST_MULTIARCH := $(shell dpkg-architecture -qDEB_HOST_MULTIARCH)
%:
- dh $@
-
-CFLAGS = -Wall -g
-
-ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS)))
- CFLAGS += -O0
-else
- CFLAGS += -O2
-endif
-
-
-tetgenbin = $(CURDIR)/debian/libtet$(TETGEN_LIBVERSION)
-tetgendev = $(CURDIR)/debian/libtet$(TETGEN_LIBVERSION)-dev
+ dh $@ --buildsystem=cmake
override_dh_auto_build:
- # Add here commands to compile the package.
- $(MAKE) CXXFLAGS="$(CXXFLAGS) -fPIC" PREDCXXFLAGS="-O0 -fPIC"
- $(MAKE) tetlib CXXFLAGS="$(CXXFLAGS) -fPIC"
- mkdir -p tmp-tetgen-shlib; \
- cd tmp-tetgen-shlib; \
- ar x ../libtet.a; \
- gcc $(CFLAGS) -shared -fPIC -lstdc++ -lm -Wl,-soname,libtet.so.$(TETGEN_VERSION) -o ../libtet.so.$(TETGEN_VERSION) *.o
-
+ dh_auto_build
docbook-to-man debian/tetgen.sgml > tetgen.1
-
-override_dh_auto_clean:
- # Add here commands to clean up after the build process.
- -$(MAKE) clean RM="rm -f"
- -rm -rf tmp-tetgen-shlib
-
- # Remove
- -rm -f tetgen.1
- -rm -f libtet.so.1.5.0
-
- dh_auto_clean
-
-override_dh_install:
- install libtet.a -m 644 debian/tmp/usr/lib
- install libtet.so.$(TETGEN_VERSION) -m 644 debian/tmp/usr/lib
- dh_link -plibtet$(TETGEN_LIBVERSION)-dev usr/lib/libtet.so.$(TETGEN_VERSION) $(tetgendev)/usr/lib/libtet.so
-
get-orig-source:
uscan --force-download --rename --verbose --upstream-version $(TETGEN_VERSION)
Modified: packages/tetgen/trunk/debian/tetgen.install
URL: http://svn.debian.org/wsvn/debian-science/packages/tetgen/trunk/debian/tetgen.install?rev=46471&op=diff
==============================================================================
--- packages/tetgen/trunk/debian/tetgen.install (original)
+++ packages/tetgen/trunk/debian/tetgen.install Tue Jan 21 17:07:29 2014
@@ -1,3 +1,3 @@
-tetgen usr/bin
+usr/bin/tetgen
tetgen.1 usr/share/man/man1
example.poly usr/share/doc/tetgen/examples
More information about the debian-science-commits
mailing list