[Debian-arabic-packages] [svn] r240 - in pkg/jcal/trunk/debian: . patches

[Lior Kaplan]

Author: kaplan
Date: Sun Aug 12 21:19:09 2012
New Revision: 240

Log:
Importing 0.4.0-1.1 NMU by Steve McIntyre <steve.mcintyre at linaro.org>

Modified:
   pkg/jcal/trunk/debian/changelog
   pkg/jcal/trunk/debian/patches/autogen-bashism.diff
   pkg/jcal/trunk/debian/patches/jcal-manpage.diff

Modified: pkg/jcal/trunk/debian/changelog
==============================================================================
--- pkg/jcal/trunk/debian/changelog	Fri Aug 10 17:27:52 2012	(r239)
+++ pkg/jcal/trunk/debian/changelog	Sun Aug 12 21:19:09 2012	(r240)
@@ -1,3 +1,11 @@
+jcal (0.4.0-1.1) unstable; urgency=low
+
+  * NMU
+  * Quote parameters to perform() in autogen.sh. Closes: #642722.
+    Previous code would work in bash, but not sh.
+
+ -- Steve McIntyre <steve.mcintyre at linaro.org>  Thu, 08 Dec 2011 17:54:45 +0000
+
 jcal (0.4.0-1) unstable; urgency=low
 
   * New upstream release.

Modified: pkg/jcal/trunk/debian/patches/autogen-bashism.diff
==============================================================================
--- pkg/jcal/trunk/debian/patches/autogen-bashism.diff	Fri Aug 10 17:27:52 2012	(r239)
+++ pkg/jcal/trunk/debian/patches/autogen-bashism.diff	Sun Aug 12 21:19:09 2012	(r240)
@@ -1,7 +1,9 @@
 Description: Fix autogen.sh to work in chroot envs
 Author: Lior Kaplan <kaplan at debian.org>
---- a/autogen.sh
-+++ b/autogen.sh
+Index: jcal-0.4.0/autogen.sh
+===================================================================
+--- jcal-0.4.0.orig/autogen.sh	2011-06-15 00:50:03.000000000 +0000
++++ jcal-0.4.0/autogen.sh	2011-12-08 18:24:28.348438961 +0000
 @@ -19,21 +19,21 @@
  # along with libjalali.  If not, see <http://www.gnu.org/licenses/>.
  #
@@ -99,16 +101,21 @@
  	local STAT
  	ACLOCAL="$(which aclocal 2>/dev/null)"
  	is_present "${ACLOCAL}" "aclocal" 1 1
-@@ -182,7 +182,7 @@
+@@ -182,16 +182,16 @@
  # $EXIT specifies whether perform() should exit on the event of
  # encoutering any errors or not.
  # $PARAMS are the parameters passed to the service.
 -function perform() {
+-	local SERVICE=$1
+-	local NAME=$2
+-	local EXIT=$3
+-	local PARAMS=$4
 +perform() {
- 	local SERVICE=$1
- 	local NAME=$2
- 	local EXIT=$3
-@@ -191,7 +191,7 @@
++	local SERVICE="$1"
++	local NAME="$2"
++	local EXIT="$3"
++	local PARAMS="$4"
+ 	local SSTAT
  
  	echo -ne "${GREEN}*${RESET} running ${YELLOW}${NAME}${RESET} ${CYAN}${PARAMS}${RESET}... "
  	${SERVICE} ${PARAMS} >/dev/null 2>&1

Modified: pkg/jcal/trunk/debian/patches/jcal-manpage.diff
==============================================================================
--- pkg/jcal/trunk/debian/patches/jcal-manpage.diff	Fri Aug 10 17:27:52 2012	(r239)
+++ pkg/jcal/trunk/debian/patches/jcal-manpage.diff	Sun Aug 12 21:19:09 2012	(r240)
@@ -1,8 +1,10 @@
 Description: Fix jcal man page
 Author: Lior Kaplan <kaplan at debian.org>
---- a/man/jcal.1
-+++ b/man/jcal.1
-@@ -155,7 +155,6 @@
+Index: jcal-0.4.0/man/jcal.1
+===================================================================
+--- jcal-0.4.0.orig/man/jcal.1	2011-06-07 04:27:19.000000000 +0000
++++ jcal-0.4.0/man/jcal.1	2011-12-08 18:21:03.000000000 +0000
+@@ -157,7 +157,6 @@
  Written by Ashkan Ghassemi. <ghassemi at ftml.net>
  .Sh REPORTING BUGS
  Report jcal bugs to <ghassemi at ftml.net>
@@ -10,7 +12,7 @@
  libjalali home page: <http://savannah.nongnu.org/projects/jcal/>
  .Sh SEE ALSO
  .Nm jdate (1),
-@@ -164,7 +163,6 @@
+@@ -166,7 +165,6 @@
  .Nm jstrptime (3)
  .Sh COPYRIGHT
  Copyright (C) 2011 Ashkan Ghassemi.