[Pkg-voip-commits] r9993 - in /sflphone/trunk/debian: changelog patches/glib-single-include.patch patches/series

[msp at alioth.debian.org]

Author: msp
Date: Mon Oct  8 06:25:38 2012
New Revision: 9993

URL: http://svn.debian.org/wsvn/pkg-voip/?sc=1&rev=9993
Log:
* Fix "Including individual glib headers no longer supported" 
  - Added glib-single-include.patch (Closes: #665610)

Added:
    sflphone/trunk/debian/patches/glib-single-include.patch
Modified:
    sflphone/trunk/debian/changelog
    sflphone/trunk/debian/patches/series

Modified: sflphone/trunk/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-voip/sflphone/trunk/debian/changelog?rev=9993&op=diff
==============================================================================
--- sflphone/trunk/debian/changelog (original)
+++ sflphone/trunk/debian/changelog Mon Oct  8 06:25:38 2012
@@ -5,6 +5,8 @@
     - Fixes "Please provide the package for KDE front-end" (Closes: #675019)
   * Update Build-Depends:
   * Update Section: comm/ gnome/ kde
+  * Fix "Including individual glib headers no longer supported" 
+    - Added glib-single-include.patch (Closes: #665610)
 
  -- Mark Purcell <msp at debian.org>  Sat, 08 Sep 2012 19:27:36 +1000
 

Added: sflphone/trunk/debian/patches/glib-single-include.patch
URL: http://svn.debian.org/wsvn/pkg-voip/sflphone/trunk/debian/patches/glib-single-include.patch?rev=9993&op=file
==============================================================================
--- sflphone/trunk/debian/patches/glib-single-include.patch (added)
+++ sflphone/trunk/debian/patches/glib-single-include.patch Mon Oct  8 06:25:38 2012
@@ -1,0 +1,146 @@
+Description: Remove individual glib headers
+Debian-Bug: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=665610
+
+Index: sflphone-1.2.0/gnome/src/actions.c
+===================================================================
+--- sflphone-1.2.0.orig/gnome/src/actions.c	2012-10-08 17:14:09.000000000 +1100
++++ sflphone-1.2.0/gnome/src/actions.c	2012-10-08 17:16:23.000000000 +1100
+@@ -34,7 +34,7 @@
+ #endif
+ 
+ #include <glib/gi18n.h>
+-#include <gtk/gtk.h>
++#include <gtk.h>
+ /* Backward compatibility for gtk < 2.22.0 */
+ #if GTK_CHECK_VERSION(2,22,0)
+ #include <gdk/gdkkeysyms-compat.h>
+Index: sflphone-1.2.0/gnome/src/config/zrtpadvanceddialog.c
+===================================================================
+--- sflphone-1.2.0.orig/gnome/src/config/zrtpadvanceddialog.c	2012-10-08 17:14:09.000000000 +1100
++++ sflphone-1.2.0/gnome/src/config/zrtpadvanceddialog.c	2012-10-08 17:17:02.000000000 +1100
+@@ -29,7 +29,7 @@
+  */
+ 
+ #include <glib/gi18n.h>
+-#include <gtk/gtk.h>
++#include <gtk.h>
+ #include "str_utils.h"
+ #include "mainwindow.h"
+ #include "zrtpadvanceddialog.h"
+Index: sflphone-1.2.0/gnome/src/config/accountconfigdialog.c
+===================================================================
+--- sflphone-1.2.0.orig/gnome/src/config/accountconfigdialog.c	2012-10-08 17:14:10.000000000 +1100
++++ sflphone-1.2.0/gnome/src/config/accountconfigdialog.c	2012-10-08 17:18:26.000000000 +1100
+@@ -41,7 +41,7 @@
+ #include <net/if.h>
+ #include <netinet/in.h>
+ #include <string.h>
+-#include <gtk/gtk.h>
++#include <gtk.h>
+ 
+ #include "config.h"
+ #include "gtk2_wrappers.h"
+Index: sflphone-1.2.0/gnome/src/config/preferencesdialog.c
+===================================================================
+--- sflphone-1.2.0.orig/gnome/src/config/preferencesdialog.c	2012-10-08 17:14:09.000000000 +1100
++++ sflphone-1.2.0/gnome/src/config/preferencesdialog.c	2012-10-08 17:17:41.000000000 +1100
+@@ -37,7 +37,7 @@
+ #endif
+ 
+ #include <glib/gi18n.h>
+-#include <gtk/gtk.h>
++#include <gtk.h>
+ #include <stdlib.h>
+ #include <stdio.h>
+ #include <string.h>
+Index: sflphone-1.2.0/gnome/src/config/tlsadvanceddialog.c
+===================================================================
+--- sflphone-1.2.0.orig/gnome/src/config/tlsadvanceddialog.c	2012-10-08 17:14:10.000000000 +1100
++++ sflphone-1.2.0/gnome/src/config/tlsadvanceddialog.c	2012-10-08 17:17:58.000000000 +1100
+@@ -36,7 +36,7 @@
+ #include "utils.h"
+ #include <dbus.h>
+ #include <glib/gi18n.h>
+-#include <gtk/gtk.h>
++#include <gtk.h>
+ #include <math.h>
+ 
+ static
+Index: sflphone-1.2.0/gnome/src/eel-gconf-extensions.c
+===================================================================
+--- sflphone-1.2.0.orig/gnome/src/eel-gconf-extensions.c	2012-10-08 17:14:10.000000000 +1100
++++ sflphone-1.2.0/gnome/src/eel-gconf-extensions.c	2012-10-08 17:18:57.000000000 +1100
+@@ -29,7 +29,7 @@
+ 
+ #include <gconf/gconf-client.h>
+ #include <gconf/gconf.h>
+-#include <gtk/gtk.h>
++#include <gtk.h>
+ #include <glib.h>
+ 
+ static GConfClient *global_gconf_client = NULL;
+Index: sflphone-1.2.0/gnome/src/main.c
+===================================================================
+--- sflphone-1.2.0.orig/gnome/src/main.c	2012-10-08 17:14:10.000000000 +1100
++++ sflphone-1.2.0/gnome/src/main.c	2012-10-08 17:19:12.000000000 +1100
+@@ -37,7 +37,7 @@
+ #include "statusicon.h"
+ #include "eel-gconf-extensions.h"
+ #include <glib/gi18n.h>
+-#include <gtk/gtk.h>
++#include <gtk.h>
+ #include <stdlib.h>
+ 
+ #include "shortcuts.h"
+Index: sflphone-1.2.0/gnome/src/mainwindow.c
+===================================================================
+--- sflphone-1.2.0.orig/gnome/src/mainwindow.c	2012-10-08 17:14:10.000000000 +1100
++++ sflphone-1.2.0/gnome/src/mainwindow.c	2012-10-08 17:19:41.000000000 +1100
+@@ -60,7 +60,7 @@
+ 
+ #include <glib/gi18n.h>
+ #include <sys/stat.h>
+-#include <gtk/gtk.h>
++#include <gtk.h>
+ 
+ #include <gdk/gdkkeysyms.h>
+ 
+Index: sflphone-1.2.0/gnome/src/sliders.c
+===================================================================
+--- sflphone-1.2.0.orig/gnome/src/sliders.c	2012-10-08 17:14:10.000000000 +1100
++++ sflphone-1.2.0/gnome/src/sliders.c	2012-10-08 17:19:24.000000000 +1100
+@@ -35,7 +35,7 @@
+ #include "actions.h"
+ #include "logger.h"
+ #include <string.h>
+-#include <gtk/gtk.h>
++#include <gtk.h>
+ 
+ static gdouble     value[2];
+ static GtkWidget * slider[2];
+Index: sflphone-1.2.0/gnome/src/statusicon.c
+===================================================================
+--- sflphone-1.2.0.orig/gnome/src/statusicon.c	2012-10-08 17:14:10.000000000 +1100
++++ sflphone-1.2.0/gnome/src/statusicon.c	2012-10-08 17:19:56.000000000 +1100
+@@ -30,7 +30,7 @@
+  */
+ 
+ #include <glib/gi18n.h>
+-#include <gtk/gtk.h>
++#include <gtk.h>
+ #include "actions.h"
+ #include "mainwindow.h"
+ #include "accountlist.h"
+Index: sflphone-1.2.0/gnome/src/uimanager.c
+===================================================================
+--- sflphone-1.2.0.orig/gnome/src/uimanager.c	2012-10-08 17:14:10.000000000 +1100
++++ sflphone-1.2.0/gnome/src/uimanager.c	2012-10-08 17:20:08.000000000 +1100
+@@ -41,7 +41,7 @@
+ #include "assistant.h"
+ #include <glib.h>
+ #include <glib/gi18n.h>
+-#include <gtk/gtk.h>
++#include <gtk.h>
+ #include <string.h>
+ 
+ #include "uimanager.h"

Modified: sflphone/trunk/debian/patches/series
URL: http://svn.debian.org/wsvn/pkg-voip/sflphone/trunk/debian/patches/series?rev=9993&op=diff
==============================================================================
--- sflphone/trunk/debian/patches/series (original)
+++ sflphone/trunk/debian/patches/series Mon Oct  8 06:25:38 2012
@@ -1,3 +1,4 @@
+glib-single-include.patch
 gcc47-fixes.patch
 02_target_s390.patch
 #03_binutils-gold.patch