[Pkg-ocaml-maint-commits] r3340 - in /trunk/packages/omake/trunk/debian: changelog patches/00list patches/20_64bit_fixes.dpatch

[mfurr at users.alioth.debian.org]

Author: mfurr
Date: Thu Nov 16 00:22:23 2006
New Revision: 3340

URL: http://svn.debian.org/wsvn/pkg-ocaml-maint/?sc=1&rev=3340
Log:
fix 64bit FTBFS

Added:
    trunk/packages/omake/trunk/debian/patches/20_64bit_fixes.dpatch   (with props)
Modified:
    trunk/packages/omake/trunk/debian/changelog
    trunk/packages/omake/trunk/debian/patches/00list

Modified: trunk/packages/omake/trunk/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-ocaml-maint/trunk/packages/omake/trunk/debian/changelog?rev=3340&op=diff
==============================================================================
--- trunk/packages/omake/trunk/debian/changelog (original)
+++ trunk/packages/omake/trunk/debian/changelog Thu Nov 16 00:22:23 2006
@@ -1,3 +1,9 @@
+omake (0.9.6.9-1-2) unstable; urgency=low
+
+  * Fix format string for 64-bit arches
+
+ -- Mike Furr <mfurr at debian.org>  Tue, 14 Nov 2006 16:54:14 -0500
+
 omake (0.9.6.9-1-1) unstable; urgency=low
 
   * New upstream release 

Modified: trunk/packages/omake/trunk/debian/patches/00list
URL: http://svn.debian.org/wsvn/pkg-ocaml-maint/trunk/packages/omake/trunk/debian/patches/00list?rev=3340&op=diff
==============================================================================
--- trunk/packages/omake/trunk/debian/patches/00list (original)
+++ trunk/packages/omake/trunk/debian/patches/00list Thu Nov 16 00:22:23 2006
@@ -1,1 +1,2 @@
 10_Makefile
+20_64bit_fixes

Added: trunk/packages/omake/trunk/debian/patches/20_64bit_fixes.dpatch
URL: http://svn.debian.org/wsvn/pkg-ocaml-maint/trunk/packages/omake/trunk/debian/patches/20_64bit_fixes.dpatch?rev=3340&op=file
==============================================================================
--- trunk/packages/omake/trunk/debian/patches/20_64bit_fixes.dpatch (added)
+++ trunk/packages/omake/trunk/debian/patches/20_64bit_fixes.dpatch Thu Nov 16 00:22:23 2006
@@ -1,0 +1,50 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 20_64bit_fixes.dpatch by Mike Furr <mfurr at debian.org>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: No description.
+
+ at DPATCH@
+diff -urNad omake-0.9.6.9~/src/libmojave-external/cutil/lm_heap.c omake-0.9.6.9/src/libmojave-external/cutil/lm_heap.c
+--- omake-0.9.6.9~/src/libmojave-external/cutil/lm_heap.c	2006-04-03 18:31:06.000000000 -0400
++++ omake-0.9.6.9/src/libmojave-external/cutil/lm_heap.c	2006-11-15 18:17:45.718226598 -0500
+@@ -83,15 +83,15 @@
+     ptr = caml_young_ptr;
+     end = caml_young_end;
+ 
+-    fprintf(stderr, "AAA: %s: [0x%08lx, 0x%08lx, 0x%08lx, 0x%08lx] (%d/%d/%d bytes)\n",
++    fprintf(stderr, "AAA: %s: [0x%08lx, 0x%08lx, 0x%08lx, 0x%08lx] (%ld/%ld/%ld bytes)\n",
+             name,
+             (unsigned long) caml_young_start,
+             (unsigned long) caml_young_ptr,
+             (unsigned long) caml_young_limit,
+             (unsigned long) caml_young_end, 
+-            caml_young_end - caml_young_ptr,
+-            caml_young_end - caml_young_limit,
+-            caml_young_end - caml_young_start);
++            (unsigned long) (caml_young_end - caml_young_ptr),
++            (unsigned long) (caml_young_end - caml_young_limit),
++            (unsigned long) (caml_young_end - caml_young_start));
+     fflush(stderr);
+ 
+     /*
+@@ -167,15 +167,15 @@
+     ptr = caml_young_ptr;
+     end = caml_young_end;
+ 
+-    fprintf(stderr, "AAA: %s: [0x%08lx, 0x%08lx, 0x%08lx, 0x%08lx] (%d/%d/%d bytes)\n",
++    fprintf(stderr, "AAA: %s: [0x%08lx, 0x%08lx, 0x%08lx, 0x%08lx] (%ld/%ld/%ld bytes)\n",
+             name,
+             (unsigned long) caml_young_start,
+             (unsigned long) caml_young_ptr,
+             (unsigned long) caml_young_limit,
+             (unsigned long) caml_young_end, 
+-            caml_young_end - caml_young_ptr,
+-            caml_young_end - caml_young_limit,
+-            caml_young_end - caml_young_start);
++            (unsigned long) (caml_young_end - caml_young_ptr),
++            (unsigned long) (caml_young_end - caml_young_limit),
++            (unsigned long) (caml_young_end - caml_young_start));
+     fflush(stderr);
+ 
+     /*

Propchange: trunk/packages/omake/trunk/debian/patches/20_64bit_fixes.dpatch
------------------------------------------------------------------------------
    svn:executable = *