[Pkg-voip-commits] r10043 - in /libosip2/trunk/debian: changelog control libosip2-10.install libosip2-7.install patches/manpage-section-mismatch.patch patches/series patches/spelling-error-in-binary.diff patches/spelling-error-in-manpage.diff
msp at alioth.debian.org
msp at alioth.debian.org
Sun Dec 23 02:48:12 UTC 2012
Author: msp
Date: Sun Dec 23 02:48:11 2012
New Revision: 10043
URL: http://svn.debian.org/wsvn/pkg-voip/?sc=1&rev=10043
Log:
* New upstream release
* NEW package libosip2-10 - match soname
* Drop obsolete spelling-error-in-manpage.diff
* Refresh manpage-section-mismatch.patch
Added:
libosip2/trunk/debian/libosip2-10.install
- copied unchanged from r10042, libosip2/trunk/debian/libosip2-7.install
Removed:
libosip2/trunk/debian/libosip2-7.install
libosip2/trunk/debian/patches/spelling-error-in-manpage.diff
Modified:
libosip2/trunk/debian/changelog
libosip2/trunk/debian/control
libosip2/trunk/debian/patches/manpage-section-mismatch.patch
libosip2/trunk/debian/patches/series
libosip2/trunk/debian/patches/spelling-error-in-binary.diff
Modified: libosip2/trunk/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-voip/libosip2/trunk/debian/changelog?rev=10043&op=diff
==============================================================================
--- libosip2/trunk/debian/changelog (original)
+++ libosip2/trunk/debian/changelog Sun Dec 23 02:48:11 2012
@@ -1,3 +1,12 @@
+libosip2 (4.0.0-1) experimental; urgency=low
+
+ * New upstream release
+ * NEW package libosip2-10 - match soname
+ * Drop obsolete spelling-error-in-manpage.diff
+ * Refresh manpage-section-mismatch.patch
+
+ -- Mark Purcell <msp at debian.org> Sun, 23 Dec 2012 13:45:52 +1100
+
libosip2 (3.6.0-4) unstable; urgency=low
* weezey polish
Modified: libosip2/trunk/debian/control
URL: http://svn.debian.org/wsvn/pkg-voip/libosip2/trunk/debian/control?rev=10043&op=diff
==============================================================================
--- libosip2/trunk/debian/control (original)
+++ libosip2/trunk/debian/control Sun Dec 23 02:48:11 2012
@@ -12,7 +12,7 @@
Package: libosip2-dev
Section: libdevel
Architecture: any
-Depends: ${misc:Depends}, libosip2-7 (= ${binary:Version})
+Depends: ${misc:Depends}, libosip2-10 (= ${binary:Version})
Recommends: pkg-config
Description: development files for the SIP library
libosip2 header files and static libraries to assist in development of
@@ -29,7 +29,7 @@
parser, and library to handle "SIP transactions" as defined by the SIP
standards (RFC3261).
-Package: libosip2-7
+Package: libosip2-10
Section: libs
Pre-Depends: ${misc:Pre-Depends}
Architecture: any
Modified: libosip2/trunk/debian/patches/manpage-section-mismatch.patch
URL: http://svn.debian.org/wsvn/pkg-voip/libosip2/trunk/debian/patches/manpage-section-mismatch.patch?rev=10043&op=diff
==============================================================================
--- libosip2/trunk/debian/patches/manpage-section-mismatch.patch (original)
+++ libosip2/trunk/debian/patches/manpage-section-mismatch.patch Sun Dec 23 02:48:11 2012
@@ -6,10 +6,10 @@
Refer to the groff_man(7) manual page and the man(1) manual page for details.
Severity: normal; Certainty: certain
-Index: libosip2-3.6.0/help/man/osip.sgml
+Index: libosip2-4.0.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
+--- libosip2-4.0.0.orig/help/man/osip.sgml 2012-07-17 20:36:07.000000000 +1000
++++ libosip2-4.0.0/help/man/osip.sgml 2012-12-23 13:41:17.000000000 +1100
@@ -4,7 +4,7 @@
<!ENTITY dhfirstname "<firstname>Aymeric</firstname>">
<!ENTITY dhsurname "<surname>MOIZARD</surname>">
@@ -19,13 +19,3 @@
<!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.
-
Modified: libosip2/trunk/debian/patches/series
URL: http://svn.debian.org/wsvn/pkg-voip/libosip2/trunk/debian/patches/series?rev=10043&op=diff
==============================================================================
--- libosip2/trunk/debian/patches/series (original)
+++ libosip2/trunk/debian/patches/series Sun Dec 23 02:48:11 2012
@@ -1,3 +1,2 @@
spelling-error-in-binary.diff
-spelling-error-in-manpage.diff
manpage-section-mismatch.patch
Modified: libosip2/trunk/debian/patches/spelling-error-in-binary.diff
URL: http://svn.debian.org/wsvn/pkg-voip/libosip2/trunk/debian/patches/spelling-error-in-binary.diff?rev=10043&op=diff
==============================================================================
--- libosip2/trunk/debian/patches/spelling-error-in-binary.diff (original)
+++ libosip2/trunk/debian/patches/spelling-error-in-binary.diff Sun Dec 23 02:48:11 2012
@@ -1,72 +1,20 @@
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
+Index: libosip2-4.0.0/src/osip2/osip_transaction.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"));
+--- libosip2-4.0.0.orig/src/osip2/osip_transaction.c 2012-11-17 08:24:10.000000000 +1100
++++ libosip2-4.0.0/src/osip2/osip_transaction.c 2012-12-23 13:38:03.000000000 +1100
+@@ -133,7 +133,7 @@
+ osip_id_mutex_lock (osip);
+ (*transaction)->transactionid = osip->transactionid++;
+ osip_id_mutex_unlock (osip);
+- OSIP_TRACE (osip_trace (__FILE__, __LINE__, OSIP_INFO2, NULL, "allocating transaction ressource %i %s\n", (*transaction)->transactionid, request->call_id->number));
++ OSIP_TRACE (osip_trace (__FILE__, __LINE__, OSIP_INFO2, NULL, "allocating transaction resource %i %s\n", (*transaction)->transactionid, request->call_id->number));
- 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 @@
+ /* those lines must be called before "osip_transaction_free" */
+ (*transaction)->ctx_type = ctx_type;
+@@ -243,7 +243,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
@@ -75,12 +23,12 @@
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));
- }
+@@ -278,7 +278,7 @@
+ if (transaction == NULL)
+ return OSIP_BADPARAMETER;
+ if (transaction->orig_request != NULL && transaction->orig_request->call_id != NULL && transaction->orig_request->call_id->number != NULL) {
+- OSIP_TRACE (osip_trace (__FILE__, __LINE__, OSIP_INFO2, NULL, "free transaction ressource %i %s\n", transaction->transactionid, transaction->orig_request->call_id->number));
++ OSIP_TRACE (osip_trace (__FILE__, __LINE__, OSIP_INFO2, NULL, "free transaction resource %i %s\n", transaction->transactionid, transaction->orig_request->call_id->number));
+ }
+ if (transaction->ctx_type == ICT) {
+ __osip_ict_free (transaction->ict_context);
More information about the Pkg-voip-commits
mailing list