diff -u amule-adunanza-2010.1+2.2.6/debian/changelog amule-adunanza-2010.1+2.2.6/debian/changelog
--- amule-adunanza-2010.1+2.2.6/debian/changelog
+++ amule-adunanza-2010.1+2.2.6/debian/changelog
@@ -1,3 +1,12 @@
+amule-adunanza (2010.1+2.2.6-0ubuntu6) quantal; urgency=low
+
+  * ftbs_libupnp_1.6.17.diff: port us to the new string interface in
+    libupnp-1.6.17.
+  * ftbs-gcc-4.7.diff: fix a couple of missing implicit function references
+    to explicitly reference this.
+
+ -- Andy Whitcroft <apw@ubuntu.com>  Thu, 07 Jun 2012 16:40:26 +0100
+
 amule-adunanza (2010.1+2.2.6-0ubuntu5) oneiric; urgency=low
 
   * Remove unused libreadline5-dev build-dependency.
diff -u amule-adunanza-2010.1+2.2.6/debian/patches/series amule-adunanza-2010.1+2.2.6/debian/patches/series
--- amule-adunanza-2010.1+2.2.6/debian/patches/series
+++ amule-adunanza-2010.1+2.2.6/debian/patches/series
@@ -3,0 +4,2 @@
+ftbs_libupnp_1.6.17.diff
+ftbs-gcc-4.7.diff
only in patch2:
unchanged:
--- amule-adunanza-2010.1+2.2.6.orig/debian/patches/ftbs_libupnp_1.6.17.diff
+++ amule-adunanza-2010.1+2.2.6/debian/patches/ftbs_libupnp_1.6.17.diff
@@ -0,0 +1,37 @@
+Description: follow switch to UpnpString in libupnp 1.6.17
+ libupnp 1.6.17 has switched its internal strings to UpnpString objects.
+ In order to extract the direct string representation new string accessors
+ are required.  Add these where needed.
+Forwarded: no
+Author: Andy Whitcroft <apw@ubuntu.com>
+Last-Updated: 2012-06-08
+
+Index: amule-adunanza-2010.1+2.2.6/src/UPnPBase.cpp
+===================================================================
+--- amule-adunanza-2010.1+2.2.6.orig/src/UPnPBase.cpp	2010-02-03 17:14:39.000000000 +0000
++++ amule-adunanza-2010.1+2.2.6/src/UPnPBase.cpp	2012-06-07 20:24:35.635928390 +0100
+@@ -1325,7 +1325,7 @@
+ 		int TimeOut = 1801;
+ 		int ret = UpnpSubscribe(
+ 			upnpCP->m_UPnPClientHandle,
+-			es_event->PublisherUrl,
++			UpnpString_get_String(es_event->PublisherUrl),
+ 			&TimeOut,
+ 			newSID);
+ 		if (ret != UPNP_E_SUCCESS) {
+@@ -1334,13 +1334,13 @@
+ 				msg.str(), es_event->ErrCode, NULL, NULL);
+ 		} else {
+ 			ServiceMap::iterator it =
+-				upnpCP->m_ServiceMap.find(es_event->PublisherUrl);
++				upnpCP->m_ServiceMap.find(UpnpString_get_String(es_event->PublisherUrl));
+ 			if (it != upnpCP->m_ServiceMap.end()) {
+ 				CUPnPService &service = *(it->second);
+ 				service.SetTimeout(TimeOut);
+ 				service.SetSID(newSID);
+ 				msg2 << "Re-subscribed to EventURL '" <<
+-					es_event->PublisherUrl <<
++					UpnpString_get_String(es_event->PublisherUrl) <<
+ 					"' with SID == '" <<
+ 					newSID << "'.";
+ 				AddDebugLogLineM(true, logUPnP, msg2);
only in patch2:
unchanged:
--- amule-adunanza-2010.1+2.2.6.orig/debian/patches/ftbs-gcc-4.7.diff
+++ amule-adunanza-2010.1+2.2.6/debian/patches/ftbs-gcc-4.7.diff
@@ -0,0 +1,28 @@
+Description: add explicit qualfiers for implied member functions
+ gcc 4.7 is more strict in matching implied member functions.  Add this->
+ qualfiers to class member functions.
+Forwarded: no
+Author: Andy Whitcroft <apw@ubuntu.com>
+Last-Updated: 2012-06-08
+
+Index: amule-adunanza-2010.1+2.2.6/src/ObservableQueue.h
+===================================================================
+--- amule-adunanza-2010.1+2.2.6.orig/src/ObservableQueue.h	2010-02-03 17:14:39.000000000 +0000
++++ amule-adunanza-2010.1+2.2.6/src/ObservableQueue.h	2012-06-07 17:54:04.335144592 +0100
+@@ -331,14 +331,14 @@
+ template <typename ValueType>
+ void CObservableQueue<ValueType>::ObserverAdded( ObserverType* o )
+ {
+-	NotifyObservers( EventType( EventType::STARTING ), o );
++	this->NotifyObservers( EventType( EventType::STARTING ), o );
+ }
+ 
+ 
+ template <typename ValueType>
+ void CObservableQueue<ValueType>::ObserverRemoved( ObserverType* o )
+ {
+-	NotifyObservers( EventType( EventType::STOPPING ), o );
++	this->NotifyObservers( EventType( EventType::STOPPING ), o );
+ }
+ 
+