[Pkg-bluetooth-commits] r1030 - in /packages/gnome-phone-manager/trunk/debian: changelog control patches/ patches/fix_554658.patch patches/series

[iwamatsu at users.alioth.debian.org]

Author: iwamatsu
Date: Tue Apr 12 04:26:35 2011
New Revision: 1030

URL: http://svn.debian.org/wsvn/pkg-bluetooth/?sc=1&rev=1030
Log:
Add patch of Fix #554658

Added:
    packages/gnome-phone-manager/trunk/debian/patches/
    packages/gnome-phone-manager/trunk/debian/patches/fix_554658.patch
    packages/gnome-phone-manager/trunk/debian/patches/series
Modified:
    packages/gnome-phone-manager/trunk/debian/changelog
    packages/gnome-phone-manager/trunk/debian/control

Modified: packages/gnome-phone-manager/trunk/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-bluetooth/packages/gnome-phone-manager/trunk/debian/changelog?rev=1030&op=diff
==============================================================================
--- packages/gnome-phone-manager/trunk/debian/changelog (original)
+++ packages/gnome-phone-manager/trunk/debian/changelog Tue Apr 12 04:26:35 2011
@@ -6,6 +6,8 @@
   * New upstream release (Closes: #618742)
   * Updte debian/control 
     + Update to S-V 3.9.2: no changes needed
+  * Fix FTBFS with binutils-gold (Closes: #554658).
+    Add patches/fix_554658.patch. Thanks to Matthias Klose.
 
  -- Nobuhiro Iwamatsu <iwamatsu at debian.org>  Tue, 12 Apr 2011 03:18:21 +0900
 

Modified: packages/gnome-phone-manager/trunk/debian/control
URL: http://svn.debian.org/wsvn/pkg-bluetooth/packages/gnome-phone-manager/trunk/debian/control?rev=1030&op=diff
==============================================================================
--- packages/gnome-phone-manager/trunk/debian/control (original)
+++ packages/gnome-phone-manager/trunk/debian/control Tue Apr 12 04:26:35 2011
@@ -9,7 +9,6 @@
  libebook1.2-dev,
  libglib2.0-dev (>= 2.13.0),
  libgnokii-dev (>= 0.6.27),
- libbluetooth-dev (>= 3.12),
  libgtk2.0-dev,
  libcanberra-gtk-dev,
  libgconf2-dev,

Added: packages/gnome-phone-manager/trunk/debian/patches/fix_554658.patch
URL: http://svn.debian.org/wsvn/pkg-bluetooth/packages/gnome-phone-manager/trunk/debian/patches/fix_554658.patch?rev=1030&op=file
==============================================================================
--- packages/gnome-phone-manager/trunk/debian/patches/fix_554658.patch (added)
+++ packages/gnome-phone-manager/trunk/debian/patches/fix_554658.patch Tue Apr 12 04:26:35 2011
@@ -1,0 +1,28 @@
+Description: FTBFS with binutils-gold
+Forwarded: 
+Origin: vendor, http://bugs.debian.org/cgi-bin/bugreport.cgi?msg=80;bug=265678
+Bug-Debian: http://bugs.debian.org/554658
+Author: Matthias Klose <doko at ubuntu.com>
+
+--- gnome-phone-manager-0.65.orig/telepathy/Makefile.in
++++ gnome-phone-manager-0.65/telepathy/Makefile.in
+@@ -288,6 +288,7 @@
+ @HAVE_TELEPATHY_TRUE at telepathy_phoney_SOURCES = $(BACKEND_FILES)
+ @HAVE_TELEPATHY_TRUE at telepathy_phoney_LDADD = \
+ @HAVE_TELEPATHY_TRUE@	$(TELEPATHY_LIBS)		\
++ at HAVE_TELEPATHY_TRUE@	$(PHONEMGR_LIBS)		\
+ @HAVE_TELEPATHY_TRUE@	../libgsm/libgsmwrap.la
+ 
+ 
+only in patch2:
+unchanged:
+--- gnome-phone-manager-0.65.orig/telepathy/Makefile.am
++++ gnome-phone-manager-0.65/telepathy/Makefile.am
+@@ -36,6 +36,7 @@
+ 
+ telepathy_phoney_LDADD =		\
+ 	$(TELEPATHY_LIBS)		\
++	$(PHONEMGR_LIBS)		\
+ 	../libgsm/libgsmwrap.la
+ 
+ # Manager file

Added: packages/gnome-phone-manager/trunk/debian/patches/series
URL: http://svn.debian.org/wsvn/pkg-bluetooth/packages/gnome-phone-manager/trunk/debian/patches/series?rev=1030&op=file
==============================================================================
--- packages/gnome-phone-manager/trunk/debian/patches/series (added)
+++ packages/gnome-phone-manager/trunk/debian/patches/series Tue Apr 12 04:26:35 2011
@@ -1,0 +1,1 @@
+fix_554658.patch