[Pkg-voip-commits] [py-asterisk] 02/04: Imported Debian patch 0.4-1

Victor Seva Lopez maniac-guest at moszumanska.debian.org
Sun Aug 16 06:17:47 UTC 2015


This is an automated email from the git hooks/post-receive script.

maniac-guest pushed a commit to branch master
in repository py-asterisk.

commit cf03c017324afb353bb59f739ff8f6ab6480626d
Merge: 68dc3a0 1875707
Author: Mark Purcell <msp at debian.org>
Date:   Mon Jun 11 13:56:41 2012 +1000

    Imported Debian patch 0.4-1

 .hg_archival.txt                |   4 +
 .hgtags                         |  12 +
 Asterisk/CLI.py                 |   2 +-
 Asterisk/Config.py              |   4 +-
 Asterisk/Logging.py             |   4 +-
 Asterisk/Manager.py             | 148 +++++--
 Asterisk/Util.py                |   4 +-
 Asterisk/__init__.py            |   4 +-
 asterisk-dump                   |   4 +-
 asterisk-recover                |   2 +-
 conf/py-asterisk.conf.sample    |   2 +-
 debian/changelog                |  38 ++
 debian/control                  |  36 +-
 debian/patches/00list           |   4 +-
 debian/patches/path_join.dpatch |  20 +
 debian/rules                    |  19 +
 debian/watch                    |   6 +
 doc/asterisk-events.txt         |   4 +-
 doc/event-handling.txt          |   2 +-
 doc/readme.txt                  |  48 +--
 doc/todo.txt                    |   2 +-
 py-asterisk                     |   4 +-
 pydoc/Asterisk.CLI.html         |  90 -----
 pydoc/Asterisk.Config.html      |  99 -----
 pydoc/Asterisk.Logging.html     | 209 ----------
 pydoc/Asterisk.Manager.html     | 865 ----------------------------------------
 pydoc/Asterisk.Util.html        | 234 -----------
 pydoc/Asterisk.html             |  78 ----
 setup.py                        |  25 +-
 29 files changed, 281 insertions(+), 1692 deletions(-)

