[pkg-boinc-commits] r528 - in /branches/experimental/boinc/debian: boinc-client.postinst changelog conffiles/cc_config.xml

[fst-guest at users.alioth.debian.org]

Author: fst-guest
Date: Sat Sep  2 11:31:46 2006
New Revision: 528

URL: http://svn.debian.org/wsvn/pkg-boinc/?sc=1&rev=528
Log:
* Made function naming and quoting in maintainer scripts consisten
* -v debian/changelog
* changed element name in cc_config.xml

Modified:
    branches/experimental/boinc/debian/boinc-client.postinst
    branches/experimental/boinc/debian/changelog
    branches/experimental/boinc/debian/conffiles/cc_config.xml

Modified: branches/experimental/boinc/debian/boinc-client.postinst
URL: http://svn.debian.org/wsvn/pkg-boinc/branches/experimental/boinc/debian/boinc-client.postinst?rev=528&op=diff
==============================================================================
--- branches/experimental/boinc/debian/boinc-client.postinst (original)
+++ branches/experimental/boinc/debian/boinc-client.postinst Sat Sep  2 11:31:46 2006
@@ -9,13 +9,13 @@
 BOINC_DIR=/var/lib/boinc-client
 CONF_DIR=/etc/boinc-client
 
-move_configfile_and_symlink()
+mv_conffile()
 {
-    if [ ! -L $BOINC_DIR/$1 -a -f $BOINC_DIR/$1 ]; then
-        mv -f $BOINC_DIR/$1 $CONF_DIR/$1
+    if [ ! -L "$BOINC_DIR/$1" -a -f "$BOINC_DIR/$1" ]; then
+        mv -f "$BOINC_DIR/$1" "$CONF_DIR/$1"
     fi
-    ln -sf $CONF_DIR/$1 $BOINC_DIR/$1
-    chown boinc:boinc $BOINC_DIR/$1
+    ln -sf "$CONF_DIR/$1" "$BOINC_DIR/$1"
+    chown boinc:boinc "$BOINC_DIR/$1"
 }
 
 case "$1" in
@@ -38,10 +38,10 @@
 
         # Move old configuration files to /etc/boinc-client/ and
         # create symlinks for the BOINC core client.
-        move_configfile_and_symlink cc_config.xml
-        move_configfile_and_symlink global_prefs_override.xml
-        move_configfile_and_symlink gui_rpc_auth.cfg
-        move_configfile_and_symlink remote_hosts.cfg
+        mv_conffile cc_config.xml
+        mv_conffile global_prefs_override.xml
+        mv_conffile gui_rpc_auth.cfg
+        mv_conffile remote_hosts.cfg
     ;;
 
     abort-upgrade|abort-remove|abort-deconfigure)

Modified: branches/experimental/boinc/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-boinc/branches/experimental/boinc/debian/changelog?rev=528&op=diff
==============================================================================
--- branches/experimental/boinc/debian/changelog (original)
+++ branches/experimental/boinc/debian/changelog Sat Sep  2 11:31:46 2006
@@ -4,17 +4,35 @@
 
   [ Frank S. Thomas ]
   * New upstream release.
+  * Updates for the new Python policy:
+    - Added python-support (>= 0.4.2) to Build-Depends.
+    - Replaced dh_python with dh_pysupport in debian/rules.
+
+  +++ Changes suitable for the trunk branch:
+
+  * debian/patches/:
+    - Updated 07_use-sensible-browser.dpatch for the new release.
+  * debian/control:
+    - Reordered Build-Depends: First list all packages that are needed for the
+      Debian packaging, then list all packages that are needed to compile the
+      upstream source.
+    - Added po-debconf to Build-Depends.
+  * debian/rules:
+    - When using the configure option --target also append --program-prefix=""
+      to avaoid that programs are prefixed with "i686-pc-linux-gnu-".
+    - Install the checkin_notes file as upstream changelog.
   * Use debconf to ask whether the BOINC data directory should be removed
-    while purging the boinc-client package.
-  * Updates for the new Python policy:
-    - Added python-support (>= 0.4) to Build-Depends.
-    - Replaced dh_python with dh_pysupport in debian/rules.
-  * debian/patches/:
-    - Updated 07_use-sensible-browser.dpatch for the new release.
+    while purging the boinc-client package. The wording for the template
+    was taken from the dbconfig-common/purge template.
   * Don't install some headers manually into the boinc-dev package because
-    they are now installed by the upstream makefiles.
-
- -- Frank S. Thomas <frank at thomas-alfeld.de>  Fri,  1 Sep 2006 10:34:43 +0200
+    they are now handled and installed by the upstream makefiles.
+  * Added debian/boinc-client.preinst which removes the obsolete conffile
+    /etc/boinc-client/log_flags.xml if it wasn't modified locally.
+  * Added debian/boinc-client.NEWS which informs the user that the conffile 
+    /etc/boinc-client/log_flags.xml is now obsolete and is superseded by the
+    new conffile /etc/boinc-client/cc_config.xml.
+
+ -- Frank S. Thomas <frank at thomas-alfeld.de>  Sat,  2 Sep 2006 13:12:55 +0200
 
 boinc (5.4.11-1) unstable; urgency=low
 

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=528&op=diff
==============================================================================
--- branches/experimental/boinc/debian/conffiles/cc_config.xml (original)
+++ branches/experimental/boinc/debian/conffiles/cc_config.xml Sat Sep  2 11:31:46 2006
@@ -19,7 +19,7 @@
     <http_debug>0</http_debug>
     <proxy_debug>0</proxy_debug>
     <time_debug>0</time_debug>
-    <net_xfer_debug>0</net_xfer_debug>
+    <http_xfer_debug>0</http_xfer_debug>
     <measurement_debug>0</measurement_debug>
     <poll_debug>0</poll_debug>
     <guirpc_debug>0</guirpc_debug>