[Pkg-octave-commit] r1172 - in octaviz/trunk/debian: . patches

[Thomas Weber]

Author: thomas-guest
Date: 2008-01-13 18:49:07 +0000 (Sun, 13 Jan 2008)
New Revision: 1172

Added:
   octaviz/trunk/debian/patches/enable-rpath.patch
Modified:
   octaviz/trunk/debian/changelog
   octaviz/trunk/debian/control
Log:
build with empty XTRA_CPPFLAGS (needs newer CVS checkout)


Modified: octaviz/trunk/debian/changelog
===================================================================
--- octaviz/trunk/debian/changelog	2008-01-11 16:12:25 UTC (rev 1171)
+++ octaviz/trunk/debian/changelog	2008-01-13 18:49:07 UTC (rev 1172)
@@ -1,4 +1,4 @@
-octaviz (0.4.6+cvs20071225-1) UNRELEASED; urgency=low
+octaviz (0.4.6+cvs20080113-1) UNRELEASED; urgency=low
 
   [ Thomas Weber]
   * Use upstream CVS snapshot
@@ -10,8 +10,12 @@
       - 60-vtkdata-path.patch
     The patches have either been integrated upstream (widgets, vtkdata) or are
     obsoleted by the new build system (revamped, liboctaviz)
+  * New patch:
+    enable-rpath: Uncomment the actual rpath lines. They have been commented
+    to temporarily fix the build on MacOS.
   * debian/rules: adapted to revamped build system
-  * debian/control: Build-depend on octave3.0-headers
+  * debian/control: Build-depend on octave3.0-headers and add myself to
+    uploaders
 
   [ Cyril Brulebois ]
   * debian/control:
@@ -28,7 +32,7 @@
     + Dropped the Homepage pseudo-header from the extended description
     + Bumped Standards-Version to 3.7.3
 
- -- Rafael Laboissiere <rafael at debian.org>  Wed, 05 Dec 2007 12:24:03 +0100
+ -- Thomas Weber <thomas.weber.mail at gmail.com>  Sun, 13 Jan 2008 15:49:02 +0000
 
 octaviz (0.4.5-5) unstable; urgency=low
 

Modified: octaviz/trunk/debian/control
===================================================================
--- octaviz/trunk/debian/control	2008-01-11 16:12:25 UTC (rev 1171)
+++ octaviz/trunk/debian/control	2008-01-13 18:49:07 UTC (rev 1172)
@@ -3,7 +3,8 @@
 Priority: optional
 Maintainer: Debian Octave Group <pkg-octave-devel at lists.alioth.debian.org>
 Uploaders: Rafael Laboissiere <rafael at debian.org>,
- Cyril Brulebois <cyril.brulebois at enst-bretagne.fr>
+ Cyril Brulebois <cyril.brulebois at enst-bretagne.fr>,
+ Thomas Weber <thomas.weber.mail at gmail.com>
 Build-Depends: debhelper (>= 5.0.0), cmake, libvtk5-dev (>= 5.0.1-4),
  octave3.0-headers, lesstif2-dev, cdbs
 Standards-Version: 3.7.3

Added: octaviz/trunk/debian/patches/enable-rpath.patch
===================================================================
--- octaviz/trunk/debian/patches/enable-rpath.patch	                        (rev 0)
+++ octaviz/trunk/debian/patches/enable-rpath.patch	2008-01-13 18:49:07 UTC (rev 1172)
@@ -0,0 +1,24 @@
+diff -Nur octaviz-0.4.6+cvs20080113/CMakeLists.txt octaviz-0.4.6+cvs20080113.new/CMakeLists.txt
+--- octaviz-0.4.6+cvs20080113/CMakeLists.txt	2008-01-13 13:20:07.000000000 +0000
++++ octaviz-0.4.6+cvs20080113.new/CMakeLists.txt	2008-01-13 15:48:22.000000000 +0000
+@@ -189,7 +189,7 @@
+         COMMAND ${MKOCTFILE}
+         ARGS ${PCHFLAGS} ${LINK_FLAGS}
+           -o ${CMAKE_CURRENT_BINARY_DIR}/${class}.oct
+-          #-Wl,-rpath=${OCTAVIZ_RPATH}
++          -Wl,-rpath=${OCTAVIZ_RPATH}
+           ${CMAKE_CURRENT_BINARY_DIR}/${class}.o
+         COMMENT "Linking ${class}.o to ${class}.oct"
+         VERBATIM)
+diff -Nur octaviz-0.4.6+cvs20080113/Common/CMakeLists.txt octaviz-0.4.6+cvs20080113.new/Common/CMakeLists.txt
+--- octaviz-0.4.6+cvs20080113/Common/CMakeLists.txt	2008-01-11 15:10:22.000000000 +0000
++++ octaviz-0.4.6+cvs20080113.new/Common/CMakeLists.txt	2008-01-13 15:48:32.000000000 +0000
+@@ -29,7 +29,7 @@
+     COMMAND ${MKOCTFILE}
+     ARGS --verbose ${WNODEPRECATED} ${INCLUDE_FLAGS} -I${CMAKE_CURRENT_SOURCE_DIR}
+       ${LINK_FLAGS} ${APPLE_FLAG}
+-      #-Wl,-rpath=${OCTAVIZ_RPATH}
++      -Wl,-rpath=${OCTAVIZ_RPATH}
+       --output ${CMAKE_CURRENT_BINARY_DIR}/${class}.oct
+       ${CMAKE_CURRENT_BINARY_DIR}/${class}.cc
+     DEPENDS octaviz