[Pkg-voip-commits] [openr2] 02/04: Imported Debian patch 1.3.2-1.1

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


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

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

commit 4ea297e46e8d700ee3104c2183ec4f99ccd1ec9a
Merge: 7815324 53e5752
Author: gregor herrmann <gregoa at debian.org>
Date:   Sat Jun 16 15:40:43 2012 +0200

    Imported Debian patch 1.3.2-1.1

 CREDITS                      |    20 +-
 ChangeLog                    |   132 +
 Makefile.am                  |     6 +-
 Makefile.in                  |    97 +-
 aclocal.m4                   | 12820 +++++++++++---------
 bootstrap                    |     8 +-
 config.h.in                  |     7 +
 config/ax_check_real_file.m4 |    27 +
 configure                    | 26939 ++++++++++++++---------------------------
 configure.in                 |    21 +-
 debian/changelog             |    21 +
 debian/control               |     2 +-
 debian/patches/avr32         |  1100 --
 debian/patches/fix_printf    |    23 -
 debian/patches/series        |     2 -
 debian/rules                 |     4 +-
 debian/watch                 |     7 +-
 doc/asterisk/br/README       |     2 +-
 doc/intro-openr2-es.wav      |   Bin 0 -> 146394 bytes
 libopenr2.spec               |    10 +-
 ltmain.sh                    | 13199 +++++++++++---------
 r2test.8                     |     6 +-
 r2test.conf.5                |    24 +-
 src/Makefile.am              |    19 +-
 src/Makefile.in              |    85 +-
 src/openr2/r2chan-pvt.h      |     8 +-
 src/openr2/r2context-pvt.h   |     2 +
 src/openr2/r2context.h       |     2 +
 src/openr2/r2proto.h         |     1 +
 src/openr2/r2utils.h         |     4 +-
 src/queue.c                  |     2 -
 src/r2chan.c                 |     3 +-
 src/r2context.c              |    19 +
 src/r2dtmf_detect.c          |     4 +-
 src/r2log.c                  |     4 +-
 src/r2proto.c                |    86 +-
 src/r2test.c                 |    30 +-
 src/r2utils.c                |     2 +-
 38 files changed, 24159 insertions(+), 30589 deletions(-)

