r35966 - in /packages/libneartree/trunk/debian: control rules

[tille at users.alioth.debian.org]

Author: tille
Date: Thu Nov  5 21:39:54 2009
New Revision: 35966

URL: http://svn.debian.org/wsvn/debian-science/?sc=1&rev=35966
Log:
Seems to need gcc-4.4 patches

Modified:
    packages/libneartree/trunk/debian/control
    packages/libneartree/trunk/debian/rules

Modified: packages/libneartree/trunk/debian/control
URL: http://svn.debian.org/wsvn/debian-science/packages/libneartree/trunk/debian/control?rev=35966&op=diff
==============================================================================
--- packages/libneartree/trunk/debian/control (original)
+++ packages/libneartree/trunk/debian/control Thu Nov  5 21:39:54 2009
@@ -3,7 +3,7 @@
 Maintainer: Debian Science Maintainers <debian-science-maintainers at lists.alioth.debian.org>
 DM-Upload-Allowed: yes
 Uploaders: Andreas Tille <tille at debian.org>
-Build-Depends: debhelper (>= 7), d-shlibs (>= 0.38), cdbs, libcvector
+Build-Depends: debhelper (>= 7), d-shlibs (>= 0.38), cdbs, libtool, libcvector-dev
 Standards-Version: 3.8.3
 Section: libs
 Homepage: http://sourceforge.net/projects/neartree/

Modified: packages/libneartree/trunk/debian/rules
URL: http://svn.debian.org/wsvn/debian-science/packages/libneartree/trunk/debian/rules?rev=35966&op=diff
==============================================================================
--- packages/libneartree/trunk/debian/rules (original)
+++ packages/libneartree/trunk/debian/rules Thu Nov  5 21:39:54 2009
@@ -5,19 +5,22 @@
 include /usr/share/cdbs/1/class/makefile.mk
 
 pkg=libneartree
+name=libNearTree
+ver=0
 
-DEB_MAKE_INVOKE = $(DEB_MAKE_ENVVARS) make all
+DEB_MAKE_BUILD_TARGET := all
 
 common-binary-post-install-arch::
 	# Call d-shlibmove to comply with library packaging guide
-	d-devlibdeps debian/$(pkg)1-dev.substvars \
-	             debian/tmp/usr/lib/$(pkg).so
+	d-devlibdeps debian/$(pkg)$(ver)-dev.substvars \
+	             lib/.libs/$(name).so
 	# /bin/sh debian/debug/
 	cp -a *.h debian/tmp
 	# cp -a doc/html/* debian/tmp/usr/share/doc/html
 	d-shlibmove --commit \
-		    --movedev "debian/tmp/*.h" usr/include \
-		    debian/tmp/usr/lib/$(pkg).so
+		    --movedev "*.h" usr/include \
+		    lib/.libs/$(name).so
 
 clean::
-	rm -f debian/$(pkg)1-dev.substvars
+	make distclean
+	rm -f debian/*-dev.substvars