r884 - in /branches/boinc/experimental/debian: boinc-client.init boinc-client.install boinc-client.udev boinc-manager.desktop changelog compat control extra/udev-cpu_share po/fi.po rules

fst at users.alioth.debian.org fst at users.alioth.debian.org
Mon Apr 7 14:59:53 UTC 2008 

Author: fst
Date: Mon Apr  7 14:59:53 2008
New Revision: 884

URL: http://svn.debian.org/wsvn/pkg-boinc/?sc=1&rev=884
Log:
Merged from trunk (= 5.10.45-2) with:
svn merge -r 831:HEAD svn+ssh://fst@svn.debian.org/svn/pkg-boinc/trunk/boinc

Added:
    branches/boinc/experimental/debian/boinc-client.udev
      - copied unchanged from r853, trunk/boinc/debian/boinc-client.udev
    branches/boinc/experimental/debian/extra/udev-cpu_share
      - copied unchanged from r853, trunk/boinc/debian/extra/udev-cpu_share
    branches/boinc/experimental/debian/po/fi.po
      - copied unchanged from r883, trunk/boinc/debian/po/fi.po
Modified:
    branches/boinc/experimental/debian/boinc-client.init
    branches/boinc/experimental/debian/boinc-client.install
    branches/boinc/experimental/debian/boinc-manager.desktop
    branches/boinc/experimental/debian/changelog
    branches/boinc/experimental/debian/compat
    branches/boinc/experimental/debian/control
    branches/boinc/experimental/debian/rules

Modified: branches/boinc/experimental/debian/boinc-client.init
URL: http://svn.debian.org/wsvn/pkg-boinc/branches/boinc/experimental/debian/boinc-client.init?rev=884&op=diff
==============================================================================
--- branches/boinc/experimental/debian/boinc-client.init (original)
+++ branches/boinc/experimental/debian/boinc-client.init Mon Apr  7 14:59:53 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,
@@ -148,6 +148,13 @@
         schedtool $children
       fi
     fi
+
+    # 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."
   fi

Modified: branches/boinc/experimental/debian/boinc-client.install
URL: http://svn.debian.org/wsvn/pkg-boinc/branches/boinc/experimental/debian/boinc-client.install?rev=884&op=diff
==============================================================================
--- branches/boinc/experimental/debian/boinc-client.install (original)
+++ branches/boinc/experimental/debian/boinc-client.install Mon Apr  7 14:59:53 2008
@@ -1,6 +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-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: branches/boinc/experimental/debian/boinc-manager.desktop
URL: http://svn.debian.org/wsvn/pkg-boinc/branches/boinc/experimental/debian/boinc-manager.desktop?rev=884&op=diff
==============================================================================
--- branches/boinc/experimental/debian/boinc-manager.desktop (original)
+++ branches/boinc/experimental/debian/boinc-manager.desktop Mon Apr  7 14:59:53 2008
@@ -7,8 +7,10 @@
 Categories=System;Monitor;GTK;
 Name=BOINC Manager
 GenericName=BOINC monitor and control utility
+GenericName[cs]=Monitorovací a ovládací nástroj pro BOINC
 GenericName[de]=BOINC Ãœberwachungs- und Kontrollprogramm
 GenericName[pt]=Monitorização BOINC e utilitário de controlo
 Comment=Configure or monitor a BOINC core client
+Comment[cs]=Monitoruje a nastavuje klienta BOINC
 Comment[de]=BOINC Basis Client konfigurieren oder überwachen
 Comment[pt]=Configurar ou monitorizar o cliente básico do BOINC

Modified: branches/boinc/experimental/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-boinc/branches/boinc/experimental/debian/changelog?rev=884&op=diff
==============================================================================
--- branches/boinc/experimental/debian/changelog (original)
+++ branches/boinc/experimental/debian/changelog Mon Apr  7 14:59:53 2008
@@ -1,4 +1,4 @@
-boinc (6.1.0-1) experimental; urgency=low
+boinc (6.1.12-1) UNRELEASED; urgency=low
 
   [ Frank S. Thomas ]
   * New upstream release.
@@ -36,6 +36,45 @@
 
  -- Frank S. Thomas <frank at thomas-alfeld.de>  Wed, 24 Oct 2007 14:58:36 +0200
 
