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

[Rafael Laboissiere]

Author: rafael
Date: 2005-09-23 22:07:21 +0000 (Fri, 23 Sep 2005)
New Revision: 263

Added:
   trunk/packages/octaviz/debian/patches/
   trunk/packages/octaviz/debian/patches/cast-pointer-long.patch
Modified:
   trunk/packages/octaviz/debian/
   trunk/packages/octaviz/debian/changelog
   trunk/packages/octaviz/debian/control
   trunk/packages/octaviz/debian/rules
Log:
Debian release 0.4.0-12



Property changes on: trunk/packages/octaviz/debian
___________________________________________________________________
Name: svn:ignore
   - files
octaviz*

   + files
octaviz*
stamp-patch-cast-pointer-long.patch
stamp-patched


Modified: trunk/packages/octaviz/debian/changelog
===================================================================
--- trunk/packages/octaviz/debian/changelog	2005-09-23 11:04:21 UTC (rev 262)
+++ trunk/packages/octaviz/debian/changelog	2005-09-23 22:07:21 UTC (rev 263)
@@ -1,3 +1,17 @@
+octaviz (0.4.0-12) unstable; urgency=low
+
+   +++ Changes by Rafael Laboissiere
+
+  * debian/patches/cast-pointer-long.patch: Added this patch in an attempt
+    to fix compilation problems in 64-bit systems.  This patch will
+    hopefully fixes bugs #302688 and #300576, and also be harmless in
+    32-bit systems.  I will wait until the build daemons have successfully
+    built the package before closing the bug reports.
+  * debian/control: Depends on cdbs
+  * debian/rules: Include CDBS simple-patch system
+
+ -- Debian Octave Group <pkg-octave-devel at lists.alioth.debian.org>  Fri, 23 Sep 2005 19:03:09 +0200
+
 octaviz (0.4.0-11) unstable; urgency=low
 
   +++ Changes by Rafael Laboissiere

Modified: trunk/packages/octaviz/debian/control
===================================================================
--- trunk/packages/octaviz/debian/control	2005-09-23 11:04:21 UTC (rev 262)
+++ trunk/packages/octaviz/debian/control	2005-09-23 22:07:21 UTC (rev 263)
@@ -2,7 +2,7 @@
 Section: math
 Priority: optional
 Maintainer: Debian Octave Group <pkg-octave-devel at lists.alioth.debian.org>
-Build-Depends: debhelper (>= 4.0.0), cmake, libvtk4-dev (>= 4.4.2-8), octave2.1-headers (>= 2.1.65), lesstif-dev
+Build-Depends: debhelper (>= 4.0.0), cmake, libvtk4-dev (>= 4.4.2-8), octave2.1-headers (>= 2.1.65), lesstif-dev, cdbs
 Standards-Version: 3.6.2
 
 Package: octaviz

Added: trunk/packages/octaviz/debian/patches/cast-pointer-long.patch
===================================================================
--- trunk/packages/octaviz/debian/patches/cast-pointer-long.patch	2005-09-23 11:04:21 UTC (rev 262)
+++ trunk/packages/octaviz/debian/patches/cast-pointer-long.patch	2005-09-23 22:07:21 UTC (rev 263)
@@ -0,0 +1,51 @@
+diff -Naur octaviz-0.4.0-orig/Common/octaviz.cc octaviz-0.4.0/Common/octaviz.cc
+--- octaviz-0.4.0-orig/Common/octaviz.cc	2005-09-23 16:52:02.544924408 +0000
++++ octaviz-0.4.0/Common/octaviz.cc	2005-09-23 16:56:39.033891696 +0000
+@@ -114,7 +114,7 @@
+ 	//std::cout << "Creating.\n" << std::flush;
+ 	std::map<unsigned int, int>& reference_count = get_reference_map();
+ 
+-	unsigned int key = reinterpret_cast<unsigned int>( pointer );
++	unsigned long key = reinterpret_cast<unsigned long>( pointer );
+ 	
+ 	if ( belongs_to_octave ) 
+ 	{
+@@ -149,7 +149,7 @@
+ 	//std::cout << "Creating copy.\n" << std::flush;
+ 	std::map<unsigned int, int>& reference_count = get_reference_map();
+ 
+-	unsigned int key = reinterpret_cast<unsigned int>( vtk_pointer );
++	unsigned long key = reinterpret_cast<unsigned long>( vtk_pointer );
+ 	
+ 	// If this is a clone than it exists in reference count map
+ 	if ( reference_count.find(key) == reference_count.end() ) return;
+@@ -162,7 +162,7 @@
+ { 
+ 	//std::cout << "Destroying.\n" << std::flush;
+ 	std::map<unsigned int, int>& reference_count = get_reference_map();
+-	unsigned int key = reinterpret_cast<unsigned int>( vtk_pointer );
++	unsigned long key = reinterpret_cast<unsigned long>( vtk_pointer );
+ 	// Check if the pointer is reference counted.
+ 	if ( reference_count.find(key) == reference_count.end() ) return;
+ 	
+@@ -180,7 +180,7 @@
+ 
+ unsigned int vtk_object::uint_value (bool req_int, bool frc_str_conv ) const
+ {
+-	return reinterpret_cast<unsigned int>(vtk_pointer);
++	return reinterpret_cast<unsigned long>(vtk_pointer);
+ }
+  
+ bool vtk_object::is_defined (void) const 
+diff -Naur octaviz-0.4.0-orig/Common/vtkInitializeInteractor.cc octaviz-0.4.0/Common/vtkInitializeInteractor.cc
+--- octaviz-0.4.0-orig/Common/vtkInitializeInteractor.cc	2005-09-23 16:52:25.605418680 +0000
++++ octaviz-0.4.0/Common/vtkInitializeInteractor.cc	2005-09-23 16:57:02.558315440 +0000
+@@ -76,7 +76,7 @@
+ 	vtkXOpenGLRenderWindow* RenderWindow = reinterpret_cast<vtkXOpenGLRenderWindow*>(CurrentInteractor->GetRenderWindow());
+ 	Widget widg = CurrentInteractor->GetWidget();
+ 	Atom wm_delete_window = XInternAtom(XtDisplay(widg), "WM_DELETE_WINDOW", False);
+-	vtk_delete_window_atoms[wm_delete_window] = reinterpret_cast<unsigned int>(RenderWindow);
++	vtk_delete_window_atoms[wm_delete_window] = reinterpret_cast<unsigned long>(RenderWindow);
+     // turn off default delete response
+ 	XSetWMProtocols(XtDisplay(widg), XtWindow(widg), &wm_delete_window, 1);
+   return retval;

Modified: trunk/packages/octaviz/debian/rules
===================================================================
--- trunk/packages/octaviz/debian/rules	2005-09-23 11:04:21 UTC (rev 262)
+++ trunk/packages/octaviz/debian/rules	2005-09-23 22:07:21 UTC (rev 263)
@@ -9,6 +9,8 @@
 # Uncomment this to turn on verbose mode.
 #export DH_VERBOSE=1
 
+include /usr/share/cdbs/1/rules/simple-patchsys.mk
+
 # Define Makefile variables MDIR and OCTDIR, as sugested in DOG Guidelines.
 include /usr/share/octave/debian/defs.make
 
@@ -44,7 +46,7 @@
 
 	touch build-stamp
 
-clean:
+clean::
 	dh_testdir
 	dh_testroot
 	rm -f build-stamp cmake-stamp