[pkg-boinc-commits] r526 - in /branches/experimental/boinc/debian:
boinc-client.NEWS
boinc-client.install boinc-client.postinst boinc-client.preinst
conffiles/cc_config.xml rules
fst-guest at users.alioth.debian.org
fst-guest at users.alioth.debian.org
Fri Sep 1 20:30:05 UTC 2006
Author: fst-guest
Date: Fri Sep 1 20:30:03 2006
New Revision: 526
URL: http://svn.debian.org/wsvn/pkg-boinc/?sc=1&rev=526
Log:
* Install checkin_notes as upstream changelog.
* Added preinst script for boinc-client which removes the obsolete conffile
log_flags.xml. I've also added boinc-client.NEWS which informs the user that
log_flags.xml was replaced by cc_config.xml.
* Install the switcher binary into /usr/lib/boinc-client/.
* More flags in cc_config.xml.
Added:
branches/experimental/boinc/debian/boinc-client.NEWS
branches/experimental/boinc/debian/boinc-client.preinst
Modified:
branches/experimental/boinc/debian/boinc-client.install
branches/experimental/boinc/debian/boinc-client.postinst
branches/experimental/boinc/debian/conffiles/cc_config.xml
branches/experimental/boinc/debian/rules
Added: branches/experimental/boinc/debian/boinc-client.NEWS
URL: http://svn.debian.org/wsvn/pkg-boinc/branches/experimental/boinc/debian/boinc-client.NEWS?rev=526&op=file
==============================================================================
--- branches/experimental/boinc/debian/boinc-client.NEWS (added)
+++ branches/experimental/boinc/debian/boinc-client.NEWS Fri Sep 1 20:30:03 2006
@@ -1,0 +1,17 @@
+boinc (5.6.1-1) experimental; urgency=low
+
+ The configuration file "log_flags.xml" of the BOINC 5.4 series was renamed
+ during the development of the 5.6 series to "cc_config.xml". Also the
+ syntax of this file was changed.
+
+ If you have made local changes to /etc/boinc-client/log_flags.xml you may
+ want to migrate those changes to the new /etc/boinc-client/cc_config.xml.
+ See http://boinc.berkeley.edu/client_msgs.php for full list of available
+ configuration options and a description of it's format.
+
+ After updating the new /etc/boinc-client/cc_config.xml file, it is safe to
+ remove the old /etc/boinc-client/log_flags.xml.dpkg-bak from your system.
+ If you did not changed the old configuration file locally, it will be
+ removed from your system automatically by the boinc-client package.
+
+ -- Frank S. Thomas <frank at thomas-alfeld.de> Fri, 1 Sep 2006 15:29:18 +0200
Modified: branches/experimental/boinc/debian/boinc-client.install
URL: http://svn.debian.org/wsvn/pkg-boinc/branches/experimental/boinc/debian/boinc-client.install?rev=526&op=diff
==============================================================================
--- branches/experimental/boinc/debian/boinc-client.install (original)
+++ branches/experimental/boinc/debian/boinc-client.install Fri Sep 1 20:30:03 2006
@@ -5,3 +5,4 @@
debian/extra/update-boinc-applinks usr/bin
debian/overrides/boinc-client usr/share/lintian/overrides
debian/tmp/usr/bin/boinc_cmd usr/bin
+debian/tmp/usr/bin/switcher usr/lib/boinc-client
Modified: branches/experimental/boinc/debian/boinc-client.postinst
URL: http://svn.debian.org/wsvn/pkg-boinc/branches/experimental/boinc/debian/boinc-client.postinst?rev=526&op=diff
==============================================================================
--- branches/experimental/boinc/debian/boinc-client.postinst (original)
+++ branches/experimental/boinc/debian/boinc-client.postinst Fri Sep 1 20:30:03 2006
@@ -46,7 +46,7 @@
abort-upgrade|abort-remove|abort-deconfigure)
;;
-
+
*)
echo "postinst called with unknown argument \`$1'" >&2
exit 1
Added: branches/experimental/boinc/debian/boinc-client.preinst
URL: http://svn.debian.org/wsvn/pkg-boinc/branches/experimental/boinc/debian/boinc-client.preinst?rev=526&op=file
==============================================================================
--- branches/experimental/boinc/debian/boinc-client.preinst (added)
+++ branches/experimental/boinc/debian/boinc-client.preinst Fri Sep 1 20:30:03 2006
@@ -1,0 +1,52 @@
+#!/bin/sh
+# preinst script for boinc-client
+
+set -e
+
+BOINC_DIR=/var/lib/boinc-client
+CONF_DIR=/etc/boinc-client
+
+# Remove a no-longer used conffile.
+# from http://wiki.debian.org/DpkgConffileHandling
+rm_conffile()
+{
+ CONFFILE="$CONF_DIR/$1"
+ SYMLINK="$BOINC_DIR/$1"
+
+ if [ -e "$CONFFILE" ]; then
+ cur_md5sum="`md5sum \"$CONFFILE\" | sed -e \"s/ .*//\"`"
+ old_md5sum="`sed -n -e \"/^Conffiles:/,/^[^ ]/{\\\\' $CONFFILE'{s/.* //;p}}\" /var/lib/dpkg/status`"
+ if [ "$cur_md5sum" != "$old_md5sum" ]; then
+ echo "Obsolete conffile $CONFFILE has been modified by you."
+ echo "Saving as $CONFFILE.dpkg-bak ..."
+ mv -f "$CONFFILE" "$CONFFILE".dpkg-bak
+ else
+ echo "Removing obsolete conffile $CONFFILE ..."
+ rm -f "$CONFFILE"
+ fi
+ fi
+
+ if [ -L "$SYMLINK" ]; then
+ rm -f "$SYMLINK"
+ fi
+}
+
+case "$1" in
+ install|upgrade)
+ if dpkg --compare-versions "$2" le "5.4.11-1"; then
+ rm_conffile log_flags.xml
+ fi
+ ;;
+
+ abort-upgrade)
+ ;;
+
+ *)
+ echo "preinst called with unknown argument \`$1'" >&2
+ exit 1
+ ;;
+esac
+
+#DEBHELPER#
+
+exit 0
Modified: branches/experimental/boinc/debian/conffiles/cc_config.xml
URL: http://svn.debian.org/wsvn/pkg-boinc/branches/experimental/boinc/debian/conffiles/cc_config.xml?rev=526&op=diff
==============================================================================
--- branches/experimental/boinc/debian/conffiles/cc_config.xml (original)
+++ branches/experimental/boinc/debian/conffiles/cc_config.xml Fri Sep 1 20:30:03 2006
@@ -1,6 +1,5 @@
<cc_config>
<options>
- <save_stats_days>365</save_stats_days>
</options>
<log_flags>
<task>1</task>
@@ -26,5 +25,7 @@
<guirpc_debug>0</guirpc_debug>
<scrsave_debug>0</scrsave_debug>
<app_msg_debug>0</app_msg_debug>
+ <mem_usage_debug>0</mem_usage_debug>
+ <network_status_debug>0</network_status_debug>
</log_flags>
</cc_config>
Modified: branches/experimental/boinc/debian/rules
URL: http://svn.debian.org/wsvn/pkg-boinc/branches/experimental/boinc/debian/rules?rev=526&op=diff
==============================================================================
--- branches/experimental/boinc/debian/rules (original)
+++ branches/experimental/boinc/debian/rules Fri Sep 1 20:30:03 2006
@@ -146,6 +146,8 @@
rm -f build-stamp-boinc-client
dh_clean client/boinc_client.optimized
+BOINC_SERVER_DIR=debian/boinc-server/usr/share/boinc-server
+
install: install-arch
install-arch: build
dh_testdir
@@ -187,27 +189,27 @@
# Fix some file permissions.
chmod +x \
- debian/boinc-server/usr/share/boinc-server/html/ops/db_update.php \
- debian/boinc-server/usr/share/boinc-server/html/ops/watchdogs.php \
- debian/boinc-server/usr/share/boinc-server/html/ops/wd_nresults_changing.php \
- debian/boinc-server/usr/share/boinc-server/tools/watch_tcp
+ $(BOINC_SERVER_DIR)/html/ops/db_update.php \
+ $(BOINC_SERVER_DIR)/html/ops/watchdogs.php \
+ $(BOINC_SERVER_DIR)/html/ops/wd_nresults_changing.php \
+ $(BOINC_SERVER_DIR)/tools/watch_tcp
chmod -x \
- debian/boinc-server/usr/share/boinc-server/html/user/forum_search.php \
- debian/boinc-server/usr/share/boinc-server/html/user/forum_search_action.php \
- debian/boinc-server/usr/share/boinc-server/html/user/forum_thread_status.php \
- debian/boinc-server/usr/share/boinc-server/html/user/forum_thread_vote.php
+ $(BOINC_SERVER_DIR)/html/user/forum_search.php \
+ $(BOINC_SERVER_DIR)/html/user/forum_search_action.php \
+ $(BOINC_SERVER_DIR)/html/user/forum_thread_status.php \
+ $(BOINC_SERVER_DIR)/html/user/forum_thread_vote.php
# Fix PHP shebang for executable PHP scripts.
sed -i -e '1 s/\/usr\/local\/bin\/php/\/usr\/bin\/php/' \
- debian/boinc-server/usr/share/boinc-server/html/ops/db_update.php \
- debian/boinc-server/usr/share/boinc-server/html/ops/make_fake_tables.php \
- debian/boinc-server/usr/share/boinc-server/html/ops/migrate_tables.php \
- debian/boinc-server/usr/share/boinc-server/html/ops/mungetest.php \
- debian/boinc-server/usr/share/boinc-server/html/ops/update_forum_activities.php \
- debian/boinc-server/usr/share/boinc-server/html/ops/update_profile_pages.php \
- debian/boinc-server/usr/share/boinc-server/html/ops/update_uotd.php \
- debian/boinc-server/usr/share/boinc-server/html/ops/watchdogs.php \
- debian/boinc-server/usr/share/boinc-server/html/ops/wd_nresults_changing.php
+ $(BOINC_SERVER_DIR)/html/ops/db_update.php \
+ $(BOINC_SERVER_DIR)/html/ops/make_fake_tables.php \
+ $(BOINC_SERVER_DIR)/html/ops/migrate_tables.php \
+ $(BOINC_SERVER_DIR)/html/ops/mungetest.php \
+ $(BOINC_SERVER_DIR)/html/ops/update_forum_activities.php \
+ $(BOINC_SERVER_DIR)/html/ops/update_profile_pages.php \
+ $(BOINC_SERVER_DIR)/html/ops/update_uotd.php \
+ $(BOINC_SERVER_DIR)/html/ops/watchdogs.php \
+ $(BOINC_SERVER_DIR)/html/ops/wd_nresults_changing.php
# Remove Python shebang from Boinc module files that are not scripts.
sed -i -e '1 d' \
@@ -219,7 +221,7 @@
binary-arch: build install-arch
dh_testdir -a
dh_testroot
- dh_installchangelogs -a
+ dh_installchangelogs -a -k checkin_notes
dh_installdocs -a
dh_installdebconf -a
dh_installexamples -a
More information about the pkg-boinc-commits
mailing list