[Popcon-commits] cvs commit to popularity-contest/debian by pere

popcon-commits@lists.alioth.debian.org popcon-commits@lists.alioth.debian.org
Sun, 08 Aug 2004 09:30:45 -0600


Update of /cvsroot/popcon/popularity-contest/debian
In directory haydn:/tmp/cvs-serv2667/debian

Modified Files:
	changelog postinst 
Log Message:
Let postinst and popcon-process.sh use /bin/sh, and make
sure the notation in postinst is POSIX compatible.  Patch
from David Weinehall.  (Closes: #260088)


Index: changelog
===================================================================
RCS file: /cvsroot/popcon/popularity-contest/debian/changelog,v
retrieving revision 1.154
retrieving revision 1.155
diff -u -d -r1.154 -r1.155
--- changelog	28 Jul 2004 20:30:52 -0000	1.154
+++ changelog	8 Aug 2004 15:30:43 -0000	1.155
@@ -1,5 +1,9 @@
 popularity-contest (1.24) UNRELEASED; urgency=low
 
+  * Petter Reinholdtsen
+    - Let postinst and popcon-process.sh use /bin/sh, and make sure
+      the notation in postinst is POSIX compatible.  Patch from David
+      Weinehall.  (Closes: #260088)
   * Translations
     - Indonesian update. Closes: #261225
     - Initial Croatian debconf translation hr.po

Index: postinst
===================================================================
RCS file: /cvsroot/popcon/popularity-contest/debian/postinst,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -d -r1.11 -r1.12
--- postinst	13 Apr 2004 22:03:04 -0000	1.11
+++ postinst	8 Aug 2004 15:30:43 -0000	1.12
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/bin/sh
 
 # Load debconf variables
 . /usr/share/debconf/confmodule
@@ -17,7 +17,7 @@
 # safe to ignore the value fetched by loading the file above.  This
 # should allow for using debconf to reconfigure the package.
 db_get popularity-contest/participate || true
-if [ "$RET" = "yes" -o "$RET" = "YES" -o "$RET" = "true" ]; then
+if [ "$RET" = "yes" ] || [ "$RET" = "YES" ] || [ "$RET" = "true" ]; then
     PARTICIPATE="yes"
 else
     PARTICIPATE="no"