[SCM] BOINC packaging branch, master, updated. debian/6.4.5+dfsg-3-11-gf87328e

[rmayorga]

The following commit has been merged in the master branch:
commit f71e9df44be5aa14cf977b3bcf9d22739b407e99
Author: rmayorga <rmayorga at debian.org>
Date:   Thu Nov 5 23:40:38 2009 -0600

    Improve debian/changelog to close some bugs on upload

diff --git a/.gitignore b/.gitignore
deleted file mode 100644
index a985dcd..0000000
--- a/.gitignore
+++ /dev/null
@@ -1,24 +0,0 @@
-Makefile.am
-client/Makefile.am
-clientgui/hyperlink.cpp
-config.guess
-config.sub
-locale/client/ar/BOINC Manager.mo
-sched/Makefile.am
-autoreconf-stamp
-build-boinc-client-stamp
-build-stamp
-client/.deps/
-client/Makefile
-client/Makefile.in
-client/boinc
-client/boinc.optimized
-client/boinc.unmodified
-client/boinc_client
-debian/stamp-patched
-Makefile
-Makefile.in
-aclocal.m4
-version.h
-*/*.o
-*/*/*.o
diff --git a/debian/boinc-client.init b/debian/boinc-client.init
index 2e00ff6..3ee9819 100644
--- a/debian/boinc-client.init
+++ b/debian/boinc-client.init
@@ -26,6 +26,7 @@ SCHEDULE=0
 BOINC_USER=boinc
 BOINC_DIR=/var/lib/boinc-client
 BOINC_CLIENT=/usr/bin/boinc
+BOINC_OOM_ADJ=15
 
 # Source defaults file. Edit that file to configure this script.
 if [ -e /etc/default/boinc-client ]; then
@@ -129,10 +130,11 @@ schedule()
       fi
     fi
 
+    children=`ps --ppid $pid -o pid= | tr '\n' ' '`
+
     if [ ! -x "`which schedtool 2>/dev/null`" ]; then
       log_progress_msg "schedtool not found"
     else
-      children=`ps --ppid $pid -o pid= | tr '\n' ' '`
       (schedtool -n 19 -D $pid $children >/dev/null \
         && log_progress_msg "idleprio") || \
       (schedtool -n 19 -B $pid $children >/dev/null \
@@ -140,6 +142,8 @@ schedule()
       (schedtool -n 19 -N $pid $children >/dev/null \
         && log_progress_msg "normal")
     fi
+    for BPID in ${pid} ${children}; do echo ${BOINC_OOM_ADJ} > /proc/${BPID}/oom_adj; echo; done
+
   fi
   log_end_msg 0
 }
@@ -149,17 +153,20 @@ status()
   STATUS="Status of $DESC:"
   if is_running; then
     log_success_msg "$STATUS running"
+    children=`ps --ppid $pid -o pid= | tr '\n' ' '`
     if [ -x "`which schedtool 2>/dev/null`" ]; then
       log_success_msg "Scheduling of $DESC: $pid"
       schedtool $pid
 
-      children=`ps --ppid $pid -o pid= | tr '\n' ' '`
       if [ -n "$children" ]; then
         log_success_msg "Scheduling of $DESC's children: $children"
         schedtool $children
       fi
     fi
 
+    log_success_msg "OOM killer status for $DESC:"
+    for BPID in ${pid} ${children}; do echo PID ${BPID}: adj `cat /proc/${BPID}/oom_adj`, score `cat /proc/${BPID}/oom_score`; done
+
     # Display $BOINC_USER's cpu_share:
     uid=`id -u $BOINC_USER`
     cpu_share_file="/sys/kernel/uids/$uid/cpu_share"
diff --git a/debian/changelog b/debian/changelog
index ea21872..fc31229 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,12 +1,16 @@
 boinc (6.10.17+dfsg-1) unstable; urgency=low
 
-  * New upstream release
+  * New upstream release (Closes: #553998)
+    + better support for dark themes (Closes: #512508)
+    + The -s (system tray option) was removed on upstream (Closes: #464192)
+    + Better handling for WU over deadline - upstream 
+      changeset 17399 (Closes: #513884)
   * debian/patches
     + 003_use_sensible-browser.patch updated
     + 006_correct_catalog_path.patch - refreshed
     + 005_using_hyphen_as_minus.patch removed - Applied upstream
     + 101_check_RSA_returned_values.patch  - Removed - Applied upstream
-    + 102_gcc4.4_safe.patch Removed - Applied upstram
+    + 102_gcc4.4_safe.patch Removed - Applied upstream
     + 006_correct_catalog_path.patch - updated
     + 002_remove_hardcoded_optimization.patch  Removed, not needed anymore
     + 004_exclude_sea.patch - Removed - not needed anymore
@@ -15,6 +19,7 @@ boinc (6.10.17+dfsg-1) unstable; urgency=low
     + zip/zip and zip/unzip references removed
   * debian/rules
     + Adjust fix-perm for catalog files
+  * use omm_adj to prevent boinc use all the system resources (Closes: #534418)
 
  -- Rene Mayorga <rmayorga at debian.org>  Mon, 02 Nov 2009 14:44:14 -0600
 
diff --git a/debian/patches/001_dont_install_ca-bundle.crt.patch b/debian/patches/001_dont_install_ca-bundle.crt.patch
deleted file mode 100644
index da3331e..0000000
--- a/debian/patches/001_dont_install_ca-bundle.crt.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-Description: Don't install ca-bundle.crt from BOINC, and keep the system using
-the ca-bundle.crt provided by ca-certificates
-Author: Frank S. Thomas <frank at thomas-alfeld.de>
---- boinc.orig/client/Makefile.am
-+++ boinc/client/Makefile.am
-@@ -67,7 +67,7 @@
- boinc_client_LDADD = $(LIBBOINC) $(PTHREAD_LIBS)
- 
- boinc_clientdir = $(bindir)
--boinc_client_DATA = ../curl/ca-bundle.crt
-+#boinc_client_DATA = ../curl/ca-bundle.crt
- 
- switcher_SOURCES = switcher.cpp
- 

-- 
BOINC packaging