r920 - in /trunk/boinc/debian: changelog extra/move-boinc-dir.sh

[fst at users.alioth.debian.org]

Author: fst
Date: Tue Jul  8 21:08:29 2008
New Revision: 920

URL: http://svn.debian.org/wsvn/pkg-boinc/?sc=1&rev=920
Log:
* New upstream release.
* debian/extra/move-boinc-dir.sh: Adjusted code to boinc-client's postinst.

Modified:
    trunk/boinc/debian/changelog
    trunk/boinc/debian/extra/move-boinc-dir.sh

Modified: trunk/boinc/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-boinc/trunk/boinc/debian/changelog?rev=920&op=diff
==============================================================================
--- trunk/boinc/debian/changelog (original)
+++ trunk/boinc/debian/changelog Tue Jul  8 21:08:29 2008
@@ -1,3 +1,11 @@
+boinc (6.2.12-1) UNRELEASED; urgency=low
+
+  [ Frank S. Thomas ]
+  * New upstream release.
+  * debian/extra/move-boinc-dir.sh: Adjusted code to boinc-client's postinst.
+
+ -- Frank S. Thomas <fst at debian.org>  Sat, 05 Jul 2008 10:39:56 +0200
+
 boinc (6.2.11-1) unstable; urgency=low
 
   [ Frank S. Thomas ]

Modified: trunk/boinc/debian/extra/move-boinc-dir.sh
URL: http://svn.debian.org/wsvn/pkg-boinc/trunk/boinc/debian/extra/move-boinc-dir.sh?rev=920&op=diff
==============================================================================
--- trunk/boinc/debian/extra/move-boinc-dir.sh (original)
+++ trunk/boinc/debian/extra/move-boinc-dir.sh Tue Jul  8 21:08:29 2008
@@ -28,7 +28,7 @@
 
 mv_conffile()
 {
-    if [ ! -L "$BOINC_DIR/$1" -a -f "$BOINC_DIR/$1" ]; then
+    if [ ! -L "$BOINC_DIR/$1" ] && [ -f "$BOINC_DIR/$1" ]; then
         mv -f "$BOINC_DIR/$1" "$CONF_DIR/$1"
     fi
     ln -sf "$CONF_DIR/$1" "$BOINC_DIR/$1"
@@ -54,7 +54,7 @@
 
 CA_FILE=/etc/ssl/certs/ca-certificates.crt
 CA_LINK="$BOINC_DIR/ca-bundle.crt"
-if [ ! -e $CA_LINK -a -f $CA_FILE ]; then
+if [ ! -e $CA_LINK ] && [ -f $CA_FILE ]; then
     ln -sf $CA_FILE $CA_LINK
 fi