[Pkg-voip-commits] r9232 - in /opensips/trunk/debian: changelog patches/01_mempool.patch rules

[tzafrir at alioth.debian.org]

Author: tzafrir
Date: Thu Aug  4 22:12:54 2011
New Revision: 9232

URL: http://svn.debian.org/wsvn/pkg-voip/?sc=1&rev=9232
Log:
New upstream beta version: 1.7.0-beta:
* Fix odd version numbers in get-orig-source.
* Fix patch 01_mempool.patch.

Modified:
    opensips/trunk/debian/changelog
    opensips/trunk/debian/patches/01_mempool.patch
    opensips/trunk/debian/rules

Modified: opensips/trunk/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-voip/opensips/trunk/debian/changelog?rev=9232&op=diff
==============================================================================
--- opensips/trunk/debian/changelog (original)
+++ opensips/trunk/debian/changelog Thu Aug  4 22:12:54 2011
@@ -1,4 +1,4 @@
-opensips (1.6.2-1) UNRELEASED; urgency=low
+opensips (1.7.0~beta-1) UNRELEASED; urgency=low
 
   [ Alejandro Rios P. ]
   * NOT RELEASED YET
@@ -7,14 +7,12 @@
   [ Bjoern Boschman ]
   * New upstream version.
   * Increased mempool to 8M
+  * Initial release after fork from openser (Closes: #556131).
 
   [ Paul Wise ]
   * Switch to dpkg-source v3 instead of dpatch
 
- -- Bjoern Boschman <bjoern at boschman.de>  Thu, 18 Mar 2010 14:12:49 +0100
+  [ Tzafrir Cohen ]
+  * Fix odd version numbers in get-orig-source
 
-opensips (1.6.0-1) unstable; urgency=low
-
-  * Initial release after fork from openser (Closes: #556131).
- 
- -- Alejandro Rios P. <alerios at debian.org>  Fri, 13 Nov 2009 12:42:35 -0500
+ -- Tzafrir Cohen <tzafrir at debian.org>  Thu, 04 Aug 2011 23:29:18 +0300

Modified: opensips/trunk/debian/patches/01_mempool.patch
URL: http://svn.debian.org/wsvn/pkg-voip/opensips/trunk/debian/patches/01_mempool.patch?rev=9232&op=diff
==============================================================================
--- opensips/trunk/debian/patches/01_mempool.patch (original)
+++ opensips/trunk/debian/patches/01_mempool.patch Thu Aug  4 22:12:54 2011
@@ -6,8 +6,8 @@
  
  #define SRV_MAX_PREFIX_LEN SRV_TLS_PREFIX_LEN
  
--#define PKG_MEM_POOL_SIZE 1024*1024		/*!< Used only if PKG_MALLOC is defined*/
-+#define PKG_MEM_POOL_SIZE 8*1024*1024		/*!< Used only if PKG_MALLOC is defined*/
+-#define PKG_MEM_POOL_SIZE 1024*1024*2		/*!< Used only if PKG_MALLOC is defined*/
++#define PKG_MEM_POOL_SIZE 1024*1024*8		/*!< Used only if PKG_MALLOC is defined*/
  #define SHM_MEM_SIZE 32				/*!< Used if SH_MEM is defined*/
  
  #define TIMER_TICK   1  			/*!< one second */

Modified: opensips/trunk/debian/rules
URL: http://svn.debian.org/wsvn/pkg-voip/opensips/trunk/debian/rules?rev=9232&op=diff
==============================================================================
--- opensips/trunk/debian/rules (original)
+++ opensips/trunk/debian/rules Thu Aug  4 22:12:54 2011
@@ -14,11 +14,13 @@
 
 DEBVERSION:=$(shell head -n 1 debian/changelog \
                     | sed -e 's/^[^(]*(\([^)]*\)).*/\1/')
-UPVERSION:=$(shell echo $(DEBVERSION) | sed -e 's/^.*://' -e 's/-[0-9.]*$$//' -e 's/.dfsg$$//')
-
-FILENAME := opensips_$(UPVERSION).orig.tar.gz
+UPVERSION_DEB:=$(shell echo $(DEBVERSION) | sed -e 's/^.*://' -e 's/-[0-9.]*$$//' -e 's/.dfsg$$//')
+UPVERSION_FULL:=$(shell echo $(UPVERSION_DEB) | sed -e 's/\.\([0-9]\)$$/-\1/' -e 's/~beta/-beta/')
+UPVERSION:=$(shell echo $(UPVERSION_FULL) | sed -e 's/-.*//')
+
+FILENAME := opensips_$(UPVERSION_DEB).orig.tar.gz
 UPFILENAME := opensips-$(UPVERSION)-tls_src.tar.gz
-URL := http://opensips.org/pub/opensips/$(UPVERSION)/src/opensips-$(UPVERSION)-tls_src.tar.gz
+URL := http://opensips.org/pub/opensips/$(UPVERSION)/src/opensips-$(UPVERSION_FULL)-tls_src.tar.gz
 
 # Uncomment this to turn on verbose mode.
 # export DH_VERBOSE=1
@@ -433,7 +435,8 @@
 
 print-version:
 	@@echo "Debian version:          $(DEBVERSION)"
-	@@echo "Upstream version:        $(UPVERSION)"
+	@@echo "Upstream version:        $(UPVERSION_FULL)"
+	@@echo "Upstream URL:            $(URL)"
 
 get-orig-source:
 	@@dh_testdir