diff --cc debian/changelog
index 6e33018,0000000..34b8bf4
mode 100644,000000..100644
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,14 -1,0 +1,35 @@@
++openr2 (1.3.2-1.1) unstable; urgency=low
++
++  * Non-maintainer upload.
++  * Fix "FTBFS: dh_install: libopenr2-bin missing files
++    (etc/openr2/*.conf), aborting":
++    update build{,-arch,-indep} target in debian/rules.
++    (Closes: #666351)
++
++ -- gregor herrmann <gregoa at debian.org>  Sat, 16 Jun 2012 15:40:43 +0200
++
++openr2 (1.3.2-1) unstable; urgency=low
++
++  * New upstream release:
++    - Patch avr32 removed - merged upstream.
++    - Patch fix_printf removed - merged upstream.
++    - Includes our gcc fixes: Closes: #625393 (Matthias Klose).
++  * Fixed watch file.
++  * Standards version 3.9.2 (no change needed).
++
++ -- Tzafrir Cohen <tzafrir at debian.org>  Thu, 22 Dec 2011 00:21:34 +0200
++
 +openr2 (1.3.0-2) unstable; urgency=low
 +
 +  * Patch fix_printf: casting to fix a sparc build issue.
 +  * Patch avr32: newer config.{guess ,sub}. Also work on avr32
 +    (Closes: #579769).
 +  * Bumped Standards Version to 3.9.0 (no change needed).
 +
 + -- Tzafrir Cohen <tzafrir at debian.org>  Fri, 23 Jul 2010 21:37:21 +0300
 +
 +openr2 (1.3.0-1) unstable; urgency=low
 +
 +  * Initial release. (Closes: #524118)
 +
 + -- Tzafrir Cohen <tzafrir at debian.org>  Mon, 05 Apr 2010 06:34:03 +0300
diff --cc debian/control
index 8bc8de6,0000000..7db3044
mode 100644,000000..100644
--- a/debian/control
+++ b/debian/control
@@@ -1,55 -1,0 +1,55 @@@
 +Source: openr2
 +Section: libs
 +Priority: optional
 +Maintainer: Debian VoIP Team <pkg-voip-maintainers at lists.alioth.debian.org>
 +Uploaders: Alexandre Cavalcante Alencar <alexandre.alencar at gmail.com>,
 + Tzafrir Cohen <tzafrir at debian.org>,
 + Faidon Liambotis <paravoid at debian.org>
 +Build-Depends: debhelper (>= 7.0), autotools-dev, dahdi-source, libtool, automake
- Standards-Version: 3.9.0
++Standards-Version: 3.9.2
 +Homepage: http://www.libopenr2.org
 +
 +Package: libopenr2-dev
 +Section: libdevel
 +Architecture: any
 +Depends: libopenr2-3 (= ${binary:Version}), ${shlibs:Depends}, ${misc:Depends}
 +Description: MFC/R2 (telephony) call setup library - development headers
 + OpenR2 is a library that implements the MFC/R2 telephony signalling 
 + over E1 lines using the DAHDI Telephony interface.
 + .
 + The MFC/R2 protocol is a telephony signalling protocol, widely used in Latin
 + America, China and Africa, similar to the ISDN protocols found in most of
 + Europe and North America
 + .
 + This package contains libraries and header files for developing applications.
 +
 +Package: libopenr2-bin
 +Section: comm
 +Architecture: any
 +Depends: libopenr2-3 (= ${binary:Version}), ${shlibs:Depends}, ${misc:Depends}
 +Description: MFC/R2 (telephony) call setup library - test programs
 + OpenR2 is a library that implements the MFC/R2 telephony signalling 
 + over E1 lines using the DAHDI Telephony interface.
 + .
 + The MFC/R2 protocol is a telephony signalling protocol, widely used in Latin
 + America, China and Africa, similar to the ISDN protocols found in most of
 + Europe and North America
 + .
 + This package contains r2test - test-driver for libopenr2.
 +
 +Package: libopenr2-3
 +Architecture: any
 +Depends: ${shlibs:Depends}, ${misc:Depends}, dahdi
 +Suggests: asterisk
 +Description: MFC/R2 (telephony) call setup library
 + OpenR2 is a library that implements the MFC/R2 telephony signalling 
 + over E1 lines using the DAHDI Telephony interface.
 + .
 + The MFC/R2 protocol is a telephony signalling protocol, widely used in Latin
 + America, China and Africa, similar to the ISDN protocols found in most of
 + Europe and North America
 + .
 + This package contains a shared library implementing the protocol. 
 + .
 + You may want to have a look at the Asterisk PBX for a telephony application
 + that uses this library.
diff --cc debian/rules
index 589726b,0000000..ff8623f
mode 100755,000000..100755
--- a/debian/rules
+++ b/debian/rules
@@@ -1,51 -1,0 +1,53 @@@
 +#!/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
 +
 +PACKAGE:=openr2
 +DEBVERSION:=$(shell head -n 1 debian/changelog \
 +		    | sed -e 's/^[^(]*(\([^)]*\)).*/\1/')
 +DEB_NOEPOCH_VERSION:=$(shell echo $(DEBVERSION) | cut -d':' -f 2)
 +DEB_SRC_VERSION:=$(shell echo $(DEB_NOEPOCH_VERSION) | sed -e 's/-[0-9.a-z]*$$//')
 +UPVERSION:=$(shell echo $(DEB_SRC_VERSION) | sed -e 's/[.~]dfsg//' -e 's/~\(\(rc\|beta\)[0-9]\)/\1/')
 +
 +FILENAME := $(PACKAGE)_$(DEB_SRC_VERSION).orig.tar.gz
 +UPFILENAME := $(PACKAGE)_$(UPVERSION).orig.tar.gz
 +URL := http://openr2.googlecode.com/files/$(PACKAGE)-$(UPVERSION).tar.gz
 +
 +%:
 +	dh $@
 +
 +# This could be used once we don't care about Lenny anymore:
 +#override_dh_auto_configure:
 +#	autoreconf -i
 +#	dh_auto_configure -- --sysconfdir=/etc/openr2
 +
 +# But for the sake of Lenny backports:
- build: build-stamp
++build: build-arch build-indep
++build-arch: build-stamp
++build-indep: build-stamp
 +build-stamp:
 +	dh build --before configure
 +	autoreconf -i
 +	dh_auto_configure -- --sysconfdir=/etc/openr2
 +	dh build --after configure
 +	touch $@
 +
 +print-version:
 +	@@echo "Debian version:          $(DEBVERSION)"
 +	@@echo "Upstream version:        $(UPVERSION)"
 +
 +get-orig-source:
 +	@@dh_testdir
 +	@@[ -d ../tarballs/. ]||mkdir -p ../tarballs
 +	@@echo Downloading $(FILENAME) from $(URL) ...
 +	@@wget -nv -T10 -t3 -O ../tarballs/$(FILENAME) $(URL)
 +
 +#binary: binary-indep binary-arch
 +#.PHONY: build clean binary-indep binary-arch binary install print-version get-orig-source
diff --cc debian/watch
index 89ad1c7,0000000..82ff985
mode 100644,000000..100644
--- a/debian/watch
+++ b/debian/watch
@@@ -1,10 -1,0 +1,5 @@@
- # Example watch control file for uscan
- # Rename this file to "watch" and then you can run the "uscan" command
- # to check for upstream updates and more.
- # See uscan(1) for format
- 
 +# Compulsory line, this is a version 3 file
 +version=3
 +http://code.google.com/p/openr2/downloads/list \
- http://openr2.googlecode.com/files/openr2-(.*)\.tar\.gz
++detail\?name=openr2-(.*)\.tar\.gz.*
 +

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



More information about the Pkg-voip-commits mailing list