diff -Nru libphone-ui-0.1+git20100517/debian/changelog libphone-ui-0.1+git20100517/debian/changelog
--- libphone-ui-0.1+git20100517/debian/changelog	2010-06-08 21:35:59.000000000 +0000
+++ libphone-ui-0.1+git20100517/debian/changelog	2011-09-13 23:43:51.000000000 +0000
@@ -1,3 +1,13 @@
+libphone-ui (0.1+git20100517-1ubuntu1) oneiric; urgency=low
+
+  * debian/patches:
+   - remove-unused-variables.patch: Remove unused variables to fix FTBFS.
+     (LP: #831071).
+  * debian/rules:
+   - Remove usage of simple-patchsys.mk.
+
+ -- Julien Lavergne <gilir@ubuntu.com>  Wed, 14 Sep 2011 01:43:40 +0200
+
 libphone-ui (0.1+git20100517-1) unstable; urgency=low
 
   * New git checkout
diff -Nru libphone-ui-0.1+git20100517/debian/control libphone-ui-0.1+git20100517/debian/control
--- libphone-ui-0.1+git20100517/debian/control	2010-06-08 21:43:37.000000000 +0000
+++ libphone-ui-0.1+git20100517/debian/control	2011-09-13 19:07:15.000000000 +0000
@@ -1,7 +1,8 @@
 Source: libphone-ui
 Section: libs
 Priority: extra
-Maintainer: Debian freesmartphone.org Team <pkg-fso-maint@lists.alioth.debian.org>
+Maintainer: Ubuntu Developers <ubuntu-devel-discuss@lists.ubuntu.com>
+XSBC-Original-Maintainer: Debian freesmartphone.org Team <pkg-fso-maint@lists.alioth.debian.org>
 Uploaders: Sebastian Reichel <elektranox@gmail.com>
 DM-Upload-Allowed: yes
 Build-Depends: debhelper (>= 7),
diff -Nru libphone-ui-0.1+git20100517/debian/patches/remove-unused-variables.patch libphone-ui-0.1+git20100517/debian/patches/remove-unused-variables.patch
--- libphone-ui-0.1+git20100517/debian/patches/remove-unused-variables.patch	1970-01-01 00:00:00.000000000 +0000
+++ libphone-ui-0.1+git20100517/debian/patches/remove-unused-variables.patch	2011-09-13 23:43:17.000000000 +0000
@@ -0,0 +1,39 @@
+Index: libphone-ui-0.1+git20100517/src/phoneui-utils.c
+===================================================================
+--- libphone-ui-0.1+git20100517.orig/src/phoneui-utils.c	2011-09-14 01:41:05.000000000 +0200
++++ libphone-ui-0.1+git20100517/src/phoneui-utils.c	2011-09-14 01:42:48.000000000 +0200
+@@ -81,10 +81,9 @@
+ int
+ phoneui_utils_init(GKeyFile *keyfile)
+ {
+-	int ret;
+-	ret = phoneui_utils_sound_init(keyfile);
+-	ret = phoneui_utils_device_init(keyfile);
+-	ret = phoneui_utils_feedback_init(keyfile);
++	phoneui_utils_sound_init(keyfile);
++	phoneui_utils_device_init(keyfile);
++	phoneui_utils_feedback_init(keyfile);
+ 
+ 	// FIXME: remove when vala learned to handle multi-field contacts !!!
+ 	g_debug("Initing libframeworkd-glib :(");
+Index: libphone-ui-0.1+git20100517/src/phoneui-utils-sound.c
+===================================================================
+--- libphone-ui-0.1+git20100517.orig/src/phoneui-utils-sound.c	2011-09-14 01:41:05.000000000 +0200
++++ libphone-ui-0.1+git20100517/src/phoneui-utils-sound.c	2011-09-14 01:41:09.000000000 +0200
+@@ -129,7 +129,6 @@
+ 	if (!control->element)
+ 		return -1;
+ 
+-	snd_ctl_elem_type_t element_type;
+ 	snd_ctl_elem_info_t *info;
+ 	snd_hctl_elem_t *elem;
+ 
+@@ -142,8 +141,6 @@
+ 		return -1;
+ 	}
+ 
+-	/* verify type == integer */
+-	element_type = snd_ctl_elem_info_get_type(info);
+ 
+ 	control->min = snd_ctl_elem_info_get_min(info);
+ 	control->max = snd_ctl_elem_info_get_max(info);
diff -Nru libphone-ui-0.1+git20100517/debian/patches/series libphone-ui-0.1+git20100517/debian/patches/series
--- libphone-ui-0.1+git20100517/debian/patches/series	1970-01-01 00:00:00.000000000 +0000
+++ libphone-ui-0.1+git20100517/debian/patches/series	2011-09-13 22:34:51.000000000 +0000
@@ -0,0 +1 @@
+remove-unused-variables.patch
diff -Nru libphone-ui-0.1+git20100517/debian/rules libphone-ui-0.1+git20100517/debian/rules
--- libphone-ui-0.1+git20100517/debian/rules	2010-06-08 21:35:59.000000000 +0000
+++ libphone-ui-0.1+git20100517/debian/rules	2011-09-13 22:53:45.000000000 +0000
@@ -1,7 +1,6 @@
 #!/usr/bin/make -f
 include /usr/share/cdbs/1/rules/debhelper.mk
 include /usr/share/cdbs/1/class/autotools.mk
-include /usr/share/cdbs/1/rules/simple-patchsys.mk
 
 DEB_DESTDIR = $(CURDIR)/debian/tmp