[Pkg-voip-commits] [t38modem] 02/03: Imported Debian patch 2.0.0-3
Victor Seva Lopez
maniac-guest at moszumanska.debian.org
Fri Aug 14 12:41:45 UTC 2015
This is an automated email from the git hooks/post-receive script.
maniac-guest pushed a commit to branch master
in repository t38modem.
commit 832acc3d85426cf1411265d94ace5055c5a8a560
Merge: 9b40227 7c1aa00
Author: Mark Purcell <msp at debian.org>
Date: Sun Sep 30 09:43:47 2012 +1000
Imported Debian patch 2.0.0-3
Changes.txt | 34 +-
Makefile | 32 +-
ReadMe.txt | 85 +-
audio.cxx | 565 +++--
audio.h | 93 +-
debian/changelog | 34 +
debian/control | 20 +-
debian/copyright | 782 +++----
debian/patches/series | 4 +-
.../{simplify-makefile => simplify-makefile-new} | 79 +-
debian/patches/spelling-error-fix | 33 +
debian/patches/t38modem-opal3.10-patch | 207 ++
debian/rules | 5 +-
drv_c0c.cxx | 32 +-
enginebase.cxx | 399 +++-
enginebase.h | 193 +-
h323lib/audio_chan.cxx | 85 +
h323lib/audio_chan.h | 65 +
h323lib/h323ep.cxx | 140 +-
h323lib/h323ep.h | 7 +-
h323lib/t38modem_2005.sln | 22 +
h323lib/t38modem_2005.vcproj | 16 +
h323lib/t38modem_openh323_2005.sln | 22 +
...m_2005.vcproj => t38modem_openh323_2005.vcproj} | 28 +-
h323lib/t38protocol.cxx | 62 +-
h323lib/t38protocol.h | 25 +-
hdlc.cxx | 40 +-
main_process.cxx | 17 +-
opal/fake_codecs.cxx | 255 +++
opal/fake_codecs.h | 45 +
opal/h323ep.cxx | 508 ++++-
opal/h323ep.h | 50 +-
opal/manager.cxx | 157 +-
opal/manager.h | 18 +-
opal/modemep.cxx | 868 +++++++-
opal/modemep.h | 49 +-
opal/modemstrm.cxx | 248 ++-
opal/modemstrm.h | 64 +-
opal/sipep.cxx | 461 ++--
opal/sipep.h | 46 +-
opal/t38modem_2005.sln | 22 +
opal/t38modem_2005.vcproj | 16 +
pmodem.h | 16 +-
pmodeme.cxx | 2334 +++++++++++++-------
pmodeme.h | 23 +-
pmodemi.cxx | 35 +-
pmodemi.h | 15 +-
t30tone.cxx | 103 +-
t30tone.h | 37 +-
t38engine.cxx | 919 +++++---
t38engine.h | 139 +-
tone_gen.cxx | 181 ++
tone_gen.h | 65 +
version.h | 4 +-
54 files changed, 7184 insertions(+), 2620 deletions(-)
diff --cc debian/changelog
index 7dc91fa,0000000..0fcc15f
mode 100644,000000..100644
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,129 -1,0 +1,163 @@@
++t38modem (2.0.0-3) unstable; urgency=low
++
++ [ Michael van der Kolff ]
++ * Apply patch attached to #671382 (Closes: #671382)
++ - Thanks, Matej! (vela at debian.org)
++
++ -- Mark Purcell <msp at debian.org> Sun, 30 Sep 2012 09:43:47 +1000
++
++t38modem (2.0.0-2) unstable; urgency=low
++
++ * Upload to unstable - coordinated through debian-release
++
++ -- Mark Purcell <msp at debian.org> Sun, 26 Feb 2012 16:24:50 +1100
++
++t38modem (2.0.0-1) experimental; urgency=low
++
++ [ Kilian Krause ]
++ * New upstream version: 2.0.0 (Closes: #615783, #592999)
++ - disable simplify makefile patch for now
++ - Build-Depend on OPAL 3.10 or greater
++ * Remove linux-headers from Build-Conflicts as we're now well into linux-2.6
++ (Closes: #614060)
++
++ [ Michael van der Kolff ]
++ * Add a new simplify-makefile, remove old simplify-makefile (Closes: #615783)
++ * Add a patch so it builds with the present OPAL in the tree (yeah, the svn
++ has the fix, but might as well make sure it builds)
++ * Add myself to Uploaders
++ * Add upstream changelog
++ * Update copyright for DEP-5
++ * Add spelling fix per lintian warning, upstreamed.
++
++ -- Michael van der Kolff <mvanderkolff at gmail.com> Thu, 09 Feb 2012 15:03:25 +1100
++
+t38modem (1.2.0-1) unstable; urgency=low
+
+ * New upstream release (Closes: #541333, #549365, #512106)
+
+ [ Patrick Matthäi ]
+ * Remove dpatch and debian/patches - there are no available patches.
+ Thanks lintian.
+
+ [ Mark Purcell ]
+ * Add Build-Depends: libopal-dev (Closes: #577869)
+ * Update debian/watch -> t38modem.sf.net
+ * Switch to dh 7
+ * Added simplify-makefile (Thks mvanderkolff) (Closes: #584501)
+ * Add missing debian/t38modem.install
+ * Update to Standards 3.8.4
+
+ -- Mark Purcell <msp at debian.org> Fri, 04 Jun 2010 22:59:05 +1000
+
+t38modem (0.8.4-2) unstable; urgency=low
+
+ * Extremadura release ;-)
+ * Rebuild to force libopenh323-1.19.1-dev transition
+
+ -- Mark Purcell <msp at debian.org> Fri, 30 Nov 2007 11:55:47 +0100
+
+t38modem (0.8.4-1) unstable; urgency=low
+
+ * New upstream release from CVS tag. (Closes: #436102)
+ * 10_debian_patch removed. Included upstream.
+ * Rebuild with new libopenh323 and libpt to overcome linker problem causing
+ --help to not work. (Closes: #433747)
+ * Needs OpenH323 Titan release to overcome FTBFS (Closes: #436102)
+ * Bump Standards-Version to 3.7.2. No change needed.
+ * Fix debian/watch.
+ * Don't set DH_COMPAT, use debian/compat
+ * Don't ignore make clean errors.
+ * Add a more meaningful whatis entry to manpage.
+ * Add Homepage field as added in dpkg-dev 1.14.6.
+
+ -- Kilian Krause <kilian at debian.org> Sun, 14 Oct 2007 22:33:53 +0200
+
+t38modem (0.8.0+20050304-4) unstable; urgency=low
+
+ * Make sure clean target leaves behind no newly created files
+ (Closes: #362707)
+
+ -- Kilian Krause <kilian at debian.org> Mon, 5 Dec 2005 19:00:38 +0000
+
+t38modem (0.8.0+20050304-3) unstable; urgency=low
+
+ * Recompile with latest pwlib and openh323 to complete libstc++ ABI
+ transition.
+
+ -- Kilian Krause <kilian at debian.org> Mon, 5 Dec 2005 19:51:42 +0100
+
+t38modem (0.8.0+20050304-2) unstable; urgency=low
+
+ * C++ ABI transition
+
+ -- Mark Purcell <msp at debian.org> Sun, 17 Jul 2005 08:35:25 +1000
+
+t38modem (0.8.0+20050304-1) unstable; urgency=low
+
+ * Updated to Mimas_rc2 codebase.
+
+ -- Kilian Krause <kk at verfaction.de> Fri, 4 Mar 2005 01:26:31 +0100
+
+t38modem (0.8.0-2) unstable; urgency=low
+
+ * Recompiled with new Mimas pwlib/openh323 release
+ * Package targeted to unstable distribution.
+
+ -- Jose Carlos Garcia Sogo <jsogo at debian.org> Sun, 20 Feb 2005 23:22:10 +0100
+
+t38modem (0.8.0-1) experimental; urgency=low
+
+ * New upstream release from CVS.
+ * Building with atlas release of openh323.
+ * Debian VoIP upload.
+
+ -- Kilian Krause <kk at verfaction.de> Wed, 5 Jan 2005 02:32:16 +0100
+
+t38modem (0.6.2-7) unstable; urgency=low
+
+ * Rebuild libopenh323-dev
+ * New openh323 needs export PREFIX=/usr; export RELATED_PKG_MAKEFILE=1
+ * Convert to dpatch for svn-upload
+ * pkg-voip-maintainers upload
+ * Closes: #264089: Uninstallable in sid
+
+ -- Mark Purcell <msp at debian.org> Fri, 13 Aug 2004 20:37:04 +1000
+
+t38modem (0.6.2-6) unstable; urgency=low
+
+ * Build-Conflicts: linux-kernel-headers (<< 2.5.999-test7-bk-14)
+
+ -- Mark Purcell <msp at debian.org> Sun, 11 Apr 2004 08:12:25 +1000
+
+t38modem (0.6.2-5) experimental; urgency=low
+
+ * Rebuild for libopenh323-dev-1.13.2
+
+ -- Mark Purcell <msp at debian.org> Sat, 13 Mar 2004 23:41:05 +1100
+
+t38modem (0.6.2-4) unstable; urgency=low
+
+ * Closes: #233609: Cleanup FTBFS debian/rules & main.cxx patch from Jurij Smakov
+
+ -- Mark Purcell <msp at debian.org> Wed, 25 Feb 2004 03:15:26 +1100
+
+t38modem (0.6.2-3) unstable; urgency=low
+
+ * Rebuild with libopenh323-dev-1.12.2 (Closes: Bug#217479)
+
+ -- Mark Purcell <msp at debian.org> Tue, 28 Oct 2003 18:01:05 +1100
+
+t38modem (0.6.2-2) unstable; urgency=low
+
+ * Build-Depends: libopenh323-dev, libexpat1-dev (Closes: Bug#201011)
+
+ -- Mark Purcell <msp at debian.org> Mon, 14 Jul 2003 23:32:48 +1000
+
+t38modem (0.6.2-1) unstable; urgency=low
+
+ * Initial Release. (Closes: Bug#200464)
+ * Patch to include -v option for help2man
+
+ -- Mark Purcell <msp at debian.org> Tue, 8 Jul 2003 23:40:22 +1000
+
diff --cc debian/control
index 42c06b5,0000000..d2961a7
mode 100644,000000..100644
--- a/debian/control
+++ b/debian/control
@@@ -1,20 -1,0 +1,28 @@@
+Source: t38modem
+Section: comm
+Priority: optional
+Maintainer: Debian VoIP Team <pkg-voip-maintainers at lists.alioth.debian.org>
- Uploaders: Kilian Krause <kilian at debian.org>, Jose Carlos Garcia Sogo <jsogo at debian.org>, Mark Purcell <msp at debian.org>, Santiago Garcia Mantinan <manty at debian.org>
- Build-Depends: debhelper (>= 7), help2man, libopal-dev, libexpat1-dev
- Build-Conflicts: linux-kernel-headers (<< 2.5.999-test7-bk-14)
- Standards-Version: 3.8.4
++Uploaders:
++ Kilian Krause <kilian at debian.org>,
++ Jose Carlos Garcia Sogo <jsogo at debian.org>,
++ Mark Purcell <msp at debian.org>,
++ Santiago Garcia Mantinan <manty at debian.org>,
++ Michael van der Kolff <mvanderkolff at gmail.com>
++Build-Depends:
++ debhelper (>= 7.0.50~),
++ help2man,
++ libexpat1-dev,
++ libopal-dev (>= 3.10)
++Standards-Version: 3.9.2
+Homepage: http://t38modem.sf.net/
+Vcs-Svn: svn://svn.debian.org/pkg-voip/t38modem/trunk/
- Vcs-Browser: http://svn.debian.org/wsvn/pkg-voip/t38modem/?op=log
++Vcs-Browser: http://anonscm.debian.org/viewvc/pkg-voip/t38modem/trunk/
+
+Package: t38modem
+Architecture: any
- Depends: ${shlibs:Depends}, ${misc:Depends}
++Depends: ${misc:Depends}, ${shlibs:Depends}
+Suggests: hylafax-server
+Description: T.38 Fax over IP pseudo modem
+ From your fax application view point it's a fax modem pool.
+ From IP network view point it's a H.323 endpoint with T.38 fax support.
+ From your view point it's a gateway between a fax application and IP network.
diff --cc debian/copyright
index 7ea17b1,0000000..f2153de
mode 100644,000000..100644
--- a/debian/copyright
+++ b/debian/copyright
@@@ -1,385 -1,0 +1,399 @@@
- This package was debianized by Mark Purcell <msp at debian.org> on
- Tue, 8 Jul 2003 22:18:50 +1000.
++Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
++Source: http://t38modem.sf.net/
++Upstream-Name: t38modem
++Upstream-Contact: Vyacheslav Frolov
++
++Files: *
++Copyright: 2001-2011, Vyacheslav Frolova
++License: MPL-1.0
++
++Files: precompile.cxx
++Copyright: 1993-1998, Equivalence Pty. Ltd.
++License: MPL-1.0
++
++Files: h323lib/g7231_fake.h
++Copyright: 2001-2002, Equivalence Pty Ltd
++License: MPL-1.0
++
++Files: g711.c
++Copyright: Sun Microsystems, Inc.
++License: other-Sun
++
++Files: debian/*
++Copyright: 2003, Mark Purcell <msp at debian.org>
++ 2012, Michael van der Kolff <mvanderkolff at gmail.com>
++
++Files: debian/patches/t38modem-opal3.10-patch
++Copyright: 2011, Peter Katzmann <pk1057 at users.sf.net>
++License: MPL-1.0
++
++License: other-Sun
++ This source code is a product of Sun Microsystems, Inc. and is provided
++ for unrestricted use. Users may copy or modify this source code without
++ charge.
++ .
++ SUN SOURCE CODE IS PROVIDED AS IS WITH NO WARRANTIES OF ANY KIND INCLUDING
++ THE WARRANTIES OF DESIGN, MERCHANTIBILITY AND FITNESS FOR A PARTICULAR
++ PURPOSE, OR ARISING FROM A COURSE OF DEALING, USAGE OR TRADE PRACTICE.
++ .
++ Sun source code is provided with no support and without any obligation on
++ the part of Sun Microsystems, Inc. to assist in its use, correction,
++ modification or enhancement.
++ .
++ SUN MICROSYSTEMS, INC. SHALL HAVE NO LIABILITY WITH RESPECT TO THE
++ INFRINGEMENT OF COPYRIGHTS, TRADE SECRETS OR ANY PATENTS BY THIS SOFTWARE
++ OR ANY PART THEREOF.
++ .
++ In no event will Sun Microsystems, Inc. be liable for any lost revenue
++ or profits or other special, indirect and consequential damages, even if
++ Sun has been advised of the possibility of such damages.
++ .
++ Sun Microsystems, Inc.
++ 2550 Garcia Avenue
++ Mountain View, California 94043
++
++License: MPL 1.0
++ The contents of this file are subject to the Mozilla Public License
++ Version 1.0 (the "License"); you may not use this file except in
++ compliance with the License. You may obtain a copy of the License at
++ http://www.mozilla.org/MPL/
++ .
++ Software distributed under the License is distributed on an "AS IS"
++ basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See
++ the License for the specific language governing rights and limitations
++ under the License.
++ .
++ Mozilla Public License Version 1.0
++ .
++ 1. Definitions.
++ 1.1. "Contributor" means each entity that creates or contributes to
++ the creation of Modifications.
++ 1.2. "Contributor Version" means the combination of the Original
++ Code, prior Modifications used by a Contributor, and the
++ Modifications made by that particular Contributor.
++ 1.3. "Covered Code" means the Original Code or Modifications or
++ the combination of the Original Code and Modifications, in each
++ case including portions thereof.
++ 1.4. "Electronic Distribution Mechanism" means a mechanism
++ generally accepted in the software development community for the
++ electronic transfer of data.
++ 1.5. "Executable" means Covered Code in any form other than Source
++ Code.
++ 1.6. "Initial Developer" means the individual or entity identified
++ as the Initial Developer in the Source Code notice required by
++ Exhibit A.
++ 1.7. "Larger Work" means a work which combines Covered Code or
++ portions thereof with code not governed by the terms of this
++ License.
++ 1.8. "License" means this document.
++ 1.9. "Modifications" means any addition to or deletion from the
++ substance or structure of either the Original Code or any previous
++ Modifications. When Covered Code is released as a series of files,
++ a Modification is:
++ .
++ A. Any addition to or deletion from the contents of a file containing
++ Original Code or previous Modifications.
++ B. Any new file that contains any part of the Original Code or
++ previous Modifications.
++ .
++ 1.10. "Original Code" means Source Code of computer software code
++ which is described in the Source Code notice required by Exhibit A as
++ Original Code, and which, at the time of its release under this
++ License is not already Covered Code governed by this License.
++ .
++ 1.11. "Source Code" means the preferred form of the Covered Code for
++ making modifications to it, including all modules it contains, plus
++ any associated interface definition files, scripts used to control
++ compilation and installation of an Executable, or a list of source
++ code differential comparisons against either the Original Code or
++ another well known, available Covered Code of the Contributor's
++ choice. The Source Code can be in a compressed or archival form,
++ provided the appropriate decompression or de-archiving software is
++ widely available for no charge.
++ .
++ 1.12. "You" means an individual or a legal entity exercising rights
++ under, and complying with all of the terms of, this License or a
++ future version of this License issued under Section 6.1. For legal
++ entities, "You" includes any entity which controls, is controlled by,
++ or is under common control with You. For purposes of this definition,
++ "control" means (a) the power, direct or indirect, to cause the
++ direction or management of such entity, whether by contract or
++ otherwise, or (b) ownership of fifty percent (50%) or more of the
++ outstanding shares or beneficial ownership of such entity.
++ 2. Source Code License.
++ 2.1. The Initial Developer Grant.
++ The Initial Developer hereby grants You a world-wide,
++ royalty-free, non-exclusive license, subject to third party
++ intellectual property claims:
++
++ (a) to use, reproduce, modify, display, perform, sublicense and
++ distribute the Original Code (or portions thereof) with or without
++ Modifications, or as part of a Larger Work; and
++ (b) under patents now or hereafter owned or controlled by Initial
++ Developer, to make, have made, use and sell ("Utilize") the
++ Original Code (or portions thereof), but solely to the extent that
++ any such patent is reasonably necessary to enable You to Utilize
++ the Original Code (or portions thereof) and not to any greater
++ extent that may be necessary to Utilize further Modifications or
++ combinations.
++ .
++ 2.2. Contributor Grant.
++ Each Contributor hereby grants You a world-wide, royalty-free,
++ non-exclusive license, subject to third party intellectual property
++ claims:
++ (a) to use, reproduce, modify, display, perform, sublicense and
++ distribute the Modifications created by such Contributor (or
++ portions thereof) either on an unmodified basis, with other
++ Modifications, as Covered Code or as part of a Larger Work; and
++ (b) under patents now or hereafter owned or controlled by
++ Contributor, to Utilize the Contributor Version (or portions
++ thereof), but solely to the extent that any such patent is
++ reasonably necessary to enable You to Utilize the Contributor
++ Version (or portions thereof), and not to any greater extent that
++ may be necessary to Utilize further Modifications or combinations.
++ .
++ 3. Distribution Obligations.
++ 3.1. Application of License.
++ The Modifications which You create or to which You contribute are
++ governed by the terms of this License, including without
++ limitation Section 2.2. The Source Code version of Covered Code
++ may be distributed only under the terms of this License or a
++ future version of this License released under Section 6.1, and You
++ must include a copy of this License with every copy of the Source
++ Code You distribute. You may not offer or impose any terms on any
++ Source Code version that alters or restricts the applicable
++ version of this License or the recipients' rights hereunder.
++ However, You may include an additional document offering the
++ additional rights described in Section 3.5.
++ 3.2. Availability of Source Code.
++ Any Modification which You create or to which You contribute must
++ be made available in Source Code form under the terms of this
++ License either on the same media as an Executable version or via
++ an accepted Electronic Distribution Mechanism to anyone to whom
++ you made an Executable version available; and if made available
++ via Electronic Distribution Mechanism, must remain available for
++ at least twelve (12) months after the date it initially became
++ available, or at least six (6) months after a subsequent version
++ of that particular Modification has been made available to such
++ recipients. You are responsible for ensuring that the Source Code
++ version remains available even if the Electronic Distribution
++ Mechanism is maintained by a third party.
++ 3.3. Description of Modifications.
++ You must cause all Covered Code to which you contribute to contain
++ a file documenting the changes You made to create that Covered
++ Code and the date of any change. You must include a prominent
++ statement that the Modification is derived, directly or
++ indirectly, from Original Code provided by the Initial Developer
++ and including the name of the Initial Developer in (a) the Source
++ Code, and (b) in any notice in an Executable version or related
++ documentation in which You describe the origin or ownership of the
++ Covered Code.
++ 3.4. Intellectual Property Matters
++ .
++ (a) Third Party Claims.
++ If You have knowledge that a party claims an intellectual property
++ right in particular functionality or code (or its utilization
++ under this License), you must include a text file with the source
++ code distribution titled "LEGAL" which describes the claim and the
++ party making the claim in sufficient detail that a recipient will
++ know whom to contact. If you obtain such knowledge after You make
++ Your Modification available as described in Section 3.2, You shall
++ promptly modify the LEGAL file in all copies You make available
++ thereafter and shall take other steps (such as notifying
++ appropriate mailing lists or newsgroups) reasonably calculated to
++ inform those who received the Covered Code that new knowledge has
++ been obtained.
++ (b) Contributor APIs.
++ If Your Modification is an application programming interface and
++ You own or control patents which are reasonably necessary to
++ implement that API, you must also include this information in the
++ LEGAL file.
++ .
++ 3.5. Required Notices.
++ You must duplicate the notice in Exhibit A in each file of the Source
++ Code, and this License in any documentation for the Source Code, where
++ You describe recipients' rights relating to Covered Code. If You
++ created one or more Modification(s), You may add your name as a
++ Contributor to the notice described in Exhibit A. If it is not
++ possible to put such notice in a particular Source Code file due to
++ its structure, then you must include such notice in a location (such
++ as a relevant directory file) where a user would be likely to look for
++ such a notice. You may choose to offer, and to charge a fee for,
++ warranty, support, indemnity or liability obligations to one or more
++ recipients of Covered Code. However, You may do so only on Your own
++ behalf, and not on behalf of the Initial Developer or any Contributor.
++ You must make it absolutely clear than any such warranty, support,
++ indemnity or liability obligation is offered by You alone, and You
++ hereby agree to indemnify the Initial Developer and every Contributor
++ for any liability incurred by the Initial Developer or such
++ Contributor as a result of warranty, support, indemnity or liability
++ terms You offer.
++ .
++ 3.6. Distribution of Executable Versions.
++ You may distribute Covered Code in Executable form only if the
++ requirements of Section 3.1-3.5 have been met for that Covered Code,
++ and if You include a notice stating that the Source Code version of
++ the Covered Code is available under the terms of this License,
++ including a description of how and where You have fulfilled the
++ obligations of Section 3.2. The notice must be conspicuously included
++ in any notice in an Executable version, related documentation or
++ collateral in which You describe recipients' rights relating to the
++ Covered Code. You may distribute the Executable version of Covered
++ Code under a license of Your choice, which may contain terms different
++ from this License, provided that You are in compliance with the terms
++ of this License and that the license for the Executable version does
++ not attempt to limit or alter the recipient's rights in the Source
++ Code version from the rights set forth in this License. If You
++ distribute the Executable version under a different license You must
++ make it absolutely clear that any terms which differ from this License
++ are offered by You alone, not by the Initial Developer or any
++ Contributor. You hereby agree to indemnify the Initial Developer and
++ every Contributor for any liability incurred by the Initial Developer
++ or such Contributor as a result of any such terms You offer.
++ .
++ 3.7. Larger Works.
++ You may create a Larger Work by combining Covered Code with other code
++ not governed by the terms of this License and distribute the Larger
++ Work as a single product. In such a case, You must make sure the
++ requirements of this License are fulfilled for the Covered Code.
++ 4. Inability to Comply Due to Statute or Regulation.
++ If it is impossible for You to comply with any of the terms of
++ this License with respect to some or all of the Covered Code due
++ to statute or regulation then You must: (a) comply with the terms
++ of this License to the maximum extent possible; and (b) describe
++ the limitations and the code they affect. Such description must be
++ included in the LEGAL file described in Section 3.4 and must be
++ included with all distributions of the Source Code. Except to the
++ extent prohibited by statute or regulation, such description must
++ be sufficiently detailed for a recipient of ordinary skill to be
++ able to understand it.
++ .
++ 5. Application of this License.
++ This License applies to code to which the Initial Developer has
++ attached the notice in Exhibit A, and to related Covered Code.
++ .
++ 6. Versions of the License.
++ 6.1. New Versions.
++ Netscape Communications Corporation ("Netscape") may publish
++ revised and/or new versions of the License from time to time. Each
++ version will be given a distinguishing version number.
++ 6.2. Effect of New Versions.
++ Once Covered Code has been published under a particular version of
++ the License, You may always continue to use it under the terms of
++ that version. You may also choose to use such Covered Code under
++ the terms of any subsequent version of the License published by
++ Netscape. No one other than Netscape has the right to modify the
++ terms applicable to Covered Code created under this License.
++ 6.3. Derivative Works.
++ If you create or use a modified version of this License (which you
++ may only do in order to apply it to code which is not already
++ Covered Code governed by this License), you must (a) rename Your
++ license so that the phrases "Mozilla", "MOZILLAPL", "MOZPL",
++ "Netscape", "NPL" or any confusingly similar phrase do not appear
++ anywhere in your license and (b) otherwise make it clear that your
++ version of the license contains terms which differ from the
++ Mozilla Public License and Netscape Public License. (Filling in
++ the name of the Initial Developer, Original Code or Contributor in
++ the notice described in Exhibit A shall not of themselves be
++ deemed to be modifications of this License.)
++ .
++ 7. DISCLAIMER OF WARRANTY.
++ COVERED CODE IS PROVIDED UNDER THIS LICENSE ON AN "AS IS" BASIS,
++ WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED OR IMPLIED,
++ INCLUDING, WITHOUT LIMITATION, WARRANTIES THAT THE COVERED CODE IS
++ FREE OF DEFECTS, MERCHANTABLE, FIT FOR A PARTICULAR PURPOSE OR
++ NON-INFRINGING. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE
++ OF THE COVERED CODE IS WITH YOU. SHOULD ANY COVERED CODE PROVE
++ DEFECTIVE IN ANY RESPECT, YOU (NOT THE INITIAL DEVELOPER OR ANY
++ OTHER CONTRIBUTOR) ASSUME THE COST OF ANY NECESSARY SERVICING,
++ REPAIR OR CORRECTION. THIS DISCLAIMER OF WARRANTY CONSTITUTES AN
++ ESSENTIAL PART OF THIS LICENSE. NO USE OF ANY COVERED CODE IS
++ AUTHORIZED HEREUNDER EXCEPT UNDER THIS DISCLAIMER.
++ .
++ 8. TERMINATION.
++ This License and the rights granted hereunder will terminate
++ automatically if You fail to comply with terms herein and fail to
++ cure such breach within 30 days of becoming aware of the breach.
++ All sublicenses to the Covered Code which are properly granted
++ shall survive any termination of this License. Provisions which,
++ by their nature, must remain in effect beyond the termination of
++ this License shall survive.
++ .
++ 9. LIMITATION OF LIABILITY.
++ UNDER NO CIRCUMSTANCES AND UNDER NO LEGAL THEORY, WHETHER TORT
++ (INCLUDING NEGLIGENCE), CONTRACT, OR OTHERWISE, SHALL THE INITIAL
++ DEVELOPER, ANY OTHER CONTRIBUTOR, OR ANY DISTRIBUTOR OF COVERED
++ CODE, OR ANY SUPPLIER OF ANY OF SUCH PARTIES, BE LIABLE TO YOU OR
++ ANY OTHER PERSON FOR ANY INDIRECT, SPECIAL, INCIDENTAL, OR
++ CONSEQUENTIAL DAMAGES OF ANY CHARACTER INCLUDING, WITHOUT
++ LIMITATION, DAMAGES FOR LOSS OF GOODWILL, WORK STOPPAGE, COMPUTER
++ FAILURE OR MALFUNCTION, OR ANY AND ALL OTHER COMMERCIAL DAMAGES OR
++ LOSSES, EVEN IF SUCH PARTY SHALL HAVE BEEN INFORMED OF THE
++ POSSIBILITY OF SUCH DAMAGES. THIS LIMITATION OF LIABILITY SHALL
++ NOT APPLY TO LIABILITY FOR DEATH OR PERSONAL INJURY RESULTING FROM
++ SUCH PARTY'S NEGLIGENCE TO THE EXTENT APPLICABLE LAW PROHIBITS
++ SUCH LIMITATION. SOME JURISDICTIONS DO NOT ALLOW THE EXCLUSION OR
++ LIMITATION OF INCIDENTAL OR CONSEQUENTIAL DAMAGES, SO THAT
++ EXCLUSION AND LIMITATION MAY NOT APPLY TO YOU.
++ .
++ 10. U.S. GOVERNMENT END USERS.
++ The Covered Code is a "commercial item," as that term is defined in 48
++ C.F.R. 2.101 (Oct. 1995), consisting of "commercial computer
++ software" and "commercial computer software documentation," as
++ such terms are used in 48 C.F.R. 12.212 (Sept. 1995). Consistent
++ with 48 C.F.R. 12.212 and 48 C.F.R. 227.7202-1 through 227.7202-4
++ (June 1995), all U.S. Government End Users acquire Covered Code
++ with only those rights set forth herein.
++ .
++ 11. MISCELLANEOUS.
++ This License represents the complete agreement concerning subject
++ matter hereof. If any provision of this License is held to be
++ unenforceable, such provision shall be reformed only to the extent
++ necessary to make it enforceable. This License shall be governed
++ by California law provisions (except to the extent applicable law,
++ if any, provides otherwise), excluding its conflict-of-law
++ provisions. With respect to disputes in which at least one party
++ is a citizen of, or an entity chartered or registered to do
++ business in, the United States of America: (a) unless otherwise
++ agreed in writing, all disputes relating to this License
++ (excepting any dispute relating to intellectual property rights)
++ shall be subject to final and binding arbitration, with the losing
++ party paying all costs of arbitration; (b) any arbitration
++ relating to this Agreement shall be held in Santa Clara County,
++ California, under the auspices of JAMS/EndDispute; and (c) any
++ litigation relating to this Agreement shall be subject to the
++ jurisdiction of the Federal Courts of the Northern District of
++ California, with venue lying in Santa Clara County, California,
++ with the losing party responsible for costs, including without
++ limitation, court costs and reasonable attorneys fees and
++ expenses. The application of the United Nations Convention on
++ Contracts for the International Sale of Goods is expressly
++ excluded. Any law or regulation which provides that the language
++ of a contract shall be construed against the drafter shall not
++ apply to this License.
++ .
++ 12. RESPONSIBILITY FOR CLAIMS.
++ Except in cases where another Contributor has failed to comply with
++ Section 3.4, You are responsible for damages arising, directly or
++ indirectly, out of Your utilization of rights under this License,
++ based on the number of copies of Covered Code you made available,
++ the revenues you received from utilizing such rights, and other
++ relevant factors. You agree to work with affected parties to
++ distribute responsibility on an equitable basis.
++ .
++ EXHIBIT A.
++ "The contents of this file are subject to the Mozilla Public License
++ Version 1.0 (the "License"); you may not use this file except in
++ compliance with the License. You may obtain a copy of the License
++ at http://www.mozilla.org/MPL/
++ Software distributed under the License is distributed on an "AS
++ IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
++ implied. See the License for the specific language governing
++ rights and limitations under the License.
++ The Original Code is ______________________________________.
++ The Initial Developer of the Original Code is
++ ________________________. Portions created by
++ ______________________ are Copyright (C) ______
++ _______________________. All Rights Reserved.
++ Contributor(s): ______________________________________."
+
- It was downloaded from http://openh323.sf.net/ or the CVS using its tag if not
- yet public.
-
- Upstream Author: Vyacheslav Frolov
-
- Copyright:
-
- * Copyright (c) 2001-2002 Vyacheslav Frolov
- *
- * Open H323 Project
- *
- * The contents of this file are subject to the Mozilla Public License
- * Version 1.0 (the "License"); you may not use this file except in
- * compliance with the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS"
- * basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See
- * the License for the specific language governing rights and limitations
- * under the License.
-
-
- MOZILLA PUBLIC LICENSE
- Version 1.0
-
- ----------------
-
- 1. Definitions.
-
- 1.1. ``Contributor'' means each entity that creates or contributes to
- the creation of Modifications.
-
- 1.2. ``Contributor Version'' means the combination of the Original
- Code, prior Modifications used by a Contributor, and the Modifications
- made by that particular Contributor.
-
- 1.3. ``Covered Code'' means the Original Code or Modifications or the
- combination of the Original Code and Modifications, in each case
- including portions thereof.
-
- 1.4. ``Electronic Distribution Mechanism'' means a mechanism generally
- accepted in the software development community for the electronic
- transfer of data.
-
- 1.5. ``Executable'' means Covered Code in any form other than Source
- Code.
-
- 1.6. ``Initial Developer'' means the individual or entity identified as
- the Initial Developer in the Source Code notice required by Exhibit A.
-
- 1.7. ``Larger Work'' means a work which combines Covered Code or
- portions thereof with code not governed by the terms of this License.
-
- 1.8. ``License'' means this document.
-
- 1.9. ``Modifications'' means any addition to or deletion from the
- substance or structure of either the Original Code or any previous
- Modifications. When Covered Code is released as a series of files, a
- Modification is:
-
- A. Any addition to or deletion from the contents of a file
- containing Original Code or previous Modifications.
-
- B. Any new file that contains any part of the Original Code or
- previous Modifications.
-
- 1.10. ``Original Code'' means Source Code of computer software code
- which is described in the Source Code notice required by Exhibit A as
- Original Code, and which, at the time of its release under this License
- is not already Covered Code governed by this License.
-
- 1.11. ``Source Code'' means the preferred form of the Covered Code for
- making modifications to it, including all modules it contains, plus any
- associated interface definition files, scripts used to control
- compilation and installation of an Executable, or a list of source code
- differential comparisons against either the Original Code or another
- well known, available Covered Code of the Contributor's choice. The
- Source Code can be in a compressed or archival form, provided the
- appropriate decompression or de-archiving software is widely available
- for no charge.
-
- 1.12. ``You'' means an individual or a legal entity exercising rights
- under, and complying with all of the terms of, this License or a future
- version of this License issued under Section 6.1. For legal entities,
- ``You'' includes any entity which controls, is controlled by, or is
- under common control with You. For purposes of this definition,
- ``control'' means (a) the power, direct or indirect, to cause the
- direction or management of such entity, whether by contract or
- otherwise, or (b) ownership of fifty percent (50%) or more of the
- outstanding shares or beneficial ownership of such entity.
-
- 2. Source Code License.
-
- 2.1. The Initial Developer Grant.
- The Initial Developer hereby grants You a world-wide, royalty-free,
- non-exclusive license, subject to third party intellectual property
- claims:
-
- (a) to use, reproduce, modify, display, perform, sublicense and
- distribute the Original Code (or portions thereof) with or without
- Modifications, or as part of a Larger Work; and
-
- (b) under patents now or hereafter owned or controlled by Initial
- Developer, to make, have made, use and sell (``Utilize'') the
- Original Code (or portions thereof), but solely to the extent that
- any such patent is reasonably necessary to enable You to Utilize
- the Original Code (or portions thereof) and not to any greater
- extent that may be necessary to Utilize further Modifications or
- combinations.
-
- 2.2. Contributor Grant.
- Each Contributor hereby grants You a world-wide, royalty-free,
- non-exclusive license, subject to third party intellectual property
- claims:
-
- (a) to use, reproduce, modify, display, perform, sublicense and
- distribute the Modifications created by such Contributor (or
- portions thereof) either on an unmodified basis, with other
- Modifications, as Covered Code or as part of a Larger Work; and
-
- (b) under patents now or hereafter owned or controlled by
- Contributor, to Utilize the Contributor Version (or portions
- thereof), but solely to the extent that any such patent is
- reasonably necessary to enable You to Utilize the Contributor
- Version (or portions thereof), and not to any greater extent that
- may be necessary to Utilize further Modifications or combinations.
-
- 3. Distribution Obligations.
-
- 3.1. Application of License.
- The Modifications which You create or to which You contribute are
- governed by the terms of this License, including without limitation
- Section 2.2. The Source Code version of Covered Code may be distributed
- only under the terms of this License or a future version of this
- License released under Section 6.1, and You must include a copy of this
- License with every copy of the Source Code You distribute. You may not
- offer or impose any terms on any Source Code version that alters or
- restricts the applicable version of this License or the recipients'
- rights hereunder. However, You may include an additional document
- offering the additional rights described in Section 3.5.
-
- 3.2. Availability of Source Code.
- Any Modification which You create or to which You contribute must be
- made available in Source Code form under the terms of this License
- either on the same media as an Executable version or via an accepted
- Electronic Distribution Mechanism to anyone to whom you made an
- Executable version available; and if made available via Electronic
- Distribution Mechanism, must remain available for at least twelve (12)
- months after the date it initially became available, or at least six
- (6) months after a subsequent version of that particular Modification
- has been made available to such recipients. You are responsible for
- ensuring that the Source Code version remains available even if the
- Electronic Distribution Mechanism is maintained by a third party.
-
- 3.3. Description of Modifications.
- You must cause all Covered Code to which you contribute to contain a
- file documenting the changes You made to create that Covered Code and
- the date of any change. You must include a prominent statement that the
- Modification is derived, directly or indirectly, from Original Code
- provided by the Initial Developer and including the name of the Initial
- Developer in (a) the Source Code, and (b) in any notice in an
- Executable version or related documentation in which You describe the
- origin or ownership of the Covered Code.
-
- 3.4. Intellectual Property Matters
-
- (a) Third Party Claims.
- If You have knowledge that a party claims an intellectual property
- right in particular functionality or code (or its utilization
- under this License), you must include a text file with the source
- code distribution titled ``LEGAL'' which describes the claim and
- the party making the claim in sufficient detail that a recipient
- will know whom to contact. If you obtain such knowledge after You
- make Your Modification available as described in Section 3.2, You
- shall promptly modify the LEGAL file in all copies You make
- available thereafter and shall take other steps (such as notifying
- appropriate mailing lists or newsgroups) reasonably calculated to
- inform those who received the Covered Code that new knowledge has
- been obtained.
-
- (b) Contributor APIs.
- If Your Modification is an application programming interface and
- You own or control patents which are reasonably necessary to
- implement that API, you must also include this information in the
- LEGAL file.
-
- 3.5. Required Notices.
- You must duplicate the notice in Exhibit A in each file of the Source
- Code, and this License in any documentation for the Source Code, where
- You describe recipients' rights relating to Covered Code. If You
- created one or more Modification(s), You may add your name as a
- Contributor to the notice described in Exhibit A. If it is not possible
- to put such notice in a particular Source Code file due to its
- structure, then you must include such notice in a location (such as a
- relevant directory file) where a user would be likely to look for such
- a notice. You may choose to offer, and to charge a fee for, warranty,
- support, indemnity or liability obligations to one or more recipients
- of Covered Code. However, You may do so only on Your own behalf, and
- not on behalf of the Initial Developer or any Contributor. You must
- make it absolutely clear than any such warranty, support, indemnity or
- liability obligation is offered by You alone, and You hereby agree to
- indemnify the Initial Developer and every Contributor for any liability
- incurred by the Initial Developer or such Contributor as a result of
- warranty, support, indemnity or liability terms You offer.
-
- 3.6. Distribution of Executable Versions.
- You may distribute Covered Code in Executable form only if the
- requirements of Section 3.1-3.5 have been met for that Covered Code,
- and if You include a notice stating that the Source Code version of the
- Covered Code is available under the terms of this License, including a
- description of how and where You have fulfilled the obligations of
- Section 3.2. The notice must be conspicuously included in any notice in
- an Executable version, related documentation or collateral in which You
- describe recipients' rights relating to the Covered Code. You may
- distribute the Executable version of Covered Code under a license of
- Your choice, which may contain terms different from this License,
- provided that You are in compliance with the terms of this License and
- that the license for the Executable version does not attempt to limit
- or alter the recipient's rights in the Source Code version from the
- rights set forth in this License. If You distribute the Executable
- version under a different license You must make it absolutely clear
- that any terms which differ from this License are offered by You alone,
- not by the Initial Developer or any Contributor. You hereby agree to
- indemnify the Initial Developer and every Contributor for any liability
- incurred by the Initial Developer or such Contributor as a result of
- any such terms You offer.
-
- 3.7. Larger Works.
- You may create a Larger Work by combining Covered Code with other code
- not governed by the terms of this License and distribute the Larger
- Work as a single product. In such a case, You must make sure the
- requirements of this License are fulfilled for the Covered Code.
-
- 4. Inability to Comply Due to Statute or Regulation.
-
- If it is impossible for You to comply with any of the terms of this
- License with respect to some or all of the Covered Code due to statute
- or regulation then You must: (a) comply with the terms of this License
- to the maximum extent possible; and (b) describe the limitations and
- the code they affect. Such description must be included in the LEGAL
- file described in Section 3.4 and must be included with all
- distributions of the Source Code. Except to the extent prohibited by
- statute or regulation, such description must be sufficiently detailed
- for a recipient of ordinary skill to be able to understand it.
-
- 5. Application of this License.
-
- This License applies to code to which the Initial Developer has
- attached the notice in Exhibit A, and to related Covered Code.
-
- 6. Versions of the License.
-
- 6.1. New Versions.
- Netscape Communications Corporation (``Netscape'') may publish revised
- and/or new versions of the License from time to time. Each version will
- be given a distinguishing version number.
-
- 6.2. Effect of New Versions.
- Once Covered Code has been published under a particular version of the
- License, You may always continue to use it under the terms of that
- version. You may also choose to use such Covered Code under the terms
- of any subsequent version of the License published by Netscape. No one
- other than Netscape has the right to modify the terms applicable to
- Covered Code created under this License.
-
- 6.3. Derivative Works.
- If you create or use a modified version of this License (which you may
- only do in order to apply it to code which is not already Covered Code
- governed by this License), you must (a) rename Your license so that the
- phrases ``Mozilla'', ``MOZILLAPL'', ``MOZPL'', ``Netscape'', ``NPL'' or
- any confusingly similar phrase do not appear anywhere in your license
- and (b) otherwise make it clear that your version of the license
- contains terms which differ from the Mozilla Public License and
- Netscape Public License. (Filling in the name of the Initial Developer,
- Original Code or Contributor in the notice described in Exhibit A shall
- not of themselves be deemed to be modifications of this License.)
-
- 7. DISCLAIMER OF WARRANTY.
-
- COVERED CODE IS PROVIDED UNDER THIS LICENSE ON AN ``AS IS'' BASIS,
- WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING,
- WITHOUT LIMITATION, WARRANTIES THAT THE COVERED CODE IS FREE OF
- DEFECTS, MERCHANTABLE, FIT FOR A PARTICULAR PURPOSE OR NON-INFRINGING.
- THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE COVERED CODE
- IS WITH YOU. SHOULD ANY COVERED CODE PROVE DEFECTIVE IN ANY RESPECT,
- YOU (NOT THE INITIAL DEVELOPER OR ANY OTHER CONTRIBUTOR) ASSUME THE
- COST OF ANY NECESSARY SERVICING, REPAIR OR CORRECTION. THIS DISCLAIMER
- OF WARRANTY CONSTITUTES AN ESSENTIAL PART OF THIS LICENSE. NO USE OF
- ANY COVERED CODE IS AUTHORIZED HEREUNDER EXCEPT UNDER THIS DISCLAIMER.
-
- 8. TERMINATION.
-
- This License and the rights granted hereunder will terminate
- automatically if You fail to comply with terms herein and fail to cure
- such breach within 30 days of becoming aware of the breach. All
- sublicenses to the Covered Code which are properly granted shall
- survive any termination of this License. Provisions which, by their
- nature, must remain in effect beyond the termination of this License
- shall survive.
-
- 9. LIMITATION OF LIABILITY.
-
- UNDER NO CIRCUMSTANCES AND UNDER NO LEGAL THEORY, WHETHER TORT
- (INCLUDING NEGLIGENCE), CONTRACT, OR OTHERWISE, SHALL THE INITIAL
- DEVELOPER, ANY OTHER CONTRIBUTOR, OR ANY DISTRIBUTOR OF COVERED CODE,
- OR ANY SUPPLIER OF ANY OF SUCH PARTIES, BE LIABLE TO YOU OR ANY OTHER
- PERSON FOR ANY INDIRECT, SPECIAL, INCIDENTAL, OR CONSEQUENTIAL DAMAGES
- OF ANY CHARACTER INCLUDING, WITHOUT LIMITATION, DAMAGES FOR LOSS OF
- GOODWILL, WORK STOPPAGE, COMPUTER FAILURE OR MALFUNCTION, OR ANY AND
- ALL OTHER COMMERCIAL DAMAGES OR LOSSES, EVEN IF SUCH PARTY SHALL HAVE
- BEEN INFORMED OF THE POSSIBILITY OF SUCH DAMAGES. THIS LIMITATION OF
- LIABILITY SHALL NOT APPLY TO LIABILITY FOR DEATH OR PERSONAL INJURY
- RESULTING FROM SUCH PARTY'S NEGLIGENCE TO THE EXTENT APPLICABLE LAW
- PROHIBITS SUCH LIMITATION. SOME JURISDICTIONS DO NOT ALLOW THE
- EXCLUSION OR LIMITATION OF INCIDENTAL OR CONSEQUENTIAL DAMAGES, SO THAT
- EXCLUSION AND LIMITATION MAY NOT APPLY TO YOU.
-
- 10. U.S. GOVERNMENT END USERS.
-
- The Covered Code is a ``commercial item,'' as that term is defined in
- 48 C.F.R. 2.101 (Oct. 1995), consisting of ``commercial computer
- software'' and ``commercial computer software documentation,'' as such
- terms are used in 48 C.F.R. 12.212 (Sept. 1995). Consistent with 48
- C.F.R. 12.212 and 48 C.F.R. 227.7202-1 through 227.7202-4 (June 1995),
- all U.S. Government End Users acquire Covered Code with only those
- rights set forth herein.
-
- 11. MISCELLANEOUS.
-
- This License represents the complete agreement concerning subject
- matter hereof. If any provision of this License is held to be
- unenforceable, such provision shall be reformed only to the extent
- necessary to make it enforceable. This License shall be governed by
- California law provisions (except to the extent applicable law, if any,
- provides otherwise), excluding its conflict-of-law provisions. With
- respect to disputes in which at least one party is a citizen of, or an
- entity chartered or registered to do business in, the United States of
- America: (a) unless otherwise agreed in writing, all disputes relating
- to this License (excepting any dispute relating to intellectual
- property rights) shall be subject to final and binding arbitration,
- with the losing party paying all costs of arbitration; (b) any
- arbitration relating to this Agreement shall be held in Santa Clara
- County, California, under the auspices of JAMS/EndDispute; and (c) any
- litigation relating to this Agreement shall be subject to the
- jurisdiction of the Federal Courts of the Northern District of
- California, with venue lying in Santa Clara County, California, with
- the losing party responsible for costs, including without limitation,
- court costs and reasonable attorneys fees and expenses. The application
- of the United Nations Convention on Contracts for the International
- Sale of Goods is expressly excluded. Any law or regulation which
- provides that the language of a contract shall be construed against the
- drafter shall not apply to this License.
-
- 12. RESPONSIBILITY FOR CLAIMS.
-
- Except in cases where another Contributor has failed to comply with
- Section 3.4, You are responsible for damages arising, directly or
- indirectly, out of Your utilization of rights under this License, based
- on the number of copies of Covered Code you made available, the
- revenues you received from utilizing such rights, and other relevant
- factors. You agree to work with affected parties to distribute
- responsibility on an equitable basis.
-
- EXHIBIT A.
-
- ``The contents of this file are subject to the Mozilla Public License
- Version 1.0 (the "License"); you may not use this file except in
- compliance with the License. You may obtain a copy of the License at
- http://www.mozilla.org/MPL/
-
- Software distributed under the License is distributed on an "AS IS"
- basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See the
- License for the specific language governing rights and limitations
- under the License.
-
- The Original Code is ______________________________________.
-
- The Initial Developer of the Original Code is ________________________.
- Portions created by ______________________ are Copyright (C) ______
- _______________________. All Rights Reserved.
-
- Contributor(s): ______________________________________.''
diff --cc debian/patches/series
index 7864634,0000000..0f0dc4a
mode 100644,000000..100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@@ -1,1 -1,0 +1,3 @@@
- simplify-makefile
++simplify-makefile-new
++t38modem-opal3.10-patch
++spelling-error-fix
diff --cc debian/patches/simplify-makefile-new
index c452190,0000000..b6ed6df
mode 100644,000000..100644
--- a/debian/patches/simplify-makefile-new
+++ b/debian/patches/simplify-makefile-new
@@@ -1,146 -1,0 +1,173 @@@
- Description: Simplify upstream Makefile (Thks mvanderkolff)
- Author: Mark Purcell <msp at debian.org>
++Description: Simplify upstream Makefile - adapt previous simplify-makefile
++Author: Michael van der Kolff <mvanderkolff at gmail.com>
+Bug-Debian: http://bugs.debian.org/584501
-
- --- t38modem-1.2.0.orig/Makefile
- +++ t38modem-1.2.0/Makefile
- @@ -97,59 +97,29 @@
++Forwarded: not-needed
++--- a/Makefile
+++++ b/Makefile
++@@ -109,60 +109,41 @@
+ #
+ #
+
+-PROG = t38modem
+-SOURCES := pmutils.cxx dle.cxx pmodem.cxx pmodemi.cxx drivers.cxx \
- - t30tone.cxx hdlc.cxx t30.cxx fcs.cxx \
++- t30tone.cxx tone_gen.cxx hdlc.cxx t30.cxx fcs.cxx \
+- pmodeme.cxx enginebase.cxx t38engine.cxx audio.cxx \
+- drv_pty.cxx \
+- main_process.cxx
+-
+-#
+-# Build t38modem for
+-# - Open Phone Abstraction Library if defined USE_OPAL
+-# - Open H323 Library or H323 Plus Library if not defined USE_OPAL
+-# (NOTE: define NO_PBOOLEAN for Open H323 Library)
+-#
+-ifdef USE_OPAL
+- VPATH_CXX := opal
+-
+- SOURCES += \
+- opalutils.cxx \
+- modemep.cxx modemstrm.cxx \
+- h323ep.cxx \
+- sipep.cxx \
- - manager.cxx
++- manager.cxx \
++- fake_codecs.cxx \
+-
+- ifndef OPALDIR
+- OPALDIR=$(HOME)/opal
+- endif
+-
+- OBJDIR_SUFFIX = _opal$(OBJ_SUFFIX)
+- STDCCFLAGS += -DUSE_OPAL
- -
+++%.o: %.cxx
+++ $(CXX) -c $(CFLAGS) $(CPPFLAGS) -o $@ $<
++
+- include $(OPALDIR)/opal_inc.mak
+-else
+- VPATH_CXX := h323lib
+-
- - SOURCES += t38protocol.cxx g7231_fake.cxx h323ep.cxx
- +%.o: %.cxx
- + $(CC) -c $(CFLAGS) $(CPPFLAGS) -o $@ $<
-
++- SOURCES += t38protocol.cxx audio_chan.cxx g7231_fake.cxx h323ep.cxx
++-
+- ifndef OPENH323DIR
+- OPENH323DIR=$(HOME)/openh323
+- endif
+-
+- include $(OPENH323DIR)/openh323u.mak
+-
+- ifdef NO_PBOOLEAN
+- STDCCFLAGS += -DPBoolean=BOOL
+- endif
+-endif
++PROG = t38modem
- +OBJECTS := pmutils.o dle.o pmodem.o pmodemi.o drivers.o t30tone.o hdlc.o t30.o fcs.o pmodeme.o enginebase.o t38engine.o audio.o drv_pty.o main_process.o \
- + opal/opalutils.o opal/modemep.o opal/modemstrm.o opal/h323ep.o opal/sipep.o opal/manager.o
- +#SOURCES renamed - but don't have explicit rules.
- +#SOURCES := pmutils.cxx dle.cxx pmodem.cxx pmodemi.cxx drivers.cxx \
- +# t30tone.cxx hdlc.cxx t30.cxx fcs.cxx \
+++OBJECTS := pmutils.o dle.o pmodem.o pmodemi.o drivers.o \
+++ t30tone.o tone_gen.o hdlc.o t30.o fcs.o \
+++ pmodeme.o enginebase.o t38engine.o audio.o \
+++ drv_pty.o \
+++ main_process.o \
+++ opal/opalutils.o \
+++ opal/modemep.o opal/modemstrm.o \
+++ opal/h323ep.o \
+++ opal/sipep.o \
+++ opal/manager.o \
+++ opal/fake_codecs.o
+++#Renamed SOURCES - no explicit rules
+++#SOURCES := pmutils.cxx dle.cxx pmodem.cxx pmodemi.cxx drivers.cxx \
+++# t30tone.cxx tone_gen.cxx hdlc.cxx t30.cxx fcs.cxx \
++# pmodeme.cxx enginebase.cxx t38engine.cxx audio.cxx \
++# drv_pty.cxx \
++# main_process.cxx
++
++USE_UNIX98_PTY := 1
- +CPPFLAGS += `pkg-config --libs --cflags opal`
+++CPPFLAGS += `pkg-config --cflags opal`
+++LDFLAGS += `pkg-config --libs opal`
++CPPFLAGS += -DUSE_OPAL
+++# Unfortunately, T38modem has a bug that mandates this for now. Filing a bug, but for now...
+++CPPFLAGS += -fpermissive
+
+ #
+ # If defined COUT_TRACE then enable duplicate the
+ # output of myPTRACE() to cout
+ #
+ ifdef COUT_TRACE
+-STDCCFLAGS += -DCOUT_TRACE
++CPPFLAGS += -DCOUT_TRACE
+ endif
+
+ #
- @@ -161,7 +131,7 @@ endif
++@@ -174,7 +155,7 @@
+ # do not use --old-asn option).
+ #
+ ifdef OPTIMIZE_CORRIGENDUM_IFP
+-STDCCFLAGS += -DOPTIMIZE_CORRIGENDUM_IFP
++CPPFLAGS += -DOPTIMIZE_CORRIGENDUM_IFP
+ endif
+
+ #
- @@ -169,7 +139,7 @@ endif
++@@ -182,7 +163,7 @@
+ # output the trace with level N
+ #
+ ifdef MYPTRACE_LEVEL
+-STDCCFLAGS += -DMYPTRACE_LEVEL=$(MYPTRACE_LEVEL)
++CPPFLAGS += -DMYPTRACE_LEVEL=$(MYPTRACE_LEVEL)
+ endif
+
+ #
- @@ -177,7 +147,7 @@ endif
++@@ -190,7 +171,7 @@
+ # output the warnings on level N for big file descriptors
+ #
+ ifdef FD_TRACE_LEVEL
+-STDCCFLAGS += -DFD_TRACE_LEVEL=$(FD_TRACE_LEVEL)
++CPPFLAGS += -DFD_TRACE_LEVEL=$(FD_TRACE_LEVEL)
+ endif
+
+ #
- @@ -186,7 +156,7 @@ endif
++@@ -199,7 +180,7 @@
+ # - CPU usage will be traced
+ #
+ ifdef PROCESS_PER_THREAD
+-STDCCFLAGS += -DPROCESS_PER_THREAD
++CPPFLAGS += -DPROCESS_PER_THREAD
+ endif
+
+ #
- @@ -194,7 +164,7 @@ endif
++@@ -207,7 +188,7 @@
+ # will repeat indicator sending on idle
+ #
+ ifdef REPEAT_INDICATOR_SENDING
+-STDCCFLAGS += -DREPEAT_INDICATOR_SENDING
++CPPFLAGS += -DREPEAT_INDICATOR_SENDING
+ endif
+
+ #
- @@ -205,12 +175,15 @@ endif
++@@ -218,13 +199,13 @@
+ # Both schemes cen be used simultaneously.
+ #
+ ifdef USE_UNIX98_PTY
+- STDCCFLAGS += -DUSE_UNIX98_PTY
++ CPPFLAGS += -DUSE_UNIX98_PTY
+
+ ifdef USE_LEGACY_PTY
+- STDCCFLAGS += -DUSE_LEGACY_PTY
++ CPPFLAGS += -DUSE_LEGACY_PTY
+ endif
+ else
+- STDCCFLAGS += -DUSE_LEGACY_PTY
++ CPPFLAGS += -DUSE_LEGACY_PTY
+ endif
+
++ #
++@@ -233,6 +214,14 @@
++ # (workaround for mgetty-voice)
++ #
++ ifdef ALAW_132_BIT_REVERSE
++- STDCCFLAGS += -DALAW_132_BIT_REVERSE
+++ CPPFLAGS += -DALAW_132_BIT_REVERSE
++ endif
++
+++.PHONY: all clean
+++all: $(PROG)
+++
+++clean:
+++ rm -f $(PROG) $(OBJECTS)
++
++$(PROG) : $(OBJECTS)
- + $(CC) $(CPPFLAGS) -o $(PROG) $(OBJECTS)
+++ $(CXX) $(CPPFLAGS) -o $(PROG) $(OBJECTS) $(LDFLAGS)
diff --cc debian/patches/spelling-error-fix
index 0000000,0000000..1524901
new file mode 100644
--- /dev/null
+++ b/debian/patches/spelling-error-fix
@@@ -1,0 -1,0 +1,33 @@@
++Author: "Michael van der Kolff" <mvanderkolff at gmail.com>
++Description: Minor spelling fix; overriden -> overridden
++Forwarded: http://sourceforge.net/tracker/?func=detail&aid=3485931&group_id=152230&atid=783658
++
++Index: t38modem-2.0.0/ReadMe.txt
++===================================================================
++--- t38modem-2.0.0.orig/ReadMe.txt 2012-02-09 13:47:45.693993691 +1100
+++++ t38modem-2.0.0/ReadMe.txt 2012-02-09 13:48:02.925993810 +1100
++@@ -258,9 +258,9 @@
++ ------------------------
++
++ F - force fax mode (T.38 or G.711 pass-trough) after dialing
++- (with OPAL can be overriden by route option OPAL-Force-Fax-Mode=false).
+++ (with OPAL can be overridden by route option OPAL-Force-Fax-Mode=false).
++ V - do not force fax mode after dialing (default)
++- (with OPAL can be overriden by route option OPAL-Force-Fax-Mode=true).
+++ (with OPAL can be overridden by route option OPAL-Force-Fax-Mode=true).
++
++ Examples:
++
++Index: t38modem-2.0.0/opal/manager.cxx
++===================================================================
++--- t38modem-2.0.0.orig/opal/manager.cxx 2012-02-09 13:47:40.701993656 +1100
+++++ t38modem-2.0.0/opal/manager.cxx 2012-02-09 13:48:20.833993934 +1100
++@@ -142,7 +142,7 @@
++ " of a pat=dst[;...] route specification.\n"
++ " -u --username str : Set the default username to str.\n"
++ " --displayname str : Set the default display name to str.\n"
++- " Can be overriden by route option\n"
+++ " Can be overridden by route option\n"
++ " OPAL-" OPAL_OPT_CALLING_DISPLAY_NAME "=str\n"
++ " --stun server : Set STUN server.\n"
++ " --fake-audio [!]wildcard[,[!]...]\n"
diff --cc debian/patches/t38modem-opal3.10-patch
index 0000000,0000000..a637eeb
new file mode 100644
--- /dev/null
+++ b/debian/patches/t38modem-opal3.10-patch
@@@ -1,0 -1,0 +1,207 @@@
++Author: "Peter Katzmann" <pk1057 at users.sf.net>
++Origin: http://sourceforge.net/tracker/index.php?func=detail&aid=3462909&group_id=152230&atid=783658
++Description: With this patch, t38modem builds against the OPAL in debian
++ * Arguments to OpalConnection::AdjustMediaFormats() changed order from
++ (local, mediaFormats, otherConnection) in 3.8.x [1] to
++ (local, otherConnection, mediaFormats) in 3.10.x [2].
++ * OpalMediaStream::RemovePatch() has been removed; in 3.8.x it was
++ implemented as simply "SetPatch(NULL)" [3], so use that instead.
++ .
++ Slightly different patch from Henning Holtschneider:
++ <https://github.com/hehol/t38modem/commit/244124970667e19daceaf4c52372cca316e4bd8e>
++ .
++ [1] <http://www.opalvoip.org/docs/opal-v3_8/de/da0/classOpalConnection.html#2c09181a20a215fa4b9c210cf006ba74>
++ [2] <http://www.opalvoip.org/docs/opal-v3_10/de/da0/classOpalConnection.html#b5b91814e4df73825c949e65ab1cc79b>
++ [3] <http://opalvoip.svn.sourceforge.net/viewvc/opalvoip/opal/branches/v3_8/src/opal/mediastrm.cxx?revision=24861&view=markup#l498>
++Forwarded: Yes
++Last-Update: 2012-05-22
++
++diff -urwb t38modem/opal/fake_codecs.cxx ../t38modem-2.0.0/opal/fake_codecs.cxx
++--- t38modem/opal/fake_codecs.cxx 2010-03-24 11:48:29.000000000 +0100
+++++ ../t38modem-2.0.0/opal/fake_codecs.cxx 2011-11-07 20:30:25.772000161 +0100
++@@ -40,13 +40,7 @@
++ #include <opal/buildopts.h>
++
++ /////////////////////////////////////////////////////////////////////////////
++-#define PACK_VERSION(major, minor, build) (((((major) << 8) + (minor)) << 8) + (build))
++
++-#if !(PACK_VERSION(OPAL_MAJOR, OPAL_MINOR, OPAL_BUILD) >= PACK_VERSION(3, 8, 1))
++- #error *** Uncompatible OPAL version (required >= 3.8.1) ***
++-#endif
++-
++-#undef PACK_VERSION
++ /////////////////////////////////////////////////////////////////////////////
++
++ #include <opal/transcoders.h>
++diff -urwb t38modem/opal/h323ep.cxx ../t38modem-2.0.0/opal/h323ep.cxx
++--- t38modem/opal/h323ep.cxx 2011-02-11 10:41:07.000000000 +0100
+++++ ../t38modem-2.0.0/opal/h323ep.cxx 2011-11-08 17:56:03.941999997 +0100
++@@ -192,8 +192,8 @@
++
++ virtual void AdjustMediaFormats(
++ bool local, ///< Media formats a local ones to be presented to remote
++- OpalMediaFormatList & mediaFormats, ///< Media formats to use
++- OpalConnection * otherConnection ///< Other connection we are adjusting media for
+++ OpalConnection * connection, ///< Connection that is about to use formats
+++ OpalMediaFormatList & mediaFormats ///< Media formats to use
++ ) const;
++
++ protected:
++@@ -549,7 +549,7 @@
++ bool MyH323Connection::SwitchFaxMediaStreams(bool enableFax)
++ {
++ OpalMediaFormatList mediaFormats = GetMediaFormats();
++- AdjustMediaFormats(true, mediaFormats, NULL);
+++ AdjustMediaFormats(true, NULL, mediaFormats);
++
++ PTRACE(3, "MyH323Connection::SwitchFaxMediaStreams:\n" << setfill('\n') << mediaFormats << setfill(' '));
++
++@@ -650,14 +650,13 @@
++ return mediaFormats;
++ }
++
++-void MyH323Connection::AdjustMediaFormats(
++- bool local,
++- OpalMediaFormatList & mediaFormats,
++- OpalConnection * otherConnection) const
+++void MyH323Connection::AdjustMediaFormats(bool local,
+++ OpalConnection * connection,
+++ OpalMediaFormatList & mediaFormats) const
++ {
++ PTRACE(4, "MyH323Connection::AdjustMediaFormats:\n" << setfill('\n') << mediaFormats << setfill(' '));
++
++- H323Connection::AdjustMediaFormats(local, mediaFormats, otherConnection);
+++ AdjustMediaFormats(local, connection, mediaFormats);
++
++ if (local) {
++ PStringArray order;
++diff -urwb t38modem/opal/modemep.cxx ../t38modem-2.0.0/opal/modemep.cxx
++--- t38modem/opal/modemep.cxx 2011-02-11 10:41:07.000000000 +0100
+++++ ../t38modem-2.0.0/opal/modemep.cxx 2011-11-08 17:56:03.924999997 +0100
++@@ -130,14 +130,7 @@
++ #include <ptlib.h>
++
++ #include <opal/buildopts.h>
++-/////////////////////////////////////////////////////////////////////////////
++-#define PACK_VERSION(major, minor, build) (((((major) << 8) + (minor)) << 8) + (build))
++-
++-#if !(PACK_VERSION(OPAL_MAJOR, OPAL_MINOR, OPAL_BUILD) == PACK_VERSION(3, 9, 0))
++- #error *** Uncompatible OPAL version (required == 3.9.0, use SVN TRUNK 24174) ***
++-#endif
++
++-#undef PACK_VERSION
++ /////////////////////////////////////////////////////////////////////////////
++
++ #include <opal/patch.h>
++@@ -882,7 +875,7 @@
++
++ if (faxMode) {
++ OpalMediaFormatList otherMediaFormats = other->GetMediaFormats();
++- other->AdjustMediaFormats(false, otherMediaFormats, NULL);
+++ other->AdjustMediaFormats(false, NULL, otherMediaFormats);
++
++ PTRACE(4, "ModemConnection::RequestMode: other connection formats: \n" <<
++ setfill('\n') << otherMediaFormats << setfill(' '));
++@@ -941,7 +934,7 @@
++
++ if (other != NULL) {
++ OpalMediaFormatList otherMediaFormats = other->GetMediaFormats();
++- other->AdjustMediaFormats(false, otherMediaFormats, NULL);
+++ other->AdjustMediaFormats(false, NULL, otherMediaFormats);
++
++ PTRACE(4, "ModemConnection::RequestMode: other connection formats: \n" <<
++ setfill('\n') << otherMediaFormats << setfill(' '));
++@@ -1072,11 +1065,11 @@
++ bool ModemConnection::UpdateMediaStreams(OpalConnection &other)
++ {
++ OpalMediaFormatList otherMediaFormats = other.GetMediaFormats();
++- other.AdjustMediaFormats(true, otherMediaFormats, NULL);
+++ other.AdjustMediaFormats(true, NULL, otherMediaFormats);
++
++ OpalMediaFormatList thisMediaFormats = GetMediaFormats();
++- AdjustMediaFormats(true, thisMediaFormats, NULL);
++- other.AdjustMediaFormats(true, thisMediaFormats, this);
+++ AdjustMediaFormats(true, NULL, thisMediaFormats);
+++ other.AdjustMediaFormats(true, this, thisMediaFormats);
++
++ PTRACE(3, "ModemConnection::UpdateMediaStreams:\n"
++ "patching " << setfill(',') << thisMediaFormats << setfill(' ') << "\n"
++@@ -1189,8 +1182,9 @@
++ OpalMediaPatch *patch = otherSink->GetPatch();
++
++ if (patch != NULL) {
++- otherSink->RemovePatch(patch);
++- patch->GetSource().Close();
+++ /* otherSink->RemovePatch(patch);
+++ patch->GetSource().Close();*/
+++ otherSink->SetPatch(NULL);
++ }
++
++ PTRACE(4, "ModemConnection::UpdateMediaStreams: opening source for sink " << *otherSink);
++@@ -1223,7 +1217,8 @@
++ OpalMediaPatch *patch = otherSource->GetPatch();
++
++ if (patch != NULL)
++- otherSource->RemovePatch(patch);
+++/* otherSource->RemovePatch(patch);*/
+++ otherSource->SetPatch(NULL);
++
++ // NOTE: Both sinks must have the same session ID for T.38 <-> PCM transcoding !!!
++ PTRACE(4, "ModemConnection::UpdateMediaStreams: opening sink for source " << *otherSource);
++diff -urwb t38modem/opal/modemep.h ../t38modem-2.0.0/opal/modemep.h
++--- t38modem/opal/modemep.h 2010-03-15 14:40:28.000000000 +0100
+++++ ../t38modem-2.0.0/opal/modemep.h 2011-11-07 20:30:25.783000161 +0100
++@@ -53,14 +53,7 @@
++ #ifndef _MODEM_EP_H
++ #define _MODEM_EP_H
++
++-/////////////////////////////////////////////////////////////////////////////
++-#define PACK_VERSION(major, minor, build) (((((major) << 8) + (minor)) << 8) + (build))
++-
++-#if !(PACK_VERSION(OPAL_MAJOR, OPAL_MINOR, OPAL_BUILD) >= PACK_VERSION(3, 8, 0))
++- #error *** Uncompatible OPAL version (required >= 3.8.0) ***
++-#endif
++
++-#undef PACK_VERSION
++ /////////////////////////////////////////////////////////////////////////////
++ #include <opal/endpoint.h>
++ /////////////////////////////////////////////////////////////////////////////
++diff -urwb t38modem/opal/sipep.cxx ../t38modem-2.0.0/opal/sipep.cxx
++--- t38modem/opal/sipep.cxx 2011-02-11 10:41:07.000000000 +0100
+++++ ../t38modem-2.0.0/opal/sipep.cxx 2011-11-08 08:54:20.495999996 +0100
++@@ -183,8 +183,8 @@
++
++ virtual void AdjustMediaFormats(
++ bool local, ///< Media formats a local ones to be presented to remote
++- OpalMediaFormatList & mediaFormats, ///< Media formats to use
++- OpalConnection * otherConnection ///< Other connection we are adjusting media for
+++ OpalConnection * otherConnection, ///< Other connection we are adjusting media for
+++ OpalMediaFormatList & mediaFormats ///< Media formats to use
++ ) const;
++
++ protected:
++@@ -490,7 +490,7 @@
++ }
++
++ OpalMediaFormatList mediaFormats = GetMediaFormats();
++- AdjustMediaFormats(true, mediaFormats, NULL);
+++ AdjustMediaFormats(true, NULL, mediaFormats);
++
++ PTRACE(3, "MySIPConnection::SwitchFaxMediaStreams:\n" << setfill('\n') << mediaFormats << setfill(' '));
++
++@@ -592,12 +592,12 @@
++
++ void MySIPConnection::AdjustMediaFormats(
++ bool local,
++- OpalMediaFormatList & mediaFormats,
++- OpalConnection * otherConnection) const
+++ OpalConnection * otherConnection,
+++ OpalMediaFormatList & mediaFormats) const
++ {
++ PTRACE(4, "MySIPConnection::AdjustMediaFormats:\n" << setfill('\n') << mediaFormats << setfill(' '));
++
++- SIPConnection::AdjustMediaFormats(local, mediaFormats, otherConnection);
+++ SIPConnection::AdjustMediaFormats(local, otherConnection, mediaFormats);
++
++ if (local) {
++ PStringArray order;
diff --cc debian/rules
index 7ff43a1,0000000..51b7941
mode 100755,000000..100755
--- a/debian/rules
+++ b/debian/rules
@@@ -1,9 -1,0 +1,12 @@@
+#!/usr/bin/make -f
+
- #export OPALDIR=/usr/include/opal
++export OPALDIR=/usr/include/opal
+export PTLIBDIR=/usr/share/ptlib
+export USE_OPAL=1
+export USE_UNIX98_PTY=1
+
+%:
+ dh $@ --parallel
++
++override_dh_installchangelogs:
++ dh_installchangelogs Changes.txt
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-voip/t38modem.git
More information about the Pkg-voip-commits
mailing list