[Pkg-voip-commits] r4354 - in libexosip2/trunk/debian: . patches

[msp at alioth.debian.org]

Author: msp
Date: 2007-08-31 23:30:13 +0000 (Fri, 31 Aug 2007)
New Revision: 4354

Added:
   libexosip2/trunk/debian/patches/
   libexosip2/trunk/debian/patches/noshowdirs.patch
Modified:
   libexosip2/trunk/debian/changelog
   libexosip2/trunk/debian/control
   libexosip2/trunk/debian/libexosip2-4.install
   libexosip2/trunk/debian/libexosip2-dev.install
   libexosip2/trunk/debian/rules
Log:
* New upstream release
* Conflicts: libexosip2-5 (>> 3.0) missed soname bump
* Set --program-suffix=-$(DEB_UPSTREAM_VERSION) to allow libs to coexist
  with different versions of sip_reg
* Set DoxyFile SHOW_DIRECTORIES=NO
  - manpages with wrong filename (Closes: #413302)

Modified: libexosip2/trunk/debian/changelog
===================================================================
--- libexosip2/trunk/debian/changelog	2007-08-31 22:44:11 UTC (rev 4353)
+++ libexosip2/trunk/debian/changelog	2007-08-31 23:30:13 UTC (rev 4354)
@@ -1,12 +1,17 @@
-libexosip2 (3.0.3-2-1) UNRELEASED; urgency=low
+libexosip2 (3.0.3-2-1) unstable; urgency=low
 
-  * (NOT RELEASED YET) New upstream release
+  * New upstream release
   * linda: debhelper.mk needs Build-Depends: (>= 4.1.0)
   * Bump build-Depends: libosip2-dev (>= 3.0.3-2-1)
   * Move /usr/bin/sip_reg to -dev package - enables multiple versions of
     dynamic libs to co-exist
+  * Conflicts: libexosip2-5 (>> 3.0) missed soname bump
+  * Set --program-suffix=-$(DEB_UPSTREAM_VERSION) to allow libs to coexist
+    with different versions of sip_reg
+  * Set DoxyFile SHOW_DIRECTORIES=NO
+    - manpages with wrong filename (Closes: #413302)
 
- -- Mark Purcell <msp at debian.org>  Fri, 31 Aug 2007 22:55:58 +0100
+ -- Mark Purcell <msp at debian.org>  Sat, 01 Sep 2007 00:29:19 +0100
 
 libexosip2 (3.0.3-2) UNRELEASED; urgency=low
 

Modified: libexosip2/trunk/debian/control
===================================================================
--- libexosip2/trunk/debian/control	2007-08-31 22:44:11 UTC (rev 4353)
+++ libexosip2/trunk/debian/control	2007-08-31 23:30:13 UTC (rev 4354)
@@ -19,6 +19,8 @@
 Section: libs
 Architecture: any
 Depends: ${shlibs:Depends}, ${misc:Depends}
+Conflicts: libexosip2-5 (>> 3.0)
+Replaces: libexosip2-5 (>> 3.0)
 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

Modified: libexosip2/trunk/debian/libexosip2-4.install
===================================================================
--- libexosip2/trunk/debian/libexosip2-4.install	2007-08-31 22:44:11 UTC (rev 4353)
+++ libexosip2/trunk/debian/libexosip2-4.install	2007-08-31 23:30:13 UTC (rev 4354)
@@ -1 +1,2 @@
 debian/tmp/usr/lib/lib*.so.*
+debian/tmp/usr/bin/*

Modified: libexosip2/trunk/debian/libexosip2-dev.install
===================================================================
--- libexosip2/trunk/debian/libexosip2-dev.install	2007-08-31 22:44:11 UTC (rev 4353)
+++ libexosip2/trunk/debian/libexosip2-dev.install	2007-08-31 23:30:13 UTC (rev 4354)
@@ -4,4 +4,3 @@
 debian/tmp/usr/lib/pkgconfig/*
 debian/tmp/usr/lib/*.la
 debian/tmp/usr/share/pkgconfig/*
-debian/tmp/usr/bin/*

Added: libexosip2/trunk/debian/patches/noshowdirs.patch
===================================================================
--- libexosip2/trunk/debian/patches/noshowdirs.patch	                        (rev 0)
+++ libexosip2/trunk/debian/patches/noshowdirs.patch	2007-08-31 23:30:13 UTC (rev 4354)
@@ -0,0 +1,12 @@
+diff -Nur libexosip2-3.0.3-2.obsolete.0.936607900149287/help/doxygen/DoxyFile libexosip2-3.0.3-2.obsolete.0.936607900149287.new/help/doxygen/DoxyFile
+--- libexosip2-3.0.3-2.obsolete.0.936607900149287/help/doxygen/DoxyFile	2007-09-01 00:25:25.000000000 +0100
++++ libexosip2-3.0.3-2.obsolete.0.936607900149287.new/help/doxygen/DoxyFile	2007-09-01 00:25:55.000000000 +0100
+@@ -65,7 +65,7 @@
+ ENABLED_SECTIONS       = 
+ MAX_INITIALIZER_LINES  = 30
+ SHOW_USED_FILES        = YES
+-SHOW_DIRECTORIES       = YES
++SHOW_DIRECTORIES       = NO
+ FILE_VERSION_FILTER    = 
+ #---------------------------------------------------------------------------
+ # configuration options related to warning and progress messages

Modified: libexosip2/trunk/debian/rules
===================================================================
--- libexosip2/trunk/debian/rules	2007-08-31 22:44:11 UTC (rev 4353)
+++ libexosip2/trunk/debian/rules	2007-08-31 23:30:13 UTC (rev 4354)
@@ -12,7 +12,7 @@
 include /usr/share/cdbs/1/rules/simple-patchsys.mk
 
 DEB_MAKE_BUILD_TARGET    := doxygen
-DEB_CONFIGURE_EXTRA_FLAGS := --disable-josua
+DEB_CONFIGURE_EXTRA_FLAGS := --disable-josua --program-suffix=-$(DEB_UPSTREAM_VERSION)
 
 print-version:
 	@@echo "DEB_UPSTREAM_VERSION:	 $(DEB_UPSTREAM_VERSION)"