[Pkg-voip-commits] [openr2] 03/04: Imported Debian patch 1.3.3-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 a7705e766576fbab646edd2c34aa0e36d4de3141
Merge: 4ea297e 2aec465
Author: Tzafrir Cohen <tzafrir at debian.org>
Date:   Wed Jan 29 22:32:09 2014 +0200

    Imported Debian patch 1.3.3-1

 CREDITS                       |    2 +-
 ChangeLog                     |   70 +
 INSTALL                       |  243 +-
 Makefile.in                   |  227 +-
 aclocal.m4                    |  334 +-
 compile                       |   18 +-
 config.guess                  |  302 +-
 config.sub                    |  232 +-
 configure                     | 7147 ++++++++++++++++++++++++-----------------
 configure.in                  |   16 +-
 debian/changelog              |   16 +-
 debian/compat                 |    2 +-
 debian/control                |    4 +-
 debian/libopenr2-3.install    |    2 +-
 debian/libopenr2-3.symbols    |   96 +
 debian/libopenr2-dev.install  |    4 +-
 debian/patches/default_cflags |   14 +
 debian/patches/series         |    1 +
 debian/rules                  |   19 +-
 depcomp                       |  168 +-
 install-sh                    |  517 ++-
 libopenr2.spec                |    2 +
 ltmain.sh                     |    0
 missing                       |  100 +-
 src/Makefile.am               |    4 -
 src/Makefile.in               |  264 +-
 src/r2chan.c                  |    5 +-
 src/r2proto.c                 |   27 +-
 src/r2utils.c                 |    6 +-
 29 files changed, 5977 insertions(+), 3865 deletions(-)

