[boinc] 03/03: New upstream release, patch refress, moved amd-opencl to experimental package

Gianfranco Costamagna locutusofborg-guest at moszumanska.debian.org
Wed Feb 19 12:39:35 UTC 2014 

This is an automated email from the git hooks/post-receive script.

locutusofborg-guest pushed a commit to annotated tag debian/7.2.39+dfsg-1
in repository boinc.

commit 06b1ea4afb2ae35d831c278588f858ae7c4bbc01
Author: Gianfranco Costamagna <costamagnagianfranco at yahoo.it>
Date:   Wed Feb 19 12:13:59 2014 +0100

    New upstream release, patch refress, moved amd-opencl to experimental package
---
 debian/changelog                                   |  7 +++
 debian/control.in                                  | 48 ++++++++--------
 debian/patches/MainDocumentWarnings.patch          | 12 ++--
 debian/patches/Missing_libSched.patch              | 30 ++++++----
 debian/patches/add-ldflags.patch                   |  6 +-
 debian/patches/addressing_addional_html_dirs.patch |  6 +-
 debian/patches/boinclib_shared.patch               | 14 +++--
 debian/patches/client_app_maxpathlen.patch         | 12 ++--
 debian/patches/cppcheck_realloc.patch              |  6 +-
 debian/patches/csh2tcsh.patch                      | 12 ++--
 debian/patches/de.po.patch                         |  8 ++-
 .../debian_debian_AdjustBoincTopdirPython.patch    |  6 +-
 debian/patches/disable_new_version_check.patch     | 14 +++--
 debian/patches/disable_silent_rules.patch          |  6 +-
 debian/patches/dynamic_libboinc.patch              |  6 +-
 .../file_upload_handler_in_sched_linking.patch     |  6 +-
 debian/patches/filesys_error_message.patch         | 12 ++--
 debian/patches/fix-add-exclusive-app.patch         |  6 +-
 debian/patches/fix-android-build.patch             |  6 +-
 debian/patches/fix-file-perms.patch                | 12 ++--
 debian/patches/fix-italian-po.patch                |  6 +-
 debian/patches/fix-lp-1274456.patch                | 10 ++--
 debian/patches/fixed-tools-permissions.patch       |  6 +-
 debian/patches/fopen_closing.patch                 | 24 +++++---
 debian/patches/generate_less.patch                 |  6 +-
 .../patches/gui_urls_xml_added_to_Makefile.patch   |  6 +-
 debian/patches/hurd-ftbfs.patch                    | 66 ++++++++++++++--------
 debian/patches/improve_opendir_warning.patch       |  6 +-
 debian/patches/investigate_boinc_api.patch         |  6 +-
 debian/patches/lib_cppcheck.patch                  |  8 ++-
 debian/patches/libnotify-0.7.patch                 | 12 ++--
 .../make_project_overcomes_Apache24_security.patch |  6 +-
 debian/patches/more_clang_warnings.patch           |  6 +-
 debian/patches/more_maxpathlen.patch               | 18 ++++--
 .../nvidia_mem_display_simplification.patch        |  6 +-
 debian/patches/opendir_errno.patch                 | 12 ++--
 debian/patches/opendir_error_messages.patch        | 18 ++++--
 debian/patches/parse_issues.patch                  |  6 +-
 debian/patches/possible_size_type_error.patch      |  6 +-
 debian/patches/rrsim_iterator_cppcheck.patch       |  6 +-
 debian/patches/sched_driver_char_buffers.patch     |  6 +-
 debian/patches/sched_driver_f_free.patch           |  6 +-
 debian/patches/slot_dir_source_trace.patch         | 34 ++++++-----
 debian/patches/some_extra_clang_warnings.patch     |  6 +-
 debian/patches/stripchart_debian.patch             | 18 ++++--
 debian/patches/termios_is_everywhere.patch         |  6 +-
 debian/patches/ticket_1168_verifycerts.patch       |  6 +-
 debian/patches/upstream_sztaki_configureEval.patch | 12 ++--
 48 files changed, 369 insertions(+), 200 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 21c69db..16548bf 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+boinc (7.2.39+dfsg-1) unstable; urgency=low
+
+  * New upstream stable release, patch refresh
+  * moved boinc-amd-opencl to experimental, to avoid "new" upload.
+
+ -- Gianfranco Costamagna <costamagnagianfranco at yahoo.it>  Tue, 18 Feb 2014 10:05:05 +0100
+
 boinc (7.2.33+dfsg-2) UNRELEASED; urgency=low
 
   [Gianfranco Costamagna]
diff --git a/debian/control.in b/debian/control.in
index ce337ec..c6a7b12 100644
--- a/debian/control.in
+++ b/debian/control.in
@@ -58,30 +58,30 @@ Package: boinc
 @ cards. This package adds a series of dependencies from the non-free
 @ section to the regular boinc package. This also meant this binary
 @ package to be redistributed in the contrib section of Debian.
-@
- at Package: boinc-amd-opencl
- at Architecture: amd64 i386
- at Section: contrib/net
- at Priority: extra
- at Depends: ${misc:Depends}, boinc, fglrx-driver, amd-libopencl1|fglrx|fglrx-updates
- at Description: metapackage for AMD/ATI OpenCL-savvy BOINC client and manager
-@ The Berkeley Open Infrastructure for Network Computing (BOINC) is a
-@ software platform for distributed computing: several initiatives of
-@ various scientific disciplines all compete for the idle time of
-@ desktop computers. The developers' web site at the University of
-@ Berkeley serves as a common portal to the otherwise independently run
-@ projects.
-@ .
-@ Regular users (righteously) often find it an unbearable nuisance to
-@ care for the configuration of BOINC for the OpenCL-savvy AMD/ATI
-@ graphics cards.  This package adds a series of dependencies from the
-@ non-free section to the regular boinc package. This also meant this
-@ binary package to be redistributed in the contrib section of Debian.
-@ .
-@ This package is not perfect, yet. A major problem for the moment
-@ is the availability of the OpenCL driver for 32bit binaries for
-@ amd64. If this is planned, install the amd-app package provided
-@ through the AMD developer forum.
+%
+%Package: boinc-amd-opencl
+%Architecture: amd64 i386
+%Section: contrib/net
+%Priority: extra
+%Depends: ${misc:Depends}, boinc, fglrx-driver, amd-libopencl1|fglrx|fglrx-updates
+%Description: metapackage for AMD/ATI OpenCL-savvy BOINC client and manager
+% The Berkeley Open Infrastructure for Network Computing (BOINC) is a
+% software platform for distributed computing: several initiatives of
+% various scientific disciplines all compete for the idle time of
+% desktop computers. The developers' web site at the University of
+% Berkeley serves as a common portal to the otherwise independently run
+% projects.
+% .
+% Regular users (righteously) often find it an unbearable nuisance to
+% care for the configuration of BOINC for the OpenCL-savvy AMD/ATI
+% graphics cards.  This package adds a series of dependencies from the
+% non-free section to the regular boinc package. This also meant this
+% binary package to be redistributed in the contrib section of Debian.
+% .
+% This package is not perfect, yet. A major problem for the moment
+% is the availability of the OpenCL driver for 32bit binaries for
+% amd64. If this is planned, install the amd-app package provided
+% through the AMD developer forum.
 @
 @Package: boinc-client
 @Architecture: any
diff --git a/debian/patches/MainDocumentWarnings.patch b/debian/patches/MainDocumentWarnings.patch
index 83d9558..b253288 100644
--- a/debian/patches/MainDocumentWarnings.patch
+++ b/debian/patches/MainDocumentWarnings.patch
@@ -1,8 +1,10 @@
 Author: Steffen Moeller <moeller at debian.org>
 Description: Nothing in this patch should be functionally relevant, only compile time warnings as by the ambiguity of the result parameter are resolved.
