[SCM] BOINC packaging branch, master, updated. debian/7.0.33+dfsg-1-45-gf336af4

[Guo Yixuan]

The following commit has been merged in the master branch:
commit f336af4ddeecc5d337058922f885e4251c475acd
Author: Guo Yixuan <culu.gyx at gmail.com>
Date:   Sun Sep 16 23:23:53 2012 +0800

    Updated api_NULL_not_defined.patch.

diff --git a/debian/changelog b/debian/changelog
index 8903064..a70ec2b 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,6 +3,9 @@ boinc (7.0.36+dfsg-1) UNRELEASED; urgency=low
   [ Gianfranco Costamagna ]
   * New upstream version
 
+  [ Guo Yixuan ]
+  * Updated api_NULL_not_defined.patch.
+
  -- Gianfranco Costamagna <costamagnagianfranco at yahoo.it>  Sat, 15 Sep 2012 15:10:21 +0200
 
 boinc (7.0.34+dfsg-6) UNRELEASED; urgency=low
diff --git a/debian/patches/api_NULL_not_defined.patch b/debian/patches/api_NULL_not_defined.patch
index c57ef00..cd6668b 100644
--- a/debian/patches/api_NULL_not_defined.patch
+++ b/debian/patches/api_NULL_not_defined.patch
@@ -1,13 +1,14 @@
+Description: Picked from http://boinc.berkeley.edu/svn/trunk/boinc@25877
 Index: boinc/api/boinc_api.h
 ===================================================================
---- boinc.orig/api/boinc_api.h	2012-05-18 14:36:50.000000000 +0200
-+++ boinc/api/boinc_api.h	2012-05-19 12:21:09.620351315 +0200
-@@ -83,7 +83,7 @@
+--- boinc.orig/api/boinc_api.h	2012-09-16 23:16:46.000000000 +0800
++++ boinc/api/boinc_api.h	2012-09-16 23:21:04.000000000 +0800
+@@ -18,6 +18,8 @@
+ #ifndef _BOINC_API_
+ #define _BOINC_API_
  
- extern int boinc_init(void);
- extern int boinc_finish(int status);
--extern int boinc_temporary_exit(int delay, const char* reason=NULL);
-+extern int boinc_temporary_exit(int delay, const char* reason=(const char *) 0);
- extern int boinc_get_init_data_p(struct APP_INIT_DATA*);
- extern int boinc_parse_init_data_file(void);
- extern int boinc_send_trickle_up(char* variety, char* text);
++#include <stddef.h>     // for NULL
++
+ #ifdef _WIN32
+ #include "boinc_win.h"
+ #endif

-- 
BOINC packaging