[Pkg-voip-commits] [libccaudio2] 02/05: Imported Debian patch 2.0.5-3

Victor Seva Lopez maniac-guest at moszumanska.debian.org
Sun Aug 16 12:07:59 UTC 2015


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

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

commit 4b9d1e36c668e48245d568fbf08df1739d31e80d
Merge: e58fdbb d14d001
Author: Mark Purcell <msp at debian.org>
Date:   Sat Jun 23 12:42:46 2012 +1000

    Imported Debian patch 2.0.5-3

 AUTHORS                                        |     2 +-
 CMakeLists.txt                                 |   202 +
 ChangeLog                                      |   196 +-
 INSTALL                                        |   200 +-
 Makefile.am                                    |    25 +-
 Makefile.in                                    |   483 +-
 NEWS                                           |     9 +-
 README                                         |    16 +-
 SUPPORT                                        |     9 +
 TODO                                           |     9 +-
 aclocal.m4                                     |  8463 +++++++++++++-
 autoconf/config.guess                          |   107 +-
 autoconf/config.sub                            |    67 +-
 autoconf/depcomp                               |    87 +-
 autoconf/install-sh                            |     5 +-
 autoconf/ltmain.sh                             |   803 +-
 autoconf/missing                               |    49 +-
 autogen.sh                                     |     2 +-
 ccaudio2-config.1                              |   101 +
 ccaudio2-config.in                             |   106 +
 ccaudio2.list                                  |    43 -
 ccaudio2.list.in                               |    43 -
 ccaudio2.pc.in                                 |     7 +
 ccaudio2.spec                                  |   107 +-
 ccaudio2.spec.in                               |   105 +-
 cmodel.sh                                      |    51 +
 codecs/Makefile.am                             |    51 -
 codecs/Makefile.in                             |   561 -
 codecs/adpcm.cpp                               |  1062 --
 codecs/codecs.h                                |    23 -
 codecs/g711.cpp                                |   357 -
 codecs/gsm.cpp                                 |   126 -
 codecs/oki.cpp                                 |   205 -
 codecs/speex.cpp                               |   208 -
 config.h.cmake                                 |    24 +
 config.h.in                                    |   119 +
 configure                                      | 13367 +++++++++--------------
 configure.ac                                   |   339 +-
 debian/changelog                               |    37 +
 debian/compat                                  |     2 +-
 debian/control                                 |    30 +-
 debian/copyright                               |     6 +-
 debian/libccaudio2-1.0-0.install               |     2 -
 debian/libccaudio2-dev.install                 |     7 +-
 debian/libccaudio2-doc.docs                    |     5 -
 debian/libccaudio2-doc.lintian-overrides       |     2 -
 debian/libccaudio2-doc.manpages                |     1 -
 debian/libccaudio2.install                     |     1 +
 debian/patches/00list                          |     1 -
 debian/patches/01_debian.dpatch                |    28 -
 debian/patches/hyphen-used-as-minus-sign.patch |    16 +
 debian/patches/series                          |     1 +
 debian/rules                                   |    24 +-
 debian/source/format                           |     1 +
 doc/Doxyfile                                   |   473 -
 doc/Doxyfile.in                                |   473 -
 doc/Makefile.am                                |    23 -
 doc/Makefile.in                                |   384 -
 {w32 => inc}/Makefile.am                       |    12 +-
 {w32 => inc}/Makefile.in                       |   254 +-
 inc/ccaudio2.h                                 |  2118 ++++
 libccaudio2.pc                                 |    18 -
 libccaudio2.pc.in                              |    18 -
 m4/Makefile.am                                 |    24 -
 m4/Makefile.in                                 |   383 -
 m4/libtool.m4                                  |  7325 -------------
 m4/ltoptions.m4                                |   368 -
 m4/ltsugar.m4                                  |   123 -
 m4/ltversion.m4                                |    23 -
 m4/lt~obsolete.m4                              |    92 -
 m4/ost_debug.m4                                |    41 -
 m4/ost_dynamic.m4                              |    46 -
 m4/ost_endian.m4                               |    83 -
 m4/ost_maint.m4                                |    51 -
 m4/ost_portable.m4                             |   110 -
 m4/ost_posix.m4                                |    87 -
 m4/ost_prog.m4                                 |    62 -
 m4/ost_string.m4                               |    57 -
 m4/ost_threading.m4                            |    81 -
 private.h.in                                   |   249 -
 src/Makefile.am                                |    48 +-
 src/Makefile.in                                |   325 +-
 src/audio2.h                                   |  2245 ----
 src/audiobase.cpp                              |    29 +-
 src/audiobuffer.cpp                            |   112 +
 src/audiofile.cpp                              |  2784 ++---
 src/buffer.cpp                                 |   131 -
 src/codec.cpp                                  |  2072 +++-
 src/detect.cpp                                 |   609 +-
 src/dialers.cpp                                |   528 +-
 src/fileio.cpp                                 |   321 +-
 src/friends.cpp                                |  2066 ++--
 src/mapper.cpp                                 |   458 +-
 src/oss.cpp                                    |   438 +-
 src/osx.cpp                                    |   114 +-
 src/resample.cpp                               |   133 +-
 src/stream.cpp                                 |   978 +-
 src/teltones.cpp                               |   100 +-
 src/tone.cpp                                   |   256 +-
 src/w32.cpp                                    |   405 +-
 utils/Makefile.am                              |    21 +-
 utils/Makefile.in                              |   354 +-
 utils/audiotool.1                              |    70 +-
 utils/audiotool.cpp                            |  1548 ++-
 utils/audiotool.h                              |    68 -
 utils/build.cpp                                |   346 -
 utils/chart.cpp                                |   199 -
 utils/info.cpp                                 |   178 -
 utils/notation.cpp                             |    85 -
 utils/packetdump.cpp                           |    83 -
 utils/play.cpp                                 |   115 -
 utils/rewrite.cpp                              |    57 -
 utils/size.cpp                                 |    44 -
 utils/strip.cpp                                |   193 -
 utils/tonedetect.cpp                           |   117 -
 utils/tonelist.cpp                             |   143 -
 utils/tonetool.cpp                             |   524 +-
 utils/tonetool.h                               |    61 -
 utils/tonewrite.cpp                            |   201 -
 utils/trim.cpp                                 |   244 -
 w32/Makefile.gcc                               |    63 -
 w32/audiotool.vcproj                           |   452 -
 w32/ccaudio2.dsp                               |   170 -
 w32/ccaudio2.rc                                |   130 -
 w32/ccaudio2.rc.in                             |   130 -
 w32/ccaudio2.reg                               |     9 -
 w32/ccaudio2.sln                               |    56 -
 w32/ccaudio2.vcproj                            |   471 -
 w32/g711.vcproj                                |   257 -
 w32/gsm.vcproj                                 |   353 -
 w32/install.bat                                |    76 -
 w32/private.h                                  |    58 -
 w32/tonetool.vcproj                            |   264 -
 133 files changed, 27304 insertions(+), 34869 deletions(-)