diff --cc debian/changelog
index 910e765,0000000..ed87b4e
mode 100644,000000..100644
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,48 -1,0 +1,86 @@@
++py-asterisk (0.4-1) unstable; urgency=low
++
++  * New upstream release
++    - Fixes "readme.txt: asynchronous usage is misleading" (Closes: #656137)
++
++ -- Mark Purcell <msp at debian.org>  Mon, 11 Jun 2012 13:56:41 +1000
++
++py-asterisk (0.3-1) unstable; urgency=low
++
++  * New upstream release
++
++ -- Mark Purcell <msp at debian.org>  Mon, 11 Jun 2012 13:39:50 +1000
++
++py-asterisk (0.2-1) unstable; urgency=low
++
++  * lca2012 release
++
++  * New upstream release
++    - Fixes "Please package version 0.2" (Closes: #656440)
++    - Fixes "fails to work with current version of Asterisk" (Closes: #650245)
++    - Fixes "fails to detect the configuration in $HOME" (Closes: #559236)
++
++  [ Julien BLACHE ]
++  * Acknowledge NMU (closes: #559237).
++  * Remove myself from Uploaders.
++
++  [ Tzafrir Cohen ]
++  * New upstream release.
++  * Add myself to Uploaders.
++  * get-orig-source target. 
++
++  [ Mark Purcell ]
++  * Update debian/watch -> code.google.com
++  * Updated Homepage:
++  * Add myself to Uploaders
++
++ -- Mark Purcell <msp at debian.org>  Fri, 20 Jan 2012 12:43:13 +1100
++
 +py-asterisk (0.1a3+r160-4.1) unstable; urgency=low
 +
 +  * Non-maintainer upload, for the upcoming Python 2.6 transition
 +  * debian/rules
 +    - optionally include python.mk and add ${py_setup_install_args} to setup.py
 +      install; thanks to Bernd Zeimetz for the report and to Luca Falavigna
 +      for the patch (uploaded in Ubuntu); Closes: #559237
 +
 + -- Sandro Tosi <morph at debian.org>  Thu, 10 Dec 2009 23:18:05 +0100
 +
 +py-asterisk (0.1a3+r160-4) unstable; urgency=low
 +
 +  * debian/control:
 +    + Bump Standards-Version to 3.7.3 (no changes).
 +    + Add Section: python field to python-asterisk.
 +  * debian/rules:
 +    + python-asterisk is arch: all and there are no arch-dep packages; move
 +      code from binary-arch to binary-indep.
 +
 + -- Julien BLACHE <jblache at debian.org>  Sat, 01 Mar 2008 16:47:52 +0100
 +
 +py-asterisk (0.1a3+r160-3) unstable; urgency=low
 +
 +  [ Julien BLACHE ]
 +  * debian/rules:
 +    + Do not ignore errors during clean.
 +  * debian/control:
 +    + Add missing python-all-dev build-dependency.
 +
 +  [ Faidon Liambotis ]
 +  * debian/control:
 +    + Add XS-Vcs-Svn and XS-Vcs-Browser.
 +
 + -- Julien BLACHE <jblache at debian.org>  Sun, 05 Aug 2007 19:20:00 +0200
 +
 +py-asterisk (0.1a3+r160-2) unstable; urgency=low
 +
 +  * debian/control:
 +    + Make python-asterisk an Arch: all package.
 +
 + -- Julien BLACHE <jblache at debian.org>  Mon, 23 Apr 2007 11:49:08 +0200
 +
 +py-asterisk (0.1a3+r160-1) unstable; urgency=low
 +
 +  * Initial release (closes: #420564).
 +
 + -- Julien BLACHE <jblache at debian.org>  Mon, 23 Apr 2007 11:40:47 +0200
 +
diff --cc debian/control
index ea5ba73,0000000..31010fd
mode 100644,000000..100644
--- a/debian/control
+++ b/debian/control
@@@ -1,27 -1,0 +1,35 @@@
 +Source: py-asterisk
 +Section: comm
 +Priority: extra
 +Maintainer: Debian VoIP Maintainers <pkg-voip-maintainers at lists.alioth.debian.org>
- Uploaders: Julien BLACHE <jblache at debian.org>
- Build-Depends: debhelper (>= 5), dpatch, python-support (>= 0.4), python-all-dev
++Uploaders: Mark Purcell <msp at debian.org>, Tzafrir Cohen <tzafrir.cohen at xorcom.com>
++Build-Depends: debhelper (>= 5), dpatch, python-support (>= 0.4), python-all
 +Standards-Version: 3.7.3
- Homepage: http://py-asterisk.berlios.de/
++Homepage: http://code.google.com/p/py-asterisk/
 +Vcs-Svn: svn://svn.debian.org/pkg-voip/py-asterisk/trunk/
 +Vcs-Browser: http://svn.debian.org/wsvn/pkg-voip/py-asterisk/?op=log
 +
 +Package: python-asterisk
 +Section: python
 +Architecture: all
 +Depends: ${python:Depends}, ${misc:Depends}
 +Description: Asterisk Manager API interface module for Python
-  This module provides an object oriented interface to the Asterisk Manager API,
-  whilst embracing some applicable Python concepts:
-   o Functionality is split into separate mix-in classes
-   o Asterisk PBX errors cause fairly granular exceptions
-   o Docstrings are provided for all objects
-   o The module may be used asynchronously if required. It should be suitable
-     for inclusion in a single-threaded GUI
-   o Asterisk data is translated into data stored using Python types, so
-     working with it should be trivial. Through the use of XMLRPCServer or
-     similar, it should be trivial to expose this conversion to other
-     languages
++ The Python Asterisk package (codenamed py-Asterisk) is an attempt to produce
++ high quality, well documented Python bindings for the Asterisk Manager API.
++ .
++ The eventual goal of the package is to allow rich specification of the
++ Asterisk configuration in Python rather than in the quirky, unstructured,
++ undocumented mess that we call the Asterisk configuration files.
++ .
++ Working Functionality
++ .
++  Python package implementing a manager client and event dispatcher.
++  User-oriented command line interface to manager API.
++ .
++ Work In Progress
++ .
++  Introductary documentation for developers.
++  Asterisk module allowing dialplan configuration via the manager AP
++ I (see my pbx_config_mgr page).
++  Objects to represent the standard applications, for specification of
++ dialplan configuration in a friendlier Python syntax.
diff --cc debian/patches/00list
index 434d46d,0000000..6a3395b
mode 100644,000000..100644
--- a/debian/patches/00list
+++ b/debian/patches/00list
@@@ -1,3 -1,0 +1,3 @@@
 +10_remove_shebang
- 11_read_response
- 
++#11_read_response
++#path_join
diff --cc debian/patches/path_join.dpatch
index 0000000,0000000..f255fe5
new file mode 100644
--- /dev/null
+++ b/debian/patches/path_join.dpatch
@@@ -1,0 -1,0 +1,20 @@@
++#! /bin/sh /usr/share/dpatch/dpatch-run
++## path_join.dpatch by Bernd Zeimetz <bzed at debian.org>
++##
++## All lines beginning with `## DP:' are a description of the patch.
++## DP: Remove a pointless '/', to fix #559236 .
++diff --git a/Asterisk/Config.py b/Asterisk/Config.py
++index aeb7dd0..af45d74 100644
++--- a/Asterisk/Config.py
+++++ b/Asterisk/Config.py
++@@ -12,8 +12,8 @@ CONFIG_FILENAME = 'py-asterisk.conf'
++ 
++ CONFIG_PATHNAMES = [
++     os.environ.get('PYASTERISK_CONF', ''),
++-    os.path.join(os.environ.get('HOME', ''), '/.py-asterisk.conf'),
++-    os.path.join(os.environ.get('USERPROFILE', ''), '/py-asterisk.conf'),
+++    os.path.join(os.environ.get('HOME', ''), '.py-asterisk.conf'),
+++    os.path.join(os.environ.get('USERPROFILE', ''), 'py-asterisk.conf'),
++     'py-asterisk.conf',
++     '/etc/py-asterisk.conf',
++     '/etc/asterisk/py-asterisk.conf',
diff --cc debian/rules
index 7767506,0000000..d26a9e6
mode 100755,000000..100755
--- a/debian/rules
+++ b/debian/rules
@@@ -1,84 -1,0 +1,103 @@@
 +#!/usr/bin/make -f
 +# -*- makefile -*-
 +# Sample debian/rules that uses debhelper.
 +# This file was originally written by Joey Hess and Craig Small.
 +# As a special exception, when this file is copied by dh-make into a
 +# dh-make output file, you may use that output file without restriction.
 +# This special exception was added by Craig Small in version 0.37 of dh-make.
 +
 +# Uncomment this to turn on verbose mode.
 +#export DH_VERBOSE=1
 +
 +# Include dpatch rules
 +include /usr/share/dpatch/dpatch.make
 +-include /usr/share/python/python.mk
 +
++PACKAGE = py-asterisk
++DEBVERSION:=$(shell head -n 1 debian/changelog \
++		    | sed -e 's/^[^(]*(\([^)]*\)).*/\1/')
++DEB_BASE_VERSION:=$(shell echo $(DEBVERSION) | sed -e 's/^.*://' -e 's/-[0-9.]*$$//')
++UPVERSION:=$(shell echo $(DEB_BASE_VERSION) | sed -e 's/~dfsg\(~\|$$\)/\1/' -e 's/~\(rc\|beta\)/-\1/')
++UPFILENAME := $(PACKAGE)_$(UPVERSION).orig.tar.bz2
++FILENAME := $(PACKAGE)_$(DEB_BASE_VERSION).orig.tar.gz
++URL := http://download.berlios.de/$(PACKAGE)/$(PACKAGE)-$(UPVERSION).tar.bz2
++
 +configure: configure-stamp
 +configure-stamp:
 +	dh_testdir
 +	# Add here commands to configure the package.
 +
 +	touch configure-stamp
 +
 +
 +build: build-stamp
 +build-stamp: patch-stamp configure-stamp 
 +	dh_testdir
 +
 +	python setup.py build
 +
 +	touch $@
 +
 +clean: real-clean unpatch
 +real-clean:
 +	dh_testdir
 +	dh_testroot
 +	rm -f build-stamp configure-stamp
 +
 +	python setup.py clean
 +	rm -rf build
 +
 +	dh_clean 
 +
 +install: build
 +	dh_testdir
 +	dh_testroot
 +	dh_clean -k 
 +	dh_installdirs
 +
 +	python setup.py install --root=$(CURDIR)/debian/python-asterisk ${py_setup_install_args}
 +	mv $(CURDIR)/debian/python-asterisk/etc/asterisk/py-asterisk.conf.sample \
 +		$(CURDIR)/debian/python-asterisk/etc/asterisk/py-asterisk.conf
 +
 +	mkdir -p $(CURDIR)/debian/python-asterisk/usr/share/doc/python-asterisk/examples
 +	mv $(CURDIR)/debian/python-asterisk/usr/bin/* \
 +		$(CURDIR)/debian/python-asterisk/usr/share/doc/python-asterisk/examples
 +	rmdir $(CURDIR)/debian/python-asterisk/usr/bin
 +
 +# Build architecture-independent files here.
 +binary-indep: build install
 +	dh_testdir -i
 +	dh_testroot -i
 +	dh_installchangelogs -i
 +	dh_installdocs -i
 +	dh_installexamples -i
 +#	dh_install -i
 +	dh_installman -i
 +	dh_pysupport -i
 +	rm -rf $(CURDIR)/debian/python-asterisk/usr/lib
 +	dh_link -i
 +	dh_strip -i
 +	dh_compress -i
 +	dh_fixperms -i
 +	dh_installdeb -i
 +	dh_shlibdeps -i
 +	dh_gencontrol -i
 +	dh_md5sums -i
 +	dh_builddeb -i
 +
 +# Build architecture-dependent files here.
 +binary-arch: build install
 +# Nothing to do here, move along.
 +
++print-version:
++	@@echo "Debian version:          $(DEBVERSION)"
++	@@echo "Upstream version:        $(UPVERSION)"
++
++get-orig-source:
++	@@dh_testdir
++	@@echo Downloading $(UPFILENAME) from $(URL) ...
++	@@wget  -nv -T10 -t3 --verbose -O $(UPFILENAME) $(URL)
++	@@bzcat $(UPFILENAME) | gzip -9 >$(FILENAME)
++
 +binary: binary-indep binary-arch
 +.PHONY: build clean binary-indep binary-arch binary install configure patch unpatch real-clean
diff --cc debian/watch
index 0000000,0000000..1cdf3bd
new file mode 100644
--- /dev/null
+++ b/debian/watch
@@@ -1,0 -1,0 +1,6 @@@
++version=3
++
++opts=\
++downloadurlmangle=s|.*[?]name=(.*?)&.*|http://py-asterisk.googlecode.com/files/$1|,\
++filenamemangle=s|[^/]+[?]name=(.*?)&.*|$1| \
++http://code.google.com/p/py-asterisk/downloads/detail[?]name=py-asterisk-([0-9.]+).tar.bz2&.* debian svn-upgrade

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-voip/py-asterisk.git



More information about the Pkg-voip-commits mailing list