[Pkg-octave-commit] rev 803 - in trunk/packages/octaviz/debian: . patches

[Rafael Laboissiere]

Author: rafael
Date: 2006-11-16 21:19:26 +0100 (Thu, 16 Nov 2006)
New Revision: 803

Modified:
   trunk/packages/octaviz/debian/changelog
   trunk/packages/octaviz/debian/patches/40-revamped-build-system.patch
   trunk/packages/octaviz/debian/rules
Log:
Debian release octaviz_0.4.5-2

Modified: trunk/packages/octaviz/debian/changelog
===================================================================
--- trunk/packages/octaviz/debian/changelog	2006-11-15 19:13:46 UTC (rev 802)
+++ trunk/packages/octaviz/debian/changelog	2006-11-16 20:19:26 UTC (rev 803)
@@ -1,3 +1,12 @@
+octaviz (0.4.5-2) unstable; urgency=low
+
+  [ Thomas Weber ]
+  * debian/patches/40-revamped-build-system.patch, debian/rules:
+    - Really allow out-of-source build
+    - No need for calling dpkg-shlibdeps twice
+
+ -- Rafael Laboissiere <rafael at debian.org>  Thu, 16 Nov 2006 08:24:57 +0100
+
 octaviz (0.4.5-1) unstable; urgency=low
 
   [ Thomas Weber ]

Modified: trunk/packages/octaviz/debian/patches/40-revamped-build-system.patch
===================================================================
--- trunk/packages/octaviz/debian/patches/40-revamped-build-system.patch	2006-11-15 19:13:46 UTC (rev 802)
+++ trunk/packages/octaviz/debian/patches/40-revamped-build-system.patch	2006-11-16 20:19:26 UTC (rev 803)
@@ -298,14 +298,18 @@
 +
 +# convert a *typed* .cc file into a .oct file
 +# this macro assumes that the .cc source file lies in CMAKE_CURRENT_SOURCE_DIR,
-+# i.e. it is a .cc file typed with an editor!
-+# It is used for Octaviz Common/ files
++# i.e. it is a .cc file typed with an editor! We copy the .cc files into the
++# BINARY dir, because mkoctfile drops .o files in the directory where the .cc
++# file resides
++# This macro is used for Octaviz Common/ files
 +MACRO(ADD_OCTAVIZ_OCT_FILE class flags)
 +	ADD_CUSTOM_COMMAND(
 +		OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/${class}.oct
++		COMMAND cp ${CMAKE_CURRENT_SOURCE_DIR}/${class}.cc
++			${CMAKE_CURRENT_BINARY_DIR}/${class}.cc
 +		COMMAND mkoctfile ${flags} 
 +			--output ${CMAKE_CURRENT_BINARY_DIR}/${class}.oct
-+			${CMAKE_CURRENT_SOURCE_DIR}/${class}.cc
++			${CMAKE_CURRENT_BINARY_DIR}/${class}.cc
 +		DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/${class}.cc octaviz 
 +		COMMENT "Compile Octaviz ${class}.cc => ${class}.oct"
 +		)
@@ -361,9 +365,12 @@
 +			ADD_OCT_FILE(${class} "${flags}")
 +
 +			# install .oct file
-+			INSTALL(FILES ${CMAKE_CURRENT_BINARY_DIR}/${class}.oct
-+                               PERMISSIONS WORLD_EXECUTE OWNER_EXECUTE
-+                               DESTINATION ${OCTAVIZ_OCT_DIR})
++			# use the PROGRAMS signature, so the .oct files have
++			# their executable bit set; this is the default for
++			# mkoctfilg
++			INSTALL(PROGRAMS 
++				${CMAKE_CURRENT_BINARY_DIR}/${class}.oct 
++				DESTINATION ${OCTAVIZ_OCT_DIR})
 +		ENDIF(NOT VTK_CLASS_WRAP_EXCLUDE_${class})
 +	ENDFOREACH(class)
 +ENDMACRO(OCTAVE_WRAP_VTK)
@@ -449,7 +456,7 @@
 +	SET (flags ${oct_flags} ${oct_link_flags} -loctaviz -L.)
 +	ADD_OCTAVIZ_OCT_FILE(${src_file} "${flags}")
 +	# install rule
-+	INSTALL(FILES ${CMAKE_CURRENT_BINARY_DIR}/${src_file}.oct 
++	INSTALL(PROGRAMS ${CMAKE_CURRENT_BINARY_DIR}/${src_file}.oct 
 +		DESTINATION ${OCTAVIZ_OCT_DIR})
 +ENDFOREACH(src_file)
 +

Modified: trunk/packages/octaviz/debian/rules
===================================================================
--- trunk/packages/octaviz/debian/rules	2006-11-15 19:13:46 UTC (rev 802)
+++ trunk/packages/octaviz/debian/rules	2006-11-16 20:19:26 UTC (rev 803)
@@ -10,8 +10,16 @@
 include /usr/share/cdbs/1/class/langcore.mk
 
 DEB_COMPRESS_EXCLUDE := .m
-DEB_DH_SHLIBDEPS_ARGS := --exclude=site
 
+# Pass only one .oct file to dpkg-shlibdeps and exclude all others; with the
+# full list of all .oct files (> 90000 characters), dpkg-shlibdeps goes
+# ballistic In theory, it shouldn't matter which .oct file we choose, we only
+# need a dependency upon libvtk5
+DEB_DH_SHLIBDEPS_ARGS := --exclude=site \
+	--dpkg-shlibdeps-params=-e$(shell find -name vtk_init.oct)
+
+
+
 # Define Makefile variables MDIR and OCTDIR, as sugested in DOG Guidelines.
 include /usr/share/octave/debian/defs.make
 
@@ -60,10 +68,7 @@
 	touch build-stamp
 
 clean::
-	rm -rf build build-stamp cmake-stamp 
-	# The following should not be necessary if out-of-source build
-        # worked...
-	rm -f Common/*.o
+	rm -rf build build-stamp cmake-stamp
 
 binary-install/octaviz::
 	( cd build ; $(MAKE) install DESTDIR=$(debdir) )
@@ -74,10 +79,6 @@
 	find $(debdir) -name \*.m | xargs -if chmod -x f
 
 binary-predeb/octaviz::
-	# Pick just one *.oct file for calculating the shlib dependencies
-	dpkg-shlibdeps -Tdebian/octaviz.substvars			\
-		`find debian -name \*.oct | perl -pe 'print;exit'`	\
-		`find debian -name \*.so`
 	octave-depends
 
 .PHONY: build