r46468 - in /packages/tetgen/trunk/debian: changelog control libtet1.5-dev.install libtet1.5.install rules tetgen.install

trophime-guest at users.alioth.debian.org trophime-guest at users.alioth.debian.org
Tue Jan 21 16:11:11 UTC 2014 

Author: trophime-guest
Date: Tue Jan 21 16:11:11 2014
New Revision: 46468

URL: http://svn.debian.org/wsvn/debian-science/?sc=1&rev=46468
Log:
use dh

Added:
    packages/tetgen/trunk/debian/libtet1.5-dev.install
    packages/tetgen/trunk/debian/libtet1.5.install
    packages/tetgen/trunk/debian/tetgen.install
Modified:
    packages/tetgen/trunk/debian/changelog
    packages/tetgen/trunk/debian/control
    packages/tetgen/trunk/debian/rules

Modified: packages/tetgen/trunk/debian/changelog
URL: http://svn.debian.org/wsvn/debian-science/packages/tetgen/trunk/debian/changelog?rev=46468&op=diff
==============================================================================
--- packages/tetgen/trunk/debian/changelog	(original)
+++ packages/tetgen/trunk/debian/changelog	Tue Jan 21 16:11:11 2014
@@ -8,7 +8,10 @@
     move to section math since the license changed to AGPLv3
   * debian/copyright:
     change of license
- * Standards-Version updated to version 3.9.5
+  * debian/rules
+    rewritte using 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
 

Modified: packages/tetgen/trunk/debian/control
URL: http://svn.debian.org/wsvn/debian-science/packages/tetgen/trunk/debian/control?rev=46468&op=diff
==============================================================================
--- packages/tetgen/trunk/debian/control	(original)
+++ packages/tetgen/trunk/debian/control	Tue Jan 21 16:11:11 2014
@@ -19,9 +19,9 @@
  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 +31,10 @@
  .
  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

Added: 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=46468&op=file
==============================================================================
--- packages/tetgen/trunk/debian/libtet1.5-dev.install	(added)
+++ packages/tetgen/trunk/debian/libtet1.5-dev.install	Tue Jan 21 16:11:11 2014
@@ -0,0 +1,2 @@
+tetgen.h usr/include
+libtet.a usr/liblibtet.a 

Added: packages/tetgen/trunk/debian/libtet1.5.install
URL: http://svn.debian.org/wsvn/debian-science/packages/tetgen/trunk/debian/libtet1.5.install?rev=46468&op=file
==============================================================================
--- packages/tetgen/trunk/debian/libtet1.5.install	(added)
+++ packages/tetgen/trunk/debian/libtet1.5.install	Tue Jan 21 16:11:11 2014
@@ -0,0 +1 @@
+usr/lib/libtet.so.*

Modified: packages/tetgen/trunk/debian/rules
URL: http://svn.debian.org/wsvn/debian-science/packages/tetgen/trunk/debian/rules?rev=46468&op=diff
==============================================================================
--- packages/tetgen/trunk/debian/rules	(original)
+++ packages/tetgen/trunk/debian/rules	Tue Jan 21 16:11:11 2014
@@ -1,7 +1,10 @@
 #!/usr/bin/make -f
 
-TETGEN_VERSION = 1.4.3
-TETGEN_LIBVERSION = 1.4
+TETGEN_VERSION = 1.5.0
+TETGEN_LIBVERSION = 1.5
+
+%:
+	dh $@
 
 CFLAGS = -Wall -g
 
@@ -15,21 +18,7 @@
 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
-
+override_dh_auto_build:
 	# Add here commands to compile the package.
 	$(MAKE) CXXFLAGS="-O3 -fPIC" PREDCXXFLAGS="-O0 -fPIC"
 	$(MAKE) tetlib CXXFLAGS="-O3 -fPIC"
@@ -40,74 +29,25 @@
 
 	docbook-to-man debian/tetgen.sgml > tetgen.1
 
-	touch $@
-
-clean:
-	dh_testdir
-	dh_testroot
-	rm -f build-stamp configure-stamp
-
+override_dh_auto_clean:
 	# 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.*
+	rm -f libtet.so.1.5.0
 
 	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
+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
 
 
 #DEB_STRIPPED_UPSTREAM_VERSION = $(shell echo $(DEB_UPSTREAM_VERSION) | sed -n -e 's/.*$$//p')
-TETGEN_VERSION=1.4.3
+TETGEN_VERSION=1.5.0
  #$(DEB_UPSTREAM_VERSION)
 
 get-orig-source:

Added: packages/tetgen/trunk/debian/tetgen.install
URL: http://svn.debian.org/wsvn/debian-science/packages/tetgen/trunk/debian/tetgen.install?rev=46468&op=file
==============================================================================
--- packages/tetgen/trunk/debian/tetgen.install	(added)
+++ packages/tetgen/trunk/debian/tetgen.install	Tue Jan 21 16:11:11 2014
@@ -0,0 +1,3 @@
+tetgen usr/bin
+tetgen.1 usr/share/man/man1
+example.poly usr/share/doc/tetgen/examples

More information about the debian-science-commits mailing list