=== modified file 'debian/changelog'
--- debian/changelog	2009-12-16 20:50:33 +0000
+++ debian/changelog	2010-06-05 23:27:10 +0000
@@ -1,9 +1,35 @@
+rampart (1.3.0-1ubuntu1) maverick; urgency=low
+
+  * Merging with debian unstable, remaining changes:
+      - debian/patches
+          - rampart-memleak.patch: Fix memory leak in rampart where
+            for every connection receiver_cert is not freed (LP: #460085)
+      - debian/rules
+          - fix shared library installation with symlinks and
+            moving the .so files into the correct FHS location      
+
+ -- Vikram Dhillon <dhillonv10@gmail.com>  Sat, 05 Jun 2010 19:23:24 -0400
+
 rampart (1.3.0-1) unstable; urgency=low
 
   * Build for debian package based largely on Ubuntu package (#561268) 
 
  -- Kyo Lee <kyo.lee@eucalyptus.com>  Wed, 16 Dec 2009 20:50:33 -0800
 
+rampart (1.3.0-0ubuntu7) lucid; urgency=low
+
+  * debian/patches/rampart-memleak.patch: Fix memory leak in rampart where
+    for every connection receiver_cert is not freed (LP: #460085)
+
+ -- Thierry Carrez <thierry.carrez@ubuntu.com>  Mon, 14 Dec 2009 09:09:58 +0100
+
+rampart (1.3.0-0ubuntu6) lucid; urgency=low
+
+  * debian/rules: fix shared library installation with symlinks and
+    moving the .so files into the correct FHS location
+
+ -- Dustin Kirkland <kirkland@ubuntu.com>  Tue, 01 Dec 2009 14:21:35 -0600
+
 rampart (1.3.0-0ubuntu5) karmic; urgency=low
 
   * Depend on newer libaxis2c0 so that /usr/lib/axis2/lib is no longer a

=== added file 'debian/patches/rampart-memleak.patch'
--- debian/patches/rampart-memleak.patch	1970-01-01 00:00:00 +0000
+++ debian/patches/rampart-memleak.patch	2010-06-05 23:16:23 +0000
@@ -0,0 +1,41 @@
+Index: rampart-1.3.0/src/util/rampart_context.c
+===================================================================
+--- rampart-1.3.0.orig/src/util/rampart_context.c	2009-12-03 18:01:22.000000000 +0100
++++ rampart-1.3.0/src/util/rampart_context.c	2009-12-03 18:01:59.000000000 +0100
+@@ -359,11 +359,11 @@
+         }
+         
+         /* Free receiver certificate we found when processing incoming security header */
+-        /*if(rampart_context->receiver_cert && rampart_context->found_cert_in_shp)
+-        {
++        if(rampart_context->receiver_cert && rampart_context->found_cert_in_shp)
++	{
+             oxs_x509_cert_free(rampart_context->receiver_cert, env);
+             rampart_context->receiver_cert = NULL;
+-        }*/
++        }
+ 
+         if(rampart_context->key_mgr)
+         {
+Index: rampart-1.3.0/src/util/rampart_sec_header_processor.c
+===================================================================
+--- rampart-1.3.0.orig/src/util/rampart_sec_header_processor.c	2009-12-03 18:01:49.000000000 +0100
++++ rampart-1.3.0/src/util/rampart_sec_header_processor.c	2009-12-03 18:01:59.000000000 +0100
+@@ -1435,8 +1435,6 @@
+                             return AXIS2_FAILURE;
+                         }
+                         
+-                        rampart_context_set_found_cert_in_shp(rampart_context, env, AXIS2_TRUE);
+-                        rampart_context_set_receiver_cert_found_in_shp(rampart_context, env, cert);
+                         status = AXIS2_SUCCESS;
+                     }
+                     else if(0 == axutil_strcmp(str_child_name, OXS_NODE_X509_DATA))
+@@ -1463,8 +1461,6 @@
+                             return AXIS2_FAILURE;
+                         }
+                         
+-                        rampart_context_set_found_cert_in_shp(rampart_context, env, AXIS2_TRUE);
+-                        rampart_context_set_receiver_cert_found_in_shp(rampart_context, env, cert);
+                         status = AXIS2_SUCCESS;
+                     }
+                     else

=== modified file 'debian/patches/series'
--- debian/patches/series	2009-09-03 12:39:37 +0000
+++ debian/patches/series	2010-06-05 23:16:23 +0000
@@ -1,3 +1,4 @@
 01-destdir.patch
 02-autoconf-quoting.patch
 token-processor-segfault.patch
+rampart-memleak.patch

=== modified file 'debian/rules'
--- debian/rules	2009-09-11 00:02:53 +0000
+++ debian/rules	2010-06-05 23:16:23 +0000
@@ -12,10 +12,11 @@
 	mkdir -p debian/$(cdbs_curpkg)/usr/lib/axis2/include/axis2-1.6.0
 	cd debian/$(cdbs_curpkg)/usr/lib/axis2/include/axis2-1.6.0 ; for x in ../../../../include/rampart-1.3.0/*; do ln -s $$x; done
 	cd debian/$(cdbs_curpkg)/usr/include/axis2-1.6.0; for x in ../rampart-1.3.0/*; do ln -s $$x; done
-	cd debian/$(cdbs_curpkg)/usr/lib/axis2/lib ; for x in ../modules/rampart/libmod_rampart.so; do ln -s $$x; done
+	cd debian/$(cdbs_curpkg)/usr/lib ; ln -s axis2/modules/rampart/libmod_rampart.so
 
 binary-install/librampart0::
-	cd debian/$(cdbs_curpkg)/usr/lib/axis2/lib ; for x in ../modules/rampart/libmod_rampart.so.*; do ln -s $$x; done
+	cd debian/$(cdbs_curpkg)/usr/lib ; for x in axis2/modules/rampart/libmod_rampart.so.*; do ln -s $$x; done
+	mv debian/$(cdbs_curpkg)/usr/lib/axis2/lib/librampart.so.* debian/$(cdbs_curpkg)/usr/lib
 
 clean::
 	find test -name Makefile -print0 | xargs -0 rm || /bin/true