Package: libphone-ui
Version: 0.1+git20100517-1
Followup-For: Bug #625373
User: ubuntu-de...@lists.ubuntu.com
Usertags: origin-ubuntu oneiric ubuntu-patch
*** /tmp/tmpXVdOAK
In Ubuntu, the attached patch was applied to fix the FTBFS.
Those variables are only set but not used in their functions.
Changelog:
* debian/patches:
- remove-unused-variables.patch: Remove unused variables to fix FTBFS.
(LP: #831071).
* debian/rules:
- Remove usage of simple-patchsys.mk.
Thanks for considering the patch.
-- System Information:
Debian Release: wheezy/sid
APT prefers oneiric-updates
APT policy: (500, 'oneiric-updates'), (500, 'oneiric-security'), (500,
'oneiric')
Architecture: amd64 (x86_64)
Kernel: Linux 3.0.0-10-generic (SMP w/8 CPU cores)
Locale: LANG=fr_FR.UTF-8, LC_CTYPE=fr_FR.UTF-8 (charmap=UTF-8)
Shell: /bin/sh linked to /bin/dash
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 01:00:00.000000000 +0100
+++ libphone-ui-0.1+git20100517/debian/patches/remove-unused-variables.patch 2011-09-14 00:48:47.000000000 +0200
@@ -0,0 +1,46 @@
+Index: libphone-ui-0.1+git20100517/src/phoneui-utils.c
+===================================================================
+--- libphone-ui-0.1+git20100517.orig/src/phoneui-utils.c 2011-09-14 00:34:18.000000000 +0200
++++ libphone-ui-0.1+git20100517/src/phoneui-utils.c 2011-09-14 00:40:09.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 :(");
+@@ -817,4 +816,4 @@
+ _set_offline_mode_callback, pack, NULL,
+ G_TYPE_BOOLEAN, offline, G_TYPE_INVALID);
+
+-}
+\ Pas de fin de ligne ? la fin du fichier.
++}
+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 00:34:18.000000000 +0200
++++ libphone-ui-0.1+git20100517/src/phoneui-utils-sound.c 2011-09-14 00:40: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 01:00:00.000000000 +0100
+++ libphone-ui-0.1+git20100517/debian/patches/series 2011-09-14 00:34:51.000000000 +0200
@@ -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 23:35:59.000000000 +0200
+++ libphone-ui-0.1+git20100517/debian/rules 2011-09-14 00:53:45.000000000 +0200
@@ -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