+boinc (5.10.45-2) unstable; urgency=low
+
+  [ Debconf translations ]
+  * Added Finnish (fi.po) by Esko Arajärvi <edu at iki.fi>. (closes: #472558)
+
+  [ Frank S. Thomas ]
+  * debian/control: Updated boinc-dev's dependency on the concrete
+    libstdc++-dev package now that GCC 4.3 is the default compiler.
+  * debian/boinc-manager.desktop: Included Czech translations for GenericName
+    and Comment from the .desktop file in the Fedora package.
+
+ -- Frank S. Thomas <fst at debian.org>  Mon, 07 Apr 2008 16:32:01 +0200
+
+boinc (5.10.45-1) unstable; urgency=low
+
+  [ Frank S. Thomas ]
+  * New upstream release.
+  * debian/rules: Do not declare the patch and unpatch targets as phony,
+    because the included /usr/share/quilt/quilt.make does this already.
+
+ -- Frank S. Thomas <fst at debian.org>  Thu, 13 Mar 2008 01:04:38 +0100
+
+boinc (5.10.44-1) unstable; urgency=low
+
+  [ Frank S. Thomas ]
+  * New upstream release.
+    - BOINC Manager: Clear all cached messages and resume auto-scrolling when
+      connected host has changed (cp. r14813, r14817). (closes: #468187)
+
+ -- Frank S. Thomas <fst at debian.org>  Sat, 01 Mar 2008 15:07:05 +0100
+
+boinc (5.10.43-1) unstable; urgency=low
+
+  [ Frank S. Thomas ]
+  * New upstream release.
+    - BOINC Manager: Do not crash when closing. (closes: #444339)
+
+ -- Frank S. Thomas <fst at debian.org>  Tue, 26 Feb 2008 17:58:31 +0100
+
 boinc (5.10.42-1) unstable; urgency=low
 
   [ Frank S. Thomas ]
@@ -48,8 +87,54 @@
   * debian/watch: Only check for versions with an even minor version number.
     Versions with an odd minor version number are test releases which are not
     intended for a wider audience.
-
- -- Frank S. Thomas <fst at debian.org>  Wed, 13 Feb 2008 20:51:17 +0100
+  * Reverted the debhelper compat level bump. It was just unnecessary (boinc
+    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
+
+  * Install /usr/lib/boinc-client/udev-usr_share with correct perms
+    (executable), so that it gets called by udevd.
+
+ -- Daniel Hahler <ubuntu at thequod.de>  Mon, 04 Feb 2008 00:40:08 +0100
+
+boinc (5.10.30-5ubuntu2) hardy; urgency=low
+
+  * Revert changes from ubuntu1 and instead use the uevent udev
+    interface to assign the lowest possible cpu_share to the
+    boinc user. This is still considered to be a workaround.
+    - Add debian/boinc-client.udev
+    - debian/rules: call dh_installudev
+    - Add debian/extra/udev-usr_share, which gets run by udevd
+    - Drop debian/patches/ubuntu_temp_cfs_fix.patch
+  * debian/boinc-client.init: Display cpu_share info for "status"
+    action
+
+ -- Daniel Hahler <ubuntu at thequod.de>  Sat, 02 Feb 2008 23:32:25 +0100
+
+boinc (5.10.30-5ubuntu1) hardy; urgency=low
+
+  * debian/patches/ubuntu_temp_cfs_fix.patch:
+    Temporary workaround for the new CFS Linux scheduler,
+    by adjusting the "boinc" user's cpu_share to the minimum (2)
+    in the init script (LP: #177713)
+  * Modify Maintainer value to match the DebianMaintainerField
+    specification.
+
+ -- Daniel Hahler <ubuntu at thequod.de>  Sat, 02 Feb 2008 02:48:01 +0100
 
 boinc (5.10.30-5) unstable; urgency=low
 

Modified: branches/boinc/experimental/debian/compat
URL: http://svn.debian.org/wsvn/pkg-boinc/branches/boinc/experimental/debian/compat?rev=884&op=diff
==============================================================================
--- branches/boinc/experimental/debian/compat (original)
+++ branches/boinc/experimental/debian/compat Mon Apr  7 14:59:53 2008
@@ -1,1 +1,1 @@
-6
+5

Modified: branches/boinc/experimental/debian/control
URL: http://svn.debian.org/wsvn/pkg-boinc/branches/boinc/experimental/debian/control?rev=884&op=diff
==============================================================================
--- branches/boinc/experimental/debian/control (original)
+++ branches/boinc/experimental/debian/control Mon Apr  7 14:59:53 2008
@@ -56,7 +56,7 @@
 Package: boinc-dev
 Section: devel
 Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}, libc6-dev | libc-dev, libstdc++6-4.2-dev | libstdc++-dev, libssl-dev, libmysqlclient15-dev
+Depends: ${shlibs:Depends}, ${misc:Depends}, libc6-dev | libc-dev, libstdc++6-4.3-dev | libstdc++-dev, libssl-dev, libmysqlclient15-dev
 Description: development files to build applications for BOINC projects
  The Berkeley Open Infrastructure for Network Computing (BOINC) is a
  software platform for distributed computing using volunteered computer

Modified: branches/boinc/experimental/debian/rules
URL: http://svn.debian.org/wsvn/pkg-boinc/branches/boinc/experimental/debian/rules?rev=884&op=diff
==============================================================================
--- branches/boinc/experimental/debian/rules (original)
+++ branches/boinc/experimental/debian/rules Mon Apr  7 14:59:53 2008
@@ -248,12 +248,14 @@
 	dh_desktop -a
 	dh_installinit -a
 	dh_installman -a
+	dh_installudev -a
 	dh_buildinfo -a
 	dh_link -a
 	dh_strip -a --dbg-package=boinc-dbg
 	dh_compress -a
 	dh_fixperms -a
 	chmod 755 \
+	  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_pysupport -a 
@@ -276,5 +278,5 @@
 	$$EXB -r $$LATEST_VERSION -t $(origDir); \
 	rm -f $$EXB
 
-.PHONY: patch unpatch unit-test pre-build build clean clean-patched install \
-  install-arch binary-arch binary get-orig-source
+.PHONY: unit-test pre-build build clean clean-patched install install-arch \
+  binary-arch binary get-orig-source

More information about the pkg-boinc-commits mailing list