---- a/clientgui/MainDocument.cpp
-+++ b/clientgui/MainDocument.cpp
-@@ -1643,7 +1643,6 @@
+Index: boinc/clientgui/MainDocument.cpp
+===================================================================
+--- boinc.orig/clientgui/MainDocument.cpp
++++ boinc/clientgui/MainDocument.cpp
+@@ -1655,7 +1655,6 @@
  }
  #else
  void CMainDocument::KillGraphicsApp(int pid) {
@@ -10,7 +12,7 @@ Description: Nothing in this patch should be functionally relevant, only compile
      char currentDir[1024];
      char thePIDbuf[20];
      int id, iRetVal;
-@@ -1651,12 +1650,13 @@
+@@ -1663,12 +1662,13 @@
  
      if (g_use_sandbox) {
          snprintf(thePIDbuf, sizeof(thePIDbuf), "%d", pid);
@@ -30,7 +32,7 @@ Description: Nothing in this patch should be functionally relevant, only compile
      
          iRetVal = run_program(
              getcwd(currentDir, sizeof(currentDir)),
-@@ -1666,6 +1666,10 @@
+@@ -1678,6 +1678,10 @@
              0,
              id
          );
diff --git a/debian/patches/Missing_libSched.patch b/debian/patches/Missing_libSched.patch
index 970778c..3609d09 100644
--- a/debian/patches/Missing_libSched.patch
+++ b/debian/patches/Missing_libSched.patch
@@ -1,5 +1,7 @@
---- a/tools/Makefile.am
-+++ b/tools/Makefile.am
+Index: boinc/tools/Makefile.am
+===================================================================
+--- boinc.orig/tools/Makefile.am
++++ boinc/tools/Makefile.am
 @@ -35,7 +35,7 @@
      project.xml
  
@@ -9,8 +11,10 @@
  
  cancel_jobs_SOURCES = cancel_jobs.cpp
  cancel_jobs_LDADD = $(SERVERLIBS)
---- a/vda/Makefile.am
-+++ b/vda/Makefile.am
+Index: boinc/vda/Makefile.am
+===================================================================
+--- boinc.orig/vda/Makefile.am
++++ boinc/vda/Makefile.am
 @@ -4,7 +4,7 @@
  vda_PROGRAMS = vda vdad ssim
  
@@ -20,8 +24,10 @@
  
  vda_SOURCES = vda.cpp vda_lib.cpp vda_lib2.cpp vda_policy.cpp stats.cpp
  vda_LDADD = $(SERVERLIBS)
---- a/sched/Makefile.am
-+++ b/sched/Makefile.am
+Index: boinc/sched/Makefile.am
+===================================================================
+--- boinc.orig/sched/Makefile.am
++++ boinc/sched/Makefile.am
 @@ -4,7 +4,7 @@
  include $(top_srcdir)/Makefile.incl
  
@@ -31,8 +37,10 @@
  
  if ENABLE_LIBRARIES
  
---- a/apps/Makefile.am
-+++ b/apps/Makefile.am
+Index: boinc/apps/Makefile.am
+===================================================================
+--- boinc.orig/apps/Makefile.am
++++ boinc/apps/Makefile.am
 @@ -8,15 +8,15 @@
  
  upper_case_SOURCES = upper_case.cpp
@@ -52,8 +60,10 @@
 -1sec_LDFLAGS = -static-libtool-libs $(PTHREAD_CFLAGS)
 +1sec_LDFLAGS = -static-libtool-libs $(PTHREAD_CFLAGS) -L../api/.libs -L../lib/.libs
  1sec_LDADD = $(APPLIBS)
---- a/clientgui/Makefile.am
-+++ b/clientgui/Makefile.am
+Index: boinc/clientgui/Makefile.am
+===================================================================
+--- boinc.orig/clientgui/Makefile.am
++++ boinc/clientgui/Makefile.am
 @@ -3,6 +3,7 @@
  
  include $(top_srcdir)/Makefile.incl
diff --git a/debian/patches/add-ldflags.patch b/debian/patches/add-ldflags.patch
index 01316f1..8c843ae 100644
--- a/debian/patches/add-ldflags.patch
+++ b/debian/patches/add-ldflags.patch
@@ -1,5 +1,7 @@
---- a/samples/wrapper/Makefile
-+++ b/samples/wrapper/Makefile
+Index: boinc/samples/wrapper/Makefile
+===================================================================
+--- boinc.orig/samples/wrapper/Makefile
++++ boinc/samples/wrapper/Makefile
 @@ -37,4 +37,4 @@
  	regexp_report.o
  
diff --git a/debian/patches/addressing_addional_html_dirs.patch b/debian/patches/addressing_addional_html_dirs.patch
index 7858890..63b307f 100644
--- a/debian/patches/addressing_addional_html_dirs.patch
+++ b/debian/patches/addressing_addional_html_dirs.patch
@@ -1,5 +1,7 @@
---- a/html/Makefile.am
-+++ b/html/Makefile.am
+Index: boinc/html/Makefile.am
+===================================================================
+--- boinc.orig/html/Makefile.am
++++ boinc/html/Makefile.am
 @@ -1,4 +1,4 @@
  htmldir=$(DESTDIR)/$(prefix)/share/boinc-server-maker/html
  install-data-local:
diff --git a/debian/patches/boinclib_shared.patch b/debian/patches/boinclib_shared.patch
index 697a02e..5e626a7 100644
--- a/debian/patches/boinclib_shared.patch
+++ b/debian/patches/boinclib_shared.patch
@@ -1,5 +1,7 @@
---- a/lib/Makefile.am
-+++ b/lib/Makefile.am
+Index: boinc/lib/Makefile.am
+===================================================================
+--- boinc.orig/lib/Makefile.am
++++ boinc/lib/Makefile.am
 @@ -150,13 +150,13 @@
  libboinc_la_SOURCES = $(generic_sources) $(mac_sources)
  libboinc_la_CFLAGS = $(AM_CFLAGS) $(PICFLAGS) $(PTHREAD_CFLAGS)
@@ -25,9 +27,11 @@
  parse_test_SOURCES = parse_test.cpp 
  parse_test_CXXFLAGS = $(PTHREAD_CFLAGS)
  parse_test_LDADD = $(LIBBOINC)
---- a/client/Makefile.am
-+++ b/client/Makefile.am
-@@ -91,7 +91,7 @@
+Index: boinc/client/Makefile.am
+===================================================================
+--- boinc.orig/client/Makefile.am
++++ boinc/client/Makefile.am
+@@ -93,7 +93,7 @@
  if OS_DARWIN
  boinc_client_LDFLAGS += -Wl,-flat_namespace,-undefined,dynamic_lookup
  endif
diff --git a/debian/patches/client_app_maxpathlen.patch b/debian/patches/client_app_maxpathlen.patch
index 93607b0..c440530 100644
--- a/debian/patches/client_app_maxpathlen.patch
+++ b/debian/patches/client_app_maxpathlen.patch
@@ -1,5 +1,7 @@
---- a/client/app.h
-+++ b/client/app.h
+Index: boinc/client/app.h
+===================================================================
+--- boinc.orig/client/app.h
++++ boinc/client/app.h
 @@ -48,7 +48,7 @@
  typedef int PROCESS_ID;
  
@@ -9,8 +11,10 @@
      // The stderr output of an application is truncated to this length
      // before sending to server,
      // to protect against apps that write unbounded amounts.
---- a/client/file_names.cpp
-+++ b/client/file_names.cpp
+Index: boinc/client/file_names.cpp
+===================================================================
+--- boinc.orig/client/file_names.cpp
++++ boinc/client/file_names.cpp
 @@ -69,7 +69,7 @@
  //
  void get_pathname(FILE_INFO* fip, char* path, int len) {
diff --git a/debian/patches/cppcheck_realloc.patch b/debian/patches/cppcheck_realloc.patch
index 44e38c2..de10e5e 100644
--- a/debian/patches/cppcheck_realloc.patch
+++ b/debian/patches/cppcheck_realloc.patch
@@ -1,8 +1,10 @@
 Author: Steffen Moeller <moeller at debian.org>
 Description: Initialisation.
 
---- a/lib/crypt.cpp
-+++ b/lib/crypt.cpp
+Index: boinc/lib/crypt.cpp
+===================================================================
+--- boinc.orig/lib/crypt.cpp
++++ boinc/lib/crypt.cpp
 @@ -342,6 +342,7 @@
      char clear_buf[MD5_LEN];
      int n, retval;
diff --git a/debian/patches/csh2tcsh.patch b/debian/patches/csh2tcsh.patch
index 7c05cd3..ed9ed6d 100644
--- a/debian/patches/csh2tcsh.patch
+++ b/debian/patches/csh2tcsh.patch
@@ -1,14 +1,18 @@
 Description: The use of the C Shell is deprecated.
---- a/tools/db_query
-+++ b/tools/db_query
+Index: boinc/tools/db_query
+===================================================================
+--- boinc.orig/tools/db_query
++++ boinc/tools/db_query
 @@ -1,4 +1,4 @@
 -#! /bin/tcsh
 +#!/usr/bin/tcsh
  
  set CIVDATE = `date "+%Y:%m:%d:%H:%M"`
  set UNIXDATE = `perl -e 'print time()'`
---- a/tools/watch_tcp
-+++ b/tools/watch_tcp
+Index: boinc/tools/watch_tcp
+===================================================================
+--- boinc.orig/tools/watch_tcp
++++ boinc/tools/watch_tcp
 @@ -1,4 +1,4 @@
 -#! /bin/csh 
 +#!/usr/bin/tcsh
diff --git a/debian/patches/de.po.patch b/debian/patches/de.po.patch
index 8a8792f..84fc660 100644
--- a/debian/patches/de.po.patch
+++ b/debian/patches/de.po.patch
@@ -1,5 +1,7 @@
---- a/html/languages/translations/de.po
-+++ b/html/languages/translations/de.po
+Index: boinc/html/languages/translations/de.po
+===================================================================
+--- boinc.orig/html/languages/translations/de.po
++++ boinc/html/languages/translations/de.po
 @@ -1073,8 +1073,8 @@
  
  #: ../inc/prefs.inc:158
@@ -33,7 +35,7 @@
  
  #: ../inc/prefs.inc:194
  msgid "Tasks checkpoint to disk at most every"
-@@ -5365,9 +5365,10 @@
+@@ -5336,9 +5336,10 @@
  "our message boards are moderated.\n"
  "Message board postings are subject to the following posting rules:\n"
  msgstr ""
diff --git a/debian/patches/debian_debian_AdjustBoincTopdirPython.patch b/debian/patches/debian_debian_AdjustBoincTopdirPython.patch
index 081256f..61a906e 100644
--- a/debian/patches/debian_debian_AdjustBoincTopdirPython.patch
+++ b/debian/patches/debian_debian_AdjustBoincTopdirPython.patch
@@ -1,7 +1,9 @@
 Author: Steffen Moeller <moeller at debian.org>
 Description: Adjusted path for BOINC to server for python code
---- a/py/boinc_path_config.py.in
-+++ b/py/boinc_path_config.py.in
+Index: boinc/py/boinc_path_config.py.in
+===================================================================
+--- boinc.orig/py/boinc_path_config.py.in
++++ boinc/py/boinc_path_config.py.in
 @@ -8,5 +8,5 @@
  
  import sys, os
diff --git a/debian/patches/disable_new_version_check.patch b/debian/patches/disable_new_version_check.patch
index 0eb1933..d96541b 100644
--- a/debian/patches/disable_new_version_check.patch
+++ b/debian/patches/disable_new_version_check.patch
@@ -10,9 +10,11 @@ Forwarded: not-needed
 Reviewed-By: costamagnagianfranco at yahoo.it
 Last-Update: <2013-03-07>
 
---- a/client/client_state.cpp
-+++ b/client/client_state.cpp
-@@ -462,7 +462,7 @@
+Index: boinc/client/client_state.cpp
+===================================================================
+--- boinc.orig/client/client_state.cpp
++++ boinc/client/client_state.cpp
+@@ -488,7 +488,7 @@
  
      // inform the user if there's a newer version of client
      //
@@ -21,8 +23,10 @@ Last-Update: <2013-03-07>
  
      // parse account files again,
      // now that we know the host's venue on each project
---- a/client/scheduler_op.cpp
-+++ b/client/scheduler_op.cpp
+Index: boinc/client/scheduler_op.cpp
+===================================================================
+--- boinc.orig/client/scheduler_op.cpp
++++ boinc/client/scheduler_op.cpp
 @@ -129,7 +129,7 @@
          // and project list
          //
diff --git a/debian/patches/disable_silent_rules.patch b/debian/patches/disable_silent_rules.patch
index 05887a8..84d93a0 100644
--- a/debian/patches/disable_silent_rules.patch
+++ b/debian/patches/disable_silent_rules.patch
@@ -1,6 +1,8 @@
 Description: Disabled silent rules, for buildlog check to work.
---- a/configure.ac
-+++ b/configure.ac
+Index: boinc/configure.ac
+===================================================================
+--- boinc.orig/configure.ac
++++ boinc/configure.ac
 @@ -16,7 +16,7 @@
  dnl generate .tar.gz, .tar.bz2, .zip
  dnl AM_INIT_AUTOMAKE(dist-bzip2 dist-zip)
diff --git a/debian/patches/dynamic_libboinc.patch b/debian/patches/dynamic_libboinc.patch
index b0619ad..6a6f3a3 100644
--- a/debian/patches/dynamic_libboinc.patch
+++ b/debian/patches/dynamic_libboinc.patch
@@ -1,5 +1,7 @@
---- a/Makefile.incl
-+++ b/Makefile.incl
+Index: boinc/Makefile.incl
+===================================================================
+--- boinc.orig/Makefile.incl
++++ boinc/Makefile.incl
 @@ -38,22 +38,22 @@
  # dependencies to make sure libs gets compiled before
  # programs linking to them:
diff --git a/debian/patches/file_upload_handler_in_sched_linking.patch b/debian/patches/file_upload_handler_in_sched_linking.patch
index 3ecb1a7..6a095af 100644
--- a/debian/patches/file_upload_handler_in_sched_linking.patch
+++ b/debian/patches/file_upload_handler_in_sched_linking.patch
@@ -1,5 +1,7 @@
---- a/sched/Makefile.am
-+++ b/sched/Makefile.am
+Index: boinc/sched/Makefile.am
+===================================================================
+--- boinc.orig/sched/Makefile.am
++++ boinc/sched/Makefile.am
 @@ -256,7 +256,7 @@
  update_stats_LDADD = $(SERVERLIBS)
  
diff --git a/debian/patches/filesys_error_message.patch b/debian/patches/filesys_error_message.patch
index 1bed45f..03f4bef 100644
--- a/debian/patches/filesys_error_message.patch
+++ b/debian/patches/filesys_error_message.patch
@@ -1,5 +1,7 @@
---- a/lib/filesys.cpp
-+++ b/lib/filesys.cpp
+Index: boinc/lib/filesys.cpp
+===================================================================
+--- boinc.orig/lib/filesys.cpp
++++ boinc/lib/filesys.cpp
 @@ -145,7 +145,9 @@
  #else
      dirp = opendir(p);
@@ -38,8 +40,10 @@
      int retval=0;
  
      retval = boinc_rename_aux(old, newf);
---- a/lib/filesys.h
-+++ b/lib/filesys.h
+Index: boinc/lib/filesys.h
+===================================================================
+--- boinc.orig/lib/filesys.h
++++ boinc/lib/filesys.h
 @@ -47,7 +47,7 @@
    extern int boinc_touch_file(const char* const path);
    extern FILE* boinc_fopen(const char* const path, const char* mode);
diff --git a/debian/patches/fix-add-exclusive-app.patch b/debian/patches/fix-add-exclusive-app.patch
index bebaa06..b9dd094 100644
--- a/debian/patches/fix-add-exclusive-app.patch
+++ b/debian/patches/fix-add-exclusive-app.patch
@@ -6,8 +6,10 @@ quoting from man
 "bool wxFileName::IsFileExecutable() 	
 Returns true if a file with this name exists and if this process has execute permissions on it."
 
---- a/clientgui/DlgAdvPreferences.cpp
-+++ b/clientgui/DlgAdvPreferences.cpp
+Index: boinc/clientgui/DlgAdvPreferences.cpp
+===================================================================
+--- boinc.orig/clientgui/DlgAdvPreferences.cpp
++++ boinc/clientgui/DlgAdvPreferences.cpp
 @@ -822,7 +822,7 @@
  #endif
              wxString directory = picker.GetDirectory();
diff --git a/debian/patches/fix-android-build.patch b/debian/patches/fix-android-build.patch
index 96931b9..8347861 100644
--- a/debian/patches/fix-android-build.patch
+++ b/debian/patches/fix-android-build.patch
@@ -1,7 +1,9 @@
 Author: Gianfranco Costamagna <costamagnagianfranco at yahoo.it>
 
---- a/samples/wrapper/build_android.sh
-+++ b/samples/wrapper/build_android.sh
+Index: boinc/samples/wrapper/build_android.sh
+===================================================================
+--- boinc.orig/samples/wrapper/build_android.sh
++++ boinc/samples/wrapper/build_android.sh
 @@ -1,4 +1,4 @@
 -#/bin/sh
 +#!/bin/sh
diff --git a/debian/patches/fix-file-perms.patch b/debian/patches/fix-file-perms.patch
index b8c96bc..557c1fd 100644
--- a/debian/patches/fix-file-perms.patch
+++ b/debian/patches/fix-file-perms.patch
@@ -1,5 +1,7 @@
---- a/db/Makefile.am
-+++ b/db/Makefile.am
+Index: boinc/db/Makefile.am
+===================================================================
+--- boinc.orig/db/Makefile.am
++++ boinc/db/Makefile.am
 @@ -10,4 +10,5 @@
  
  ## other stuff to go into the distribution
@@ -7,8 +9,10 @@
 -dist_extra_DATA = constraints.sql schema.sql init_db
 +dist_extra_DATA = constraints.sql schema.sql
 +dist_extra_SCRIPTS = init_db
---- a/sched/Makefile.am
-+++ b/sched/Makefile.am
+Index: boinc/sched/Makefile.am
+===================================================================
+--- boinc.orig/sched/Makefile.am
++++ boinc/sched/Makefile.am
 @@ -116,7 +116,7 @@
      sample_trivial_validator \
      sample_work_generator \
diff --git a/debian/patches/fix-italian-po.patch b/debian/patches/fix-italian-po.patch
index a233bbb..a3e09f8 100644
--- a/debian/patches/fix-italian-po.patch
+++ b/debian/patches/fix-italian-po.patch
@@ -1,5 +1,7 @@
---- a/locale/Makefile.am
-+++ b/locale/Makefile.am
+Index: boinc/locale/Makefile.am
+===================================================================
+--- boinc.orig/locale/Makefile.am
++++ boinc/locale/Makefile.am
 @@ -21,7 +21,7 @@
  	gl \
  	hr \
diff --git a/debian/patches/fix-lp-1274456.patch b/debian/patches/fix-lp-1274456.patch
index cd81ad5..0c042fa 100644
--- a/debian/patches/fix-lp-1274456.patch
+++ b/debian/patches/fix-lp-1274456.patch
@@ -1,9 +1,11 @@
 Author: Jussi Lahtinen
 Bug-Ubuntu: https://bugs.launchpad.net/bugs/1274456
 
---- boinc-7.2.33+dfsg.orig/client/hostinfo_unix.cpp
-+++ boinc-7.2.33+dfsg/client/hostinfo_unix.cpp
-@@ -1867,6 +1867,7 @@ bool xss_idle(long idle_treshold) {
+Index: boinc/client/hostinfo_unix.cpp
+===================================================================
+--- boinc.orig/client/hostinfo_unix.cpp
++++ boinc/client/hostinfo_unix.cpp
+@@ -1890,6 +1890,7 @@
      static Display* disp = NULL;
      
      long idle_time = 0;
@@ -11,7 +13,7 @@ Bug-Ubuntu: https://bugs.launchpad.net/bugs/1274456
      
      if(disp != NULL) {
          XScreenSaverQueryInfo(disp, DefaultRootWindow(disp), xssInfo);
-@@ -1923,6 +1924,9 @@ bool xss_idle(long idle_treshold) {
+@@ -1946,6 +1947,9 @@
          // or DISPLAY points to wrong/invalid display
          if(disp != NULL) {
              xssInfo = XScreenSaverAllocInfo();
diff --git a/debian/patches/fixed-tools-permissions.patch b/debian/patches/fixed-tools-permissions.patch
index 5f29257..e06202a 100644
--- a/debian/patches/fixed-tools-permissions.patch
+++ b/debian/patches/fixed-tools-permissions.patch
@@ -1,5 +1,7 @@
---- a/tools/Makefile.am
-+++ b/tools/Makefile.am
+Index: boinc/tools/Makefile.am
+===================================================================
+--- boinc.orig/tools/Makefile.am
++++ boinc/tools/Makefile.am
 @@ -31,7 +31,9 @@
      manage_privileges \
      run_in_ops \
diff --git a/debian/patches/fopen_closing.patch b/debian/patches/fopen_closing.patch
index a939679..ba499e5 100644
--- a/debian/patches/fopen_closing.patch
+++ b/debian/patches/fopen_closing.patch
@@ -1,5 +1,7 @@
---- a/lib/crypt_prog.cpp
-+++ b/lib/crypt_prog.cpp
+Index: boinc/lib/crypt_prog.cpp
+===================================================================
+--- boinc.orig/lib/crypt_prog.cpp
++++ boinc/lib/crypt_prog.cpp
 @@ -152,6 +152,8 @@
          if (!fpub) die("fopen");
          print_key_hex(fpriv, (KEY*)&private_key, sizeof(private_key));
@@ -59,8 +61,10 @@
              }
          }
      } else {
---- a/lib/mfile.cpp
-+++ b/lib/mfile.cpp
+Index: boinc/lib/mfile.cpp
+===================================================================
+--- boinc.orig/lib/mfile.cpp
++++ boinc/lib/mfile.cpp
 @@ -38,13 +38,14 @@
  MFILE::MFILE() {
      buf = (char*)malloc(64*1024);
@@ -123,8 +127,10 @@
      int n = (int)strlen(p);
      buf = (char*)realloc_aux(buf, len+n+1);
      if (!buf) {
---- a/lib/parse_test.cpp
-+++ b/lib/parse_test.cpp
+Index: boinc/lib/parse_test.cpp
+===================================================================
+--- boinc.orig/lib/parse_test.cpp
++++ boinc/lib/parse_test.cpp
 @@ -57,6 +57,7 @@
          exit(1);
      }
@@ -133,8 +139,10 @@
  }
  
  /* try it with something like:
---- a/lib/mfile.h
-+++ b/lib/mfile.h
+Index: boinc/lib/mfile.h
+===================================================================
+--- boinc.orig/lib/mfile.h
++++ boinc/lib/mfile.h
 @@ -37,12 +37,12 @@
  public:
      MFILE();
diff --git a/debian/patches/generate_less.patch b/debian/patches/generate_less.patch
index bba2350..10009c5 100644
--- a/debian/patches/generate_less.patch
+++ b/debian/patches/generate_less.patch
@@ -1,7 +1,9 @@
 Author: unknown
 
---- a/generate_svn_version.sh
-+++ b/generate_svn_version.sh
+Index: boinc/generate_svn_version.sh
+===================================================================
+--- boinc.orig/generate_svn_version.sh
++++ boinc/generate_svn_version.sh
 @@ -7,7 +7,9 @@
  echo "#define SVN_VERSION_H" >> $TMPFILE
  echo "" >> $TMPFILE
diff --git a/debian/patches/gui_urls_xml_added_to_Makefile.patch b/debian/patches/gui_urls_xml_added_to_Makefile.patch
index 4b8f244..bfd1e5d 100644
--- a/debian/patches/gui_urls_xml_added_to_Makefile.patch
+++ b/debian/patches/gui_urls_xml_added_to_Makefile.patch
@@ -1,5 +1,7 @@
---- a/tools/Makefile.am
-+++ b/tools/Makefile.am
+Index: boinc/tools/Makefile.am
+===================================================================
+--- boinc.orig/tools/Makefile.am
++++ boinc/tools/Makefile.am
 @@ -34,7 +34,8 @@
      watch_tcp
  
diff --git a/debian/patches/hurd-ftbfs.patch b/debian/patches/hurd-ftbfs.patch
index 5e8d791..0f19925 100644
--- a/debian/patches/hurd-ftbfs.patch
+++ b/debian/patches/hurd-ftbfs.patch
@@ -8,8 +8,10 @@ Forwarded: <yes>
 Reviewed-By: <costamagnagianfranco at yahoo.it>
 Last-Update: <2013-08-22>
 
---- a/sched/make_work.cpp
-+++ b/sched/make_work.cpp
+Index: boinc/sched/make_work.cpp
+===================================================================
+--- boinc.orig/sched/make_work.cpp
++++ boinc/sched/make_work.cpp
 @@ -52,6 +52,7 @@
  #include "str_replace.h"
  #include "str_util.h"
@@ -18,8 +20,10 @@ Last-Update: <2013-08-22>
  
  #define LOCKFILE            "make_work.out"
  #define PIDFILE             "make_work.pid"
---- a/sched/get_file.cpp
-+++ b/sched/get_file.cpp
+Index: boinc/sched/get_file.cpp
+===================================================================
+--- boinc.orig/sched/get_file.cpp
++++ boinc/sched/get_file.cpp
 @@ -38,6 +38,7 @@
  
  #include "backend_lib.h"
@@ -28,8 +32,10 @@ Last-Update: <2013-08-22>
  
  #include "sched_config.h"
  #include "sched_util.h"
---- a/sched/sched_assign.cpp
-+++ b/sched/sched_assign.cpp
+Index: boinc/sched/sched_assign.cpp
+===================================================================
+--- boinc.orig/sched/sched_assign.cpp
++++ boinc/sched/sched_assign.cpp
 @@ -33,6 +33,7 @@
  #include "crypt.h"
  #include "backend_lib.h"
@@ -38,8 +44,10 @@ Last-Update: <2013-08-22>
  
  #include "sched_main.h"
  #include "sched_msgs.h"
---- a/sched/sample_work_generator.cpp
-+++ b/sched/sample_work_generator.cpp
+Index: boinc/sched/sample_work_generator.cpp
+===================================================================
+--- boinc.orig/sched/sample_work_generator.cpp
++++ boinc/sched/sample_work_generator.cpp
 @@ -47,6 +47,7 @@
  #include "str_replace.h"
  #include "util.h"
@@ -48,8 +56,10 @@ Last-Update: <2013-08-22>
  
  #include "sched_config.h"
  #include "sched_util.h"
---- a/sched/sched_timezone.cpp
-+++ b/sched/sched_timezone.cpp
+Index: boinc/sched/sched_timezone.cpp
+===================================================================
+--- boinc.orig/sched/sched_timezone.cpp
++++ boinc/sched/sched_timezone.cpp
 @@ -28,6 +28,7 @@
  
  #include "sched_types.h"
@@ -58,8 +68,10 @@ Last-Update: <2013-08-22>
  #include "sched_config.h"
  
  #ifdef _USING_FCGI_
---- a/sched/feeder.cpp
-+++ b/sched/feeder.cpp
+Index: boinc/sched/feeder.cpp
+===================================================================
+--- boinc.orig/sched/feeder.cpp
++++ boinc/sched/feeder.cpp
 @@ -115,6 +115,7 @@
  #include "util.h"
  #include "str_util.h"
@@ -68,8 +80,10 @@ Last-Update: <2013-08-22>
  
  #include "credit.h"
  #include "sched_config.h"
---- a/sched/wu_check.cpp
-+++ b/sched/wu_check.cpp
+Index: boinc/sched/wu_check.cpp
+===================================================================
+--- boinc.orig/sched/wu_check.cpp
++++ boinc/sched/wu_check.cpp
 @@ -35,6 +35,7 @@
  #include "error_numbers.h"
  #include "parse.h"
@@ -78,8 +92,10 @@ Last-Update: <2013-08-22>
  
  #include "sched_config.h"
  #include "sched_util.h"
---- a/sched/sched_shmem.cpp
-+++ b/sched/sched_shmem.cpp
+Index: boinc/sched/sched_shmem.cpp
+===================================================================
+--- boinc.orig/sched/sched_shmem.cpp
++++ boinc/sched/sched_shmem.cpp
 @@ -40,6 +40,7 @@
  #include "sched_msgs.h"
  #include "sched_types.h"
@@ -88,8 +104,10 @@ Last-Update: <2013-08-22>
  
  #include "sched_shmem.h"
  
---- a/sched/transitioner.cpp
-+++ b/sched/transitioner.cpp
+Index: boinc/sched/transitioner.cpp
+===================================================================
+--- boinc.orig/sched/transitioner.cpp
++++ boinc/sched/transitioner.cpp
 @@ -44,7 +44,7 @@
  #include "error_numbers.h"
  #include "str_util.h"
@@ -99,8 +117,10 @@ Last-Update: <2013-08-22>
  #include "sched_config.h"
  #include "credit.h"
  #include "sched_util.h"
---- a/tools/create_work.cpp
-+++ b/tools/create_work.cpp
+Index: boinc/tools/create_work.cpp
+===================================================================
+--- boinc.orig/tools/create_work.cpp
++++ boinc/tools/create_work.cpp
 @@ -37,6 +37,7 @@
  #include "sched_config.h"
  #include "str_replace.h"
@@ -109,8 +129,10 @@ Last-Update: <2013-08-22>
  
  void usage() {
      fprintf(stderr,
---- a/tools/dir_hier_path.cpp
-+++ b/tools/dir_hier_path.cpp
+Index: boinc/tools/dir_hier_path.cpp
+===================================================================
+--- boinc.orig/tools/dir_hier_path.cpp
++++ boinc/tools/dir_hier_path.cpp
 @@ -29,7 +29,7 @@
  #include "sched_config.h"
  #include "sched_util.h"
diff --git a/debian/patches/improve_opendir_warning.patch b/debian/patches/improve_opendir_warning.patch
index f44c815..6a37366 100644
--- a/debian/patches/improve_opendir_warning.patch
+++ b/debian/patches/improve_opendir_warning.patch
@@ -1,8 +1,10 @@
 Author: Steffen Moeller <moeller at debian.org>
 Description: Helping verbosity of error messages.
 
---- a/lib/filesys.cpp
-+++ b/lib/filesys.cpp
+Index: boinc/lib/filesys.cpp
+===================================================================
+--- boinc.orig/lib/filesys.cpp
++++ boinc/lib/filesys.cpp
 @@ -144,7 +144,10 @@
      dirp->handle = INVALID_HANDLE_VALUE;
  #else
diff --git a/debian/patches/investigate_boinc_api.patch b/debian/patches/investigate_boinc_api.patch
index cb7c667..83c775d 100644
--- a/debian/patches/investigate_boinc_api.patch
+++ b/debian/patches/investigate_boinc_api.patch
@@ -1,5 +1,7 @@
---- a/api/boinc_api.cpp
-+++ b/api/boinc_api.cpp
+Index: boinc/api/boinc_api.cpp
+===================================================================
+--- boinc.orig/api/boinc_api.cpp
++++ boinc/api/boinc_api.cpp
 @@ -356,7 +356,7 @@
  
      if (standalone) return true;
diff --git a/debian/patches/lib_cppcheck.patch b/debian/patches/lib_cppcheck.patch
index 8ff014e..2553853 100644
--- a/debian/patches/lib_cppcheck.patch
+++ b/debian/patches/lib_cppcheck.patch
@@ -1,6 +1,8 @@
---- a/lib/unix_util.cpp
-+++ b/lib/unix_util.cpp
-@@ -61,7 +61,13 @@
+Index: boinc/lib/unix_util.cpp
+===================================================================
+--- boinc.orig/lib/unix_util.cpp
++++ boinc/lib/unix_util.cpp
+@@ -80,7 +80,13 @@
              }
              if (i!=envstrings.end()) {
                  // we allocated this string.  Reallocate it.
diff --git a/debian/patches/libnotify-0.7.patch b/debian/patches/libnotify-0.7.patch
index 64b1a5c..5033d38 100644
--- a/debian/patches/libnotify-0.7.patch
+++ b/debian/patches/libnotify-0.7.patch
@@ -2,8 +2,10 @@ Author: Steffen Moeller <moeller at debian.org>
 Description: Later versions of Debian come with libnotify 0.7.
 Disclaimer: For backports, this patch needs to be disabled.
 
---- a/clientgui/Makefile.am
-+++ b/clientgui/Makefile.am
+Index: boinc/clientgui/Makefile.am
+===================================================================
+--- boinc.orig/clientgui/Makefile.am
++++ boinc/clientgui/Makefile.am
 @@ -117,9 +117,13 @@
      ../lib/error_numbers.h \
      locale $(mac_headers)
@@ -21,8 +23,10 @@ Disclaimer: For backports, this patch needs to be disabled.
  
  win_config.h: $(top_srcdir)/config.h
  	grep '#define.*BOINC.*VERSION' $^ > $@
---- a/configure.ac
-+++ b/configure.ac
+Index: boinc/configure.ac
+===================================================================
+--- boinc.orig/configure.ac
++++ boinc/configure.ac
 @@ -743,14 +743,12 @@
  
  dnl ---------- libNotify --------------------------------------------------
diff --git a/debian/patches/make_project_overcomes_Apache24_security.patch b/debian/patches/make_project_overcomes_Apache24_security.patch
index d1abcb7..6baed9c 100644
--- a/debian/patches/make_project_overcomes_Apache24_security.patch
+++ b/debian/patches/make_project_overcomes_Apache24_security.patch
@@ -1,5 +1,7 @@
---- a/tools/make_project
-+++ b/tools/make_project
+Index: boinc/tools/make_project
+===================================================================
+--- boinc.orig/tools/make_project
++++ boinc/tools/make_project
 @@ -321,6 +321,7 @@
      <Directory "%(proot)s/html">
          Options Indexes FollowSymlinks MultiViews
diff --git a/debian/patches/more_clang_warnings.patch b/debian/patches/more_clang_warnings.patch
index e5396c3..0b21cb0 100644
--- a/debian/patches/more_clang_warnings.patch
+++ b/debian/patches/more_clang_warnings.patch
@@ -1,5 +1,7 @@
---- a/lib/shmem.cpp
-+++ b/lib/shmem.cpp
+Index: boinc/lib/shmem.cpp
+===================================================================
+--- boinc.orig/lib/shmem.cpp
++++ boinc/lib/shmem.cpp
 @@ -337,7 +337,10 @@
          // area to all zeros because they write beyond the old EOF. 
          // See the lseek man page for details.
diff --git a/debian/patches/more_maxpathlen.patch b/debian/patches/more_maxpathlen.patch
index b9a1d90..4285f0a 100644
--- a/debian/patches/more_maxpathlen.patch
+++ b/debian/patches/more_maxpathlen.patch
@@ -1,5 +1,7 @@
---- a/api/graphics2_util.cpp
-+++ b/api/graphics2_util.cpp
+Index: boinc/api/graphics2_util.cpp
+===================================================================
+--- boinc.orig/api/graphics2_util.cpp
++++ boinc/api/graphics2_util.cpp
 @@ -37,7 +37,7 @@
  static key_t get_shmem_name(const char* prog_name) {
      char cwd[MAXPATHLEN], path[MAXPATHLEN];
@@ -18,8 +20,10 @@
  }
  #endif
  
---- a/lib/filesys.cpp
-+++ b/lib/filesys.cpp
+Index: boinc/lib/filesys.cpp
+===================================================================
+--- boinc.orig/lib/filesys.cpp
++++ boinc/lib/filesys.cpp
 @@ -433,7 +433,7 @@
      while (1) {
          retval = dir_scan(filename, dirp, sizeof(filename));
@@ -49,8 +53,10 @@
          retval = boinc_mkdir(newpath);
          if (retval) return retval;
          safe_strcpy(oldpath, newpath);
---- a/lib/network.cpp
-+++ b/lib/network.cpp
+Index: boinc/lib/network.cpp
+===================================================================
+--- boinc.orig/lib/network.cpp
++++ boinc/lib/network.cpp
 @@ -71,7 +71,7 @@
      case WSAENOTSOCK:
          return "not a socket";
diff --git a/debian/patches/nvidia_mem_display_simplification.patch b/debian/patches/nvidia_mem_display_simplification.patch
index 59740d0..09e0339 100644
--- a/debian/patches/nvidia_mem_display_simplification.patch
+++ b/debian/patches/nvidia_mem_display_simplification.patch
@@ -1,5 +1,7 @@
---- a/lib/coproc.cpp
-+++ b/lib/coproc.cpp
+Index: boinc/lib/coproc.cpp
+===================================================================
+--- boinc.orig/lib/coproc.cpp
++++ boinc/lib/coproc.cpp
 @@ -355,7 +355,7 @@
      cuda_version = 0;
      display_driver_version = 0;
diff --git a/debian/patches/opendir_errno.patch b/debian/patches/opendir_errno.patch
index 19b37a0..b870dd2 100644
--- a/debian/patches/opendir_errno.patch
+++ b/debian/patches/opendir_errno.patch
@@ -1,5 +1,7 @@
---- a/client/check_security.cpp
-+++ b/client/check_security.cpp
+Index: boinc/client/check_security.cpp
+===================================================================
+--- boinc.orig/client/check_security.cpp
++++ boinc/client/check_security.cpp
 @@ -40,9 +40,9 @@
  #endif
  
@@ -40,8 +42,10 @@
              return 0;
          } else {
              retval = -1200;
---- a/client/cs_platforms.cpp
-+++ b/client/cs_platforms.cpp
+Index: boinc/client/cs_platforms.cpp
+===================================================================
+--- boinc.orig/client/cs_platforms.cpp
++++ boinc/client/cs_platforms.cpp
 @@ -45,6 +45,7 @@
  #include <sys/sysctl.h>
  #endif
diff --git a/debian/patches/opendir_error_messages.patch b/debian/patches/opendir_error_messages.patch
index 4c6402a..6ff7235 100644
--- a/debian/patches/opendir_error_messages.patch
+++ b/debian/patches/opendir_error_messages.patch
@@ -1,5 +1,7 @@
---- a/lib/filesys.cpp
-+++ b/lib/filesys.cpp
+Index: boinc/lib/filesys.cpp
+===================================================================
+--- boinc.orig/lib/filesys.cpp
++++ boinc/lib/filesys.cpp
 @@ -585,9 +585,9 @@
      fclose(src);
      fclose(dst);
@@ -13,8 +15,10 @@
      return retval;
  #endif
  }
---- a/lib/diagnostics.cpp
-+++ b/lib/diagnostics.cpp
+Index: boinc/lib/diagnostics.cpp
+===================================================================
+--- boinc.orig/lib/diagnostics.cpp
++++ boinc/lib/diagnostics.cpp
 @@ -344,7 +344,7 @@
  
      // Store various pieces of inforation for future use.
@@ -24,8 +28,10 @@
          char    proxy_address[256];
          int     proxy_port;
          MIOFILE mf;
---- a/client/sandbox.cpp
-+++ b/client/sandbox.cpp
+Index: boinc/client/sandbox.cpp
+===================================================================
+--- boinc.orig/client/sandbox.cpp
++++ boinc/client/sandbox.cpp
 @@ -207,7 +207,7 @@
          strcpy(filename, "");
          retval = dir_scan(filename, dirp, sizeof(filename));
diff --git a/debian/patches/parse_issues.patch b/debian/patches/parse_issues.patch
index 4a191d7..02cb09c 100644
--- a/debian/patches/parse_issues.patch
+++ b/debian/patches/parse_issues.patch
@@ -1,8 +1,10 @@
 Author: Steffen Moeller <moeller at debian.org>
 Description: Improved memory handling.
 
---- a/lib/procinfo_win.cpp
-+++ b/lib/procinfo_win.cpp
+Index: boinc/lib/procinfo_win.cpp
+===================================================================
+--- boinc.orig/lib/procinfo_win.cpp
++++ boinc/lib/procinfo_win.cpp
 @@ -25,6 +25,9 @@
      tNTQSI   pNTQSI = (tNTQSI)GetProcAddress(hNTDllLib, "NtQuerySystemInformation");
      ULONG    cbBuffer = 0;
diff --git a/debian/patches/possible_size_type_error.patch b/debian/patches/possible_size_type_error.patch
index b8bfeb5..ed977fc 100644
--- a/debian/patches/possible_size_type_error.patch
+++ b/debian/patches/possible_size_type_error.patch
@@ -1,8 +1,10 @@
 Author: Steffen Moeller <moeller at debian.org>
 Description: int may not be enough (theoretically) for large files.
 
---- a/sched/file_upload_handler.cpp
-+++ b/sched/file_upload_handler.cpp
+Index: boinc/sched/file_upload_handler.cpp
+===================================================================
+--- boinc.orig/sched/file_upload_handler.cpp
++++ boinc/sched/file_upload_handler.cpp
 @@ -138,13 +138,13 @@
      bytes_left = nbytes - offset;
  
diff --git a/debian/patches/rrsim_iterator_cppcheck.patch b/debian/patches/rrsim_iterator_cppcheck.patch
index e35ee72..7a4e0cc 100644
--- a/debian/patches/rrsim_iterator_cppcheck.patch
+++ b/debian/patches/rrsim_iterator_cppcheck.patch
@@ -1,5 +1,7 @@
---- a/client/rrsim_test.cpp
-+++ b/client/rrsim_test.cpp
+Index: boinc/client/rrsim_test.cpp
+===================================================================
+--- boinc.orig/client/rrsim_test.cpp
++++ boinc/client/rrsim_test.cpp
 @@ -184,7 +184,6 @@
      vector<RESULT*> active;
      unsigned int i;
diff --git a/debian/patches/sched_driver_char_buffers.patch b/debian/patches/sched_driver_char_buffers.patch
index 8a0f85c..944c32d 100644
--- a/debian/patches/sched_driver_char_buffers.patch
+++ b/debian/patches/sched_driver_char_buffers.patch
@@ -1,7 +1,9 @@
 Author: Steffen Moeller
 Description: Allowing descriptions of hosts, vendor or model that are larger than a SMS.
---- a/sched/sched_driver.cpp
-+++ b/sched/sched_driver.cpp
+Index: boinc/sched/sched_driver.cpp
+===================================================================
+--- boinc.orig/sched/sched_driver.cpp
++++ boinc/sched/sched_driver.cpp
 @@ -53,9 +53,9 @@
  using std::vector;
  
diff --git a/debian/patches/sched_driver_f_free.patch b/debian/patches/sched_driver_f_free.patch
index d1645f6..0d39a78 100644
--- a/debian/patches/sched_driver_f_free.patch
+++ b/debian/patches/sched_driver_f_free.patch
@@ -1,7 +1,9 @@
 Author: Steffen Moeller <moeller at debian.org>
 Description: Increased buffers and eliminated memory sink.
---- a/sched/sched_driver.cpp
-+++ b/sched/sched_driver.cpp
+Index: boinc/sched/sched_driver.cpp
+===================================================================
+--- boinc.orig/sched/sched_driver.cpp
++++ boinc/sched/sched_driver.cpp
 @@ -63,7 +63,7 @@
  double max_time = 1;
  
diff --git a/debian/patches/slot_dir_source_trace.patch b/debian/patches/slot_dir_source_trace.patch
index 7658ea4..688c1d4 100644
--- a/debian/patches/slot_dir_source_trace.patch
+++ b/debian/patches/slot_dir_source_trace.patch
@@ -1,6 +1,8 @@
---- a/client/app.cpp
-+++ b/client/app.cpp
-@@ -436,8 +436,8 @@
+Index: boinc/client/app.cpp
+===================================================================
+--- boinc.orig/client/app.cpp
++++ boinc/client/app.cpp
+@@ -438,8 +438,8 @@
      char new_path[MAXPATHLEN], old_path[MAXPATHLEN];
      int retval;
  
@@ -11,7 +13,7 @@
          "%s/trickle_up_%s_%d.xml",
          result->project->project_dir(), result->name, (int)time(0)
      );
-@@ -472,7 +472,7 @@
+@@ -474,7 +474,7 @@
      return 0;
  }
  
@@ -20,7 +22,7 @@
      unsigned int i;
      for (i=0; i<active_tasks.size(); i++) {
          if (active_tasks[i]->slot == slot) {
-@@ -482,7 +482,7 @@
+@@ -484,7 +484,7 @@
      return false;
  }
  
@@ -29,7 +31,7 @@
      char path[MAXPATHLEN];
      unsigned int i;
      for (i=0; i<active_tasks.size(); i++) {
-@@ -533,7 +533,7 @@
+@@ -535,7 +535,7 @@
      return 0;
  }
  
@@ -38,7 +40,7 @@
      unsigned int i;
      for (i=0; i<active_tasks.size(); i++) {
          if (active_tasks[i]->slot == slot) return true;
-@@ -645,7 +645,7 @@
+@@ -656,7 +656,7 @@
  #endif
  
  int ACTIVE_TASK::parse(XML_PARSER& xp) {
@@ -47,8 +49,10 @@
      int n, dummy;
      unsigned int i;
      PROJECT* project=0;
---- a/client/app.h
-+++ b/client/app.h
+Index: boinc/client/app.h
+===================================================================
+--- boinc.orig/client/app.h
++++ boinc/client/app.h
 @@ -48,6 +48,7 @@
  typedef int PROCESS_ID;
  
@@ -97,8 +101,10 @@
      void get_memory_usage();
  
      void process_control_poll();
---- a/lib/filesys.cpp
-+++ b/lib/filesys.cpp
+Index: boinc/lib/filesys.cpp
+===================================================================
+--- boinc.orig/lib/filesys.cpp
++++ boinc/lib/filesys.cpp
 @@ -86,7 +86,7 @@
  
  // routines for enumerating the entries in a directory
@@ -320,8 +326,10 @@
  #ifdef STATFS
      struct STATFS fs_info;
  
---- a/lib/filesys.h
-+++ b/lib/filesys.h
+Index: boinc/lib/filesys.h
+===================================================================
+--- boinc.orig/lib/filesys.h
++++ boinc/lib/filesys.h
 @@ -43,30 +43,30 @@
  #ifdef __cplusplus
  extern "C" {
diff --git a/debian/patches/some_extra_clang_warnings.patch b/debian/patches/some_extra_clang_warnings.patch
index ddc480d..e6aefc7 100644
--- a/debian/patches/some_extra_clang_warnings.patch
+++ b/debian/patches/some_extra_clang_warnings.patch
@@ -1,5 +1,7 @@
---- a/clientgui/sg_ProjectPanel.cpp
-+++ b/clientgui/sg_ProjectPanel.cpp
+Index: boinc/clientgui/sg_ProjectPanel.cpp
+===================================================================
+--- boinc.orig/clientgui/sg_ProjectPanel.cpp
++++ boinc/clientgui/sg_ProjectPanel.cpp
 @@ -414,8 +414,7 @@
      CMainDocument* pDoc = wxGetApp().GetDocument();
      ProjectSelectionData* selData;
diff --git a/debian/patches/stripchart_debian.patch b/debian/patches/stripchart_debian.patch
index e5c999d..2b46ee9 100644
--- a/debian/patches/stripchart_debian.patch
+++ b/debian/patches/stripchart_debian.patch
@@ -1,8 +1,10 @@
 Author: Steffen Moeller <moeller at debian.org>
 Description: Adjusting paths.
 Disclaimer: This is mostly dead code in upstream.
---- a/stripchart/stripchart.cnf
-+++ b/stripchart/stripchart.cnf
+Index: boinc/stripchart/stripchart.cnf
+===================================================================
+--- boinc.orig/stripchart/stripchart.cnf
++++ boinc/stripchart/stripchart.cnf
 @@ -4,7 +4,7 @@
  $majorversion = 2; $minorversion = 1;
  
@@ -36,8 +38,10 @@ Disclaimer: This is mostly dead code in upstream.
  
  # What time is it right now?
  $rightnow = time;
---- a/stripchart/stripchart
-+++ b/stripchart/stripchart
+Index: boinc/stripchart/stripchart
+===================================================================
+--- boinc.orig/stripchart/stripchart
++++ boinc/stripchart/stripchart
 @@ -1,4 +1,4 @@
 -#!/usr/bin/env perl
 +#!/usr/bin/perl
@@ -53,8 +57,10 @@ Disclaimer: This is mostly dead code in upstream.
  
  # Read it in:
  open (CNFFILE,$cnfpath) or die "cannot open configuration file: $cnfpath\nmake sure this variable is set properly";
---- a/stripchart/stripchart.cgi
-+++ b/stripchart/stripchart.cgi
+Index: boinc/stripchart/stripchart.cgi
+===================================================================
+--- boinc.orig/stripchart/stripchart.cgi
++++ boinc/stripchart/stripchart.cgi
 @@ -1,4 +1,4 @@
 -#! /usr/bin/env perl
 +#!/usr/bin/perl
diff --git a/debian/patches/termios_is_everywhere.patch b/debian/patches/termios_is_everywhere.patch
index aac56f0..a00149f 100644
--- a/debian/patches/termios_is_everywhere.patch
+++ b/debian/patches/termios_is_everywhere.patch
@@ -1,7 +1,9 @@
 Author: Steffen Moeller <moeller at debian.org>
 Description: Helping compilation on freebsd machines.
---- a/zip/unzip/ttyio.c
-+++ b/zip/unzip/ttyio.c
+Index: boinc/zip/unzip/ttyio.c
+===================================================================
+--- boinc.orig/zip/unzip/ttyio.c
++++ boinc/zip/unzip/ttyio.c
 @@ -54,6 +54,7 @@
  #  define HAVE_TERMIOS_H
  #endif
diff --git a/debian/patches/ticket_1168_verifycerts.patch b/debian/patches/ticket_1168_verifycerts.patch
index ba4aacd..4d48716 100644
--- a/debian/patches/ticket_1168_verifycerts.patch
+++ b/debian/patches/ticket_1168_verifycerts.patch
@@ -1,5 +1,7 @@
---- a/client/cs_files.cpp
-+++ b/client/cs_files.cpp
+Index: boinc/client/cs_files.cpp
+===================================================================
+--- boinc.orig/client/cs_files.cpp
++++ boinc/client/cs_files.cpp
 @@ -177,7 +177,9 @@
      //
      if (download_gzipped && !boinc_file_exists(pathname)) {
diff --git a/debian/patches/upstream_sztaki_configureEval.patch b/debian/patches/upstream_sztaki_configureEval.patch
index 5a2de47..a8f4774 100644
--- a/debian/patches/upstream_sztaki_configureEval.patch
+++ b/debian/patches/upstream_sztaki_configureEval.patch
@@ -1,6 +1,8 @@
 Author: Unknown
---- a/configure.ac
-+++ b/configure.ac
+Index: boinc/configure.ac
+===================================================================
+--- boinc.orig/configure.ac
++++ boinc/configure.ac
 @@ -289,6 +289,20 @@
  
  AC_SUBST([TOP_BUILD_DIR], [`pwd`])
@@ -22,8 +24,10 @@ Author: Unknown
  ## commented this out to turn all maintainer-mode features ON by default,
  ## such as automatic reconfiguring on changes in Makefile.am's and configure.ac
  ## AM_MAINTAINER_MODE
---- a/tools/update_versions
-+++ b/tools/update_versions
+Index: boinc/tools/update_versions
+===================================================================
+--- boinc.orig/tools/update_versions
++++ boinc/tools/update_versions
 @@ -1,4 +1,4 @@
 -#! /usr/bin/env php
 +#!/usr/bin/php

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-boinc/boinc.git

More information about the pkg-boinc-commits mailing list