[Pkg-voip-commits] [libosip2] 02/04: Imported Debian patch 3.6.0-4

Victor Seva Lopez maniac-guest at moszumanska.debian.org
Sun Aug 16 11:39:15 UTC 2015


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

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

commit 1142d333c5608c4b00d23eae835a2012508200dc
Merge: 8ef3c11 8a83ad5
Author: Mark Purcell <msp at debian.org>
Date:   Sun Jun 24 20:57:55 2012 +1000

    Imported Debian patch 3.6.0-4

 ChangeLog                                        |    17 +
 Makefile.in                                      |   386 +-
 aclocal.m4                                       | 10761 ++++---
 config.h.in                                      |     7 +
 configure                                        | 32283 +++++++--------------
 configure.in                                     |    60 +-
 debian/changelog                                 |    48 +
 debian/compat                                    |     2 +-
 debian/control                                   |    10 +-
 debian/copyright                                 |     2 +-
 debian/docs                                      |     1 -
 debian/libosip2-4.install                        |     1 -
 debian/libosip2-7.install                        |     1 +
 debian/libosip2-dev.install                      |    12 +-
 debian/patches/manpage-section-mismatch.patch    |    17 +-
 debian/patches/series                            |     3 +
 debian/patches/spelling-error-in-binary.diff     |    86 +
 debian/patches/spelling-error-in-manpage.diff    |    29 +
 debian/rules                                     |    30 +-
 debian/source/format                             |     1 +
 debian/watch                                     |     3 +-
 help/Makefile.in                                 |   281 +-
 help/doxygen/Makefile.in                         |   148 +-
 help/man/Makefile.in                             |   257 +-
 help/man/osip.1                                  |     2 +-
 include/Makefile.in                              |   281 +-
 include/osip2/Makefile.in                        |   226 +-
 include/osip2/internal.h                         |   177 +-
 include/osip2/osip.h                             |   822 +-
 include/osip2/osip_condv.h                       |    30 +-
 include/osip2/osip_dialog.h                      |    96 +-
 include/osip2/osip_fifo.h                        |    41 +-
 include/osip2/osip_mt.h                          |    62 +-
 include/osip2/osip_time.h                        |    24 +-
 include/osipparser2/Makefile.in                  |   320 +-
 include/osipparser2/headers/Makefile.in          |   229 +-
 include/osipparser2/osip_body.h                  |    35 +-
 include/osipparser2/osip_const.h                 |     2 +-
 include/osipparser2/osip_list.h                  |    68 +-
 include/osipparser2/osip_md5.h                   |    30 +-
 include/osipparser2/osip_message.h               |   164 +-
 include/osipparser2/osip_parser.h                |   237 +-
 include/osipparser2/osip_port.h                  |   179 +-
 include/osipparser2/osip_uri.h                   |   117 +-
 include/osipparser2/sdp_message.h                |   334 +-
 platform/Makefile.in                             |   281 +-
 platform/rpm/Makefile.in                         |   148 +-
 platform/vsnet/Makefile.in                       |   148 +-
 platform/vsnet/osip2.vcproj                      |     2 +-
 platform/vsnet/osipparser2.vcproj                |     2 +-
 platform/wince/Makefile.in                       |   148 +-
 platform/wince/osip2.vcproj                      |   360 +-
 platform/wince/osipparser2.vcproj                |   332 +-
 scripts/Makefile.in                              |   148 +-
 scripts/config.guess                             |   107 +-
 scripts/config.sub                               |    67 +-
 scripts/depcomp                                  |   172 +-
 scripts/ltmain.sh                                | 13245 +++++----
 src/Makefile.in                                  |   281 +-
 src/osip2/Makefile.in                            |   261 +-
 src/osip2/fsm.h                                  |   143 +-
 src/osip2/fsm_misc.c                             |    45 +-
 src/osip2/ict.c                                  |   276 +-
 src/osip2/ict_fsm.c                              |   956 +-
 src/osip2/ist.c                                  |   135 +-
 src/osip2/ist_fsm.c                              |   657 +-
 src/osip2/nict.c                                 |   275 +-
 src/osip2/nict_fsm.c                             |   676 +-
 src/osip2/nist.c                                 |   103 +-
 src/osip2/nist_fsm.c                             |   559 +-
 src/osip2/osip.c                                 |  3196 +-
 src/osip2/osip_dialog.c                          |   928 +-
 src/osip2/osip_event.c                           |   249 +-
 src/osip2/osip_time.c                            |   101 +-
 src/osip2/osip_transaction.c                     |  1292 +-
 src/osip2/port_condv.c                           |   450 +-
 src/osip2/port_fifo.c                            |   236 +-
 src/osip2/port_sema.c                            |  1016 +-
 src/osip2/port_thread.c                          |   341 +-
 src/osip2/xixt.h                                 |   119 +-
 src/osipparser2/Makefile.in                      |   261 +-
 src/osipparser2/osip_accept.c                    |   194 +-
 src/osipparser2/osip_accept_encoding.c           |   308 +-
 src/osipparser2/osip_accept_language.c           |    54 +-
 src/osipparser2/osip_alert_info.c                |    52 +-
 src/osipparser2/osip_allow.c                     |    50 +-
 src/osipparser2/osip_authentication_info.c       |   536 +-
 src/osipparser2/osip_authorization.c             |  1022 +-
 src/osipparser2/osip_body.c                      |   760 +-
 src/osipparser2/osip_call_id.c                   |   275 +-
 src/osipparser2/osip_call_info.c                 |   302 +-
 src/osipparser2/osip_contact.c                   |   120 +-
 src/osipparser2/osip_content_disposition.c       |    44 +-
 src/osipparser2/osip_content_encoding.c          |    52 +-
 src/osipparser2/osip_content_length.c            |   154 +-
 src/osipparser2/osip_content_type.c              |   345 +-
 src/osipparser2/osip_cseq.c                      |   255 +-
 src/osipparser2/osip_error_info.c                |    52 +-
 src/osipparser2/osip_from.c                      |  1036 +-
 src/osipparser2/osip_header.c                    |   428 +-
 src/osipparser2/osip_list.c                      |   434 +-
 src/osipparser2/osip_md5c.c                      |   347 +-
 src/osipparser2/osip_message.c                   |   883 +-
 src/osipparser2/osip_message_parse.c             |  2042 +-
 src/osipparser2/osip_message_to_str.c            |  1506 +-
 src/osipparser2/osip_mime_version.c              |    41 +-
 src/osipparser2/osip_parser_cfg.c                |   322 +-
 src/osipparser2/osip_port.c                      |  1722 +-
 src/osipparser2/osip_proxy_authenticate.c        |    54 +-
 src/osipparser2/osip_proxy_authentication_info.c |    59 +-
 src/osipparser2/osip_proxy_authorization.c       |    55 +-
 src/osipparser2/osip_record_route.c              |   195 +-
 src/osipparser2/osip_route.c                     |    76 +-
 src/osipparser2/osip_to.c                        |    71 +-
 src/osipparser2/osip_uri.c                       |  1660 +-
 src/osipparser2/osip_via.c                       |   801 +-
 src/osipparser2/osip_www_authenticate.c          |  1021 +-
 src/osipparser2/parser.h                         |    46 +-
 src/osipparser2/sdp_accessor.c                   |  1140 +-
 src/osipparser2/sdp_message.c                    |  3890 ++-
 src/test/Makefile.in                             |   342 +-
 src/test/res/Makefile.in                         |   148 +-
 src/test/tcallid.c                               |    82 +-
 src/test/tcontact.c                              |    83 +-
 src/test/tcontentt.c                             |    84 +-
 src/test/tfrom.c                                 |    82 +-
 src/test/torture.c                               |   485 +-
 src/test/trecordr.c                              |    84 +-
 src/test/troute.c                                |    82 +-
 src/test/tto.c                                   |    80 +-
 src/test/turls.c                                 |   217 +-
 src/test/tvia.c                                  |    81 +-
 src/test/twwwa.c                                 |    86 +-
 133 files changed, 45530 insertions(+), 54448 deletions(-)

