r851 - in /trunk/boinc/debian: boinc-client.init boinc-client.install boinc-client.udev changelog extra/udev-cpu_share extra/udev-usr_share rules

[fst at users.alioth.debian.org]

Author: fst
Date: Mon Feb 25 00:00:17 2008
New Revision: 851

URL: http://svn.debian.org/wsvn/pkg-boinc/?sc=1&rev=851
Log:
* Renamed debian/extra/udev-usr_share to debian/extra/udev-cpu_share
  because this name seems to be more appropriate since this script changes
  the boinc user's cpu_share.
* Install udev-cpu_share into /usr/share/boinc-client instead of
  /usr/lib/boinc-client since it is an architecture-independent shell
  script.
* Use lowercase variables in the init script because UID is set by bash
  and it complains when trying to overwrite it.

Added:
    trunk/boinc/debian/extra/udev-cpu_share
      - copied unchanged from r850, trunk/boinc/debian/extra/udev-usr_share
Removed:
    trunk/boinc/debian/extra/udev-usr_share
Modified:
    trunk/boinc/debian/boinc-client.init
    trunk/boinc/debian/boinc-client.install
    trunk/boinc/debian/boinc-client.udev
    trunk/boinc/debian/changelog
    trunk/boinc/debian/rules

Modified: trunk/boinc/debian/boinc-client.init
URL: http://svn.debian.org/wsvn/pkg-boinc/trunk/boinc/debian/boinc-client.init?rev=851&op=diff
==============================================================================
--- trunk/boinc/debian/boinc-client.init (original)
+++ trunk/boinc/debian/boinc-client.init Mon Feb 25 00:00:17 2008
@@ -11,7 +11,7 @@
 ### END INIT INFO
 
 # Debian init.d script for the BOINC core client
-# Copyright © 2005, 2006, 2007
+# Copyright © 2005, 2006, 2007, 2008
 # Debian BOINC Maintainers <pkg-boinc-devel at lists.alioth.debian.org>
 #
 # This file is licensed under the terms of the GNU General Public License,
@@ -149,11 +149,11 @@
       fi
     fi
 
-    # Display cpu_share info:
-    UID=`id -u $BOINC_USER`
-    CPU_SHARE_FILE="/sys/kernel/uids/$UID/cpu_share"
-    if [ -f "$CPU_SHARE_FILE" ]; then
-      log_success_msg "cpu_share: `cat "$CPU_SHARE_FILE"`"
+    # Display $BOINC_USER's cpu_share:
+    uid=`id -u $BOINC_USER`
+    cpu_share_file="/sys/kernel/uids/$uid/cpu_share"
+    if [ -f "$cpu_share_file" ]; then
+      log_success_msg "cpu_share: `cat "$cpu_share_file"`"
     fi
   else
     log_success_msg "$STATUS stopped."

Modified: trunk/boinc/debian/boinc-client.install
URL: http://svn.debian.org/wsvn/pkg-boinc/trunk/boinc/debian/boinc-client.install?rev=851&op=diff
==============================================================================
--- trunk/boinc/debian/boinc-client.install (original)
+++ trunk/boinc/debian/boinc-client.install Mon Feb 25 00:00:17 2008
@@ -1,7 +1,7 @@
 debian/bug/boinc-client/script      usr/share/bug/boinc-client
 debian/conffiles/*                  etc/boinc-client
 debian/extra/bash/*                 etc/bash_completion.d
-debian/extra/udev-usr_share         usr/lib/boinc-client
+debian/extra/udev-cpu_share         usr/share/boinc-client
 debian/extra/update-boinc-applinks  usr/bin
 debian/overrides/boinc-client       usr/share/lintian/overrides
 debian/tmp/usr/bin/switcher         usr/lib/boinc-client

Modified: trunk/boinc/debian/boinc-client.udev
URL: http://svn.debian.org/wsvn/pkg-boinc/trunk/boinc/debian/boinc-client.udev?rev=851&op=diff
==============================================================================
--- trunk/boinc/debian/boinc-client.udev (original)
+++ trunk/boinc/debian/boinc-client.udev Mon Feb 25 00:00:17 2008
@@ -1,1 +1,1 @@
-SUBSYSTEM=="kernel", DEVPATH=="/kernel/uids/*", ACTION=="add", RUN+="/usr/lib/boinc-client/udev-usr_share"
+SUBSYSTEM=="kernel", DEVPATH=="/kernel/uids/*", ACTION=="add", RUN+="/usr/share/boinc-client/udev-cpu_share"

Modified: trunk/boinc/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-boinc/trunk/boinc/debian/changelog?rev=851&op=diff
==============================================================================
--- trunk/boinc/debian/changelog (original)
+++ trunk/boinc/debian/changelog Mon Feb 25 00:00:17 2008
@@ -11,11 +11,21 @@
     Versions with an odd minor version number are test releases which are not
     intended for a wider audience.
   * Reverted the debhelper compat level bump. It was just unnecessary (boinc
-    does not need V6) and would have made backporting harder.
-  * Merged the workaround from Ubuntu's 5.10.30-5ubuntu3 for Linux's new CFS,
-    refer to #461630 for details. Thanks to Daniel Hahler <daniel at thequod.de>.
-
- -- Frank S. Thomas <fst at debian.org>  Thu, 21 Feb 2008 13:53:43 +0100
+    does not need V6) and it would have made backporting harder.
+  * Merged the workaround from Ubuntu's 5.10.30-5ubuntu3 for Linux's new CFS
+    with the following changes:
+    - Renamed debian/extra/udev-usr_share to debian/extra/udev-cpu_share
+      because this name seems to be more appropriate since this script changes
+      the boinc user's cpu_share.
+    - Install udev-cpu_share into /usr/share/boinc-client instead of
+      /usr/lib/boinc-client since it is an architecture-independent shell
+      script.
+    - Use lowercase variables in the init script because UID is set by bash
+      and it complains when trying to overwrite it.
+    Thanks to Daniel Hahler <daniel at thequod.de> for investigating this issue
+    and the patch. (closes: #461630)
+
+ -- Frank S. Thomas <fst at debian.org>  Mon, 25 Feb 2008 00:53:20 +0100
 
 boinc (5.10.30-5ubuntu3) hardy; urgency=low
 

Modified: trunk/boinc/debian/rules
URL: http://svn.debian.org/wsvn/pkg-boinc/trunk/boinc/debian/rules?rev=851&op=diff
==============================================================================
--- trunk/boinc/debian/rules (original)
+++ trunk/boinc/debian/rules Mon Feb 25 00:00:17 2008
@@ -246,7 +246,7 @@
 	dh_compress -a
 	dh_fixperms -a
 	chmod 755 \
-	  debian/boinc-client/usr/lib/boinc-client/udev-usr_share \
+	  debian/boinc-client/usr/share/boinc-client/udev-cpu_share \
 	  debian/boinc-client/usr/share/bug/boinc-client/script \
 	  debian/boinc-manager/usr/share/doc/boinc-manager/examples/run-boincmgr
 	dh_installdeb -a