diff --cc debian/changelog
index 34b8bf4,0000000..06bb4e6
mode 100644,000000..100644
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,35 -1,0 +1,37 @@@
- openr2 (1.3.2-1.1) unstable; urgency=low
++openr2 (1.3.3-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)
++  * Simplify rules: no need to support Lenny anymore.
++  * A symbols file.
++  * A new upstream release.
++  * compat level 9:
++    - libraries in /usr/lib/<triplet>
++  * Use autoreconf properly (Closes: #726570).
++  * Don't override CFLAGS.
 +
-  -- gregor herrmann <gregoa at debian.org>  Sat, 16 Jun 2012 15:40:43 +0200
++ -- Tzafrir Cohen <tzafrir at debian.org>  Wed, 29 Jan 2014 22:32:09 +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/compat
index 7f8f011,0000000..ec63514
mode 100644,000000..100644
--- a/debian/compat
+++ b/debian/compat
@@@ -1,1 -1,0 +1,1 @@@
- 7
++9
diff --cc debian/control
index 7db3044,0000000..77c30c0
mode 100644,000000..100644
--- a/debian/control
+++ b/debian/control
@@@ -1,55 -1,0 +1,57 @@@
 +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
++Build-Depends: debhelper (>= 9.0), autotools-dev, dh-autoreconf, dahdi-source, libtool, automake
 +Standards-Version: 3.9.2
 +Homepage: http://www.libopenr2.org
++VCS-Browser: http://anonscm.debian.org/viewvc/pkg-voip/openr2/
++VCS-Svn: svn://anonscm.alioth.debian.org/svn/pkg-voip/
 +
 +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/libopenr2-3.install
index 0e5a097,0000000..38678a1
mode 100644,000000..100644
--- a/debian/libopenr2-3.install
+++ b/debian/libopenr2-3.install
@@@ -1,1 -1,0 +1,1 @@@
- usr/lib/libopenr2.so.*
++usr/lib/*/libopenr2.so.*
diff --cc debian/libopenr2-3.symbols
index 0000000,0000000..6e99f6a
new file mode 100644
--- /dev/null
+++ b/debian/libopenr2-3.symbols
@@@ -1,0 -1,0 +1,96 @@@
++libopenr2.so.3 libopenr2-3 #MINVER#
++ openr2_chan_accept_call at Base 1.3.2
++ openr2_chan_answer_call at Base 1.3.2
++ openr2_chan_answer_call_with_mode at Base 1.3.2
++ openr2_chan_delete at Base 1.3.2
++ openr2_chan_disable_call_files at Base 1.3.2
++ openr2_chan_disable_read at Base 1.3.2
++ openr2_chan_disconnect_call at Base 1.3.2
++ openr2_chan_enable_call_files at Base 1.3.2
++ openr2_chan_enable_read at Base 1.3.2
++ openr2_chan_get_ani at Base 1.3.2
++ openr2_chan_get_call_files_enabled at Base 1.3.2
++ openr2_chan_get_call_state_string at Base 1.3.2
++ openr2_chan_get_client_data at Base 1.3.2
++ openr2_chan_get_context at Base 1.3.2
++ openr2_chan_get_direction at Base 1.3.2
++ openr2_chan_get_dnis at Base 1.3.2
++ openr2_chan_get_fd at Base 1.3.2
++ openr2_chan_get_log_level at Base 1.3.2
++ openr2_chan_get_mf_group_string at Base 1.3.2
++ openr2_chan_get_mf_state_string at Base 1.3.2
++ openr2_chan_get_number at Base 1.3.2
++ openr2_chan_get_r2_state_string at Base 1.3.2
++ openr2_chan_get_read_enabled at Base 1.3.2
++ openr2_chan_get_rx_cas_string at Base 1.3.2
++ openr2_chan_get_rx_mf_signal at Base 1.3.2
++ openr2_chan_get_time_to_next_event at Base 1.3.2
++ openr2_chan_get_tx_cas_string at Base 1.3.2
++ openr2_chan_get_tx_mf_signal at Base 1.3.2
++ openr2_chan_handle_cas at Base 1.3.2
++ openr2_chan_make_call at Base 1.3.2
++ openr2_chan_new at Base 1.3.2
++ openr2_chan_new_from_fd at Base 1.3.2
++ openr2_chan_process_event at Base 1.3.2
++ openr2_chan_set_blocked at Base 1.3.2
++ openr2_chan_set_client_data at Base 1.3.2
++ openr2_chan_set_dtmf_handles at Base 1.3.2
++ openr2_chan_set_idle at Base 1.3.2
++ openr2_chan_set_log_level at Base 1.3.2
++ openr2_chan_set_logging_func at Base 1.3.2
++ openr2_chan_write at Base 1.3.2
++ openr2_context_configure_from_advanced_file at Base 1.3.2
++ openr2_context_delete at Base 1.3.2
++ openr2_context_error_string at Base 1.3.2
++ openr2_context_get_ani_first at Base 1.3.2
++ openr2_context_get_double_answer at Base 1.3.2
++ openr2_context_get_dtmf_detection at Base 1.3.2
++ openr2_context_get_dtmf_detection_end_timeout at Base 1.3.2
++ openr2_context_get_dtmf_dialing at Base 1.3.2
++ openr2_context_get_immediate_accept at Base 1.3.2
++ openr2_context_get_last_error at Base 1.3.2
++ openr2_context_get_log_directory at Base 1.3.2
++ openr2_context_get_log_level at Base 1.3.2
++ openr2_context_get_max_ani at Base 1.3.2
++ openr2_context_get_max_dnis at Base 1.3.2
++ openr2_context_get_metering_pulse_timeout at Base 1.3.2
++ openr2_context_get_mf_back_timeout at Base 1.3.2
++ openr2_context_get_mf_threshold at Base 1.3.2
++ openr2_context_get_skip_category_request at Base 1.3.2
++ openr2_context_get_time_to_next_event at Base 1.3.2
++ openr2_context_get_variant at Base 1.3.2
++ openr2_context_new at Base 1.3.2
++ openr2_context_set_ani_first at Base 1.3.2
++ openr2_context_set_double_answer at Base 1.3.2
++ openr2_context_set_dtmf_detection at Base 1.3.2
++ openr2_context_set_dtmf_detection_end_timeout at Base 1.3.2
++ openr2_context_set_dtmf_dialing at Base 1.3.2
++ openr2_context_set_dtmf_interface at Base 1.3.2
++ openr2_context_set_immediate_accept at Base 1.3.2
++ openr2_context_set_log_directory at Base 1.3.2
++ openr2_context_set_log_level at Base 1.3.2
++ openr2_context_set_metering_pulse_timeout at Base 1.3.2
++ openr2_context_set_mf_back_timeout at Base 1.3.2
++ openr2_context_set_mf_threshold at Base 1.3.2
++ openr2_context_set_skip_category_request at Base 1.3.2
++ openr2_dtmf_rx at Base 1.3.2
++ openr2_dtmf_rx_init at Base 1.3.2
++ openr2_dtmf_rx_status at Base 1.3.2
++ openr2_dtmf_tx at Base 1.3.2
++ openr2_dtmf_tx_init at Base 1.3.2
++ openr2_dtmf_tx_put at Base 1.3.2
++ openr2_dtmf_tx_set_level at Base 1.3.2
++ openr2_dtmf_tx_set_timing at Base 1.3.2
++ openr2_get_revision at Base 1.3.2
++ openr2_get_version at Base 1.3.2
++ openr2_log_get_level at Base 1.3.2
++ openr2_log_get_level_string at Base 1.3.2
++ openr2_proto_get_call_mode_string at Base 1.3.2
++ openr2_proto_get_category at Base 1.3.2
++ openr2_proto_get_category_string at Base 1.3.2
++ openr2_proto_get_disconnect_string at Base 1.3.2
++ openr2_proto_get_error at Base 1.3.2
++ openr2_proto_get_variant at Base 1.3.2
++ openr2_proto_get_variant_list at Base 1.3.2
++ openr2_proto_get_variant_string at Base 1.3.2
++ openr2_strncasecmp at Base 1.3.2
diff --cc debian/libopenr2-dev.install
index 30e1cfa,0000000..5e247d1
mode 100644,000000..100644
--- a/debian/libopenr2-dev.install
+++ b/debian/libopenr2-dev.install
@@@ -1,4 -1,0 +1,4 @@@
 +usr/include/*.h
 +usr/include/openr2/*.h
- usr/lib/libopenr2.a
- usr/lib/libopenr2.so
++usr/lib/*/libopenr2.a
++usr/lib/*/libopenr2.so
diff --cc debian/patches/default_cflags
index 0000000,0000000..400a4cb
new file mode 100644
--- /dev/null
+++ b/debian/patches/default_cflags
@@@ -1,0 -1,0 +1,14 @@@
++--- a/configure.in
+++++ b/configure.in
++@@ -27,11 +27,6 @@ AC_SUBST(OPENR2_LT_AGE)
++ AC_CONFIG_HEADERS(config.h)
++ AM_INIT_AUTOMAKE
++ 
++-# let's default to compile with debugging information
++-# most users will not even care about it
++-CFLAGS='-ggdb3 -O0'
++-CXXFLAGS='-ggdb3 -O0'
++-
++ AC_PROG_CC
++ AM_PROG_CC_C_O
++ AC_PROG_LIBTOOL
diff --cc debian/patches/series
index 0000000,0000000..6c2b0a5
new file mode 100644
--- /dev/null
+++ b/debian/patches/series
@@@ -1,0 -1,0 +1,1 @@@
++default_cflags
diff --cc debian/rules
index ff8623f,0000000..fb3492c
mode 100755,000000..100755
--- a/debian/rules
+++ b/debian/rules
@@@ -1,53 -1,0 +1,40 @@@
 +#!/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-arch build-indep
- build-arch: build-stamp
- build-indep: build-stamp
- build-stamp:
- 	dh build --before configure
- 	autoreconf -i
++	dh $@ --with=autoreconf
++
++override_dh_auto_configure:
 +	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

-- 
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