[maemo-commits] [maemo-commits] r14327 - in projects/haf/trunk/dosfstools/debian: . patches

[From: subversion at stage.maemo.org]

Author: kihamala
Date: 2007-10-05 12:31:30 +0300 (Fri, 05 Oct 2007)
New Revision: 14327

Modified:
   projects/haf/trunk/dosfstools/debian/changelog
   projects/haf/trunk/dosfstools/debian/patches/07-use-osso-mem.patch
Log:
try to fix compilation in integration environment


Modified: projects/haf/trunk/dosfstools/debian/changelog
===================================================================
--- projects/haf/trunk/dosfstools/debian/changelog	2007-10-05 07:55:36 UTC (rev 14326)
+++ projects/haf/trunk/dosfstools/debian/changelog	2007-10-05 09:31:30 UTC (rev 14327)
@@ -1,3 +1,9 @@
+dosfstools (2.11-0osso6) unstable; urgency=low
+
+  * Trying to fix compilation.
+
+ -- Kimmo Hämäläinen <kimmo.hamalainen at nokia.com>  Fri,  5 Oct 2007 12:33:43 +0300
+
 dosfstools (2.11-0osso5) unstable; urgency=low
 
   * Added osso_mem* magic, preventing eating all system memory. Fixes: NB#71826

Modified: projects/haf/trunk/dosfstools/debian/patches/07-use-osso-mem.patch
===================================================================
--- projects/haf/trunk/dosfstools/debian/patches/07-use-osso-mem.patch	2007-10-05 07:55:36 UTC (rev 14326)
+++ projects/haf/trunk/dosfstools/debian/patches/07-use-osso-mem.patch	2007-10-05 09:31:30 UTC (rev 14327)
@@ -1,6 +1,6 @@
 diff -purN dosfstools-2.11/dosfsck/Makefile dosfstools-2.11.new/dosfsck/Makefile
 --- dosfstools-2.11/dosfsck/Makefile	1999-07-06 17:23:11.000000000 +0300
-+++ dosfstools-2.11.new/dosfsck/Makefile	2007-10-04 09:08:29.847111488 +0300
++++ dosfstools-2.11.new/dosfsck/Makefile	2007-10-05 12:28:43.104932184 +0300
 @@ -1,5 +1,5 @@
  
 -OBJECTS = boot.o check.o common.o dosfsck.o fat.o file.o io.o lfn.o
@@ -15,7 +15,7 @@
 +osso-mem.o: osso-mem.c osso-mem.h osso-log.h
 diff -purN dosfstools-2.11/dosfsck/dosfsck.c dosfstools-2.11.new/dosfsck/dosfsck.c
 --- dosfstools-2.11/dosfsck/dosfsck.c	2004-02-25 21:28:57.000000000 +0200
-+++ dosfstools-2.11.new/dosfsck/dosfsck.c	2007-10-04 09:34:19.617510576 +0300
++++ dosfstools-2.11.new/dosfsck/dosfsck.c	2007-10-05 12:28:43.104932184 +0300
 @@ -22,6 +22,7 @@
  #include "fat.h"
  #include "file.h"
@@ -72,7 +72,7 @@
      read_boot(&fs);
 diff -purN dosfstools-2.11/dosfsck/osso-log.h dosfstools-2.11.new/dosfsck/osso-log.h
 --- dosfstools-2.11/dosfsck/osso-log.h	1970-01-01 02:00:00.000000000 +0200
-+++ dosfstools-2.11.new/dosfsck/osso-log.h	2007-10-04 09:08:07.733473272 +0300
++++ dosfstools-2.11.new/dosfsck/osso-log.h	2007-10-05 12:28:43.105932032 +0300
 @@ -0,0 +1,290 @@
 +/**
 +  @file osso-log.h
@@ -366,7 +366,7 @@
 +#endif /* OSSO_LOG_H */
 diff -purN dosfstools-2.11/dosfsck/osso-mem.c dosfstools-2.11.new/dosfsck/osso-mem.c
 --- dosfstools-2.11/dosfsck/osso-mem.c	1970-01-01 02:00:00.000000000 +0200
-+++ dosfstools-2.11.new/dosfsck/osso-mem.c	2007-10-04 09:05:26.835933416 +0300
++++ dosfstools-2.11.new/dosfsck/osso-mem.c	2007-10-05 12:29:13.578299528 +0300
 @@ -0,0 +1,609 @@
 +/* ========================================================================= *
 + * File: osso-mem.c
@@ -396,7 +396,6 @@
 + * Includes
 + * ========================================================================= */
 +
-+#include <osso-log.h>
 +#include <stdio.h>
 +#include <stdlib.h>
 +#include <unistd.h>
@@ -407,6 +406,7 @@
 +#include <syslog.h>
 +#include <inttypes.h>
 +
++#include "osso-log.h"
 +#include "osso-mem.h"
 +
 +
@@ -979,7 +979,7 @@
 +
 diff -purN dosfstools-2.11/dosfsck/osso-mem.h dosfstools-2.11.new/dosfsck/osso-mem.h
 --- dosfstools-2.11/dosfsck/osso-mem.h	1970-01-01 02:00:00.000000000 +0200
-+++ dosfstools-2.11.new/dosfsck/osso-mem.h	2007-10-04 09:07:35.946305656 +0300
++++ dosfstools-2.11.new/dosfsck/osso-mem.h	2007-10-05 12:28:43.110931272 +0300
 @@ -0,0 +1,151 @@
 +/* ========================================================================= *
 + * File: osso-mem.h