[Pkg-cli-apps-commits] [SCM] Packaging for f-spot branch, master, updated. debian/0.6.0.0-1-14-g56bbb4c

[Iain Lane]

The following commit has been merged in the master branch:
commit 56bbb4c14681dc88eadb6b91d3cca5506004cd95
Author: Iain Lane <laney at ubuntu.com>
Date:   Tue Sep 1 22:15:38 2009 +0100

    debian/control: Add gnome-screensaver build dependency; build uses this to work out where to install screensaver. Defatulted to /usr/libexec without this, which caused the screensaver to not work. Thanks to Sebastien Bacher for pointing out the fix. (Closes: #544204)

diff --git a/debian/changelog b/debian/changelog
index dc111ad..b224dcb 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -25,16 +25,17 @@ f-spot (0.6.1.1-1) UNRELEASED; urgency=low
     pictures. Only applies to new users; existing users will see no change.
     (LP: #127315)
   * debian/rules: Remove leftover CDBS variables 
-  * debian/rules: Move f-spot-screensaver to /usr/lib/xscreensaver so it
-    actually works. Previously it was installed in /usr/libexec and so was not
-    found by gnome-screensaver. (Closes: #544204)
+  * debian/control: Add gnome-screensaver build dependency; build uses this to
+    work out where to install screensaver. Defatulted to /usr/libexec without
+    this, which caused the screensaver to not work. Thanks to Sebastien Bacher
+    for pointing out the fix. (Closes: #544204)
   * debian/control, debian_link-system-flickrnet.patch: Update flickrnet
     dependency to new ABI (Closes: #543803) 
   * debian/control: Increase Standards-Version to 3.8.3, no changes required 
   * debian/copyright: Update bundled library locations, point to versioned GPL
     and update FSF address
 
- -- Iain Lane <laney at ubuntu.com>  Sun, 30 Aug 2009 00:33:32 +0100
+ -- Iain Lane <laney at ubuntu.com>  Tue, 01 Sep 2009 22:12:30 +0100
 
 f-spot (0.6.0.0-1) unstable; urgency=low
 
diff --git a/debian/control b/debian/control
index 2e24853..9b42b91 100644
--- a/debian/control
+++ b/debian/control
@@ -34,6 +34,7 @@ Build-Depends: debhelper (>= 7.0.50),
  libglu1-mesa-dev,
  libglitz1-dev,
  libglitz-glx1-dev,
+ gnome-screensaver,
  gnome-doc-utils (>= 0.3.2),
  docbook-xml,
  intltool,
diff --git a/debian/rules b/debian/rules
index 71dc493..fe2971b 100755
--- a/debian/rules
+++ b/debian/rules
@@ -27,12 +27,9 @@ override_dh_auto_configure: autoreconf-stamp
 		MCS=/usr/bin/csc
 
 override_dh_install:
-	mv $(CURDIR)/debian/f-spot/usr/libexec/gnome-screensaver \
-	   $(CURDIR)/debian/f-spot/usr/lib/xscreensaver
-	rm -rf $(CURDIR)/debian/f-spot/usr/lib/f-spot/*.a \
+	rm -f $(CURDIR)/debian/f-spot/usr/lib/f-spot/*.a \
 	   $(CURDIR)/debian/f-spot/usr/lib/f-spot/*.la \
-	   $(CURDIR)/debian/f-spot/usr/lib/f-spot/*.so \
-	   $(CURDIR)/debian/f-spot/usr/libexec
+	   $(CURDIR)/debian/f-spot/usr/lib/f-spot/*.so
 	dh_install
 
 # disable tests

-- 
Packaging for f-spot