[boinc] 01/01: Patch refresh, re-enabled de.po.patch from my ppa boinc-upstream-daily (sorry Steffen, but I did already waste my time here :) )

[Gianfranco Costamagna]

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

locutusofborg-guest pushed a commit to branch master
in repository boinc.

commit f8a645391f202dd0008b409cfe93026cdcb41899
Author: Gianfranco Costamagna <costamagnagianfranco at yahoo.it>
Date:   Fri Nov 8 20:39:29 2013 +0100

    Patch refresh, re-enabled de.po.patch from my ppa boinc-upstream-daily (sorry Steffen, but I did already waste my time here :) )
---
 debian/patches/de.po.patch                  |   36 ++++++++++-----------------
 debian/patches/opendir_error_messages.patch |    2 +-
 debian/patches/series                       |    3 +--
 debian/patches/slot_dir_source_trace.patch  |   24 ++++++------------
 4 files changed, 23 insertions(+), 42 deletions(-)

diff --git a/debian/patches/de.po.patch b/debian/patches/de.po.patch
index e0cdcd9..8a8792f 100644
--- a/debian/patches/de.po.patch
+++ b/debian/patches/de.po.patch
@@ -1,39 +1,39 @@
 --- a/html/languages/translations/de.po
 +++ b/html/languages/translations/de.po
-@@ -1066,8 +1066,8 @@
+@@ -1073,8 +1073,8 @@
  
- #: ../inc/prefs.inc:157
+ #: ../inc/prefs.inc:158
  #, php-format
 -msgid "% of the processors"
--msgstr "% von den Prozessoren"
+-msgstr "% der Prozessoren"
 +msgid "%% of the processors"
-+msgstr "%% von den Prozessoren"
++msgstr "%% der Prozessoren"
  
- #: ../inc/prefs.inc:161
+ #: ../inc/prefs.inc:162
  msgid "Use at most %1 Can be used to reduce CPU heat %2"
-@@ -1075,8 +1075,8 @@
+@@ -1083,8 +1083,8 @@
  
- #: ../inc/prefs.inc:166
+ #: ../inc/prefs.inc:167
  #, php-format
 -msgid "% of CPU time"
 -msgstr "% der Prozessorzeit"
 +msgid "%% of CPU time"
 +msgstr "%% der Prozessorzeit"
  
- #: ../inc/prefs.inc:174 ../inc/prefs.inc:188
+ #: ../inc/prefs.inc:175 ../inc/prefs.inc:189
  msgid "Disk: use at most"
-@@ -1095,8 +1095,8 @@
- #: ../inc/prefs.inc:190 ../inc/prefs.inc:200 ../inc/prefs.inc:205
- #: ../inc/prefs.inc:210
+@@ -1103,8 +1103,8 @@
+ #: ../inc/prefs.inc:191 ../inc/prefs.inc:201 ../inc/prefs.inc:206
+ #: ../inc/prefs.inc:211
  #, php-format
 -msgid "% of total"
 -msgstr "% von Gesamt"
 +msgid "%% of total"
 +msgstr "%% von Gesamt"
  
- #: ../inc/prefs.inc:193
+ #: ../inc/prefs.inc:194
  msgid "Tasks checkpoint to disk at most every"
-@@ -5279,9 +5279,10 @@
+@@ -5365,9 +5365,10 @@
  "our message boards are moderated.\n"
  "Message board postings are subject to the following posting rules:\n"
  msgstr ""
@@ -46,13 +46,3 @@
  
  #: ../user/moderation.php:30
  msgid ""
---- a/html/languages/translations/ru.po
-+++ b/html/languages/translations/ru.po
-@@ -386,6 +386,7 @@
- "<li> Не должно быть оскорбительных комментариев, затрагивающих расу, "
- "религию,\n"
- " национальность, пол, класс или сексуальность.\n"
-+"        "
- 
- #: ../inc/forum.inc:734
- msgid "Rules:"
diff --git a/debian/patches/opendir_error_messages.patch b/debian/patches/opendir_error_messages.patch
index da7ffe5..4c6402a 100644
--- a/debian/patches/opendir_error_messages.patch
+++ b/debian/patches/opendir_error_messages.patch
@@ -15,7 +15,7 @@
  }
 --- a/lib/diagnostics.cpp
 +++ b/lib/diagnostics.cpp
-@@ -306,7 +306,7 @@
+@@ -344,7 +344,7 @@
  
      // Store various pieces of inforation for future use.
      if (flags & BOINC_DIAG_BOINCAPPLICATION) {
diff --git a/debian/patches/series b/debian/patches/series
index 0a26b0d..cf4d089 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -60,8 +60,7 @@ lib_cppcheck.patch
 fopen_closing.patch
 rrsim_iterator_cppcheck.patch
 filesys_error_message.patch
-#clashes with 7.2.27 - we should not waste our time on this here
-#de.po.patch
+de.po.patch
 more_clang_warnings.patch
 #mmap_mem_only.patch
 add-ldflags.patch
diff --git a/debian/patches/slot_dir_source_trace.patch b/debian/patches/slot_dir_source_trace.patch
index aebe3f7..7658ea4 100644
--- a/debian/patches/slot_dir_source_trace.patch
+++ b/debian/patches/slot_dir_source_trace.patch
@@ -1,7 +1,5 @@
-Index: boinc/client/app.cpp
-===================================================================
---- boinc.orig/client/app.cpp
-+++ boinc/client/app.cpp
+--- a/client/app.cpp
++++ b/client/app.cpp
 @@ -436,8 +436,8 @@
      char new_path[MAXPATHLEN], old_path[MAXPATHLEN];
      int retval;
@@ -49,10 +47,8 @@ Index: boinc/client/app.cpp
      int n, dummy;
      unsigned int i;
      PROJECT* project=0;
-Index: boinc/client/app.h
-===================================================================
---- boinc.orig/client/app.h
-+++ boinc/client/app.h
+--- a/client/app.h
++++ b/client/app.h
 @@ -48,6 +48,7 @@
  typedef int PROCESS_ID;
  
@@ -101,10 +97,8 @@ Index: boinc/client/app.h
      void get_memory_usage();
  
      void process_control_poll();
-Index: boinc/lib/filesys.cpp
-===================================================================
---- boinc.orig/lib/filesys.cpp
-+++ boinc/lib/filesys.cpp
+--- a/lib/filesys.cpp
++++ b/lib/filesys.cpp
 @@ -86,7 +86,7 @@
  
  // routines for enumerating the entries in a directory
@@ -326,10 +320,8 @@ Index: boinc/lib/filesys.cpp
  #ifdef STATFS
      struct STATFS fs_info;
  
-Index: boinc/lib/filesys.h
-===================================================================
---- boinc.orig/lib/filesys.h
-+++ boinc/lib/filesys.h
+--- a/lib/filesys.h
++++ b/lib/filesys.h
 @@ -43,30 +43,30 @@
  #ifdef __cplusplus
  extern "C" {

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