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

joss at users.alioth.debian.org joss at users.alioth.debian.org
Sun Sep 4 17:37:03 UTC 2011 

Author: joss
Date: Sun Sep  4 17:37:03 2011
New Revision: 29577

URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=29577
Log:
Use dh-autoreconf to go with this patch.

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

Modified: desktop/experimental/gnome-control-center/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/gnome-control-center/debian/changelog?rev=29577&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:37:03 2011
@@ -17,6 +17,7 @@
   * 02_https.patch: patch from upstream git. Correctly register https 
     scheme together with http.
   * 03_ppd_h.patch: patch from upstream git. Include ppd.h explicitly.
+  * Use dh-autoreconf to go with this patch.
 
  -- Josselin Mouette <joss at debian.org>  Sun, 04 Sep 2011 19:15:55 +0200
 

Modified: desktop/experimental/gnome-control-center/debian/control
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/gnome-control-center/debian/control?rev=29577&op=diff
==============================================================================
--- desktop/experimental/gnome-control-center/debian/control [utf-8] (original)
+++ desktop/experimental/gnome-control-center/debian/control [utf-8] Sun Sep  4 17:37:03 2011
@@ -7,10 +7,11 @@
 Section: gnome
 Priority: optional
 Maintainer: Debian GNOME Maintainers <pkg-gnome-maintainers at lists.alioth.debian.org>
-Uploaders: Emilio Pozuelo Monfort <pochu at debian.org>, Frederic Peters <fpeters at debian.org>, Josselin Mouette <joss at debian.org>, Sjoerd Simons <sjoerd at debian.org>
+Uploaders: Emilio Pozuelo Monfort <pochu at debian.org>, Frederic Peters <fpeters at debian.org>, Josselin Mouette <joss at debian.org>
 Standards-Version: 3.9.1
 Build-Depends: cdbs (>= 0.4.41),
                gnome-pkg-tools (>= 0.10),
+               dh-autoreconf,
                gnome-common,
                debhelper (>= 5.0.0),
                docbook-to-man,

Modified: desktop/experimental/gnome-control-center/debian/control.in
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/gnome-control-center/debian/control.in?rev=29577&op=diff
==============================================================================
--- desktop/experimental/gnome-control-center/debian/control.in [utf-8] (original)
+++ desktop/experimental/gnome-control-center/debian/control.in [utf-8] Sun Sep  4 17:37:03 2011
@@ -6,6 +6,7 @@
 Standards-Version: 3.9.1
 Build-Depends: cdbs (>= 0.4.41),
                gnome-pkg-tools (>= 0.10),
+               dh-autoreconf,
                gnome-common,
                debhelper (>= 5.0.0),
                docbook-to-man,

Modified: 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=29577&op=diff
==============================================================================
--- desktop/experimental/gnome-control-center/debian/patches/03_ppd_h.patch [utf-8] (original)
+++ desktop/experimental/gnome-control-center/debian/patches/03_ppd_h.patch [utf-8] Sun Sep  4 17:37:03 2011
@@ -5,8 +5,31 @@
 
 cups/ppd.h is not included by cups/cups.h since CUPS 1.5.
 ---
-(limited to 'panels/printers/pp-utils.c')
-
+diff --git a/configure.ac b/configure.ac
+index 24a2f8b..f8d5ff1 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -147,7 +147,7 @@ if test x"$enable_cups" != x"no" ; then
+   CUPS_API_MAJOR=`echo $ECHO_N $CUPS_API_VERSION | cut -d . -f 1`
+   CUPS_API_MINOR=`echo $ECHO_N $CUPS_API_VERSION | cut -d . -f 2`
+ 
+-  AC_CHECK_HEADERS([cups/cups.h cups/http.h cups/ipp.h],,
++  AC_CHECK_HEADERS([cups/cups.h cups/http.h cups/ipp.h cups/ppd.h],,
+                    AC_MSG_ERROR([CUPS headers not found but CUPS support requested]))
+ 
+   if ! test $CUPS_API_MAJOR -gt 1 -o \
+diff --git a/panels/printers/pp-new-printer-dialog.c b/panels/printers/pp-new-printer-dialog.c
+index a6164fa..d972c4d 100644
+--- a/panels/printers/pp-new-printer-dialog.c
++++ b/panels/printers/pp-new-printer-dialog.c
+@@ -31,6 +31,7 @@
+ #include <gtk/gtk.h>
+ 
+ #include <cups/cups.h>
++#include <cups/ppd.h>
+ 
+ #include "pp-new-printer-dialog.h"
+ #include "pp-utils.h"
 diff --git a/panels/printers/pp-utils.c b/panels/printers/pp-utils.c
 index 07ccfc3..faa29b9 100644
 --- a/panels/printers/pp-utils.c

Modified: desktop/experimental/gnome-control-center/debian/rules
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/gnome-control-center/debian/rules?rev=29577&op=diff
==============================================================================
--- desktop/experimental/gnome-control-center/debian/rules [utf-8] (original)
+++ desktop/experimental/gnome-control-center/debian/rules [utf-8] Sun Sep  4 17:37:03 2011
@@ -7,6 +7,7 @@
 include /usr/share/gnome-pkg-tools/1/rules/gnome-version.mk
 include /usr/share/gnome-pkg-tools/1/rules/clean-la.mk
 include /usr/share/gnome-pkg-tools/1/rules/gnome-get-source.mk
+include /usr/share/cdbs/1/rules/autoreconf.mk
 
 DEB_AUTO_UPDATE_LIBTOOL=pre
 DEB_AUTO_UPDATE_ACLOCAL=1.11

More information about the pkg-gnome-commits mailing list