[Pkg-cli-apps-commits] [SCM] f-spot branch, master, updated. debian/0.6.1.5-3-8-g9d2d7df

[Iain Lane]

The following commit has been merged in the master branch:
commit 1be849add667d3734b785c415cdeb8952074ea67
Author: Iain Lane <laney at ubuntu.com>
Date:   Mon May 17 12:44:13 2010 +0100

    Drop gnome-screensaver BD and set variables in rules
    
    * debian/control, debian/rules: Drop gnome-screensaver build-dep and set
      variables at configure time. Should reduce the BD chain significantly.

diff --git a/debian/changelog b/debian/changelog
index ca42ecc..10f2541 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -35,6 +35,8 @@ f-spot (0.6.2-1) UNRELEASED; urgency=low
    + Fix the longstanding issue of F-Spot changing photo timestamps
      (Paul Wellner Bou)
    + Tons of translation updates (seriously)
+  * debian/control, debian/rules: Drop gnome-screensaver build-dep and set
+    variables at configure time. Should reduce the BD chain significantly. 
 
  -- Iain Lane <laney at ubuntu.com>  Mon, 17 May 2010 11:59:58 +0100
 
diff --git a/debian/control b/debian/control
index 635e512..a6014e0 100644
--- a/debian/control
+++ b/debian/control
@@ -33,7 +33,6 @@ Build-Depends: debhelper (>= 7.0.50),
  libglitz1-dev,
  libglitz-glx1-dev,
  libjpeg-dev,
- gnome-screensaver,
  gnome-doc-utils (>= 0.3.2),
  docbook-xml,
  intltool,
diff --git a/debian/rules b/debian/rules
index 4e39294..173c4ae 100755
--- a/debian/rules
+++ b/debian/rules
@@ -21,6 +21,9 @@ override_dh_clean:
 override_dh_auto_configure: autoreconf-stamp
 	dh_auto_configure -- \
 		--disable-scrollkeeper \
+		--with-gnome-screensaver=/usr \
+		--with-gnome-screensaver-privlibexecdir=/usr/lib/gnome-screensaver/gnome-screensaver \
+		--with-gnome-screensaver-themesdir=/usr/share/applications/screensavers \
 		LDFLAGS="-Wl,-z,defs -Wl,-O1 -Wl,--as-needed" \
 		MCS=/usr/bin/mono-csc
 

-- 
f-spot