r26553 - in /desktop/unstable/evince/debian: changelog control control.in patches/02_link_ice.patch patches/series rules

[pochu at users.alioth.debian.org]

Author: pochu
Date: Wed Feb 16 21:23:44 2011
New Revision: 26553

URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=26553
Log:
* debian/patches/02_link_ice.patch:
  - Link against libICE since eggsmclient uses it.
* Use dh-autoreconf for the above patch.

Added:
    desktop/unstable/evince/debian/patches/02_link_ice.patch
Modified:
    desktop/unstable/evince/debian/changelog
    desktop/unstable/evince/debian/control
    desktop/unstable/evince/debian/control.in
    desktop/unstable/evince/debian/patches/series
    desktop/unstable/evince/debian/rules

Modified: desktop/unstable/evince/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/evince/debian/changelog?rev=26553&op=diff
==============================================================================
--- desktop/unstable/evince/debian/changelog [utf-8] (original)
+++ desktop/unstable/evince/debian/changelog [utf-8] Wed Feb 16 21:23:44 2011
@@ -9,8 +9,11 @@
       clash with those from evince itself. Closes: #610856.
   * Remove gir1.0-evince-2.30 since nothing uses it, to ease the gir1.2
     transition.
-
- -- Emilio Pozuelo Monfort <pochu at debian.org>  Wed, 16 Feb 2011 20:34:26 +0000
+  * debian/patches/02_link_ice.patch:
+    - Link against libICE since eggsmclient uses it.
+  * Use dh-autoreconf for the above patch.
+
+ -- Emilio Pozuelo Monfort <pochu at debian.org>  Wed, 16 Feb 2011 21:22:17 +0000
 
 evince (2.30.3-2) unstable; urgency=medium
 

Modified: desktop/unstable/evince/debian/control
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/evince/debian/control?rev=26553&op=diff
==============================================================================
--- desktop/unstable/evince/debian/control [utf-8] (original)
+++ desktop/unstable/evince/debian/control [utf-8] Wed Feb 16 21:23:44 2011
@@ -10,6 +10,7 @@
 Uploaders: Emilio Pozuelo Monfort <pochu at debian.org>, Josselin Mouette <joss at debian.org>, Sebastian Dröge <slomo at debian.org>
 Build-Depends: cdbs,
                debhelper (>= 5),
+               dh-autoreconf,
                intltool (>= 0.35.0),
                gnome-pkg-tools (>= 0.10),
                gnome-doc-utils (>= 0.3.2),

Modified: desktop/unstable/evince/debian/control.in
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/evince/debian/control.in?rev=26553&op=diff
==============================================================================
--- desktop/unstable/evince/debian/control.in [utf-8] (original)
+++ desktop/unstable/evince/debian/control.in [utf-8] Wed Feb 16 21:23:44 2011
@@ -5,6 +5,7 @@
 Uploaders: @GNOME_TEAM@
 Build-Depends: cdbs,
                debhelper (>= 5),
+               dh-autoreconf,
                intltool (>= 0.35.0),
                gnome-pkg-tools (>= 0.10),
                gnome-doc-utils (>= 0.3.2),

Added: desktop/unstable/evince/debian/patches/02_link_ice.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/evince/debian/patches/02_link_ice.patch?rev=26553&op=file
==============================================================================
--- desktop/unstable/evince/debian/patches/02_link_ice.patch (added)
+++ desktop/unstable/evince/debian/patches/02_link_ice.patch [utf-8] Wed Feb 16 21:23:44 2011
@@ -1,0 +1,26 @@
+From 48e3d5a5bd9d1095c6b3314e163cb4a94407c26f Mon Sep 17 00:00:00 2001
+From: Emilio Pozuelo Monfort <pochu27 at gmail.com>
+Date: Wed, 16 Feb 2011 21:19:15 +0000
+Subject: [PATCH] Check for libICE, needed by eggsmclient
+
+https://bugzilla.gnome.org/show_bug.cgi?id=642509
+---
+ configure.ac |    2 +-
+ 1 files changed, 1 insertions(+), 1 deletions(-)
+
+diff --git a/configure.ac b/configure.ac
+index 034926b..10b577b 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -201,7 +201,7 @@ if test "$with_smclient" != "no"; then
+   AC_DEFINE([WITH_SMCLIENT],[1],[Define if smclient is enabled])
+ 
+   case "$with_smclient" in
+-    xsmp) SMCLIENT_PKGS="sm >= 1.0.0" ;;
++    xsmp) SMCLIENT_PKGS="sm >= 1.0.0 ice" ;;
+     *) SMCLIENT_PKGS="" ;;
+   esac
+ 
+-- 
+1.7.2.3
+

Modified: desktop/unstable/evince/debian/patches/series
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/evince/debian/patches/series?rev=26553&op=diff
==============================================================================
--- desktop/unstable/evince/debian/patches/series [utf-8] (original)
+++ desktop/unstable/evince/debian/patches/series [utf-8] Wed Feb 16 21:23:44 2011
@@ -1,1 +1,2 @@
 01_dvi_security.patch
+02_link_ice.patch

Modified: desktop/unstable/evince/debian/rules
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/evince/debian/rules?rev=26553&op=diff
==============================================================================
--- desktop/unstable/evince/debian/rules [utf-8] (original)
+++ desktop/unstable/evince/debian/rules [utf-8] Wed Feb 16 21:23:44 2011
@@ -1,5 +1,6 @@
 #!/usr/bin/make -f
 
+include /usr/share/cdbs/1/rules/autoreconf.mk
 include /usr/share/cdbs/1/rules/debhelper.mk
 include /usr/share/cdbs/1/class/gnome.mk
 include /usr/share/gnome-pkg-tools/1/rules/uploaders.mk