tags 712856 + patch
thanks

Hi,

since the gnome-phone-manager FTBFS blocks the libgnome-bluetooth
transition, I've prepared a patch and uploaded a fixed patch to
DELAYED/2. The full debdiff is attached.

Please let me know if you don't consider the patch appropriate and you
want me to cancel the NMU.
If you are fine with the NMU, you can also let me know. In this case I
would upload to DELAYED/0, ie. without delay.

Cheers,
Michael


-- 
Why is it that all of the instruments seeking intelligent life in the
universe are pointed away from Earth?
diff -Nru gnome-phone-manager-0.68/debian/changelog 
gnome-phone-manager-0.68/debian/changelog
--- gnome-phone-manager-0.68/debian/changelog   2012-05-30 00:19:54.000000000 
+0200
+++ gnome-phone-manager-0.68/debian/changelog   2013-06-20 10:00:49.000000000 
+0200
@@ -1,3 +1,12 @@
+gnome-phone-manager (0.68-3.1) unstable; urgency=low
+
+  * Non-maintainer upload.
+  * Fix build failures by disabling Werror and linking against gthread
+    (Closes: #712856)
+  * Use dh-autoreconf to update the build system.
+
+ -- Michael Biebl <bi...@debian.org>  Thu, 20 Jun 2013 09:17:57 +0200
+
 gnome-phone-manager (0.68-3) unstable; urgency=low
 
   * Team upload.
diff -Nru gnome-phone-manager-0.68/debian/control 
gnome-phone-manager-0.68/debian/control
--- gnome-phone-manager-0.68/debian/control     2012-05-10 05:19:51.000000000 
+0200
+++ gnome-phone-manager-0.68/debian/control     2013-06-20 09:24:05.000000000 
+0200
@@ -5,6 +5,8 @@
 Uploaders: Francesco Namuri <france...@namuri.it>, Geert Stappers 
<stapp...@debian.org>, Filippo Giunchedi <fili...@debian.org>
 Build-Depends: cdbs,
  debhelper (>= 5), 
+ dh-autoreconf,
+ gnome-common,
  intltool (>= 0.35),
  libebook1.2-dev,
  libglib2.0-dev (>= 2.25.0),
diff -Nru 
gnome-phone-manager-0.68/debian/patches/0002-link-against-gthread.patch 
gnome-phone-manager-0.68/debian/patches/0002-link-against-gthread.patch
--- gnome-phone-manager-0.68/debian/patches/0002-link-against-gthread.patch     
1970-01-01 01:00:00.000000000 +0100
+++ gnome-phone-manager-0.68/debian/patches/0002-link-against-gthread.patch     
2013-06-20 09:20:41.000000000 +0200
@@ -0,0 +1,13 @@
+Index: gnome-phone-manager-0.68/configure.in
+===================================================================
+--- gnome-phone-manager-0.68.orig/configure.in 2013-06-20 09:16:54.000000000 
+0200
++++ gnome-phone-manager-0.68/configure.in      2013-06-20 09:20:36.946806525 
+0200
+@@ -47,7 +47,7 @@
+ PKG_CHECK_MODULES(PHONEMGR, gtk+-3.0 >= 3.0 glib-2.0 >= 2.25.0
+       libcanberra-gtk3 gconf-2.0
+       $GNOME_BLUETOOTH_REQS $evo_pc_file
+-      gmodule-2.0 dbus-glib-1 gnome-icon-theme >= 2.19.1
++      gmodule-2.0 gthread-2.0 dbus-glib-1 gnome-icon-theme >= 2.19.1
+ )
+ 
+ DBUSLIBDIR="`$PKG_CONFIG dbus-glib-1 --variable=libdir`"
diff -Nru gnome-phone-manager-0.68/debian/patches/series 
gnome-phone-manager-0.68/debian/patches/series
--- gnome-phone-manager-0.68/debian/patches/series      2012-05-10 
05:19:51.000000000 +0200
+++ gnome-phone-manager-0.68/debian/patches/series      2013-06-20 
09:36:12.000000000 +0200
@@ -1,2 +1,3 @@
 fix_554658.patch
 0001-Bug-665309-Adapt-to-gnome-bluetooth-3.3-API.patch
+0002-link-against-gthread.patch
diff -Nru gnome-phone-manager-0.68/debian/rules 
gnome-phone-manager-0.68/debian/rules
--- gnome-phone-manager-0.68/debian/rules       2012-05-10 05:19:51.000000000 
+0200
+++ gnome-phone-manager-0.68/debian/rules       2013-06-20 09:18:36.000000000 
+0200
@@ -1,10 +1,11 @@
 #!/usr/bin/make -f
   
 include /usr/share/cdbs/1/rules/debhelper.mk
+include /usr/share/cdbs/1/rules/autoreconf.mk
 include /usr/share/cdbs/1/class/autotools.mk
 include /usr/share/cdbs/1/class/gnome.mk
 
-DEB_CONFIGURE_EXTRA_FLAGS := --enable-telepathy
+DEB_CONFIGURE_EXTRA_FLAGS := --enable-telepathy --enable-compile-warnings=no
 
 common-install-arch::
        rm `find $(CURDIR) -name '*.la'`

Attachment: signature.asc
Description: OpenPGP digital signature

Reply via email to