[tetgen] 02/15: Update debian-files.
Anton Gladky
gladk at moszumanska.debian.org
Tue Jan 28 22:13:45 UTC 2014
This is an automated email from the git hooks/post-receive script.
gladk pushed a commit to branch master
in repository tetgen.
commit cefb6471add163e58457182c05f9ff8726131cac
Author: Christophe Trophime <christophe.trophime at lncmi.cnrs.fr>
Date: Tue Jan 28 20:06:20 2014 +0100
Update debian-files.
---
debian/changelog | 25 ++++++++++
debian/compat | 2 +-
debian/control | 23 +++++----
debian/copyright | 47 +++++++-----------
debian/libtet1.5-dev.install | 3 ++
debian/libtet1.5.install | 1 +
debian/patches/cmake.patch | 43 ++++++++++++++++
debian/patches/series | 2 +-
debian/rules | 114 ++++---------------------------------------
debian/source/format | 1 +
debian/tetgen.install | 3 ++
debian/watch | 1 +
12 files changed, 116 insertions(+), 149 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index eb0243f..f66785b 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,28 @@
+tetgen (1.5.0-1.1) UNRELEASED; urgency=low
+
+ * Non-maintainer upload.
+ * New upstream release
+ * debian/control:
+ update Vcs-Svn and Vcs-Browser
+ update homepage
+ move to section math since the license changed to AGPLv3
+ remove obsolete dm-upload
+ * debian/copyright:
+ change of license
+ * debian/rules
+ switch to cmake
+ switch to dh
+ * Add .install files
+ * Standards-Version updated to version 3.9.5
+
+ -- Christophe Trophime <christophe.trophime at lncmi.cnrs.fr> Tue, 21 Jan 2014 16:34:23 +0100
+
+tetgen (1.4.3-2) UNRELEASED; urgency=low
+
+ * Switch to dpkg-source 3.0 (quilt) format
+
+ -- Sylvestre Ledru <sylvestre at debian.org> Thu, 15 Sep 2011 10:39:44 +0200
+
tetgen (1.4.3-1) unstable; urgency=low
* Team upload
diff --git a/debian/compat b/debian/compat
index 7ed6ff8..ec63514 100644
--- a/debian/compat
+++ b/debian/compat
@@ -1 +1 @@
-5
+9
diff --git a/debian/control b/debian/control
index 4742131..04162b2 100644
--- a/debian/control
+++ b/debian/control
@@ -1,14 +1,13 @@
Source: tetgen
Priority: extra
-Section: non-free/math
+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 (>= 5), docbook-to-man, quilt
-Standards-Version: 3.9.2
-Vcs-Svn: svn://svn.debian.org/svn/pkg-scicomp/tetgen/trunk/
-Vcs-Browser: http://svn.debian.org/wsvn/pkg-scicomp/tetgen/
-XS-DM-Upload-Allowed: yes
-Homepage: http://tetgen.berlios.de/
+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/
+Homepage: http://www.tetgen.org/
Package: tetgen
Architecture: any
@@ -19,9 +18,9 @@ Description: Quality Tetrahedral Mesh Generator
tetrahedralizations and quality tetrahedral meshes for three-dimensional
domains with piecewise linear boundary.
-Package: libtet1.4
+Package: libtet1.5
Architecture: any
-Section: non-free/libs
+Section: libs
Depends: ${shlibs:Depends}, ${misc:Depends}
Description: Quality Tetrahedral Mesh Generator
TetGen generates the Delaunay tetrahedralization, Voronoi diagram, and convex
@@ -31,10 +30,10 @@ Description: Quality Tetrahedral Mesh Generator
.
This package provides the runtime shared library.
-Package: libtet1.4-dev
+Package: libtet1.5-dev
Architecture: any
-Section: non-free/libdevel
-Depends: libtet1.4 (= ${binary:Version}), ${misc:Depends}
+Section: libdevel
+Depends: libtet1.5 (= ${binary:Version}), ${misc:Depends}
Description: Quality Tetrahedral Mesh Generator
TetGen generates the Delaunay tetrahedralization, Voronoi diagram, and convex
hull for three-dimensional point sets, generates the constrained Delaunay
diff --git a/debian/copyright b/debian/copyright
index 57736c7..0b3dd1b 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -15,36 +15,23 @@ Copyright:
si at wias-berlin.de
-License:
-
-Permission is hereby granted, free of charge, to any person obtaining
-a copy of this software and associated documentation files (the
-"Software"), to deal in the Software without restriction, including
-without limitation the rights to use, copy, modify, merge, publish,
-distribute, sublicense and/or sell copies of the Software, and to
-permit persons to whom the Software is furnished to do so, subject to
-the following conditions:
-
-Distribution of modified versions of this code is permissible UNDER
-THE CONDITION THAT THIS CODE AND ANY MODIFICATIONS MADE TO IT IN THE
-SAME SOURCE FILES tetgen.h AND tetgen.cxx REMAIN UNDER COPYRIGHT OF
-THE ORIGINAL AUTHOR, BOTH SOURCE AND OBJECT CODE ARE MADE FREELY
-AVAILABLE WITHOUT CHARGE, AND CLEAR NOTICE IS GIVEN OF THE
-MODIFICATIONS.
-
-Distribution of this code for any commercial purpose is permissible
-ONLY BY DIRECT ARRANGEMENT WITH THE COPYRIGHT OWNER.
-
-The above copyright notice and this permission notice shall be
-included in all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
-IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY
-CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
-TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
-SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+License: AGPLv3
+
+TetGen is distributed under a dual licensing scheme. You can
+redistribute it and/or modify it under the terms of the GNU Affero
+General Public License as published by the Free Software Foundation,
+either version 3 of the License, or (at your option) any later
+version. A copy of the GNU Affero General Public License is reproduced
+below.
+
+If the terms and conditions of the AGPL v.3. would prevent you from
+using TetGen, please consider the option to obtain a commercial
+license for a fee. These licenses are offered by the Weierstrass
+Institute for Applied Analysis and Stochastics (WIAS). As a rule,
+licenses are provided "as-is", unlimited in time for a one time
+fee. Please send corresponding requests to:
+tetgen at wias-berlin.de. Please do not forget to include some
+description of your company and the realm of its activities.
The Debian packaging is (C) 2007, Ondrej Certik <ondrej at certik.cz> and
diff --git a/debian/libtet1.5-dev.install b/debian/libtet1.5-dev.install
new file mode 100644
index 0000000..5d33049
--- /dev/null
+++ b/debian/libtet1.5-dev.install
@@ -0,0 +1,3 @@
+usr/include/tetgen.h
+usr/lib/libtet.a
+usr/lib/libtet.so
diff --git a/debian/libtet1.5.install b/debian/libtet1.5.install
new file mode 100644
index 0000000..918efa7
--- /dev/null
+++ b/debian/libtet1.5.install
@@ -0,0 +1 @@
+usr/lib/libtet.so.*
diff --git a/debian/patches/cmake.patch b/debian/patches/cmake.patch
new file mode 100644
index 0000000..85e6b0f
--- /dev/null
+++ b/debian/patches/cmake.patch
@@ -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)
diff --git a/debian/patches/series b/debian/patches/series
index 8b13789..09ee5a3 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1 +1 @@
-
+cmake.patch
diff --git a/debian/rules b/debian/rules
index 7e40981..ce3c2f9 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,115 +1,19 @@
#!/usr/bin/make -f
-TETGEN_VERSION = 1.4.3
-TETGEN_LIBVERSION = 1.4
+TETGEN_VERSION = 1.5.0
+TETGEN_LIBVERSION = 1.5
-CFLAGS = -Wall -g
+export DEB_CFLAGS_MAINT_APPEND = -Wall -pedantic
+export DEB_LDFLAGS_MAINT_APPEND = -Wl,--as-needed
+export DEB_HOST_MULTIARCH := $(shell dpkg-architecture -qDEB_HOST_MULTIARCH)
-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
-
-configure: configure-stamp
-configure-stamp:
- dh_testdir
- # Add here commands to configure the package.
- QUILT_PATCHES=debian/patches quilt push -a || test $$? = 2
-
- touch configure-stamp
-
-build: build-arch build-indep
-build-arch: build-stamp
-build-indep: build-stamp
-
-build-stamp: configure-stamp
- dh_testdir
-
- # Add here commands to compile the package.
- $(MAKE) CXXFLAGS="-O3 -fPIC" PREDCXXFLAGS="-O0 -fPIC"
- $(MAKE) tetlib CXXFLAGS="-O3 -fPIC"
- mkdir -p tmp-tetgen-shlib; \
- cd tmp-tetgen-shlib; \
- ar x ../libtet.a; \
- gcc -shared -fPIC -lstdc++ -lm -Wl,-soname,libtet.so.$(TETGEN_VERSION) -o ../libtet.so.$(TETGEN_VERSION) *.o
+%:
+ dh $@ --buildsystem=cmake
+override_dh_auto_build:
+ dh_auto_build
docbook-to-man debian/tetgen.sgml > tetgen.1
- touch $@
-
-clean:
- dh_testdir
- dh_testroot
- rm -f build-stamp configure-stamp
-
- # Add here commands to clean up after the build process.
- $(MAKE) clean RM="rm -f"
- rm -rf tmp-tetgen-shlib
- QUILT_PATCHES=debian/patches quilt pop -a -R || test $$? = 2
-
- # Remove
- rm -f tetgen.1
- rm -f libtet.so.1.4.3
- rm -f $(tetgenbin)/usr/lib/libtet.so.1.4.3
- rm -f $(tetgendev)/usr/lib/libtet.*
-
- dh_clean
-
-install: build
- dh_testdir
- dh_testroot
- dh_clean -k
- dh_installdirs
-
- mkdir -p $(tetgenbin)/usr/lib
- mkdir -p $(tetgendev)/usr/lib
- mkdir -p $(tetgendev)/usr/include
- dh_install --sourcedir=$(CURDIR) tetgen usr/bin/
- dh_installexamples --sourcedir=$(CURDIR) example.poly
-
- cp $(CURDIR)/tetgen.h $(tetgendev)/usr/include/
- cp $(CURDIR)/libtet.a $(tetgendev)/usr/lib
- ln -s /usr/lib/libtet.so.$(TETGEN_VERSION) $(tetgendev)/usr/lib/libtet.so
- cp $(CURDIR)/libtet.so.$(TETGEN_VERSION) $(tetgenbin)/usr/lib/
- rm -r $(CURDIR)/debian/tetgen/usr/sbin
-
-
-# Build architecture-independent files here.
-binary-indep: build install
-# We have nothing to do by default.
-
-# Build architecture-dependent files here.
-binary-arch: build install
- dh_testdir
- dh_testroot
- dh_installchangelogs
- dh_installdocs
- dh_installexamples
- dh_installman
- dh_link
- dh_strip
- dh_compress
- dh_fixperms
- dh_makeshlibs
- dh_installdeb
- dh_shlibdeps
- dh_gencontrol
- dh_md5sums
- dh_builddeb
-
-binary: binary-indep binary-arch
-.PHONY: build clean binary-indep binary-arch binary install configure
-
-
-#DEB_STRIPPED_UPSTREAM_VERSION = $(shell echo $(DEB_UPSTREAM_VERSION) | sed -n -e 's/.*$$//p')
-TETGEN_VERSION=1.4.3
- #$(DEB_UPSTREAM_VERSION)
-
get-orig-source:
uscan --force-download --rename --verbose --upstream-version $(TETGEN_VERSION)
tar xzf ../tetgen_$(TETGEN_VERSION).orig.tar.gz
diff --git a/debian/source/format b/debian/source/format
new file mode 100644
index 0000000..163aaf8
--- /dev/null
+++ b/debian/source/format
@@ -0,0 +1 @@
+3.0 (quilt)
diff --git a/debian/tetgen.install b/debian/tetgen.install
new file mode 100644
index 0000000..1823e45
--- /dev/null
+++ b/debian/tetgen.install
@@ -0,0 +1,3 @@
+usr/bin/tetgen
+tetgen.1 usr/share/man/man1
+example.poly usr/share/doc/tetgen/examples
diff --git a/debian/watch b/debian/watch
index b65467a..396df0e 100644
--- a/debian/watch
+++ b/debian/watch
@@ -1,2 +1,3 @@
version=3
http://tetgen.berlios.de/files/tetgen(.*)\.tar\.gz
+#http://wias-berlin.de/software/tetgen/formAction12.jsp
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-science/packages/tetgen.git
More information about the debian-science-commits
mailing list