← Back to branch summary

~ubuntu-branches/ubuntu/saucy/dahdi-tools/saucy

« back to all changes in this revision

Viewing changes to debian/patches/bashism

  • Committer: Stefan Lesicnik
  • Date: 2011-05-08 12:22:46 UTC
  • mfrom: (2.1.4 sid)
  • Revision ID: stefan@lsd.co.za-20110508122246-lh6k2x1uy8pl3vdi
Tags: 1:2.4.1-1ubuntu1
http://bugs.debian.org/581076
http://bugs.debian.org/582094
https://launchpad.net/bugs/493304
* Merge from Debian. Remaining changes:
  - Bug Fix: If linux-headers are not installed, don't block, and print
    information for the user.
  - added debian/dahdi.postinst
  - added --error-handler=init_failed to debian/rules
  - Changes from Debian:
    - debian/control: Change Maintainer
    - debian/control: Removed Uploaders field.
    - debian/control: Removed Debian Vcs-Svn entry and replaced with
      ubuntu-voip Vcs-Bzr, to reflect divergence in packages.
    - debian/control: Package dahdi Depends on dahdi-dkms | dahdi-source
* debian/control: Added gawk as dependency for dkms build (LP: #493304)
* New upstream release (Closes: #581076, #582094).
* Patches hardware_rescan, perl_fix_noserial, perl_fix_transportdir,
  astribank_allow_ignoreend, init_unload_modules and wcb4xxp_extra_trunk
  dropped: merged upstream.
* dahdi-linux 2.3.0 is required (extra config options for dahdi_cfg).
* Convert to dpkg v.3 format.
* Standards version: 3.9.1.0 (No change needed.

Show diffs side-by-side

added added

removed removed

Lines of Context:
debian/patches/bashism
 
1
From: Tzafrir Cohen <tzafrir.cohen@xorcom.com>
 
2
Subject: Fix bashism (Raphael Geissert, checkbashism)
 
3
Origin: http://svn.asterisk.org/svn/dahdi/tools/branches/2.3@8643
 
4
Bug-Debian: http://bugs.debian.org/581076
 
5
 
 
6
---
 
7
 xpp/astribank_hook |    2 +-
 
8
 xpp/waitfor_xpds   |    2 +-
 
9
 2 files changed, 2 insertions(+), 2 deletions(-)
 
10
 
 
11
diff --git a/xpp/astribank_hook b/xpp/astribank_hook
 
12
index 52e2826..ae38635 100755
 
13
--- a/xpp/astribank_hook
 
14
+++ b/xpp/astribank_hook
 
15
@@ -53,7 +53,7 @@ matched_devices() {
 
16
                lineno=`clean_lines | egrep -n "^${label}$|^@${connector}$" | cut -d: -f1`
 
17
                if [ "$lineno" != "" ]; then
 
18
                        #echo "$xbus: $XPPORDER_CONF:$lineno -- Match ${label} @${connector}" | $LOGGER
 
19
-                       echo -e "${xbus}\t${label}"
 
20
+                       printf "${xbus}\t${label}\n"
 
21
                else
 
22
                        echo "${xbus}: ${label} @${connector} not found in $XPPORDER_CONF: Ignore($ACTION)" | $LOGGER
 
23
                fi
 
24
diff --git a/xpp/waitfor_xpds b/xpp/waitfor_xpds
 
25
index 63f05f6..30b3ac5 100755
 
26
--- a/xpp/waitfor_xpds
 
27
+++ b/xpp/waitfor_xpds
 
28
@@ -65,7 +65,7 @@ do
 
29
        fi
 
30
        echo -n 1>&2 "."
 
31
        sleep 1
 
32
-       : $((tries--))
 
33
+       : $((tries-=1))
 
34
 done
 
35
 echo ""
 
36
 
 
37
-- 
 
38
1.5.6.5
 
39