r46469 - in /packages/tetgen/trunk/debian: control rules watch

[trophime-guest at users.alioth.debian.org]

Author: trophime-guest
Date: Tue Jan 21 16:21:44 2014
New Revision: 46469

URL: http://svn.debian.org/wsvn/debian-science/?sc=1&rev=46469
Log:
cleanup

Modified:
    packages/tetgen/trunk/debian/control
    packages/tetgen/trunk/debian/rules
    packages/tetgen/trunk/debian/watch

Modified: packages/tetgen/trunk/debian/control
URL: http://svn.debian.org/wsvn/debian-science/packages/tetgen/trunk/debian/control?rev=46469&op=diff
==============================================================================
--- packages/tetgen/trunk/debian/control	(original)
+++ packages/tetgen/trunk/debian/control	Tue Jan 21 16:21:44 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, quilt
+Build-Depends: debhelper (>= 9), docbook-to-man
 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/rules
URL: http://svn.debian.org/wsvn/debian-science/packages/tetgen/trunk/debian/rules?rev=46469&op=diff
==============================================================================
--- packages/tetgen/trunk/debian/rules	(original)
+++ packages/tetgen/trunk/debian/rules	Tue Jan 21 16:21:44 2014
@@ -2,6 +2,10 @@
 
 TETGEN_VERSION = 1.5.0
 TETGEN_LIBVERSION = 1.5
+
+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)
 
 %:
 	dh $@
@@ -20,35 +24,31 @@
 
 override_dh_auto_build:
 	# Add here commands to compile the package.
-	$(MAKE) CXXFLAGS="-O3 -fPIC" PREDCXXFLAGS="-O0 -fPIC"
-	$(MAKE) tetlib CXXFLAGS="-O3 -fPIC"
+	$(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 -shared -fPIC -lstdc++ -lm -Wl,-soname,libtet.so.$(TETGEN_VERSION) -o ../libtet.so.$(TETGEN_VERSION) *.o
+	gcc $(CFLAGS) -shared -fPIC -lstdc++ -lm -Wl,-soname,libtet.so.$(TETGEN_VERSION) -o ../libtet.so.$(TETGEN_VERSION) *.o
 
 	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
+	-$(MAKE) clean RM="rm -f"
+	[ -d tmp-tetgen-shlib ] && rm -rf tmp-tetgen-shlib
 
 	# Remove 
-	rm -f tetgen.1
-	rm -f libtet.so.1.5.0
+	-rm -f tetgen.1
+	-rm -f libtet.so.1.5.0
 
-	dh_clean
+	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
 
-
-#DEB_STRIPPED_UPSTREAM_VERSION = $(shell echo $(DEB_UPSTREAM_VERSION) | sed -n -e 's/.*$$//p')
-TETGEN_VERSION=1.5.0
- #$(DEB_UPSTREAM_VERSION)
 
 get-orig-source:
 	uscan --force-download --rename --verbose --upstream-version $(TETGEN_VERSION)

Modified: packages/tetgen/trunk/debian/watch
URL: http://svn.debian.org/wsvn/debian-science/packages/tetgen/trunk/debian/watch?rev=46469&op=diff
==============================================================================
--- packages/tetgen/trunk/debian/watch	(original)
+++ packages/tetgen/trunk/debian/watch	Tue Jan 21 16:21:44 2014
@@ -1,2 +1,3 @@
 version=3
 http://tetgen.berlios.de/files/tetgen(.*)\.tar\.gz
+#http://wias-berlin.de/software/tetgen/formAction12.jsp