r29576 - in /desktop/experimental/gnome-control-center/debian: changelog patches/03_ppd_h.patch patches/series

[joss at users.alioth.debian.org]

Author: joss
Date: Sun Sep  4 17:31:40 2011
New Revision: 29576

URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=29576
Log:
03_ppd_h.patch: patch from upstream git. Include ppd.h explicitly.

Added:
    desktop/experimental/gnome-control-center/debian/patches/03_ppd_h.patch
Modified:
    desktop/experimental/gnome-control-center/debian/changelog
    desktop/experimental/gnome-control-center/debian/patches/series

Modified: desktop/experimental/gnome-control-center/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/gnome-control-center/debian/changelog?rev=29576&op=diff
==============================================================================
--- desktop/experimental/gnome-control-center/debian/changelog [utf-8] (original)
+++ desktop/experimental/gnome-control-center/debian/changelog [utf-8] Sun Sep  4 17:31:40 2011
@@ -1,4 +1,4 @@
-gnome-control-center (1:3.0.2-1) UNRELEASED; urgency=low
+gnome-control-center (1:3.0.2-1) experimental; urgency=low
 
   [ Josselin Mouette ]
   * Break glib < 2.28.6-2 for x-scheme-handler support.
@@ -16,8 +16,9 @@
   * Break gnome-power-manager < 3.0 because of the power panel.
   * 02_https.patch: patch from upstream git. Correctly register https 
     scheme together with http.
-
- -- Sjoerd Simons <sjoerd at debian.org>  Thu, 02 Jun 2011 20:34:08 -0700
+  * 03_ppd_h.patch: patch from upstream git. Include ppd.h explicitly.
+
+ -- Josselin Mouette <joss at debian.org>  Sun, 04 Sep 2011 19:15:55 +0200
 
 gnome-control-center (1:3.0.1.1-1) experimental; urgency=low
 

Added: desktop/experimental/gnome-control-center/debian/patches/03_ppd_h.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/gnome-control-center/debian/patches/03_ppd_h.patch?rev=29576&op=file
==============================================================================
--- desktop/experimental/gnome-control-center/debian/patches/03_ppd_h.patch (added)
+++ desktop/experimental/gnome-control-center/debian/patches/03_ppd_h.patch [utf-8] Sun Sep  4 17:31:40 2011
@@ -1,0 +1,23 @@
+From 63edb0dcbeec16f00d5a9e54e80e1a0a5b2d6488 Mon Sep 17 00:00:00 2001
+From: Marek Kasik <mkasik at redhat.com>
+Date: Mon, 20 Jun 2011 15:02:39 +0000
+Subject: Printers: Include cups/ppd.h explicitly
+
+cups/ppd.h is not included by cups/cups.h since CUPS 1.5.
+---
+(limited to 'panels/printers/pp-utils.c')
+
+diff --git a/panels/printers/pp-utils.c b/panels/printers/pp-utils.c
+index 07ccfc3..faa29b9 100644
+--- a/panels/printers/pp-utils.c
++++ b/panels/printers/pp-utils.c
+@@ -25,6 +25,7 @@
+ #include <glib/gstdio.h>
+ #include <gtk/gtk.h>
+ #include <cups/cups.h>
++#include <cups/ppd.h>
+ #include <dbus/dbus-glib.h>
+ 
+ #include "pp-utils.h"
+--
+cgit v0.9.0.2

Modified: desktop/experimental/gnome-control-center/debian/patches/series
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/gnome-control-center/debian/patches/series?rev=29576&op=diff
==============================================================================
--- desktop/experimental/gnome-control-center/debian/patches/series [utf-8] (original)
+++ desktop/experimental/gnome-control-center/debian/patches/series [utf-8] Sun Sep  4 17:31:40 2011
@@ -1,3 +1,4 @@
 01_menu_category.patch
 02_https.patch
+03_ppd_h.patch
 90_force_fallback.patch