[Pkg-voip-commits] r9835 - in /libosip2/trunk/debian: changelog compat control libosip2-7.install libosip2-dev.install patches/manpage-section-mismatch.patch patches/series patches/spelling-error-in-binary.diff patches/spelling-error-in-manpage.diff rules

msp at alioth.debian.org msp at alioth.debian.org
Sun Jun 24 11:00:38 UTC 2012


Author: msp
Date: Sun Jun 24 11:00:37 2012
New Revision: 9835

URL: http://svn.debian.org/wsvn/pkg-voip/?sc=1&rev=9835
Log:
* weezey polish
* Update Standards-Version: 3.9.3
* Refresh manpage-section-mismatch.patch
* debian/compat -> 9 - hardening & multiarch
* Fix minor spelling-error.diff

Added:
    libosip2/trunk/debian/patches/spelling-error-in-binary.diff
    libosip2/trunk/debian/patches/spelling-error-in-manpage.diff
Modified:
    libosip2/trunk/debian/changelog
    libosip2/trunk/debian/compat
    libosip2/trunk/debian/control
    libosip2/trunk/debian/libosip2-7.install
    libosip2/trunk/debian/libosip2-dev.install
    libosip2/trunk/debian/patches/manpage-section-mismatch.patch
    libosip2/trunk/debian/patches/series
    libosip2/trunk/debian/rules

Modified: libosip2/trunk/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-voip/libosip2/trunk/debian/changelog?rev=9835&op=diff
==============================================================================
--- libosip2/trunk/debian/changelog (original)
+++ libosip2/trunk/debian/changelog Sun Jun 24 11:00:37 2012
@@ -1,8 +1,18 @@
-libosip2 (3.6.0-2) unstable; urgency=low
+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
-
- -- Mark Purcell <msp at debian.org>  Sun, 26 Feb 2012 07:38:57 +1100
+  * 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
 

Modified: libosip2/trunk/debian/compat
URL: http://svn.debian.org/wsvn/pkg-voip/libosip2/trunk/debian/compat?rev=9835&op=diff
==============================================================================
--- libosip2/trunk/debian/compat (original)
+++ libosip2/trunk/debian/compat Sun Jun 24 11:00:37 2012
@@ -1,1 +1,1 @@
-7
+9

Modified: libosip2/trunk/debian/control
URL: http://svn.debian.org/wsvn/pkg-voip/libosip2/trunk/debian/control?rev=9835&op=diff
==============================================================================
--- libosip2/trunk/debian/control (original)
+++ libosip2/trunk/debian/control Sun Jun 24 11:00:37 2012
@@ -3,8 +3,8 @@
 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 (>= 7.0.50~), dpkg-dev (>= 1.13.19), autotools-dev, docbook-to-man
-Standards-Version: 3.9.2
+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
@@ -31,7 +31,9 @@
 
 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.

Modified: libosip2/trunk/debian/libosip2-7.install
URL: http://svn.debian.org/wsvn/pkg-voip/libosip2/trunk/debian/libosip2-7.install?rev=9835&op=diff
==============================================================================
--- libosip2/trunk/debian/libosip2-7.install (original)
+++ libosip2/trunk/debian/libosip2-7.install Sun Jun 24 11:00:37 2012
@@ -1,1 +1,1 @@
-usr/lib/lib*.so.*
+usr/lib/*/lib*.so.*

Modified: libosip2/trunk/debian/libosip2-dev.install
URL: http://svn.debian.org/wsvn/pkg-voip/libosip2/trunk/debian/libosip2-dev.install?rev=9835&op=diff
==============================================================================
--- libosip2/trunk/debian/libosip2-dev.install (original)
+++ libosip2/trunk/debian/libosip2-dev.install Sun Jun 24 11:00:37 2012
@@ -1,7 +1,7 @@
+usr/include/osip2/*
 usr/include/osipparser2/*
-usr/include/osip2/*
-usr/lib/lib*.a
-usr/lib/lib*.la
-usr/lib/lib*.so
-usr/lib/pkgconfig/libosip2.pc
+usr/lib/*/lib*.a
+usr/lib/*/lib*.la
+usr/lib/*/lib*.so
+usr/lib/*/pkgconfig/libosip2.pc
 usr/share/

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=9835&op=diff
==============================================================================
--- libosip2/trunk/debian/patches/manpage-section-mismatch.patch (original)
+++ libosip2/trunk/debian/patches/manpage-section-mismatch.patch Sun Jun 24 11:00:37 2012
@@ -6,9 +6,10 @@
 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>">
@@ -18,3 +19,13 @@
    <!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=9835&op=diff
==============================================================================
--- libosip2/trunk/debian/patches/series (original)
+++ libosip2/trunk/debian/patches/series Sun Jun 24 11:00:37 2012
@@ -1,1 +1,3 @@
+spelling-error-in-binary.diff
+spelling-error-in-manpage.diff
 manpage-section-mismatch.patch

Added: 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=9835&op=file
==============================================================================
--- libosip2/trunk/debian/patches/spelling-error-in-binary.diff (added)
+++ libosip2/trunk/debian/patches/spelling-error-in-binary.diff Sun Jun 24 11:00:37 2012
@@ -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));
+ 	}

Added: libosip2/trunk/debian/patches/spelling-error-in-manpage.diff
URL: http://svn.debian.org/wsvn/pkg-voip/libosip2/trunk/debian/patches/spelling-error-in-manpage.diff?rev=9835&op=file
==============================================================================
--- libosip2/trunk/debian/patches/spelling-error-in-manpage.diff (added)
+++ libosip2/trunk/debian/patches/spelling-error-in-manpage.diff Sun Jun 24 11:00:37 2012
@@ -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>

Modified: libosip2/trunk/debian/rules
URL: http://svn.debian.org/wsvn/pkg-voip/libosip2/trunk/debian/rules?rev=9835&op=diff
==============================================================================
--- libosip2/trunk/debian/rules (original)
+++ libosip2/trunk/debian/rules Sun Jun 24 11:00:37 2012
@@ -1,6 +1,6 @@
 #!/usr/bin/make -f
 %:
-	dh $@ --parallel
+	dh $@ --parallel --with-autotools-dev
 
 export EXTRA_LIB=-lpthread
 




More information about the Pkg-voip-commits mailing list