diff --cc debian/changelog
index 933b4f4,0000000..dc68bff
mode 100644,000000..100644
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,132 -1,0 +1,169 @@@
++libccaudio2 (2.0.5-3) unstable; urgency=low
++
++  * wheezey polish - lintian clean
++  * Update to Standards Version 3.9.3 - no changes
++  * libccaudio2-dev enhance Description:
++  * Add hyphen-used-as-minus-sign.patch
++  * Update to debian/compat 9 - hardening & multiarch
++
++ -- Mark Purcell <msp at debian.org>  Sat, 23 Jun 2012 12:42:46 +1000
++
++libccaudio2 (2.0.5-2) unstable; urgency=low
++
++  * Upload to unstable - coordinated through debian-release
++
++ -- Mark Purcell <msp at debian.org>  Wed, 16 May 2012 07:17:50 +1000
++
++libccaudio2 (2.0.5-1) experimental; urgency=low
++
++  * New upstream release
++    - NEW libccaudio2 - soname bump 
++  * Add Build-Depends libucommon-dev
++  * libccaudio2-dev Depends: s/libcommoncpp2-dev/libucommon-dev/
++  * Switch to dpkg-source 3.0 (quilt) format
++  * Switch to dh
++  * Drop libccaudio-doc - documentation support dropped upstream
++  * Update Standards Version 3.9.2
++  * debian/copyright update GPL-2 - copyright-refers-to-symlink-license
++
++ -- Mark Purcell <msp at debian.org>  Sat, 08 Oct 2011 16:36:54 +1100
++
++libccaudio2 (1.0.0-2.1) unstable; urgency=low
++
++  * Non-maintainer upload.
++  * Don't ship .la files (Closes: #621634).
++
++ -- Luk Claes <luk at debian.org>  Wed, 22 Jun 2011 19:34:36 +0200
++
 +libccaudio2 (1.0.0-2) unstable; urgency=low
 +
 +  * Upload to unstable - libcommoncpp2 tranistion
 +  * debian/compat => 7
 +
 + -- Mark Purcell <msp at debian.org>  Mon, 23 Feb 2009 23:46:04 +1100
 +
 +libccaudio2 (1.0.0-1) experimental; urgency=low
 +
 +  * New upstream release
 +    - NEW libccaudio2-1.0-0 - fixes package-name-doesnt-match-sonames
 +  * Add ${misc:Depends} -  debhelper-but-no-misc-depends
 +  * Hide doxygen errors - libccaudio2-doc.lintian-overrides
 +  * Add Depends: pkg-config
 +
 + -- Mark Purcell <msp at debian.org>  Tue, 30 Dec 2008 08:59:04 +1100
 +
 +libccaudio2 (0.9.14-2) unstable; urgency=low
 +
 +  * Update debian/copyright lintian: copyright-without-copyright-notice
 +  * Upgrade to Standards-Version: 3.8.0 - no changes necessary
 +
 + -- Mark Purcell <msp at debian.org>  Fri, 05 Sep 2008 23:11:02 +1000
 +
 +libccaudio2 (0.9.14-1) unstable; urgency=low
 +
 +  * New upstream release
 +
 +  [ Kilian Krause ]
 +  * Add ${binary:Version} for binNMU-safe uploads.
 +    Add dpkg-dev (>= 1.13.19) to Build-Depends.
 +
 +  [ Mark Purcell ]
 +  * Cleanup get-orig-source VARS
 +  * Add ${shlibs:Depends} missing-dependency-on-libc
 +
 + -- Mark Purcell <msp at debian.org>  Mon, 24 Mar 2008 22:05:37 +1100
 +
 +libccaudio2 (0.9.12-1) unstable; urgency=low
 +
 +  * New upstream release
 +
 + -- Mark Purcell <msp at debian.org>  Fri,  1 Dec 2006 22:45:07 +0000
 +
 +libccaudio2 (0.9.10-2) unstable; urgency=low
 +
 +  * Delete usr/share/man/man3/ost.3.gz again
 +    - Fixes: libccaudio2-doc conflicts with libcommoncpp2-doc (Closes: #399216)
 +
 + -- Mark Purcell <msp at debian.org>  Fri,  1 Dec 2006 21:07:37 +0000
 +
 +libccaudio2 (0.9.10-1) unstable; urgency=low
 +
 +  * New upstream release
 +
 + -- Mark Purcell <msp at debian.org>  Mon, 28 Aug 2006 21:40:33 +0100
 +
 +libccaudio2 (0.9.9-1) unstable; urgency=low
 +
 +  * New upstream release
 +
 + -- Mark Purcell <msp at debian.org>  Fri, 28 Jul 2006 21:35:58 +0100
 +
 +libccaudio2 (0.9.7-1) unstable; urgency=low
 +
 +  * New upstream release
 +  * Switch to cdbs (Closes: Bug#368615)
 +  * Add Build-Depends: cdbs, dpatch
 +  * Debian VoIP Team <pkg-voip-maintainers at lists.alioth.debian.org>
 +
 + -- Mark Purcell <msp at debian.org>  Thu,  8 Jun 2006 20:27:53 +0100
 +
 +libccaudio2 (0.9.2-1) unstable; urgency=low
 +
 +  * New upstream release
 +
 + -- Mark Purcell <msp at debian.org>  Sun,  7 May 2006 20:26:50 +0100
 +
 +libccaudio2 (0.9.0-2) unstable; urgency=low
 +
 +  * Move audiotool & tonetool to -dev package, allowing smooth soname
 +    migration
 +
 + -- Mark Purcell <msp at debian.org>  Mon, 17 Apr 2006 14:31:46 +0100
 +
 +libccaudio2 (0.9.0-1) unstable; urgency=low
 +
 +  * New upstream release
 +  * Don't install man pages ost.3 conflicts
 +  * Fix package-name-doesnt-match-sonames libccaudio2-0.9-0
 +
 + -- Mark Purcell <msp at debian.org>  Mon, 17 Apr 2006 14:12:50 +0100
 +
 +libccaudio2 (0.8.0-2) unstable; urgency=low
 +
 +  * make install info
 +  * Build-Depends: doxygen
 +  * debian/control add libccaudio2-doc package Architecture: all
 +  * dh_makeshlibs -L libccaudio2-0.8-0
 +
 + -- Mark Purcell <msp at debian.org>  Wed,  5 Apr 2006 22:41:03 +0100
 +
 +libccaudio2 (0.8.0-1) unstable; urgency=low
 +
 +  * New upstream release
 +  * Bump soname. Fixes package-name-doesnt-match-sonames libccaudio2-
 +    0.8-0
 +  * patch speex/speex.c to emable speex build
 +  * Add Build-Depends: libspeex-dev
 +
 + -- Mark Purcell <msp at debian.org>  Tue, 14 Mar 2006 18:40:50 +0000
 +
 +libccaudio2 (0.7.11-1) unstable; urgency=low
 +
 +  * New upstream release
 +
 + -- Mark Purcell <msp at debian.org>  Sat, 21 Jan 2006 11:49:20 +0000
 +
 +libccaudio2 (0.7.10-1) unstable; urgency=low
 +
 +  * New upstream release
 +  * Add Depends: libcommoncpp2-dev
 +  * fix old-fsf-address-in-copyright-file
 +
 + -- Mark Purcell <msp at debian.org>  Mon,  5 Sep 2005 07:38:31 +0100
 +
 +libccaudio2 (0.7.6-1) unstable; urgency=low
 +
 +  * Initial release Closes: #318987
 +
 + -- Mark Purcell <msp at debian.org>  Tue, 19 Jul 2005 12:43:14 +1000
 +
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 416a395,0000000..2e3f4d2
mode 100644,000000..100644
--- a/debian/control
+++ b/debian/control
@@@ -1,41 -1,0 +1,43 @@@
 +Source: libccaudio2
++Section: libs
 +Priority: optional
 +Maintainer: Debian VoIP Team <pkg-voip-maintainers at lists.alioth.debian.org>
 +Uploaders: Mark Purcell <msp at debian.org>, Kilian Krause <kilian at debian.org>
- Build-Depends: debhelper (>= 7), autotools-dev, libgsm1-dev, libspeex-dev, doxygen, cdbs, dpatch, dpkg-dev (>= 1.13.19)
- Standards-Version: 3.8.0
- Section: libs
++Build-Depends: debhelper (>= 9), autotools-dev, libgsm1-dev, libspeex-dev, doxygen, dpkg-dev (>= 1.13.19), libucommon-dev
++Standards-Version: 3.9.3
 +Homepage: http://www.gnu.org/software/ccaudio/
 +Vcs-Svn: svn://svn.debian.org/pkg-voip/libccaudio2/trunk/
 +Vcs-Browser: http://svn.debian.org/wsvn/pkg-voip/libccaudio2/?op=log
 +
 +Package: libccaudio2-dev
 +Section: libdevel
 +Suggests: libccaudio2-doc
 +Architecture: any
- Depends: ${shlibs:Depends}, ${misc:Depends}, libccaudio2-1.0-0 (= ${binary:Version}), libcommoncpp2-dev, pkg-config
++Depends: ${shlibs:Depends}, ${misc:Depends}, libccaudio2 (= ${binary:Version}), libucommon-dev, pkg-config
 +Description: header files and static link library for GNU ccAudio
++ The GNU ccAudio package offers a highly portable C++ class framework for
++ developing applications which manipulate audio streams and various
++ disk based audio file formats.  At the moment ccaudio is primarly a class
++ framework for handling .au, .wav (RIFF), and various .raw audio encoding
++ formats under Posix and win32 systems, though it may expand to become a
++ general purpose audio and soundcard support library.  Support for
++ controlling CD audio devices has recently been added as well as support
++ for codecs and other generic audio processing services.
++ .
 + This package provides the header files and documentation for building
 + applications that use GNU ccAudio.
 +
- Package: libccaudio2-1.0-0
- Section: libs
++Package: libccaudio2
 +Architecture: any
 +Depends: ${shlibs:Depends}, ${misc:Depends}
++Pre-Depends: ${misc:Pre-Depends}
++Multi-Arch: same
 +Description: GNU ccAudio2 - a C++ class framework for processing audio files
 + The GNU ccAudio package offers a highly portable C++ class framework for
 + developing applications which manipulate audio streams and various
 + disk based audio file formats.  At the moment ccaudio is primarly a class
 + framework for handling .au, .wav (RIFF), and various .raw audio encoding
 + formats under Posix and win32 systems, though it may expand to become a
 + general purpose audio and soundcard support library.  Support for
 + controlling CD audio devices has recently been added as well as support
 + for codecs and other generic audio processing services.
- 
- Package: libccaudio2-doc
- Depends: ${misc:Depends}
- Section: doc
- Architecture: all
- Description: Documentation files for  GNU ccAudio2 library
-  This package contains the documentation files for the GNU ccAudio2 packages.
- 
diff --cc debian/copyright
index c2ca02a,0000000..38dc9f8
mode 100644,000000..100644
--- a/debian/copyright
+++ b/debian/copyright
@@@ -1,32 -1,0 +1,32 @@@
 +This package was debianized by Mark Purcell <msp at debian.org> on
 +Tue, 19 Jul 2005 12:21:48 +1000.
 +
 +It was downloaded from http://www.gnu.org/software/ccaudio
 +
 +Auuthor: David Sugar <dyfet at ostel.com>
 +
 +Copyright:
 +  [Copyright: 2005-2007 David Sugar, Tycho Softworks]
 +  [Copyright: 2001 Steve Underwood <steveu at coppice.org>]
 +  [Copyright: 1999-2005 Open Source Telecom Corporation]
 +
 +   This package is free software; you can redistribute it and/or modify
 +   it under the terms of the GNU General Public License as published by
 +   the Free Software Foundation; either version 2 of the License, or
 +   (at your option) any later version.
 +
 +   This package is distributed in the hope that it will be useful,
 +   but WITHOUT ANY WARRANTY; without even the implied warranty of
 +   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 +   GNU General Public License for more details.
 +
 +   You should have received a copy of the GNU General Public License
 +   along with this package; if not, write to the 
 +   Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston,
 +   MA 02110-1301, USA.Free Software
 +
 +On Debian systems, the complete text of the GNU General
- Public License can be found in `/usr/share/common-licenses/GPL'.
++Public License can be found in `/usr/share/common-licenses/GPL-2'.
 +
- The Debian packaging is (C) 2005-2008, Mark Purcell <msp at debian.org> and
- is licensed under the GPL, see above.
++The Debian packaging is Copyright 2005-2008, Mark Purcell <msp at debian.org> and
++is licensed under the GPL-2, see above.
diff --cc debian/libccaudio2-dev.install
index f4d8972,0000000..e27ec0f
mode 100644,000000..100644
--- a/debian/libccaudio2-dev.install
+++ b/debian/libccaudio2-dev.install
@@@ -1,7 -1,0 +1,6 @@@
 +usr/include/*
- usr/lib/lib*.a
- usr/lib/lib*.so
- usr/lib/pkgconfig/*
- usr/lib/*.la
++usr/lib/*/lib*.a
++usr/lib/*/lib*.so
++usr/lib/*/pkgconfig/*
 +usr/bin/*
 +usr/share/man/man1/
diff --cc debian/libccaudio2.install
index 0000000,0000000..3ddde58
new file mode 100644
--- /dev/null
+++ b/debian/libccaudio2.install
@@@ -1,0 -1,0 +1,1 @@@
++usr/lib/*/lib*.so.*
diff --cc debian/patches/hyphen-used-as-minus-sign.patch
index 0000000,0000000..155538f
new file mode 100644
--- /dev/null
+++ b/debian/patches/hyphen-used-as-minus-sign.patch
@@@ -1,0 -1,0 +1,16 @@@
++Description: hyphen-used-as-minus-sign usr/share/man/man1/audiotool.1.gz:98
++ http://lintian.debian.org/tags/hyphen-used-as-minus-sign.html
++
++Index: libccaudio2-2.0.5/utils/audiotool.1
++===================================================================
++--- libccaudio2-2.0.5.orig/utils/audiotool.1	2011-03-18 10:43:54.000000000 +1100
+++++ libccaudio2-2.0.5/utils/audiotool.1	2012-06-23 12:40:21.000000000 +1000
++@@ -95,7 +95,7 @@
++ the threashold.
++ .TP
++ \fB\-trim\fR
++-Removes leading and trailing "silence" from a file.  The -padding option
+++Removes leading and trailing "silence" from a file.  The \-padding option
++ may be used to add additional silent frames at the end of the file after
++ it has been trimed, as this may be needed for files that will later be
++ used to join together phrases.
diff --cc debian/patches/series
index 0000000,0000000..ac8e90e
new file mode 100644
--- /dev/null
+++ b/debian/patches/series
@@@ -1,0 -1,0 +1,1 @@@
++hyphen-used-as-minus-sign.patch
diff --cc debian/rules
index 6bf3d05,0000000..aea87ff
mode 100755,000000..100755
--- a/debian/rules
+++ b/debian/rules
@@@ -1,22 -1,0 +1,6 @@@
 +#!/usr/bin/make -f
++%:
++	dh $@ --parallel
 +
- FILENAME = $(DEB_SOURCE_PACKAGE)_$(DEB_UPSTREAM_VERSION).orig.tar.gz
- URL = http://ftp.gnu.org/pub/gnu/ccaudio/ccaudio2-$(DEB_UPSTREAM_VERSION).tar.gz
- 
- include /usr/share/cdbs/1/rules/debhelper.mk
- include /usr/share/cdbs/1/class/autotools.mk
- include /usr/share/cdbs/1/rules/dpatch.mk
- 
- build/libccaudio2-doc::
- 	rm -f doc/man/man3/ost.3
- 
- clean::
- 	rm -f doc/latex/* doc/html/* doc/man/man3/* doc/doxy
- 
- DEB_CONFIGURE_EXTRA_FLAGS := --enable-speex
- 
- get-orig-source:
- 	@@dh_testdir
- 	@@[ -d ../tarballs/. ]||mkdir -p ../tarballs
- 	@@echo Downloading $(FILENAME) from $(URL) ...
- 	@@wget -N -nv -T10 -t3 -O ../tarballs/$(FILENAME) $(URL)
++override_dh_auto_configure:
++	dh_auto_configure -- --enable-speex
diff --cc debian/source/format
index 0000000,0000000..163aaf8
new file mode 100644
--- /dev/null
+++ b/debian/source/format
@@@ -1,0 -1,0 +1,1 @@@
++3.0 (quilt)

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



More information about the Pkg-voip-commits mailing list