[Pkg-voip-commits] [libzrtpcpp] 02/04: Imported Debian patch 2.0.0-3

Victor Seva Lopez maniac-guest at moszumanska.debian.org
Sun Aug 16 10:19:00 UTC 2015


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

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

commit 875688164d8e5c9108098928c3d702d5aadd6596
Merge: 0a37bd6 5cab1f1
Author: Mark Purcell <msp at debian.org>
Date:   Sun Jun 24 22:09:11 2012 +1000

    Imported Debian patch 2.0.0-3

 CMakeLists.txt                                     |   150 +
 ChangeLog                                          |    11 +
 Makefile.am                                        |    21 -
 Makefile.in                                        |   819 -
 NEWS                                               |    32 +
 aclocal.m4                                         |  1158 --
 autoconf/config.guess                              |  1561 --
 autoconf/config.sub                                |  1686 --
 autoconf/depcomp                                   |   630 -
 autoconf/install-sh                                |   520 -
 autoconf/ltmain.sh                                 |  8413 ---------
 autoconf/missing                                   |   376 -
 autogen.sh                                         |    98 -
 cmake/Modules/AutoArgs.cmake                       |    39 +
 cmake/Modules/FindGcryptConfig.cmake               |   241 +
 cmake/Modules/GeneratePackage.cmake                |    73 +
 cmake/Modules/LibFindMacros.cmake                  |    99 +
 cmake/Modules/SourceDistribution.cmake             |   218 +
 cmake/Modules/UseRPMTools.cmake                    |   177 +
 cmake/cmake_uninstall.cmake.in                     |    20 +
 config.h.cmake                                     |    53 +
 config.h.in                                        |   114 -
 configure                                          | 18613 -------------------
 configure.ac                                       |   188 -
 debian/backports/sarge                             |     0
 debian/changelog                                   |    52 +
 debian/compat                                      |     2 +-
 debian/control                                     |    10 +-
 debian/copyright                                   |    26 +-
 debian/libzrtpcpp-dev.install                      |     2 -
 ...ibzrtpcpp-1.4-0.install => libzrtpcpp2.install} |     0
 debian/rules                                       |    18 +-
 debian/source/format                               |     1 +
 demo/CMakeLists.txt                                |    19 +
 demo/Makefile.am                                   |    23 -
 demo/Makefile.in                                   |   512 -
 demo/wrappertest.c                                 |   169 +
 demo/zrtptest.cpp                                  |    10 +-
 demo/zrtptestMulti.cpp                             |    30 +-
 doc/Makefile.am                                    |    27 -
 doc/Makefile.in                                    |   408 -
 doc/fdl.texi                                       |   452 +
 doc/fdlnotice.texi                                 |     6 +
 doc/gpl.texi                                       |   392 +
 libzrtpcpp.pc.in => libzrtpcpp.pc.cmake            |     0
 libzrtpcpp.spec                                    |   123 +
 libzrtpcpp.spec.cmake                              |   123 +
 libzrtpcpp.spec.in                                 |   123 -
 m4/Makefile.am                                     |    23 -
 m4/Makefile.in                                     |   406 -
 m4/libgcrypt_local.m4                              |   108 -
 m4/libtool.m4                                      |  7376 --------
 m4/ltoptions.m4                                    |   368 -
 m4/ltsugar.m4                                      |   123 -
 m4/ltversion.m4                                    |    23 -
 m4/lt~obsolete.m4                                  |    92 -
 m4/ost_cxx.m4                                      |   148 -
 m4/ost_debug.m4                                    |    41 -
 m4/ost_endian.m4                                   |    65 -
 m4/ost_maint.m4                                    |    51 -
 m4/ost_misc.m4                                     |    37 -
 m4/ost_posix.m4                                    |    51 -
 m4/ost_prog.m4                                     |    66 -
 m4/ost_systime.m4                                  |    46 -
 src/{Base32.cxx => Base32.cpp}                     |    72 +-
 src/CMakeLists.txt                                 |    81 +
 src/Makefile.am                                    |    53 -
 src/Makefile.in                                    |   894 -
 src/{ZIDFile.cxx => ZIDFile.cpp}                   |   313 +-
 src/{ZIDRecord.cxx => ZIDRecord.cpp}               |     0
 src/{ZRtp.cxx => ZRtp.cpp}                         |  1123 +-
 src/ZrtpCWrapper.cpp                               |   422 +
 src/ZrtpCallbackWrapper.cpp                        |   173 +
 src/ZrtpConfigure.cpp                              |   488 +
 src/{ZrtpCrc32.cxx => ZrtpCrc32.cpp}               |     0
 ...tpPacketClearAck.cxx => ZrtpPacketClearAck.cpp} |     0
 src/{ZrtpPacketCommit.cxx => ZrtpPacketCommit.cpp} |     0
 ...tpPacketConf2Ack.cxx => ZrtpPacketConf2Ack.cpp} |     0
 ...ZrtpPacketConfirm.cxx => ZrtpPacketConfirm.cpp} |     0
 src/{ZrtpPacketDHPart.cxx => ZrtpPacketDHPart.cpp} |    46 +-
 src/{ZrtpPacketError.cxx => ZrtpPacketError.cpp}   |     0
 ...ZrtpPacketGoClear.cxx => ZrtpPacketGoClear.cpp} |     0
 src/{ZrtpPacketHello.cxx => ZrtpPacketHello.cpp}   |    27 +-
 ...tpPacketHelloAck.cxx => ZrtpPacketHelloAck.cpp} |     0
 src/{ZrtpPacketPing.cxx => ZrtpPacketPing.cpp}     |     0
 ...ZrtpPacketPingAck.cxx => ZrtpPacketPingAck.cpp} |     0
 src/ZrtpQueue.cpp                                  |   141 +-
 src/{ZrtpStateClass.cxx => ZrtpStateClass.cpp}     |    14 +-
 src/ZrtpTextData.cpp                               |    95 +
 src/ZrtpTextData.cxx                               |    91 -
 src/libzrtpcpp/Base32.h                            |    17 +-
 src/libzrtpcpp/CMakeLists.txt                      |     9 +
 src/libzrtpcpp/Makefile.am                         |    27 -
 src/libzrtpcpp/Makefile.in                         |   508 -
 src/libzrtpcpp/TimeoutProvider.h                   |   158 +-
 src/libzrtpcpp/ZIDFile.h                           |    22 +-
 src/libzrtpcpp/ZIDRecord.h                         |   155 +-
 src/libzrtpcpp/ZRtp.h                              |   230 +-
 src/libzrtpcpp/ZrtpCWrapper.h                      |  1265 ++
 src/libzrtpcpp/ZrtpCallback.h                      |    60 +-
 src/libzrtpcpp/ZrtpCallbackWrapper.h               |    98 +
 src/libzrtpcpp/ZrtpCodes.h                         |    14 +-
 src/libzrtpcpp/ZrtpConfigure.h                     |   521 +
 src/libzrtpcpp/ZrtpCrc32.h                         |    49 +-
 src/libzrtpcpp/ZrtpPacketBase.h                    |    82 +-
 src/libzrtpcpp/ZrtpPacketClearAck.h                |    23 +-
 src/libzrtpcpp/ZrtpPacketCommit.h                  |    66 +-
 src/libzrtpcpp/ZrtpPacketConf2Ack.h                |    22 +-
 src/libzrtpcpp/ZrtpPacketConfirm.h                 |    62 +-
 src/libzrtpcpp/ZrtpPacketDHPart.h                  |    70 +-
 src/libzrtpcpp/ZrtpPacketError.h                   |    27 +-
 src/libzrtpcpp/ZrtpPacketErrorAck.h                |    24 +-
 src/libzrtpcpp/ZrtpPacketGoClear.h                 |    26 +-
 src/libzrtpcpp/ZrtpPacketHello.h                   |   105 +-
 src/libzrtpcpp/ZrtpPacketHelloAck.h                |    24 +-
 src/libzrtpcpp/ZrtpPacketPing.h                    |    22 +-
 src/libzrtpcpp/ZrtpPacketPingAck.h                 |    26 +-
 src/libzrtpcpp/ZrtpQueue.h                         |    79 +-
 src/libzrtpcpp/ZrtpStateClass.h                    |   142 +-
 src/libzrtpcpp/ZrtpStates.h                        |    51 +-
 src/libzrtpcpp/ZrtpTextData.h                      |   157 +-
 src/libzrtpcpp/ZrtpUserCallback.h                  |    16 +-
 src/libzrtpcpp/crypto/Makefile.am                  |    19 -
 src/libzrtpcpp/crypto/Makefile.in                  |   455 -
 .../crypto/{openssl/AesCFB.cpp => TwoCFB.cpp}      |    74 +-
 src/libzrtpcpp/crypto/ZrtpDH.h                     |    42 +-
 src/libzrtpcpp/crypto/aesCFB.h                     |    26 +-
 .../{InitializeGcrypt.cxx => InitializeGcrypt.cpp} |     0
 src/libzrtpcpp/crypto/gcrypt/gcryptAesCFB.cpp      |    14 +-
 .../gcrypt/{gcryptZrtpDH.cxx => gcryptZrtpDH.cpp}  |    69 +-
 .../{gcrypthmac256.cxx => gcrypthmac256.cpp}       |     0
 .../{gcrypthmac256.cxx => gcrypthmac384.cpp}       |    24 +-
 .../gcrypt/{gcryptsha256.cxx => gcryptsha256.cpp}  |    10 +-
 .../gcrypt/{gcryptsha256.cxx => gcryptsha384.cpp}  |    36 +-
 src/libzrtpcpp/crypto/hmac256.h                    |    15 +-
 src/libzrtpcpp/crypto/{hmac256.h => hmac384.h}     |    45 +-
 src/libzrtpcpp/crypto/openssl/AesCFB.cpp           |    22 +-
 ...InitializeOpenSSL.cxx => InitializeOpenSSL.cpp} |    71 +-
 src/libzrtpcpp/crypto/openssl/ZrtpDH.cpp           |   426 +
 src/libzrtpcpp/crypto/openssl/ZrtpDH.cxx           |   299 -
 .../crypto/openssl/{hmac256.cxx => hmac256.cpp}    |     0
 .../crypto/openssl/{hmac256.cxx => hmac384.cpp}    |     8 +-
 .../crypto/openssl/{sha256.cxx => sha256.cpp}      |     0
 .../crypto/openssl/{sha256.cxx => sha384.cpp}      |    40 +-
 src/libzrtpcpp/crypto/sha256.h                     |    11 +
 src/libzrtpcpp/crypto/{sha256.h => sha384.h}       |    85 +-
 src/libzrtpcpp/crypto/{aesCFB.h => twoCFB.h}       |    50 +-
 src/libzrtpcpp/crypto/twofish.c                    |  1733 ++
 src/libzrtpcpp/crypto/twofish.h                    |   263 +
 src/libzrtpcpp/crypto/twofish_cfb.c                |    82 +
 src/libzrtpcpp/zrtpPacket.h                        |   287 +-
 src/libzrtpcpp/zrtpccrtp.h                         |    12 +-
 152 files changed, 11043 insertions(+), 48227 deletions(-)