diff --cc debian/changelog
index 12f4256,0000000..66ea069
mode 100644,000000..100644
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,234 -1,0 +1,282 @@@
++libosip2 (3.6.0-4) unstable; urgency=low
++
++  * weezey polish
++  * Update Standards-Version: 3.9.3
++  * Refresh manpage-section-mismatch.patch
++  * debian/compat -> 9 - hardening & multiarch
++
++ -- Mark Purcell <msp at debian.org>  Sun, 24 Jun 2012 20:57:55 +1000
++
++libosip2 (3.6.0-3) unstable; urgency=low
++
++  * Upload to unstable - debian-release endorsed
++  * Fix minor spelling-error.diff
++
++ -- Mark Purcell <msp at debian.org>  Sun, 26 Feb 2012 07:52:37 +1100
++
++libosip2 (3.6.0-2) experimental; urgency=low
++
++  * Fix "Resolve unresolved symbols in shared libraries" 
++    debian/rules: export EXTRA_LIB=-lpthread (Closes: #558915)
++
++ -- Mark Purcell <msp at debian.org>  Sat, 08 Oct 2011 14:06:34 +1100
++
++libosip2 (3.6.0-1) experimental; urgency=low
++
++  * New upstream release
++    - NEW package libosip2-7 - soname bump
++  * docs: drop duplicate-changelog-files ChangeLog
++  * Drop content of dependancy_libs (sed -i)
++    - Fixes "Emptying dependency_libs in .la files" (Closes: #633334)
++  * Switch to dh 7
++  * Switch to dpkg-source 3.0 (quilt) format
++  * Upgrade to Standards Version 3.9.2
++  * Upgrade debian/watch to v3
++  * copyright-refers-to-symlink-license
++    - Updated debian/copyright -> LGPL-2.1
++  * Add osip.1 to libosip2-dev
++
++ -- Mark Purcell <msp at debian.org>  Sat, 08 Oct 2011 13:54:35 +1100
++
++libosip2 (3.5.0-1) experimental; urgency=low
++
++  * New upstream release
++  * NEW package libosip2-6 - soname bump
++  * debian/compat -> 7
++
++ -- Mark Purcell <msp at debian.org>  Sat, 29 Jan 2011 15:08:04 +1000
++
 +libosip2 (3.3.0-1) unstable; urgency=low
 +
 +  * New upstream release
 +    - libosip2 transition
 +  * Cleanup Uploaders: (Closes: #508850)
 +  * Upstream includes ignore-debian-Makefile.in.patch
 +
 + -- Mark Purcell <msp at debian.org>  Sun, 08 Mar 2009 15:36:40 +1100
 +
 +libosip2 (3.2.0-1) experimental; urgency=low
 +
 +  * New upstream release
 +
 +  [ Patrick Matthäi ]
 +  * Bumped to Standards-Version 3.8.0.
 +  * Removed some more useless whitespaces at EOL in debian/control.
 +
 +  [ Mark Purcell ]
 +  * NEW package libosip2-4 to match upstream soname
 +  * Add uclean(1) call to get-orig-source target
 +  * Add manpage-section-mismatch.patch
 +
 + -- Mark Purcell <msp at debian.org>  Sat, 15 Nov 2008 22:11:57 +1100
 +
 +libosip2 (3.1.0-1) unstable; urgency=low
 +
 +  * New upstream release
 +
 +  [ Kilian Krause ]
 +  * Update Maintainer to Debian VoIP Team.
 +
 +  [ Mark Purcell ]
 +  * Cleanup get-orig-source VARS
 +  * Ran uclean(1) over .orig.tar.gz
 +  * Ignore upstream debian/Makefile.in
 +     - ignore-debian-Makefile.in.patch
 +  * Bump packagename to libosip2-3deb (libosip2-3 is used in etch)
 +    - package-name-doesnt-match-sonames libosip2-3
 +    - Conflicts: Replaces: etch libosip3 (<< 3.0) same soname
 +  * Remove debian/dirs - lintian: package-contains-empty-directory
 +
 + -- Mark Purcell <msp at debian.org>  Fri, 18 Apr 2008 16:04:23 +1000
 +
 +libosip2 (3.0.3-2-1) unstable; urgency=low
 +
 +  * New Upstream Release
 +
 +  [ Mikael Magnusson ]
 +  * Fix debian/rules print-version and get-orig-source
 +
 +  [ Mark Purcell ]
 +  * Bump soname (backwards libosip2-2)
 +    - linphone-nox: nox client fails to start (Closes: #439196)
 +    - libosip2-3: package-name-doesnt-match-sonames libosip2-2 
 +    (Closes: #439600)
 +  * linda: debhelper.mk needs Build-Depends: (>=  4.1.0)
 +  * Dump Provides:/ Conflicts: libosip2feature209 not used in Debian
 +  * Add Conflicts: libosip2-3 (>> 3.0) for missed soname bump
 +
 + -- Mark Purcell <msp at debian.org>  Fri, 31 Aug 2007 22:02:47 +0100
 +
 +libosip2 (3.0.3-2) unstable; urgency=low
 +
 +  * Build-Depends: cdbs
 +
 + -- Mark Purcell <msp at debian.org>  Sun, 19 Aug 2007 12:27:34 +0100
 +
 +libosip2 (3.0.3-1) unstable; urgency=low
 +
 +  * New upstream release (Closes: #421509)
 +
 +  [ Kilian Krause ]
 +  * debian/control:
 +    - Import into pkg-voip.
 +    - Use binary:Version stanza to allow clean binNMUs.
 +      Bump to dpkg-dev (>= 1.13.19)
 +  * debian/watch: Update.
 +
 +  [ Mark Purcell ]
 +  * libosip2-dev Recommends: pkg-config
 +  * Switch to cdbs
 +  * Ack NMU
 +    - libosip2-dev: libosip2.pc is missing (Closes: #328825)
 +    - libosip2-3: please provide osip.1 upstream man page (Closes:
 +    #366037)
 +    - Link in description doesn't exist (Closes: #352251)
 +  * Add Build-Depends: docbook-to-man to generate osip(1)
 +  * Add Build-Depends: autotools-dev
 +  * move osip.1 to -dev package, allows future upgrades of libs
 +
 + -- Mark Purcell <msp at debian.org>  Sun, 19 Aug 2007 11:43:12 +0100
 +
 +libosip2 (2.2.2-3.1) unstable; urgency=low
 +
 +  * Non-maintainer upload.
 +  * BTS old bugs:
 +    + Include libosip2.pc in -dev package (Closes: #328825)
 +    + Link libosip2.so.3.0.0 against libpthread.so (Closes: #356330)
 +    + Fix Links in debian/control: fsf.org => gnu.org (Closes: #352251)
 +
 +  * Remove debian/*.ex files (Closes: #366036).
 +  * Remove debian/libosip2.* files.
 +  * switch to dh_install in debian/rules:
 +    + enable --list-missing to catch non installed files (like osip.1).
 +    + .files/.install were not in sync.
 +  * Also bump Standards-Version to 3.6.2.
 +  * Install upstream man page osip.1 (Closes: #366037).
 +  * Fix FSF address in debian/copyright.
 +  * Make debian/copyright complete (missing copyright statement for
 +    osip_md5.{h,c}) (Closes: #366034).
 +
 + -- Pierre Habouzit <madcoder at debian.org>  Wed, 24 May 2006 22:04:05 +0200
 +
 +libosip2 (2.2.2-3) unstable; urgency=medium
 +
 +  * Revert NMU
 +
 + -- Anand Kumria <wildfire at progsoc.org>  Tue, 18 Apr 2006 13:44:28 +1000
 +
 +libosip2 (2.2.2-2) unstable; urgency=low
 +
 +  * Change Build-Dep to automake1.8 (Closes: #335134)
 +
 + -- Anand Kumria <wildfire at progsoc.org>  Sat, 31 Dec 2005 13:07:36 +1100
 +
 +libosip2 (2.2.2-1) unstable; urgency=low
 +
 +  [ Aymeric MOIZARD ]
 +  * parser speed improvements
 +  * replace mutex with critical section on windows for performance.
 +  * fix a bug in the parser for empty header (also store empty Accept header)
 +  * improve mime support.
 +  * improve sipfrag support.
 +  * add NULL checks (uris...).
 +  * patch for PSOS support.
 +
 +  [ ARAKI Yasuhiro ]
 +  * new upstream release.
 +
 + -- ARAKI Yasuhiro <ar at debian.org>  Wed, 21 Dec 2005 18:36:25 +0900
 +
 +libosip2 (2.2.1-1) unstable; urgency=low
 +
 +  * fix a potential mem leak content_type and osip_message_parse.
 +  * fix osip_body_clone method (add terminating NULL)
 +  * fix for binary support when multipart is used.
 +  * automatic check for reliable protocol SCTP and TLS.
 +  * avoid <winsock.h> inclusion so user can (and must) now include either
 +    <winsock.h> or <winsock2.h> before including <osip/osip2.h>
 +
 + -- Aymeric MOIZARD <jack at atosc.org>  Tue, 12 Jul 2005 13:04:32 +0100
 +
 +libosip2 (2.2.0+2.2.1pre4-2) unstable; urgency=low
 +
 +  * Maintainer change: Anand Kumria <wildfire at progsoc.org> to ARAKI Yasuhiro
 +    <ar at debian.org>.
 +
 + -- ARAKI Yasuhiro <ar at debian.org>  Mon, 25 Apr 2005 14:11:33 +0900
 +
 +libosip2 (2.2.0+2.2.1pre4-1) unstable; urgency=low
 +
 +  * New upstream release
 +  * fix osip_body_clone doesn't NULL terminate the copied body.
 +    Reported by Mikael Magnusson. (Close: #305729)
 +  * Maintainer change: Anand Kumria <wildfire at progsoc.org> to ARAKI Yasuhiro
 +    <ar at debian.org>.
 +
 + -- ARAKI Yasuhiro <ar at debian.org>  Fri, 22 Apr 2005 15:33:12 +0900
 +
 +libosip2 (2.2.0-1) unstable; urgency=low
 +
 +  * remove #ifdef OSIP_RETRANSMIT_2XX to always compile it.
 +  * initialize remote_contact_uri when dialog is built with notify.
 +  * allow very short attachements.
 +  * new macros allocators.
 +  * remove use of alloca in the parser.
 +  * fix memory bug when realloc is needed on large message.
 +  * remove useless prototypes.
 +  * fix memory access in parser.
 +  * API slightly broken to enable support for binary data.
 +  * improvements of the sip message test suite.
 +  * ABI change to 3 
 +
 + -- ARAKI Yasuhiro <ar at debian.org>  Fri,  4 Feb 2005 14:46:08 +0900
 +libosip2 (2.0.9-2) unstable; urgency=low
 +
 +  * fix for ABI change (close: #285079)
 +
 + -- ARAKI Yasuhiro <ar at debian.org>  Sat, 11 Dec 2004 15:20:14 +0900
 +
 +libosip2 (2.0.9-1) unstable; urgency=low
 +
 +  * New upstream release 
 +
 + -- ARAKI Yasuhiro <ar at debian.org>  Thu,  9 Dec 2004 18:09:09 +0900
 +
 +libosip2 (2.0.6-2) unstable; urgency=low
 +
 +  * fix: lack "libosip2.so" install for libosip2-dev. 
 +
 + -- ARAKI Yasuhiro <ar at debian.org>  Tue, 23 Mar 2004 15:29:12 +0900
 +
 +libosip2 (2.0.6-1) unstable; urgency=low
 +
 +  * New upstream release (close: #238263)
 +  * Co-maintainer add: ARAKI Yasuhiro <ar at debian.org>
 +
 + -- ARAKI Yasuhiro <ar at debian.org>  Thu, 18 Mar 2004 11:56:11 +0900
 +
 +libosip2 (2.0.5-2) unstable; urgency=low
 +
 +  * Build depend on automake1.6 too
 +
 + -- Anand Kumria <wildfire at progsoc.org>  Sun, 28 Dec 2003 13:17:07 +1100
 +
 +libosip2 (2.0.5-1) unstable; urgency=low
 +
 +  * New upstream release (and change of source name)
 +  * For the life of me I couldn't see what the patch
 +    was but I believe this will fix the problem (closes: #215606, 219421)
 +
 + -- Anand Kumria <wildfire at progsoc.org>  Sat, 27 Dec 2003 11:07:33 +1100
 +
 +osip (2.0.4-1) unstable; urgency=low
 +
 +  * New upstream release
 +
 + -- Anand Kumria <wildfire at progsoc.org>  Sun, 11 Oct 2003 05:17:51 +1000
 +
 +osip (2.0.1.2-1) unstable; urgency=low
 +
 +  * Initial Release.
 +
 + -- Anand Kumria <wildfire at progsoc.org>  Tue, 30 Sep 2003 16:09:51 +1000
diff --cc debian/compat
index b8626c4,0000000..ec63514
mode 100644,000000..100644
--- a/debian/compat
+++ b/debian/compat
@@@ -1,1 -1,0 +1,1 @@@
- 4
++9
diff --cc debian/control
index d2974cd,0000000..0925ed4
mode 100644,000000..100644
--- a/debian/control
+++ b/debian/control
@@@ -1,45 -1,0 +1,47 @@@
 +Source: libosip2
 +Section: comm
 +Priority: optional
 +Maintainer: Debian VoIP Team <pkg-voip-maintainers at lists.alioth.debian.org>
 +Uploaders: Mark Purcell <msp at debian.org>, Kilian Krause <kilian at debian.org>
- Build-Depends: debhelper (>= 4.1.0), dpkg-dev (>= 1.13.19), cdbs, autotools-dev, docbook-to-man
- Standards-Version: 3.8.0
++Build-Depends: debhelper (>= 9), dpkg-dev (>= 1.13.19), autotools-dev, docbook-to-man
++Standards-Version: 3.9.3
 +Homepage: http://www.gnu.org/software/osip/
 +Vcs-Svn: svn://svn.debian.org/pkg-voip/libosip2/trunk/
 +Vcs-Browser: http://svn.debian.org/wsvn/pkg-voip/libosip2/?op=log
 +
 +Package: libosip2-dev
 +Section: libdevel
 +Architecture: any
- Depends: ${misc:Depends}, libosip2-4 (= ${binary:Version})
++Depends: ${misc:Depends}, libosip2-7 (= ${binary:Version})
 +Recommends: pkg-config
 +Description: development files for the SIP library
 + libosip2 header files and static libraries to assist in development of
 + programs wishing to use SIP.
 + .
 + The oSIP library is written in C, is thread safe and has no dependencies
 + except the standard C library.
 + .
 + oSIP could be used to implement an IP soft-phone as well as embedded SIP
 + software. oSIP is not limited to endpoint agents implementations and can
 + also be used to implement SIP proxies or registration services.
 + .
 + oSIP currently provides an API for the SIP message parser, SDP message
 + parser, and library to handle "SIP transactions" as defined by the SIP
 + standards (RFC3261).
 +
- Package: libosip2-4
++Package: libosip2-7
 +Section: libs
++Pre-Depends: ${misc:Pre-Depends}
 +Architecture: any
++Multi-Arch: same
 +Depends: ${shlibs:Depends}, ${misc:Depends}
 +Description: Session Initiation Protocol (SIP) library
 + oSIP is an implementation of SIP.
 + .
 + SIP stands for the Session Initiation Protocol and is described by the
 + RFC3261.  This library aims to provide multimedia and telecom software
 + developers an easy and powerful interface to initiate and control SIP
 + based sessions in their applications.
 + .
 + SIP is the IETF replacement for the ITU's H323. Example programs using this
 + library are partysip and linphone.
diff --cc debian/copyright
index ac04855,0000000..aa3c975
mode 100644,000000..100644
--- a/debian/copyright
+++ b/debian/copyright
@@@ -1,60 -1,0 +1,60 @@@
 +Package: libosip2
 +This package was debianized by Aymeric Moizard <jack at atosc.org>
 +
 +Obtained from: It was downloaded from ftp://ftp.gnu.org/gnu/osip/
 +
 +Debian copyright/license:
 +
 +  osip is mostly licensed under the GPL with the copyright statement:
 +
 +    Copyright (C) 2001,2002,2003,2004,2005  Aymeric MOIZARD jack at atosc.org
 +
 +    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.
 +
 +    You should have received a copy of the GNU Lesser General Public
 +    License along with this library; if not, write to the Free Software
 +    Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.
 +
 +
 +  except for osip_md5.{h,c}:
 +
 +    This is a modified version from Aymeric MOIZARD of MD5C.C provided by
 +    RSA Data Security, Inc.
 +
 +    modification: path for include files
 +
 +    Copyright (C) 1991-2, RSA Data Security, Inc. Created 1991. All rights
 +    reserved.
 +
 +    License to copy and use this software is granted provided that it is
 +    identified as the "RSA Data Security, Inc. MD5 Message-Digest
 +    Algorithm" in all material mentioning or referencing this software or
 +    this function.
 +
 +    License is also granted to make and use derivative works provided that
 +    such works are identified as "derived from the RSA Data Security, Inc.
 +    MD5 Message-Digest Algorithm" in all material mentioning or
 +    referencing the derived work.
 +
 +    RSA Data Security, Inc. makes no representations concerning either the
 +    merchantability of this software or the suitability of this software
 +    for any particular purpose. It is provided "as is" without express or
 +    implied warranty of any kind.
 +
 +    These notices must be retained in any copies of any part of this
 +    documentation and/or software.
 +
 +
 +On Debian systems, the complete text of the GNU General Public
- License can be found in the file `/usr/share/common-licenses/LGPL`
++License can be found in the file `/usr/share/common-licenses/LGPL-2.1`
 +
 +Upstream Author: Aymeric Moizard <jack at atosc.org>
 +
diff --cc debian/docs
index 2e4f9a2,0000000..b5c7362
mode 100644,000000..100644
--- a/debian/docs
+++ b/debian/docs
@@@ -1,5 -1,0 +1,4 @@@
 +BUGS
 +NEWS
 +README
 +TODO
- ChangeLog
diff --cc debian/libosip2-7.install
index 0000000,0000000..3ddde58
new file mode 100644
--- /dev/null
+++ b/debian/libosip2-7.install
@@@ -1,0 -1,0 +1,1 @@@
++usr/lib/*/lib*.so.*
diff --cc debian/libosip2-dev.install
index fe94308,0000000..218f3f2
mode 100644,000000..100644
--- a/debian/libosip2-dev.install
+++ b/debian/libosip2-dev.install
@@@ -1,7 -1,0 +1,7 @@@
- usr/include/osipparser2/*
 +usr/include/osip2/*
- usr/lib/lib*.a
- usr/lib/lib*.la
- usr/lib/lib*.so
- usr/lib/pkgconfig/libosip2.pc
- 
++usr/include/osipparser2/*
++usr/lib/*/lib*.a
++usr/lib/*/lib*.la
++usr/lib/*/lib*.so
++usr/lib/*/pkgconfig/libosip2.pc
++usr/share/
diff --cc debian/patches/manpage-section-mismatch.patch
index bc9527f,0000000..e7327f1
mode 100644,000000..100644
--- a/debian/patches/manpage-section-mismatch.patch
+++ b/debian/patches/manpage-section-mismatch.patch
@@@ -1,20 -1,0 +1,31 @@@
 +usr/share/man/man1/osip.1.gz:1 1 != SECTION
 +
 +A man page usually should contain a .TH header, specifying the section.
 +The section in this manpage doesn't match with the section in the filename. 
 +
 +Refer to the groff_man(7) manual page and the man(1) manual page for details. 
 +Severity: normal; Certainty: certain
 +
- diff -Nur -x '*.orig' -x '*~' libosip2-3.2.0/help/man/osip.sgml libosip2-3.2.0.new/help/man/osip.sgml
- --- libosip2-3.2.0/help/man/osip.sgml	2008-09-18 21:49:34.000000000 +1000
- +++ libosip2-3.2.0.new/help/man/osip.sgml	2008-11-15 21:55:48.000000000 +1100
++Index: libosip2-3.6.0/help/man/osip.sgml
++===================================================================
++--- libosip2-3.6.0.orig/help/man/osip.sgml	2012-06-24 20:50:24.000000000 +1000
+++++ libosip2-3.6.0/help/man/osip.sgml	2012-06-24 20:50:25.000000000 +1000
 +@@ -4,7 +4,7 @@
 +   <!ENTITY dhfirstname "<firstname>Aymeric</firstname>">
 +   <!ENTITY dhsurname   "<surname>MOIZARD</surname>">
 +   <!ENTITY dhdate      "<date>Jan 15, 2005</date>">
 +-  <!ENTITY dhsection   "<manvolnum>SECTION</manvolnum>">
 ++  <!ENTITY dhsection   "<manvolnum>1</manvolnum>">
 +   <!ENTITY dhemail     "<email>jack at atosc.org</email>">
 +   <!ENTITY dhusername  "Aymeric Moizard">
 +   <!ENTITY dhucpackage "<refentrytitle>libosip</refentrytitle>">
++Index: libosip2-3.6.0/help/man/osip.1
++===================================================================
++--- libosip2-3.6.0.orig/help/man/osip.1	2012-06-24 20:50:24.000000000 +1000
+++++ libosip2-3.6.0/help/man/osip.1	2012-06-24 20:50:44.000000000 +1000
++@@ -1,4 +1,4 @@
++-.TH "libosip" "SECTION" 
+++.TH "libosip" "1" 
++ .SH "NAME" 
++ libosip2 \(em The GNU oSIP library is a low layer SIP implementation. 
++  
diff --cc debian/patches/series
index 0000000,0000000..4b665b0
new file mode 100644
--- /dev/null
+++ b/debian/patches/series
@@@ -1,0 -1,0 +1,3 @@@
++spelling-error-in-binary.diff
++spelling-error-in-manpage.diff
++manpage-section-mismatch.patch
diff --cc debian/patches/spelling-error-in-binary.diff
index 0000000,0000000..7b0ac32
new file mode 100644
--- /dev/null
+++ b/debian/patches/spelling-error-in-binary.diff
@@@ -1,0 -1,0 +1,86 @@@
++Description: spelling-error-in-binary
++Bug-Debian: http://lintian.debian.org/tags/spelling-error-in-binary.html
++
++Index: libosip2-3.6.0/src/osip2/ict.c
++===================================================================
++--- libosip2-3.6.0.orig/src/osip2/ict.c	2011-09-28 09:55:56.000000000 +1000
+++++ libosip2-3.6.0/src/osip2/ict.c	2012-02-26 07:50:52.000000000 +1100
++@@ -144,7 +144,7 @@
++ 	if (ict == NULL)
++ 		return OSIP_SUCCESS;
++ 	OSIP_TRACE(osip_trace
++-			   (__FILE__, __LINE__, OSIP_INFO2, NULL, "free ict ressource\n"));
+++			   (__FILE__, __LINE__, OSIP_INFO2, NULL, "free ict resource\n"));
++ 
++ 	osip_free(ict->destination);
++ 	osip_free(ict);
++Index: libosip2-3.6.0/src/osip2/ist.c
++===================================================================
++--- libosip2-3.6.0.orig/src/osip2/ist.c	2010-01-07 01:58:16.000000000 +1100
+++++ libosip2-3.6.0/src/osip2/ist.c	2012-02-26 07:50:24.000000000 +1100
++@@ -76,7 +76,7 @@
++ 	if (ist == NULL)
++ 		return OSIP_SUCCESS;
++ 	OSIP_TRACE(osip_trace
++-			   (__FILE__, __LINE__, OSIP_INFO2, NULL, "free ist ressource\n"));
+++			   (__FILE__, __LINE__, OSIP_INFO2, NULL, "free ist resource\n"));
++ 	osip_free(ist);
++ 	return OSIP_SUCCESS;
++ }
++Index: libosip2-3.6.0/src/osip2/nict.c
++===================================================================
++--- libosip2-3.6.0.orig/src/osip2/nict.c	2011-09-28 09:55:56.000000000 +1000
+++++ libosip2-3.6.0/src/osip2/nict.c	2012-02-26 07:50:44.000000000 +1100
++@@ -138,7 +138,7 @@
++ 	if (nict == NULL)
++ 		return OSIP_SUCCESS;
++ 	OSIP_TRACE(osip_trace
++-			   (__FILE__, __LINE__, OSIP_INFO2, NULL, "free nict ressource\n"));
+++			   (__FILE__, __LINE__, OSIP_INFO2, NULL, "free nict resource\n"));
++ 
++ 	osip_free(nict->destination);
++ 	osip_free(nict);
++Index: libosip2-3.6.0/src/osip2/nist.c
++===================================================================
++--- libosip2-3.6.0.orig/src/osip2/nist.c	2010-01-07 01:58:16.000000000 +1100
+++++ libosip2-3.6.0/src/osip2/nist.c	2012-02-26 07:50:35.000000000 +1100
++@@ -72,7 +72,7 @@
++ 	if (nist == NULL)
++ 		return OSIP_SUCCESS;
++ 	OSIP_TRACE(osip_trace
++-			   (__FILE__, __LINE__, OSIP_INFO2, NULL, "free nist ressource\n"));
+++			   (__FILE__, __LINE__, OSIP_INFO2, NULL, "free nist resource\n"));
++ 
++ 	osip_free(nist);
++ 	return OSIP_SUCCESS;
++Index: libosip2-3.6.0/src/osip2/osip_transaction.c
++===================================================================
++--- libosip2-3.6.0.orig/src/osip2/osip_transaction.c	2011-05-11 19:29:08.000000000 +1000
+++++ libosip2-3.6.0/src/osip2/osip_transaction.c	2012-02-26 07:51:15.000000000 +1100
++@@ -137,7 +137,7 @@
++ 
++ 	OSIP_TRACE(osip_trace
++ 			   (__FILE__, __LINE__, OSIP_INFO2, NULL,
++-				"allocating transaction ressource %i %s\n", transactionid,
+++				"allocating transaction resource %i %s\n", transactionid,
++ 				request->call_id->number));
++ 
++ 	*transaction = (osip_transaction_t *) osip_malloc(sizeof(osip_transaction_t));
++@@ -260,7 +260,7 @@
++    when a transaction goes in the TERMINATED STATE.
++    However the user might want to just take the context out of
++    the SIP stack andf keep it for future use without freeing
++-   all ressource.... This way the transaction context can be
+++   all resource.... This way the transaction context can be
++    kept without being used by the oSIP stack.
++ 
++    new methods that replace this one:
++@@ -299,7 +299,7 @@
++ 		&& transaction->orig_request->call_id->number != NULL) {
++ 		OSIP_TRACE(osip_trace
++ 				   (__FILE__, __LINE__, OSIP_INFO2, NULL,
++-					"free transaction ressource %i %s\n",
+++					"free transaction resource %i %s\n",
++ 					transaction->transactionid,
++ 					transaction->orig_request->call_id->number));
++ 	}
diff --cc debian/patches/spelling-error-in-manpage.diff
index 0000000,0000000..090d753
new file mode 100644
--- /dev/null
+++ b/debian/patches/spelling-error-in-manpage.diff
@@@ -1,0 -1,0 +1,29 @@@
++Description: spelling-error-in-manpage
++Bug-Debian: http://lintian.debian.org/tags/spelling-error-in-manpage.html 
++
++Index: libosip2-3.6.0/help/man/osip.1
++===================================================================
++--- libosip2-3.6.0.orig/help/man/osip.1	2010-01-12 23:25:21.000000000 +1100
+++++ libosip2-3.6.0/help/man/osip.1	2012-02-26 07:45:17.000000000 +1100
++@@ -52,7 +52,7 @@
++ .SH "osip general overview." 
++ .PP 
++ The file help/man/osip.html in the source distribution 
++-should give you a nice amount of informations about the 
+++should give you a nice amount of information about the
++ osip stack. 
++ .SH "Free software projects \-send me your project name-" 
++ .PP 
++Index: libosip2-3.6.0/help/man/osip.sgml
++===================================================================
++--- libosip2-3.6.0.orig/help/man/osip.sgml	2010-01-07 01:58:16.000000000 +1100
+++++ libosip2-3.6.0/help/man/osip.sgml	2012-02-26 07:44:41.000000000 +1100
++@@ -119,7 +119,7 @@
++     <title>osip general overview.</title>
++ 
++     <para>The file help/man/osip.html in the source distribution
++-       should give you a nice amount of informations about the
+++       should give you a nice amount of information about the
++        osip stack.</para>
++ 
++   </refsect1>
diff --cc debian/rules
index 4049121,0000000..2065dde
mode 100755,000000..100755
--- a/debian/rules
+++ b/debian/rules
@@@ -1,25 -1,0 +1,17 @@@
 +#!/usr/bin/make -f
++%:
++	dh $@ --parallel --with-autotools-dev
 +
- include /usr/share/cdbs/1/rules/debhelper.mk
++export EXTRA_LIB=-lpthread
 +
- FILENAME := $(DEB_SOURCE_PACKAGE)_$(DEB_UPSTREAM_VERSION).orig.tar.gz
- URL := http://ftp.gnu.org/gnu/osip/$(DEB_SOURCE_PACKAGE)-$(DEB_UPSTREAM_VERSION).tar.gz
++override_dh_auto_configure:
++	dh_auto_configure -- --enable-gperf --enable-pthread
 +
- include /usr/share/cdbs/1/class/autotools.mk
- include /usr/share/cdbs/1/rules/simple-patchsys.mk
- 
- DEB_CONFIGURE_EXTRA_FLAGS := --enable-gperf --enable-pthread
- 
- DEB_DH_INSTALL_ARGS = --sourcedir=debian/tmp --list-missing
- 
- clean::
- 	rm -f help/man/osip.1
++override_dh_install:
++	dh_install --list-missing
++	# Drop content of dependency_libs to avoid having to recompile exiv2
++	# if the path of the libs that appear there changes
++	sed -i "/dependency_libs/ s/'.*'/''/" `find . -name '*.la'`
 +
 +get-orig-source:
- 	@@dh_testdir
- 	@@[ -d ../tarballs/. ]||mkdir -p ../tarballs
- 	@@echo Downloading $(FILENAME) from $(URL) ...
- 	@@wget -nv -T10 -t3 -O ../tarballs/$(FILENAME) $(URL)
- 
- 	@@echo Repacking without upstream debian/...
- 	uclean ../tarballs/$(FILENAME)
++	uscan --force-download
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)
diff --cc debian/watch
index 7a20788,0000000..7ee3144
mode 100644,000000..100644
--- a/debian/watch
+++ b/debian/watch
@@@ -1,3 -1,0 +1,2 @@@
- # Site		Directory		Pattern			Version	Script
- version=2
++version=3
 +http://ftp.gnu.org/gnu/osip/libosip2-(.*)\.tar\.gz debian svn-upgrade

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



More information about the Pkg-voip-commits mailing list