← Back to branch summary

~ubuntu-branches/ubuntu/lucid/asterisk/lucid-proposed

« back to all changes in this revision

Viewing changes to channels/chan_local.c

  • Committer: Bazaar Package Importer
  • Author(s): Dave Walker (Daviey)
  • Date: 2009-09-22 16:22:14 UTC
  • mfrom: (1.2.4 upstream)
  • Revision ID: james.westby@ubuntu.com-20090922162214-awce8id0lt9v51jb
Tags: 1:1.6.2.0~rc2-0ubuntu1

* New upstream version, upstream is now DFSG compliant.
  - ilibc has been removed upstream.
  - Music on Hold is now cc-by-sa.
  - binary firmware iaxy.bin has been removed upstream.
* debian/rules: Santitised UPSTREAM variable for compatiability
  with Ubuntu and other variants.
* debian/control: Removed Debian Vcs-Svn entry and replaced 
  with ubuntu-voip Vcs-Bzr, to reflect divergence in packages.
* patches/makefile_appdocs_dtd: Removed, merged upstream.
* patches/disable_moh: Previosly disabled, removed from pool.
* patches/ubuntu-banner: Ported debian-banner to display Ubuntu
  centric bug report information.
* Refresh quilt patches

Show diffs side-by-side

added added

removed removed

Lines of Context:
channels/chan_local.c
27
27
 
28
28
#include "asterisk.h"
29
29
 
30
 
ASTERISK_FILE_VERSION(__FILE__, "$Revision: 190297 $")
 
30
ASTERISK_FILE_VERSION(__FILE__, "$Revision: 214960 $")
31
31
 
32
32
#include <fcntl.h>
33
33
#include <sys/signal.h>
237
237
                return and destroy p.  */
238
238
                ast_mutex_unlock(&p->lock);
239
239
                p = local_pvt_destroy(p);
 
240
                if (other) {
 
241
                        ast_channel_unlock(other);
 
242
                }
240
243
                return -1;
241
244
        }
242
245