Bug#320520: FTBFS: Couldn't find XScreenSaver extension

[Matt Kraai]

Package: gossip
Version: 0.8-2
Severity: serious
Tags: patch

gossip fails to build because it cannot find the XScreenSaver
extension:

> checking for XScreenSaverRegister in -lXss... no
> configure: error: Couldn't find XScreenSaver extension.

There are actually two problems: it doesn't build-depend on libxss-dev
which provides this extension and the test for the scrnsaver.h header
file has the success and failure cases switched.  The attached patch
fixes both of these problems.

-- 
Matt

diff -u gossip-0.8/debian/control gossip-0.8/debian/control
--- gossip-0.8/debian/control
+++ gossip-0.8/debian/control
@@ -2,7 +2,7 @@
 Section: gnome
 Priority: optional
 Maintainer: Ross Burton <[EMAIL PROTECTED]>
-Build-Depends: debhelper (>= 4.1.0), cdbs, gnome-pkg-tools, 
libxml-parser-perl, libloudmouth1-dev (>= 0.17-1), libgnomeui-dev (>= 
2.6.1.1-4), libgtk2.0-dev (>= 2.4), libglade2-dev, libgnomevfs2-0 (>= 2.8.4-2), 
libxslt1-dev, xlibs-static-dev, libxt-dev
+Build-Depends: debhelper (>= 4.1.0), cdbs, gnome-pkg-tools, 
libxml-parser-perl, libloudmouth1-dev (>= 0.17-1), libgnomeui-dev (>= 
2.6.1.1-4), libgtk2.0-dev (>= 2.4), libglade2-dev, libgnomevfs2-0 (>= 2.8.4-2), 
libxslt1-dev, xlibs-static-dev, libxt-dev, libxss-dev, autoconf
 Uploaders: Debian GNOME Maintainers <[EMAIL PROTECTED]>, Akira TAGOH <[EMAIL 
PROTECTED]>, Andreas Rottmann <[EMAIL PROTECTED]>, Andrew Lau <[EMAIL 
PROTECTED]>, Carlos Perelló Marín <[EMAIL PROTECTED]>, Ed Boraas <[EMAIL 
PROTECTED]>, Edd Dumbill <[EMAIL PROTECTED]>, Emil Soleyman-Zomalan <[EMAIL 
PROTECTED]>, Gustavo Noronha Silva <[EMAIL PROTECTED]>, J.H.M. Dassen (Ray) 
<[EMAIL PROTECTED]>, Joe Drew <[EMAIL PROTECTED]>, Johannes Rohr <[EMAIL 
PROTECTED]>, Jordi Mallach <[EMAIL PROTECTED]>, Jose Carlos Garcia Sogo <[EMAIL 
PROTECTED]>, Josselin Mouette <[EMAIL PROTECTED]>, Marc 'HE' Brockschmidt 
<[EMAIL PROTECTED]>, Ondřej Surý <[EMAIL PROTECTED]>, Rob Bradford <[EMAIL 
PROTECTED]>, Robert McQueen <[EMAIL PROTECTED]>, Sebastien Bacher <[EMAIL 
PROTECTED]>, Sjoerd Simons <[EMAIL PROTECTED]>, Takuo KITAME <[EMAIL PROTECTED]>
 Standards-Version: 3.6.1
 
diff -u gossip-0.8/debian/control.in gossip-0.8/debian/control.in
--- gossip-0.8/debian/control.in
+++ gossip-0.8/debian/control.in
@@ -2,7 +2,7 @@
 Section: gnome
 Priority: optional
 Maintainer: Ross Burton <[EMAIL PROTECTED]>
-Build-Depends: debhelper (>= 4.1.0), cdbs, gnome-pkg-tools, 
libxml-parser-perl, libloudmouth1-dev (>= 0.17-1), libgnomeui-dev (>= 
2.6.1.1-4), libgtk2.0-dev (>= 2.4), libglade2-dev, libgnomevfs2-0 (>= 2.8.4-2), 
libxslt1-dev, xlibs-static-dev, libxt-dev
+Build-Depends: debhelper (>= 4.1.0), cdbs, gnome-pkg-tools, 
libxml-parser-perl, libloudmouth1-dev (>= 0.17-1), libgnomeui-dev (>= 
2.6.1.1-4), libgtk2.0-dev (>= 2.4), libglade2-dev, libgnomevfs2-0 (>= 2.8.4-2), 
libxslt1-dev, xlibs-static-dev, libxt-dev, libxss-dev, autoconf
 Uploaders: @GNOME_TEAM@
 Standards-Version: 3.6.1
 
diff -u gossip-0.8/debian/rules gossip-0.8/debian/rules
--- gossip-0.8/debian/rules
+++ gossip-0.8/debian/rules
@@ -9,0 +10 @@
+DEB_AUTO_UPDATE_AUTOCONF := yes
only in patch2:
unchanged:
--- gossip-0.8.orig/configure.in
+++ gossip-0.8/configure.in
@@ -114,9 +114,9 @@
 if test \! "$XSS_LIBS" = "no"; then
    AC_TRY_COMPILE([
 #include <X11/extensions/scrnsaver.h>
-               ],[],[enable_xss=no],[
+               ],[],[
                AC_DEFINE(USE_SCREENSAVER, 1, [Define if we're using 
XScreenSaver.])
-               ])
+               ],[enable_xss=no])
 else
     XSS_LIBS=""
     enable_xss=no

signature.asc
Description: Digital signature