tags 636097 + pending thanks Dear maintainer,
I've prepared an NMU for pidgin-skype (versioned as 20110407+svn612+dfsg-1.1) and uploaded it to DELAYED/5. Please feel free to tell me if I should delay it longer. Regards. -- .''`. Homepage: http://info.comodo.priv.at/ - PGP/GPG key ID: 0x8649AA06 : :' : Debian GNU/Linux user, admin, & developer - http://www.debian.org/ `. `' Member of VIBE!AT & SPI, fellow of Free Software Foundation Europe `- NP: Pink Floyd: Comfortably Numb
diff -Nru pidgin-skype-20110407+svn612+dfsg/debian/changelog pidgin-skype-20110407+svn612+dfsg/debian/changelog --- pidgin-skype-20110407+svn612+dfsg/debian/changelog 2011-04-11 02:01:15.000000000 +0200 +++ pidgin-skype-20110407+svn612+dfsg/debian/changelog 2011-09-07 20:55:34.000000000 +0200 @@ -1,3 +1,14 @@ +pidgin-skype (20110407+svn612+dfsg-1.1) unstable; urgency=low + + * Non-maintainer upload. + * Fix "pidgin-skype FTBFS with multiarch": add patch from Micah Gersten + (forwarded from Ubuntu) that uses pkg-config instead of using hardcoded + paths. + Closes: #636097 + LP: #756174 + + -- gregor herrmann <gre...@debian.org> Wed, 07 Sep 2011 20:55:31 +0200 + pidgin-skype (20110407+svn612+dfsg-1) unstable; urgency=low * New upstream release. diff -Nru pidgin-skype-20110407+svn612+dfsg/debian/control pidgin-skype-20110407+svn612+dfsg/debian/control --- pidgin-skype-20110407+svn612+dfsg/debian/control 2011-04-11 02:01:15.000000000 +0200 +++ pidgin-skype-20110407+svn612+dfsg/debian/control 2011-09-07 20:55:26.000000000 +0200 @@ -3,7 +3,7 @@ Priority: optional Maintainer: Gabriele Giacone <1o5g4...@gmail.com> Build-Depends: debhelper (>= 7.0.50~), libglib2.0-dev, - libpurple-dev (>= 2.1.1), libx11-dev, librsvg2-bin + libpurple-dev (>= 2.1.1), libx11-dev, librsvg2-bin, libdbus-1-dev, pkg-config Standards-Version: 3.9.2 DM-Upload-Allowed: yes Homepage: http://eion.robbmob.com/ diff -Nru pidgin-skype-20110407+svn612+dfsg/debian/patches/series pidgin-skype-20110407+svn612+dfsg/debian/patches/series --- pidgin-skype-20110407+svn612+dfsg/debian/patches/series 2011-04-11 02:01:15.000000000 +0200 +++ pidgin-skype-20110407+svn612+dfsg/debian/patches/series 2011-09-07 20:55:26.000000000 +0200 @@ -1 +1,2 @@ 00Makefile +use-pkg-config.patch diff -Nru pidgin-skype-20110407+svn612+dfsg/debian/patches/use-pkg-config.patch pidgin-skype-20110407+svn612+dfsg/debian/patches/use-pkg-config.patch --- pidgin-skype-20110407+svn612+dfsg/debian/patches/use-pkg-config.patch 1970-01-01 01:00:00.000000000 +0100 +++ pidgin-skype-20110407+svn612+dfsg/debian/patches/use-pkg-config.patch 2011-09-07 21:16:30.000000000 +0200 @@ -0,0 +1,20 @@ +Description: Use pkg-config to find include paths + We can use pkg-config to find the dbus and glib include paths + instead of hard coding them so the build doesn't break w/multiarch. +Author: Micah Gersten <mic...@ubuntu.com> +Bug-Ubuntu: https://bugs.launchpad.net/bugs/756174 +Bug-Debian: http://bugs.debian.org/636097 + +--- pidgin-skype-20110407+svn612+dfsg.orig/Makefile ++++ pidgin-skype-20110407+svn612+dfsg/Makefile +@@ -6,8 +6,8 @@ WIN32_COMPILER = /usr/bin/i586-mingw32-g + LINUX_ARM_COMPILER = arm-none-linux-gnueabi-gcc + + LIBPURPLE_CFLAGS = -I/usr/include/libpurple -DPURPLE_PLUGINS -DENABLE_NLS +-GLIB_CFLAGS = -I/usr/include/glib-2.0 -I/usr/lib/glib-2.0/include -I/usr/lib64/glib-2.0/include -I/usr/include +-DBUS_CFLAGS = -DSKYPE_DBUS -I/usr/include/dbus-1.0 -I/usr/lib/dbus-1.0/include -I/usr/lib64/dbus-1.0/include ++GLIB_CFLAGS = `pkg-config --cflags glib-2.0` -I/usr/include ++DBUS_CFLAGS = -DSKYPE_DBUS `pkg-config --cflags dbus-1` + WIN32_DEV_DIR = /root/pidgin/win32-dev + WIN32_PIDGIN_DIR = /root/pidgin/pidgin-2.6.1 + WIN32_CFLAGS = -DPURPLE_PLUGINS -DENABLE_NLS -I${WIN32_DEV_DIR}/gtk_2_0/include/glib-2.0 -I${WIN32_PIDGIN_DIR}/libpurple/win32 -I${WIN32_PIDGIN_DIR}/libpurple -I${WIN32_DEV_DIR}/gtk_2_0/include -I${WIN32_DEV_DIR}/gtk_2_0/include/glib-2.0 -I${WIN32_DEV_DIR}/gtk_2_0/lib/glib-2.0/include
signature.asc
Description: Digital signature
