[Pkg-voip-commits] [libexosip2] 02/04: Imported Debian patch 3.6.0-4
Victor Seva Lopez
maniac-guest at moszumanska.debian.org
Sun Aug 16 11:43:43 UTC 2015
This is an automated email from the git hooks/post-receive script.
maniac-guest pushed a commit to branch master
in repository libexosip2.
commit bd4e35df5941e0da2c13d1008eae7fc2424dc564
Merge: 2abf23c 53c99bc
Author: Mark Purcell <msp at debian.org>
Date: Sun Jun 24 20:42:02 2012 +1000
Imported Debian patch 3.6.0-4
ChangeLog | 29 +
Makefile.in | 337 +-
NEWS | 2 +-
aclocal.m4 | 10815 +++---
config.h.in | 16 +-
configure | 32814 ++++++-------------
configure.in | 88 +-
debian/changelog | 60 +
debian/compat | 2 +-
debian/control | 28 +-
debian/copyright | 2 +-
debian/libexosip2-4.install | 2 -
debian/libexosip2-7.install | 2 +
...libexosip2-4.manpages => libexosip2-7.manpages} | 0
debian/libexosip2-dev.docs | 2 +
debian/libexosip2-dev.install | 8 +-
debian/libexosip2-dev.lintian-overrides | 2 +-
.../manpages/{sip_reg-3.3.0.1 => sip_reg-3.6.0.1} | 0
debian/patches/series | 3 +
debian/patches/spelling-error-in-binary.patch | 16 +
debian/patches/spelling-error-in-manpage.patch | 105 +
debian/patches/variable.diff | 14 +
debian/rules | 35 +-
debian/source/format | 1 +
debian/watch | 20 -
help/Makefile.in | 282 +-
help/doxygen/Makefile.in | 149 +-
help/doxygen/ht1-callcontrol.dox | 4 +-
include/Makefile.in | 282 +-
include/eXosip2/Makefile.in | 236 +-
include/eXosip2/eX_call.h | 4 +-
include/eXosip2/eX_message.h | 2 +-
include/eXosip2/eX_options.h | 2 +-
include/eXosip2/eX_refer.h | 2 +-
include/eXosip2/eX_register.h | 15 +
include/eXosip2/eX_setup.h | 102 +-
include/eXosip2/eX_subscribe.h | 2 +-
include/eXosip2/eXosip.h | 32 +
platform/Makefile.in | 282 +-
platform/vsnet/Makefile.in | 149 +-
platform/vsnet/eXosip2.def | 1 +
platform/wince/Makefile.in | 149 +-
platform/wince/eXosip2.def | 1 +
platform/wince/eXosip2.vcproj | 360 +-
scripts/Makefile.in | 149 +-
scripts/config.guess | 107 +-
scripts/config.sub | 67 +-
scripts/depcomp | 172 +-
scripts/ltmain.sh | 13245 ++++----
src/Makefile.am | 2 +-
src/Makefile.in | 264 +-
src/eXcall_api.c | 2821 +-
src/eXconf.c | 1825 +-
src/eXinsubscription_api.c | 1295 +-
src/eXmessage_api.c | 246 +-
src/eXoptions_api.c | 245 +-
src/eXosip.c | 2765 +-
src/eXosip2.h | 909 +-
src/eXpublish_api.c | 295 +-
src/eXrefer_api.c | 61 +-
src/eXregister_api.c | 605 +-
src/eXsubscription_api.c | 921 +-
src/eXtl.c | 6 +-
src/eXtl_dtls.c | 1842 +-
src/eXtl_tcp.c | 2045 +-
src/eXtl_tls.c | 4212 ++-
src/eXtl_udp.c | 1299 +-
src/eXtransport.c | 202 +-
src/eXtransport.h | 43 +-
src/eXutils.c | 4767 ++-
src/inet_ntop.c | 253 +-
src/inet_ntop.h | 13 +-
src/jauth.c | 2138 +-
src/jcall.c | 154 +-
src/jcallback.c | 3276 +-
src/jdialog.c | 367 +-
src/jevents.c | 707 +-
src/jnotify.c | 234 +-
src/jpipe.c | 355 +-
src/jpipe.h | 33 +-
src/jpublish.c | 154 +-
src/jreg.c | 280 +-
src/jrequest.c | 2024 +-
src/jresponse.c | 821 +-
src/jsubscribe.c | 200 +-
src/milenage.c | 349 +-
src/milenage.h | 14 +-
src/misc.c | 492 +-
src/rijndael.c | 892 +-
src/rijndael.h | 4 +-
src/sdp_offans.c | 526 +-
src/udp.c | 4160 ++-
tools/Makefile.in | 272 +-
tools/sip_reg.c | 499 +-
94 files changed, 50432 insertions(+), 54654 deletions(-)
diff --cc debian/changelog
index 99577bf,0000000..fd62ca5
mode 100644,000000..100644
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,117 -1,0 +1,177 @@@
++libexosip2 (3.6.0-4) unstable; urgency=low
++
++ * wheezey polish
++ * Update Standards-Version: 3.9.3
++ * Fix variable.diff quilt-patch-missing-description
++ * Fix spelling-error-in-binary usr/bin/sip_reg-3.6.0 recieved received
++ * Fix libexosip2-dev extended-description-is-probably-too-short
++ * Fix spelling-error-in-manpage
++ * debian/compat -> 9 - multiarch & hardening
++
++ -- Mark Purcell <msp at debian.org> Sun, 24 Jun 2012 20:42:02 +1000
++
++libexosip2 (3.6.0-3) unstable; urgency=low
++
++ * Added variable.diff patch from pinotree - thks
++ - Fixes libexosip2: FTBFS on hurd-i386: (Closes: #661321)
++
++ -- Mark Purcell <msp at debian.org> Sun, 26 Feb 2012 21:37:34 +1100
++
++libexosip2 (3.6.0-2) unstable; urgency=low
++
++ * Upload to unstable - debian-release endorsed
++ * Added --with autotools_dev
++ * Fix "[libexosip2] "OSIP" completely uppercase in short description"
++ Updated debian/control - note upstream uppercase X (Closes: #644864)
++
++ -- Mark Purcell <msp at debian.org> Sun, 26 Feb 2012 08:06:14 +1100
++
++libexosip2 (3.6.0-1) experimental; urgency=low
++
++ * New upstream release
++ - NEW package libeXosip2-7 - soname bump
++ * Switch to dpkg-source 3.0 (quilt) format
++ * Switch to dh
++ * Update to Standards Version 3.9.2
++ * Fix "Getting rid of unneeded *.la / emptying dependency_libs"
++ debian/rules sed -i (Closes: #633180)
++ * Fix "[libexosip2-4] typo "establishement" in extended description"
++ Updated debian/control (Closes: #583519)
++ * Drop binary-control-field-duplicates-source
++ * cleanup debian/watch - debian-watch-contains-dh_make-template
++ * Update debian/copyright GPL2 - copyright-refers-to-symlink-license
++
++ -- Mark Purcell <msp at debian.org> Sat, 08 Oct 2011 15:20:31 +1100
++
++libexosip2 (3.5.0-1) experimental; urgency=low
++
++ * New upstream release
++
++ [ Kilian Krause ]
++ * Remove -N from wget args in get-orig-source target as -O is already
++ used.
++
++ [ Mark Purcell ]
++ * NEW package libexosip2-6 - soname bump
++ * Include html docs in -dev package
++ * Build-Depends: libosip2-dev (>= 3.5)
++
++ -- Mark Purcell <msp at debian.org> Sat, 29 Jan 2011 15:37:37 +1000
++
+libexosip2 (3.3.0-1) unstable; urgency=low
+
+ * New upstream release
+ - libosip2 transition
+
+ -- Mark Purcell <msp at debian.org> Sat, 07 Mar 2009 11:51:53 +1100
+
+libexosip2 (3.2.0-1) experimental; urgency=low
+
+ * New upstream release
+
+ [ Patrick Matthäi ]
+ * Bumped to Standards-Version 3.8.0.
+
+ [ Mark Purcell ]
+ * export DH_ALWAYS_EXCLUDE := eXosip2_license.3.gz
+ * Ship debian/manpages/* - Fix binary-without-manpage
+ * Build-Depends: libosip2-dev (>= 3.2)
+
+ -- Mark Purcell <msp at debian.org> Sat, 15 Nov 2008 22:32:45 +1100
+
+libexosip2 (3.1.0-1) unstable; urgency=low
+
+ * New upstream release
+ * Remove Conflicts:/ Replaces: as libexosip2-5 (>> 3.0) does not
+ exist in etch/ lenny/ sid
+ * Build-Depends:/ Depends: libosip2-dev (>= 3.1)
+
+ -- Mark Purcell <msp at debian.org> Tue, 22 Apr 2008 19:39:04 +1000
+
+libexosip2 (3.0.3-3-1) unstable; urgency=low
+
+ * New upstream release
+
+ -- Mark Purcell <msp at debian.org> Sun, 30 Sep 2007 12:03:30 +0100
+
+libexosip2 (3.0.3-2-2) unstable; urgency=high
+
+ [ Kilian Krause ]
+ * Build-Conflicts with libssl-dev to make sure it's not included in
+ libexosip.pc (Closes: #442964)
+ * Set high urgency due to fixing RC bug
+ * Add versioned depends on cdbs >= 0.4.39 due to use of DEB_UPSTREAM_VERSION
+ * Add Homepage field as added in dpkg-dev 1.14.6.
+
+ [ Rene Mayorga ]
+ * Remove help/doxygen/doc in clean target to fix rebuild
+ (Closes: #442632)
+ * Added missing manpage for /usr/bin/sip_reg-3.0.3-2
+ * Bump Standards-Version to 3.7.2
+ * debian/compat set to 5
+ * debian/control
+ + debhelper versioned raised to 5
+ + Added myself to uploaders
+
+ -- Kilian Krause <kilian at debian.org> Sat, 22 Sep 2007 12:08:47 +0200
+
+libexosip2 (3.0.3-2-1) unstable; urgency=low
+
+ * New upstream release
+ * linda: debhelper.mk needs Build-Depends: (>= 4.1.0)
+ * Bump build-Depends: libosip2-dev (>= 3.0.3-2-1)
+ * Conflicts: libexosip2-5 (>> 3.0) missed soname bump
+ * Set --program-suffix=-$(DEB_UPSTREAM_VERSION) allow libs pkgs to coexist
+ * Set DoxyFile SHOW_DIRECTORIES=NO
+ - manpages with wrong filename (Closes: #413302)
+ * Add DEB_DH_ALWAYS_EXCLUDE := eXosip2_license.3.gz
+ - lintian: extra-license-file
+
+ -- Mark Purcell <msp at debian.org> Sat, 01 Sep 2007 00:40:23 +0100
+
+libexosip2 (3.0.3-1) unstable; urgency=low
+
+ [ Kilian Krause ]
+ * New upstream release
+ * debian/control:
+ - New upstream version 3.0.0 requires libosip2-dev (>= 3.0.0) to fix FTBFS
+ - Use new binary:Version stanza for binNMU safety.
+ Requires dpkg-dev (>= 1.13.19)
+ * debian/libexosip2-5.install:
+ Remove eXosip_addidentity.sh as no longer provided by upstream.
+
+ -- Mark Purcell <msp at debian.org> Sun, 19 Aug 2007 12:07:38 +0100
+
+libexosip2 (2.2.3-2) unstable; urgency=low
+
+ * libexosip2-dev Depends: libosip2-dev
+ - Fixes: missing dependency on libosip2-dev (Closes: #393637)
+
+ -- Mark Purcell <msp at debian.org> Sat, 9 Dec 2006 13:06:51 +0000
+
+libexosip2 (2.2.3-1) unstable; urgency=low
+
+ * New upstream release
+
+ -- Mark Purcell <msp at debian.org> Thu, 4 May 2006 17:07:35 +0100
+
+libexosip2 (2.2.2-3) unstable; urgency=low
+
+ * debian/control: Add libosip2-dev to build-deps.
+
+ -- Kilian Krause <kilian at debian.org> Mon, 17 Apr 2006 10:36:48 +0000
+
+libexosip2 (2.2.2-2) unstable; urgency=low
+
+ * Update debian/copyright for src/inet_ntop.c which isn't GPL
+ * Initial release. (Closes: #346515: ITP: libexosip2 -- eXtended OSIP
+ library - Debian Bug report logs)
+
+ -- Mark Purcell <msp at debian.org> Mon, 17 Apr 2006 10:16:51 +0100
+
+libexosip2 (2.2.2-1) unstable; urgency=low
+
+ * Initial release Closes: #346515
+
+ -- Mark Purcell <msp at debian.org> Sat, 1 Apr 2006 07:58:30 +0100
+
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 62c63af,0000000..0984e8e
mode 100644,000000..100644
--- a/debian/control
+++ b/debian/control
@@@ -1,29 -1,0 +1,35 @@@
+Source: libexosip2
+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>, Rene Mayorga <rmayorga at debian.org.sv>
- Build-Depends: debhelper (>= 5), autotools-dev, cdbs (>= 0.4.39), libncurses5-dev, libosip2-dev (>= 3.2), dpkg-dev (>= 1.13.19), doxygen
++Build-Depends: debhelper (>= 9), autotools-dev, libncurses5-dev, libosip2-dev (>= 3.6), dpkg-dev (>= 1.13.19), doxygen
+Build-Conflicts: libssl-dev
+Section: libs
- Standards-Version: 3.8.0
++Standards-Version: 3.9.3
+Homepage: http://savannah.gnu.org/projects/exosip/
+Vcs-Svn: svn://svn.debian.org/pkg-voip/libexosip2/trunk/
+Vcs-Browser: http://svn.debian.org/wsvn/pkg-voip/libexosip2/?op=log
+
+Package: libexosip2-dev
+Section: libdevel
+Architecture: any
- Depends: ${misc:Depends}, libexosip2-4 (= ${binary:Version}), libosip2-dev (>= 3.1)
- Description: eXtended OSIP library development files
- Development files for the eXtended OSIP library
++Depends: ${misc:Depends}, libexosip2-7 (= ${binary:Version}), libosip2-dev
++Description: eXtended osip library development files
++ Hides the complexity of using the SIP protocol for multimedia
++ session establishment. This protocol is mainly to be used by VoIP
++ telephony applications (endpoints or conference server) but might be
++ also useful for any application that wish to establish sessions like
++ multi-player games.
++ .
++ Development files for the eXtended osip library
+
- Package: libexosip2-4
- Section: libs
++Package: libexosip2-7
+Architecture: any
++Pre-Depends: ${misc:Pre-Depends}
+Depends: ${shlibs:Depends}, ${misc:Depends}
- Description: eXtended OSIP library
- Library that hides the complexity of using the SIP protocol for multimedia
- session establishement. This protocol is mainly to be used by VoIP
++Description: eXtended osip library
++ Hides the complexity of using the SIP protocol for multimedia
++ session establishment. This protocol is mainly to be used by VoIP
+ telephony applications (endpoints or conference server) but might be
+ also useful for any application that wish to establish sessions like
- multiplayer games.
++ multi-player games.
diff --cc debian/copyright
index afb99c7,0000000..4af69a0
mode 100644,000000..100644
--- a/debian/copyright
+++ b/debian/copyright
@@@ -1,34 -1,0 +1,34 @@@
+This package was debianized by Mark Purcell <msp at debian.org> on
+Sat, 1 Apr 2006 07:58:30 +0100.
+
+It was downloaded from http://savannah.nongnu.org/projects/eXosip
+
+Copyright Holder: Copyright (C) 2002,2003,2004,2005 Aymeric MOIZARD - jack at atosc.org
+
+License:
+
+ This package is free software; you can redistribute it and/or modify
+ it under the terms of the GNU General Public License as published by
+ the Free Software Foundation; either version 2 of the License, or
+ (at your option) any later version.
+
+ This package is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ GNU General Public License for more details.
+
+ You should have received a copy of the GNU General Public License
+ along with this package; if not, write to the Free Software
+ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+
+On Debian systems, the complete text of the GNU General
- Public License can be found in `/usr/share/common-licenses/GPL'.
++Public License can be found in `/usr/share/common-licenses/GPL-2'.
+
+src/inet_ntop.c
+
+/* Copyright (c) 1996 by Internet Software Consortium.
+ *
+ * Permission to use, copy, modify, and distribute this software for any
+ * purpose with or without fee is hereby granted, provided that the above
+ * copyright notice and this permission notice appear in all copies.
+
diff --cc debian/libexosip2-7.install
index 0000000,0000000..00c8fc1
new file mode 100644
--- /dev/null
+++ b/debian/libexosip2-7.install
@@@ -1,0 -1,0 +1,2 @@@
++usr/lib/*/lib*.so.*
++usr/bin/*
diff --cc debian/libexosip2-7.manpages
index 2fb19fb,0000000..2fb19fb
mode 100644,000000..100644
--- a/debian/libexosip2-7.manpages
+++ b/debian/libexosip2-7.manpages
diff --cc debian/libexosip2-dev.docs
index 50bd824,0000000..a7aa7c1
mode 100644,000000..100644
--- a/debian/libexosip2-dev.docs
+++ b/debian/libexosip2-dev.docs
@@@ -1,2 -1,0 +1,4 @@@
+NEWS
+README
++help/doxygen/doc/html/
++
diff --cc debian/libexosip2-dev.install
index 43458db,0000000..5fd4780
mode 100644,000000..100644
--- a/debian/libexosip2-dev.install
+++ b/debian/libexosip2-dev.install
@@@ -1,4 -1,0 +1,4 @@@
- debian/tmp/usr/include/*
- debian/tmp/usr/lib/lib*.a
- debian/tmp/usr/lib/lib*.so
- debian/tmp/usr/lib/*.la
++usr/include/*
++usr/lib/*/lib*.a
++usr/lib/*/lib*.so
++usr/lib/*/*.la
diff --cc debian/libexosip2-dev.lintian-overrides
index c7bfa07,0000000..4e29f6b
mode 100644,000000..100644
--- a/debian/libexosip2-dev.lintian-overrides
+++ b/debian/libexosip2-dev.lintian-overrides
@@@ -1,3 -1,0 +1,3 @@@
+# override doxygen issues
+libexosip2-dev: manpage-has-bad-whatis-entry
-
++libexosip2-dev: hyphen-used-as-minus-sign
diff --cc debian/manpages/sip_reg-3.6.0.1
index 6df3f13,0000000..6df3f13
mode 100644,000000..100644
--- a/debian/manpages/sip_reg-3.6.0.1
+++ b/debian/manpages/sip_reg-3.6.0.1
diff --cc debian/patches/series
index 0000000,0000000..d2df776
new file mode 100644
--- /dev/null
+++ b/debian/patches/series
@@@ -1,0 -1,0 +1,3 @@@
++spelling-error-in-manpage.patch
++spelling-error-in-binary.patch
++variable.diff
diff --cc debian/patches/spelling-error-in-binary.patch
index 0000000,0000000..6999a4f
new file mode 100644
--- /dev/null
+++ b/debian/patches/spelling-error-in-binary.patch
@@@ -1,0 -1,0 +1,16 @@@
++Description: spelling-error-in-binary usr/bin/sip_reg-3.6.0 recieved received
++Bug-Debian: http://lintian.debian.org/tags/spelling-error-in-binary.html
++
++Index: libexosip2-3.6.0/tools/sip_reg.c
++===================================================================
++--- libexosip2-3.6.0.orig/tools/sip_reg.c 2010-01-07 01:57:57.000000000 +1100
+++++ libexosip2-3.6.0/tools/sip_reg.c 2012-06-24 20:15:56.000000000 +1000
++@@ -373,7 +373,7 @@
++ break;
++ default:
++ syslog_wrapper(LOG_DEBUG,
++- "recieved unknown eXosip event (type, did, cid) = (%d, %d, %d)",
+++ "received unknown eXosip event (type, did, cid) = (%d, %d, %d)",
++ event->type, event->did, event->cid);
++
++ }
diff --cc debian/patches/spelling-error-in-manpage.patch
index 0000000,0000000..ab4891c
new file mode 100644
--- /dev/null
+++ b/debian/patches/spelling-error-in-manpage.patch
@@@ -1,0 -1,0 +1,105 @@@
++Description: spelling-error-in-manpage
++Bug-Debian: http://lintian.debian.org/tags/spelling-error-in-manpage.html
++
++Index: libexosip2-3.6.0/ChangeLog
++===================================================================
++--- libexosip2-3.6.0.orig/ChangeLog 2011-10-06 01:35:05.000000000 +1100
+++++ libexosip2-3.6.0/ChangeLog 2012-06-24 20:23:56.000000000 +1000
++@@ -1,5 +1,5 @@
++ eXosip2 (3.6.0)
++- * use optionnal c-ares DNS library for non blocking DNS access
+++ * use optional c-ares DNS library for non blocking DNS access
++ as well as improvments over DNS operation such as NAPTR and
++ SRV records.
++ * again, so many minor change/fix/improvments, sorry for not
++@@ -15,7 +15,7 @@
++ eXosip2 (3.4.0)
++ * modification to allow using "windows certificate store" for TLS.
++ * handle keep alive for TCP/TLS.
++- * fix when receiving additionnal CRLF on reliable transport.
+++ * fix when receiving additional CRLF on reliable transport.
++ * modification to allow non-blocking socket for reliable transport. (TLS/TCP)
++ * fix tag issue with application where tag is missing.
++ * fix compilation for mingw
++Index: libexosip2-3.6.0/help/doxygen/doxygen.dox.in
++===================================================================
++--- libexosip2-3.6.0.orig/help/doxygen/doxygen.dox.in 2010-01-07 01:57:57.000000000 +1100
+++++ libexosip2-3.6.0/help/doxygen/doxygen.dox.in 2012-06-24 20:25:42.000000000 +1000
++@@ -40,14 +40,14 @@
++ *
++ * SIP is an IP telephony protocol made by the IETF.
++ * It is an effort to create a simple (telephony is never
++- * simple) and powerfull protocol for next generation
+++ * simple) and powerful protocol for next generation
++ * telephony systems.
++ *
++ * @section what_features SIP features
++ *
++ * SIP is not just about telephony. It's much more
++ * that what you expect from phones. SIP means mobility,
++- * video, textual call informations, file exchange,
+++ * video, textual call information, file exchange,
++ * instant messaging, presence support and much more!
++ *
++ * @section what_freesoftware eXosip2 is free software
++Index: libexosip2-3.6.0/include/eXosip2/eX_setup.h
++===================================================================
++--- libexosip2-3.6.0.orig/include/eXosip2/eX_setup.h 2011-09-28 09:56:28.000000000 +1000
+++++ libexosip2-3.6.0/include/eXosip2/eX_setup.h 2012-06-24 20:22:04.000000000 +1000
++@@ -60,7 +60,7 @@
++ int eXosip_init (void);
++
++ /**
++- * Release ressource used by the eXtented oSIP library.
+++ * Release resource used by the eXtented oSIP library.
++ *
++ */
++ void eXosip_quit (void);
++@@ -219,7 +219,7 @@
++ /**
++ * Use IPv6 instead of IPv4.
++ *
++- * @param ipv6_enable This paramter should be set to 1 to enable IPv6 mode.
+++ * @param ipv6_enable This parameter should be set to 1 to enable IPv6 mode.
++ */
++ void eXosip_enable_ipv6 (int ipv6_enable);
++
++Index: libexosip2-3.6.0/include/eXosip2/eXosip.h
++===================================================================
++--- libexosip2-3.6.0.orig/include/eXosip2/eXosip.h 2011-04-28 23:45:33.000000000 +1000
+++++ libexosip2-3.6.0/include/eXosip2/eXosip.h 2012-06-24 20:23:21.000000000 +1000
++@@ -361,7 +361,7 @@
++ };
++
++ /**
++- * Free ressource in an eXosip event.
+++ * Free resource in an eXosip event.
++ *
++ * @param je event to work on.
++ */
++Index: libexosip2-3.6.0/src/eXcall_api.c
++===================================================================
++--- libexosip2-3.6.0.orig/src/eXcall_api.c 2011-09-28 09:56:28.000000000 +1000
+++++ libexosip2-3.6.0/src/eXcall_api.c 2012-06-24 20:21:08.000000000 +1000
++@@ -1377,7 +1377,7 @@
++ osip_free(exp_h->element);
++ exp_h->element = osip_strdup(min_se_h->element);
++
++- /* rebuild session-expires with new value/same paramters */
+++ /* rebuild session-expires with new value/same parameters */
++ osip_free(exp->hvalue);
++ exp->hvalue = NULL;
++ osip_content_disposition_to_str(exp_h, &exp->hvalue);
++Index: libexosip2-3.6.0/src/eXosip2.h
++===================================================================
++--- libexosip2-3.6.0.orig/src/eXosip2.h 2011-10-06 01:27:09.000000000 +1100
+++++ libexosip2-3.6.0/src/eXosip2.h 2012-06-24 20:24:48.000000000 +1000
++@@ -480,7 +480,7 @@
++ /**
++ * Prepare addrinfo for socket binding and resolv hostname
++ *
++- * @param addrinfo informations about the connections
+++ * @param addrinfo information about the connections
++ * @param hostname hostname to resolv.
++ * @param service port number or "sip" SRV record if service=0
++ */
diff --cc debian/patches/variable.diff
index 0000000,0000000..90a87a7
new file mode 100644
--- /dev/null
+++ b/debian/patches/variable.diff
@@@ -1,0 -1,0 +1,14 @@@
++Description: libexosip2: FTBFS on hurd-i386: typo in variable name
++Bug-Debian: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=661321
++
++--- a/src/eXtl_udp.c
+++++ b/src/eXtl_udp.c
++@@ -178,7 +178,7 @@
++ res = setsockopt(udp_socket, IPPROTO_IPV6, IPV6_TCLASS,
++ (SOCKET_OPTION_VALUE)&tos, sizeof(tos));
++ #else
++- retval = setsockopt(udp_socket, IPPROTO_IPV6, IP_TOS,
+++ res = setsockopt(udp_socket, IPPROTO_IPV6, IP_TOS,
++ (SOCKET_OPTION_VALUE)&tos, sizeof(tos));
++ #endif
++ }
diff --cc debian/rules
index 7747b8b,0000000..89cd2b4
mode 100755,000000..100755
--- a/debian/rules
+++ b/debian/rules
@@@ -1,29 -1,0 +1,22 @@@
+#!/usr/bin/make -f
-
- # Add here any variable or target overrides you need
+
- FILENAME = $(DEB_SOURCE_PACKAGE)_$(DEB_UPSTREAM_VERSION).orig.tar.gz
- URL = http://download.savannah.nongnu.org/releases/exosip/libeXosip2-$(DEB_UPSTREAM_VERSION).tar.gz
++# Grab the version from the changelog, up to the first -
++DEB_UPSTREAM_VERSION=$(shell dpkg-parsechangelog | sed -rne 's,^Version: ([^-]+).*,\1,p')
+
- include /usr/share/cdbs/1/class/autotools.mk
- include /usr/share/cdbs/1/rules/debhelper.mk
++%:
++ dh $@ --parallel --with autotools_dev
+
- DEB_MAKE_BUILD_TARGET := doxygen
- DEB_CONFIGURE_EXTRA_FLAGS := --disable-josua --program-suffix=-$(DEB_UPSTREAM_VERSION)
++override_dh_auto_configure:
++ dh_auto_configure -- --disable-josua --program-suffix=-$(DEB_UPSTREAM_VERSION)
+
- export DH_ALWAYS_EXCLUDE := eXosip2_license.3.gz
++override_dh_auto_build:
++ dh_auto_build -- doxygen
+
- clean::
- [ ! -d help/doxygen/doc ] || rm -rf help/doxygen/doc
-
- print-version:
- @@echo "DEB_UPSTREAM_VERSION: $(DEB_UPSTREAM_VERSION)"
- @@echo "Filename: $(FILENAME)"
- @@echo "URL: $(URL)"
++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 -N -nv -T10 -t3 -O ../tarballs/$(FILENAME) $(URL)
-
++ 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 7bfcc5f,0000000..3590dcb
mode 100644,000000..100644
--- a/debian/watch
+++ b/debian/watch
@@@ -1,23 -1,0 +1,3 @@@
- # Example watch control file for uscan
- # Rename this file to "watch" and then you can run the "uscan" command
- # to check for upstream updates and more.
- # See uscan(1) for format
-
- # Compulsory line, this is a version 3 file
+version=3
+
- # Uncomment to examine a Webpage
- # <Webpage URL> <string match>
- #http://www.example.com/downloads.php libexosip2-(.*)\.tar\.gz
-
- # Uncomment to examine a Webserver directory
- #http://www.example.com/pub/libexosip2-(.*)\.tar\.gz
+http://download.savannah.nongnu.org/releases/exosip/libeXosip2-(.*)\.tar\.gz debian svn-upgrade
-
- # Uncommment to examine a FTP server
- #ftp://ftp.example.com/pub/libexosip2-(.*)\.tar\.gz debian uupdate
-
- # Uncomment to find new files on sourceforge, for debscripts >= 2.9
- # http://sf.net/libexosip2/libexosip2-(.*)\.tar\.gz
-
-
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-voip/libexosip2.git
More information about the Pkg-voip-commits
mailing list