[SCM] BOINC packaging branch, master, updated. debian/6.10.17+dfsg-3-379-g0f04de8

[Steffen Moeller]

The following commit has been merged in the master branch:
commit 514ca3a6999fc8634732d35cda1371a633526ded
Merge: 2c821b52a8cc698276e722db64fe0e9bd5635bc4 310a59eff9161201773cb8b695e3e49d720df77a
Author: Steffen Moeller <moeller at debian.org>
Date:   Fri Feb 3 21:41:39 2012 +0100

    Merge commit 'upstream/7.0.14+dfsg'
    
    Conflicts:
    	version.h

diff --combined debian/patches/series
index 95e5a2a,0000000..038f211
mode 100644,000000..100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@@ -1,19 -1,0 +1,20 @@@
++termios_is_everywhere.patch
 +mac_addresses_cores_in_kfreebsd.patch
 +stripchart_debian.patch
 +upstream_sztaki_configureEval.patch
 +generate_less.patch
 +texfont_removal.patch
 +#Makefile_subdirs.patch
 +csh2tcsh.patch
 +file_upload_handler_permission.patch
 +possible_size_type_error.patch
 +upstream_sztaki_reduce_accessibility_of_php_inc_file.patch
 +debian_debian_AdjustBoincTopdirPython.patch
 +libnotify-0.7.patch
 +stripchart_security.patch
 +#AddSomeConstToMakeClearMemoryIsNotAllocated.patch
 +#AddingMoreConst.patch
 +#evenMoreConst03.patch
 +#andYetMorePatches04.patch
 +#erase_while_1.patch
 +redundant_i.patch
diff --combined debian/patches/termios_is_everywhere.patch
index 0000000,0000000..b549532
new file mode 100644
--- /dev/null
+++ b/debian/patches/termios_is_everywhere.patch
@@@ -1,0 -1,0 +1,20 @@@
++Index: boinc/zip/unzip/ttyio.c
++===================================================================
++--- boinc.orig/zip/unzip/ttyio.c	2012-02-04 18:57:37.000000000 +0100
+++++ boinc/zip/unzip/ttyio.c	2012-02-05 00:17:10.000000000 +0100
++@@ -26,6 +26,7 @@
++ 
++ #define __TTYIO_C       /* identifies this source module */
++ 
+++
++ #include "zip.h"
++ //#include "crypt.h"
++ 
++@@ -54,6 +55,7 @@
++ #  define HAVE_TERMIOS_H
++ #endif
++ 
+++#include <unistd.h>	/* defines _POSIX_VERSION */
++ #ifdef _POSIX_VERSION
++ #  ifndef USE_POSIX_TERMIOS
++ #    define USE_POSIX_TERMIOS  /* use POSIX style termio (termios) */

-- 
BOINC packaging