[Pkg-voip-commits] r3064 - in openser/trunk/debian: . patches

[Julien Blache]

Author: jblache
Date: 2007-01-26 17:05:56 +0100 (Fri, 26 Jan 2007)
New Revision: 3064

Removed:
   openser/trunk/debian/patches/20_pdt_domains.c_lockfix.dpatch
   openser/trunk/debian/patches/21_arm_register_overlap.dpatch
Modified:
   openser/trunk/debian/changelog
   openser/trunk/debian/patches/00list
Log:
Update for OpenSER 1.1.1.


Modified: openser/trunk/debian/changelog
===================================================================
--- openser/trunk/debian/changelog	2007-01-25 22:32:28 UTC (rev 3063)
+++ openser/trunk/debian/changelog	2007-01-26 16:05:56 UTC (rev 3064)
@@ -1,8 +1,12 @@
-openser (1.1.0-10) UNRELEASED; urgency=low
+openser (1.1.1-1) unstable; urgency=low
 
-  * NOT RELEASED YET
+  * New upstream bugfix release.
+  * debian/patches/21_arm_register_overlap.dpatch:
+    + Removed; Merged upstream.
+  * debian/patches/20_pdt_domains.c_lockfix.dpatch:
+    + Removed; Merged upstream.
 
- -- Julien BLACHE <jblache at debian.org>  Fri, 12 Jan 2007 15:30:24 +0100
+ -- Julien BLACHE <jblache at debian.org>  Fri, 26 Jan 2007 16:58:48 +0100
 
 openser (1.1.0-9) unstable; urgency=medium
 

Modified: openser/trunk/debian/patches/00list
===================================================================
--- openser/trunk/debian/patches/00list	2007-01-25 22:32:28 UTC (rev 3063)
+++ openser/trunk/debian/patches/00list	2007-01-26 16:05:56 UTC (rev 3064)
@@ -3,7 +3,5 @@
 10_no_lib64_on_64_bits
 11_always_smp
 12_fail_on_build_failure
-20_pdt_domains.c_lockfix
-21_arm_register_overlap
 22_OpenPKG-SA-2006.042
 

Deleted: openser/trunk/debian/patches/20_pdt_domains.c_lockfix.dpatch
===================================================================
--- openser/trunk/debian/patches/20_pdt_domains.c_lockfix.dpatch	2007-01-25 22:32:28 UTC (rev 3063)
+++ openser/trunk/debian/patches/20_pdt_domains.c_lockfix.dpatch	2007-01-26 16:05:56 UTC (rev 3064)
@@ -1,19 +0,0 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 20_pdt_domains.c_lockfix.dpatch by  <jblache at debian.org>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: Fix typo in pdt/domains.c, the lock is hl->hl_lock, not hash->hl_lock
-
- at DPATCH@
-diff -urNad openser-1.1.0~/modules/pdt/domains.c openser-1.1.0/modules/pdt/domains.c
---- openser-1.1.0~/modules/pdt/domains.c	2006-07-05 12:48:29.000000000 +0200
-+++ openser-1.1.0/modules/pdt/domains.c	2006-10-08 19:13:24.484557783 +0200
-@@ -303,7 +303,7 @@
- 
- 	if(hl->hash!=NULL)
- 		free_hash(hl->hash);
--	lock_destroy(&hash->hl_lock);
-+	lock_destroy(&hl->hl_lock);
- 	shm_free(hl);
- }
- 

Deleted: openser/trunk/debian/patches/21_arm_register_overlap.dpatch
===================================================================
--- openser/trunk/debian/patches/21_arm_register_overlap.dpatch	2007-01-25 22:32:28 UTC (rev 3063)
+++ openser/trunk/debian/patches/21_arm_register_overlap.dpatch	2007-01-26 16:05:56 UTC (rev 3064)
@@ -1,19 +0,0 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 21_arm_register_overlap.dpatch by  <jblache at debian.org>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: Fix asm constraint to avoid register overlap on arm
-
- at DPATCH@
-diff -urNad openser-1.1.0~/fastlock.h openser-1.1.0/fastlock.h
---- openser-1.1.0~/fastlock.h	2005-06-16 13:37:45.000000000 +0200
-+++ openser-1.1.0/fastlock.h	2006-10-22 19:31:59.834688449 +0200
-@@ -90,7 +90,7 @@
- 	asm volatile(
- 			"# here \n\t"
- 			"swpb %0, %1, [%2] \n\t"
--			: "=r" (val)
-+			: "=&r" (val)
- 			: "r"(1), "r" (lock) : "memory"
- 	);
-