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

[Rafael Laboissiere]

Author: rafael
Date: 2006-11-15 20:13:38 +0100 (Wed, 15 Nov 2006)
New Revision: 801

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-1

Modified: trunk/packages/octaviz/debian/changelog
===================================================================
--- trunk/packages/octaviz/debian/changelog	2006-11-14 09:19:04 UTC (rev 800)
+++ trunk/packages/octaviz/debian/changelog	2006-11-15 19:13:38 UTC (rev 801)
@@ -1,7 +1,5 @@
 octaviz (0.4.5-1) unstable; urgency=low
 
-  NOT YET RELEASED!
-
   [ Thomas Weber ]
   * New upstream release (closes: #398412)
   * Dropped Patches:
@@ -23,7 +21,7 @@
     making it possible to do out-of-source builds and/or parallel builds
   * Version the suggests on vtkdata for new VTK_DATA_ROOT path
 
- --
+ -- Rafael Laboissiere <rafael at debian.org>  Tue, 14 Nov 2006 21:27:26 +0100
 
 octaviz (0.4.0+cvs20060921-2) unstable; urgency=low
 

Modified: trunk/packages/octaviz/debian/patches/40-revamped-build-system.patch
===================================================================
--- trunk/packages/octaviz/debian/patches/40-revamped-build-system.patch	2006-11-14 09:19:04 UTC (rev 800)
+++ trunk/packages/octaviz/debian/patches/40-revamped-build-system.patch	2006-11-15 19:13:38 UTC (rev 801)
@@ -1,7 +1,7 @@
 diff -Nur octaviz/CMakeLists.txt octaviz.new/CMakeLists.txt
 --- octaviz/CMakeLists.txt	2006-11-13 10:59:17.355774000 +0000
 +++ octaviz.new/CMakeLists.txt	2006-11-13 12:25:35.647040165 +0000
-@@ -1,165 +1,234 @@
+@@ -1,165 +1,236 @@
 -# This file is a hacked CMakeLists.txt from ParaView/Octave
 -# Thanks to Brad King.
 -
@@ -361,7 +361,9 @@
 +			ADD_OCT_FILE(${class} "${flags}")
 +
 +			# install .oct file
-+			INSTALL(FILES ${CMAKE_CURRENT_BINARY_DIR}/${class}.oct DESTINATION ${OCTAVIZ_OCT_DIR})
++			INSTALL(FILES ${CMAKE_CURRENT_BINARY_DIR}/${class}.oct
++                               PERMISSIONS WORLD_EXECUTE OWNER_EXECUTE
++                               DESTINATION ${OCTAVIZ_OCT_DIR})
 +		ENDIF(NOT VTK_CLASS_WRAP_EXCLUDE_${class})
 +	ENDFOREACH(class)
 +ENDMACRO(OCTAVE_WRAP_VTK)

Modified: trunk/packages/octaviz/debian/rules
===================================================================
--- trunk/packages/octaviz/debian/rules	2006-11-14 09:19:04 UTC (rev 800)
+++ trunk/packages/octaviz/debian/rules	2006-11-15 19:13:38 UTC (rev 801)
@@ -60,7 +60,10 @@
 	touch build-stamp
 
 clean::
-	rm -rf build build-stamp cmake-stamp
+	rm -rf build build-stamp cmake-stamp 
+	# The following should not be necessary if out-of-source build
+        # worked...
+	rm -f Common/*.o
 
 binary-install/octaviz::
 	( cd build ; $(MAKE) install DESTDIR=$(debdir) )
@@ -71,6 +74,10 @@
 	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