diff --cc debian/backports/sarge
index c71a971,0000000..c71a971
mode 100644,000000..100755
--- a/debian/backports/sarge
+++ b/debian/backports/sarge
diff --cc debian/changelog
index 9a9af96,0000000..2052a99
mode 100644,000000..100644
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,157 -1,0 +1,209 @@@
++libzrtpcpp (2.0.0-3) unstable; urgency=low
++
++  * wheezy polish - lintian clean
++  * Update Standards-Version: 3.9.3
++  * Add source/format 3.0 (quilt)
++  * Update debian/copyright - fix copyright-refers-to-symlink-license
++  * debian/compat -> 9
++
++ -- Mark Purcell <msp at debian.org>  Sun, 24 Jun 2012 22:09:11 +1000
++
++libzrtpcpp (2.0.0-2) unstable; urgency=low
++
++  * Added Build-Depends: cmake
++  * Upstream:
++    - Fixes "FTBFS with gcc-4.7: missing include" (Closes: #672942)
++    - Fixes "FTBFS in sid: No package 'libccrtp1' found" (Closes: #673255)
++
++ -- Mark Purcell <msp at debian.org>  Sat, 19 May 2012 21:39:32 +1000
++
++libzrtpcpp (2.0.0-1) unstable; urgency=low
++
++  * New upstream release
++  * NEW package libzrtpcpp2 - match-soname
++  * Upload to unstable - coordinated through debian-release
++  * Switch to dh 7 
++  * Add Build-Depends: libucommon & libssl
++  * Ack NMUs - Thanks Matthias & Andreas
++
++ -- Mark Purcell <msp at debian.org>  Sat, 19 May 2012 11:16:39 +1000
++
++libzrtpcpp (1.4.6-1.2) unstable; urgency=low
++
++  * Non maintainer upload.
++  * Fix build failure with GCC 4.7. Closes: #667261.
++
++ -- Matthias Klose <doko at debian.org>  Tue, 17 Apr 2012 08:32:37 +0200
++
++libzrtpcpp (1.4.6-1.1) unstable; urgency=low
++
++  * Non-maintainer upload.
++  * Stop shipping libtool la file. Closes: #620607
++    http://wiki.debian.org/ReleaseGoals/LAFileRemoval
++
++ -- Andreas Metzler <ametzler at debian.org>  Sun, 24 Apr 2011 14:13:20 +0200
++
++libzrtpcpp (1.6.0-1) experimental; urgency=low
++
++  * New upstream release
++  * NEW package libzrtpcpp-1.6-0 - soname bump
++
++ -- Mark Purcell <msp at debian.org>  Sun, 30 Jan 2011 18:46:47 +1100
++
 +libzrtpcpp (1.4.6-1) unstable; urgency=low
 +
 +  * New upstream release 
 +
 + -- Mark Purcell <msp at debian.org>  Fri, 30 Oct 2009 23:00:05 +1100
 +
 +libzrtpcpp (1.4.5-1) unstable; urgency=low
 +
 +  * New upstream release
 +
 +  [ Kilian Krause ]
 +  * Remove -N from wget args in get-orig-source target as -O is already
 +    used.
 +
 + -- Mark Purcell <msp at debian.org>  Wed, 15 Jul 2009 20:36:59 +1000
 +
 +libzrtpcpp (1.4.3-3) unstable; urgency=low
 +
 +  * Upload to unstable
 +    - libcommoncpp2 transition
 +
 + -- Mark Purcell <msp at debian.org>  Thu, 26 Feb 2009 18:31:25 +1100
 +
 +libzrtpcpp (1.4.3-1) experimental; urgency=low
 +
 +  * New upstream release
 +
 + -- Mark Purcell <msp at debian.org>  Sun, 08 Feb 2009 11:26:39 +1100
 +
 +libzrtpcpp (1.4.2-1) experimental; urgency=low
 +
 +  * New upstream release
 +
 + -- Mark Purcell <msp at debian.org>  Tue, 03 Feb 2009 21:29:49 +1100
 +
 +libzrtpcpp (1.4.1-1) experimental; urgency=low
 +
 +  * New upstream release
 +
 + -- Mark Purcell <msp at debian.org>  Tue, 23 Dec 2008 17:36:27 +1100
 +
 +libzrtpcpp (1.4.0-1) experimental; urgency=low
 +
 +  * New upstream release
 +    - first release that is conformant to the ZRTP specification
 +
 +  [ Patrick Matthäi ]
 +  * Bumped to Standards-Version 3.8.0.
 +
 +  [ Mark Purcell ]
 +  * NEW libzrtpcpp-1.4-0 - lintian:package-name-doesnt-match-sonames
 +  * Add ${misc:Depends} - fixes lintian:debhelper-but-no-misc-depends
 +  * debian/watch opts=pasv
 +  * Update debian/copyright
 +
 + -- Mark Purcell <msp at debian.org>  Sun, 30 Nov 2008 11:42:37 +1100
 +
 +libzrtpcpp (1.3.0-1) unstable; urgency=low
 +
 +  * New upstream release
 +  * New Package: libzrtpcpp-1.3-0 - soname bump
 +    - Upload discussed with debian-release
 +
 + -- Mark Purcell <msp at debian.org>  Sun, 22 Jun 2008 10:01:03 +1000
 +
 +libzrtpcpp (1.2.0-1) unstable; urgency=low
 +
 +  * New upstream release
 +    - Implements latest changes to ZRTP draft
 +  * DEB_INSTALL_CHANGELOGS_ALL := NEWS
 +  * New Package: libzrtpcpp-1.2-0 soname bump
 +    - Upload cleared with debian-release
 +
 + -- Mark Purcell <msp at debian.org>  Fri, 13 Jun 2008 08:18:39 +1000
 +
 +libzrtpcpp (1.1.0-1) unstable; urgency=low
 +
 +  * New upstream release
 +  * Package: libzrtpcpp-1.1-0 due to soname bump
 +
 + -- Mark Purcell <msp at debian.org>  Tue, 29 Apr 2008 22:52:58 +1000
 +
 +libzrtpcpp (0.9.2-3) unstable; urgency=low
 +
 +  [ Mark Purcell ]
 +  * Bump LT_RELEASE="0.9.2deb" to cater for upstream ABI breakage
 +    - ABI breakage - sendDataRTP removed in 0.9.2 (Closes: #445657)
 +  * Cleanup get-orig-source target
 +
 + -- Mark Purcell <msp at debian.org>  Sat, 20 Oct 2007 12:03:24 +0100
 +
 +libzrtpcpp (0.9.2-2) unstable; urgency=high
 +
 +  * Fix package names to reflect new ABI - leaving the internal SOVER
 +    unchanged (Closes: #445657)
 +  * High urgency due to fixing RC bug.
 +  * Add myself to Uploaders to make this a non-NMU
 +  * Adjust DEB_DH_MAKESHLIBS_ARGS_libzrtpcpp-0.9-1 := -V"libzrtpcpp-0.9-1"
 +
 + -- Kilian Krause <kilian at debian.org>  Mon, 15 Oct 2007 21:42:05 +0200
 +
 +libzrtpcpp (0.9.2-1) unstable; urgency=low
 +
 +  * New upstream release
 +
 +  [ Kilian Krause ]
 +  * Add dpkg-dev (>= 1.13.19) to Build-Depends for binary:Version
 +
 + -- Mark Purcell <msp at debian.org>  Sun, 30 Sep 2007 12:17:10 +0100
 +
 +libzrtpcpp (0.9.0-6) unstable; urgency=low
 +
 +  * DEB_DH_MAKESHLIBS_ARGS_libzrtpcpp-0.9-0 := -V"libzrtpcpp-0.9-0 (>= 0.9.0-4)"
 +    - Closes: #434590: twinkle: Crashes on every call when using etch
 +    libraries - Debian Bug report logs
 +  * Use ${binary:Version} libzrtpcpp source: substvar-source-version-is-
 +    deprecated
 +
 + -- Mark Purcell <msp at debian.org>  Wed, 25 Jul 2007 21:57:34 +0100
 +
 +libzrtpcpp (0.9.0-5) unstable; urgency=low
 +
 +  * DEB_DH_MAKESHLIBS_ARGS_libzrtpcpp-0.9-0 := -V"libzrtpcpp-0.9-0 (>= 0.9-4)"
 +  * Depends: pkg-config
 +
 + -- Mark Purcell <msp at debian.org>  Sun, 20 May 2007 16:43:12 +0100
 +
 +libzrtpcpp (0.9.0-4) unstable; urgency=low
 +
 +  * Rebuild for libccrtp-dev > 1.5.1 [libccrtp soname]
 +
 + -- Mark Purcell <msp at debian.org>  Thu, 12 Apr 2007 21:36:27 +0100
 +
 +libzrtpcpp (0.9.0-3) unstable; urgency=low
 +
 +  * Rebuild for libccrtp-dev (>= 1.5.0-3) [libcommoncpp2 soname]
 +
 + -- Mark Purcell <msp at debian.org>  Sun,  7 Jan 2007 06:11:31 +0000
 +
 +libzrtpcpp (0.9.0-2) unstable; urgency=low
 +
 +  [ Mikael Magnusson ]
 +  * Add Build-Depends: pkg-config
 +  * Add Uploaders: Mikael Magnusson <mikma at users.sourceforge.net>
 +
 +  [ Mark Purcell ]
 +  * Maintainer: Debian VoIP Team <pkg-voip-maintainers at lists.alioth.debian.org>
 +  * Initial release (Closes: #390591)
 +
 + -- Mark Purcell <msp at debian.org>  Thu, 12 Oct 2006 23:12:26 +1000
 +
 +libzrtpcpp (0.9.0-1) unstable; urgency=low
 +
 +  * Initial release (Closes: #390591)
 +
 + -- Mark Purcell <msp at debian.org>  Mon,  2 Oct 2006 08:51:56 +0800
 +
diff --cc debian/compat
index 7ed6ff8,0000000..ec63514
mode 100644,000000..100644
--- a/debian/compat
+++ b/debian/compat
@@@ -1,1 -1,0 +1,1 @@@
- 5
++9
diff --cc debian/control
index b5cd70e,0000000..7588e65
mode 100644,000000..100644
--- a/debian/control
+++ b/debian/control
@@@ -1,33 -1,0 +1,33 @@@
 +Source: libzrtpcpp
 +Priority: optional
 +Maintainer: Debian VoIP Team <pkg-voip-maintainers at lists.alioth.debian.org>
 +Uploaders: Mark Purcell <msp at debian.org>, Mikael Magnusson <mikma at users.sourceforge.net>, Kilian Krause <kilian at debian.org>
- Build-Depends: debhelper (>= 5), cdbs, autotools-dev, libccrtp-dev (>= 1.5.0-3), libgcrypt11-dev | libgcrypt-dev, pkg-config, dpkg-dev (>= 1.13.19)
- Standards-Version: 3.8.0
++Build-Depends: debhelper (>= 9), autotools-dev, pkg-config, dpkg-dev (>= 1.13.19), cmake,
++ libucommon-dev, libccrtp-dev (>= 2.0.0), libssl-dev, libgcrypt11-dev | libgcrypt-dev
++Standards-Version: 3.9.3
 +Section: libs
 +Homepage: http://www.gnu.org/software/ccrtp/
 +Vcs-Svn: svn://svn.debian.org/pkg-voip/libzrtpcpp/trunk/
 +Vcs-Browser: http://svn.debian.org/wsvn/pkg-voip/libzrtpcpp/?op=log
 +
 +Package: libzrtpcpp-dev
 +Section: libdevel
 +Architecture: any
- Depends: ${misc:Depends}, libzrtpcpp-1.4-0 (= ${binary:Version}), pkg-config
++Depends: ${misc:Depends}, libzrtpcpp2 (= ${binary:Version}), pkg-config
 +Description: Headers and static link library for libzrtpcpp
 + This library is an extension to the GNU RTP Stack, libccrtp,
 + that offers compatibility with Phil Zimmermann's zrtp/Zfone voice
 + encryption, and which can be directly embedded into telephony
 + applications.  The current release is conformant to the ZRTP specification.
 + .
 + This package provides the header files, link libraries, and
 + documentation for building applications that use libzrtpcpp.
 +
- Package: libzrtpcpp-1.4-0
- Section: libs
++Package: libzrtpcpp2
 +Architecture: any
 +Depends: ${shlibs:Depends}, ${misc:Depends}
 +Description: ccrtp extension for zrtp/Zfone support
 + This library is an extension to the GNU RTP Stack, libccrtp,
 + that offers compatibility with Phil Zimmermann's zrtp/Zfone voice
 + encryption, and which can be directly embedded into telephony
 + applications.  The current release is conformant to the ZRTP specification.
diff --cc debian/copyright
index 60d3e41,0000000..889bdb6
mode 100644,000000..100644
--- a/debian/copyright
+++ b/debian/copyright
@@@ -1,130 -1,0 +1,146 @@@
 +This package was debianized by Mark Purcell <msp at debian.org> on
 +Mon,  2 Oct 2006 08:51:56 +0800.
 +
 +It was downloaded from ftp://ftp.gnu.org/gnu/ccrtp/libzrtpcpp-0.9.0.tar.gz
 +
 +Upstream Author: Werner Dittmann <Werner.Dittmann at t-online.de>
 +
-   Copyright (C) 2006-2008 Werner Dittmann
++  [Copyright: 2006-2011 Werner Dittmann]
 +
 +License:
 +
 +Please note, this library is licensed under the GNU GPL, version 3 or
 +later, and has been copyright assigned to the Free Software Foundation.
 +
 +  This program 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 3 of the License, or
 +  (at your option) any later version.
 +
 +  This program 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 program.  If not, see <http://www.gnu.org/licenses/>.
 +
 +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-3'.
 +
 +Other portions:
 +
 +  This library is free software; you can redistribute it and/or
 +  modify it under the terms of the GNU Lesser General Public
 +  License as published by the Free Software Foundation; either
 +  version 2.1 of the License, or (at your option) any later version.
 +
 +  This library 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
 +  Lesser General Public License for more details.
 +
 +On Debian systems, the complete text of the GNU Lesser General
- Public License can be found in `/usr/share/common-licenses/LGPL'.
++Public License can be found in `/usr/share/common-licenses/LGPL-2.1'.
 +
- The Debian packaging is (C) 2006, Mark Purcell <msp at debian.org> and
- is licensed under the GPL, see above.
++The Debian packaging is (Copyright) 2006, Mark Purcell <msp at debian.org> and
++is licensed under the GPL-3, see above.
 +
 +src/Base32.cxx: UNKNOWN
 +  [Copyright: 2002 Bryce "Zooko" Wilcox-O'Hearn Permission is hereby / HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER]
 + * Copyright (c) 2002 Bryce "Zooko" Wilcox-O'Hearn Permission is hereby
 + * granted, free of charge, to any person obtaining a copy of this software to
 + * deal in this software without restriction, including without limitation the
 + * rights to use, copy, modify, merge, publish, distribute, sublicense, and/or
 + * sell copies of this software, and to permit persons to whom this software
 + * is furnished to do so, subject to the following conditions:
 + *
 + * The above copyright notice and this permission notice shall be included in
 + * all copies or substantial portions of this software.
 + *
 + * THIS SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
 + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
 + * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
 + * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
 + * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
 + * FROM, OUT OF OR IN CONNECTION WITH THIS SOFTWARE OR THE USE OR OTHER
 + * DEALINGS IN THIS SOFTWARE.
 + *
 + * Converted to C++ by:
 + * @author Werner Dittmann <Werner.Dittmann at t-online.de>
 +
 +src/libzrtpcpp/crypto/openssl/hmac256.cxx: LGPL (v2.1 or later) (with incorrect FSF address) 
 +  [Copyright: holders give / 2005, 2004 Erik Eliasson, Johan Bilien]
 +src/libzrtpcpp/crypto/openssl/sha256.cxx: LGPL (v2.1 or later) (with incorrect FSF address) 
 +  [Copyright: holders give / 2005, 2004 Erik Eliasson, Johan Bilien]
 + * In addition, as a special exception, the copyright holders give
 + * permission to link the code of portions of this program with the
 + * OpenSSL library under certain conditions as described in each
 + * individual source file, and distribute linked combinations
 + * including the two.
 + * You must obey the GNU General Public License in all respects
 + * for all of the code used other than OpenSSL.  If you modify
 + * file(s) with this exception, you may extend this exception to your
 + * version of the file(s), but you are not obligated to do so.  If you
 + * do not wish to do so, delete this exception statement from your
 + * version.  If you delete this exception statement from all source
 + * files in the program, then also delete it here.
 +
 +src/ZrtpCrc32.cxx: GPL (with incorrect FSF address) 
 +  [Copyright: 1999-2001 Motorola, Inc / 2001, D. Otis. Use this program, code or tables */ / 2001-2003 International Business Machines, Corp]
 +/* SCTP kernel reference Implementation
 + * Copyright (c) 1999-2001 Motorola, Inc.
 + * Copyright (c) 2001-2003 International Business Machines, Corp.
 + *
 + * SCTP Checksum functions
 + *
 + * The SCTP reference implementation 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, or (at your option)
 + * any later version.
 + *
 + * The SCTP reference implementation 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.
 + *
 + * Please send any bug reports or fixes you make to the
 + * email address(es):
 + *    lksctp developers <lksctp-developers at lists.sourceforge.net>
 + *
 + * Or submit a bug report through the following website:
 + *    http://www.sf.net/projects/lksctp
 + *
 + * Written or modified by:
 + *    Dinakaran Joseph
 + *    Jon Grimm <jgrimm at us.ibm.com>
 + *    Sridhar Samudrala <sri at us.ibm.com>
 + *
 + * Any bugs reported given to us we will try to fix... any fixes shared will
 + * be incorporated into the next SCTP release.
 + */
 +
 +/* The following code has been taken directly from
 + * draft-ietf-tsvwg-sctpcsum-03.txt
 + *
 + * The code has now been modified by Werner.Dittmann at t-online.de for use
 + * inside the ZRTP implementation.
 + */
++
++src/libzrtpcpp/crypto/twofish.*
++  [Copyright: 2002 by Niels Ferguson]
++
++ * The author hereby grants a perpetual license to everybody to 
++ * use this code for any purpose as long as the copyright message is included 
++ * in the source code of this or any derived work. 
++ *  
++ * Yes, this means that you, your company, your club, and anyone else 
++ * can use this code anywhere you want. You can change it and distribute it 
++ * under the GPL, include it in your commercial product without releasing 
++ * the source code, put it on the web, etc.  
++ * The only thing you cannot do is remove my copyright message,  
++ * or distribute any source code based on this implementation that does not  
++ * include my copyright message.  
++
diff --cc debian/libzrtpcpp-dev.install
index 68a175d,0000000..5774e64
mode 100644,000000..100644
--- a/debian/libzrtpcpp-dev.install
+++ b/debian/libzrtpcpp-dev.install
@@@ -1,5 -1,0 +1,3 @@@
 +usr/include/*
- usr/lib/lib*.a
 +usr/lib/lib*.so
 +usr/lib/pkgconfig/*
- usr/lib/*.la
diff --cc debian/libzrtpcpp2.install
index d0dbfd1,0000000..d0dbfd1
mode 100644,000000..100644
--- a/debian/libzrtpcpp2.install
+++ b/debian/libzrtpcpp2.install
diff --cc debian/rules
index d4ec66d,0000000..b0e0606
mode 100755,000000..100755
--- a/debian/rules
+++ b/debian/rules
@@@ -1,18 -1,0 +1,6 @@@
 +#!/usr/bin/make -f
 +
- FILENAME = $(DEB_SOURCE_PACKAGE)_$(DEB_UPSTREAM_VERSION).orig.tar.gz
- URL = ftp://ftp.gnu.org/pub/gnu/ccrtp/$(DEB_SOURCE_PACKAGE)-$(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/simple-patchsys.mk
- 
- DEB_DH_INSTALL_ARGS := --sourcedir=debian/tmp
- DEB_INSTALL_CHANGELOGS_ALL := NEWS
- 
- get-orig-source:
- 	@@dh_testdir
- 	@@[ -d ../tarballs/. ]||mkdir -p ../tarballs
- 	@@echo Downloading $(FILENAME) from $(URL) ...
- 	@@wget -nv -T10 -t3 -O ../tarballs/$(FILENAME) $(URL)
++export USES_CCRTP_INCLUDE_DIRS=yes
 +
++%:
++	dh $@ --parallel --with autotools-dev
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/libzrtpcpp.git



More information about the Pkg-voip-commits mailing list