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

[Iain Lane]

The following commit has been merged in the master branch:
commit b51af4b79b338f8aedd5705ab431c6118fba7024
Author: Iain Lane <laney at ubuntu.com>
Date:   Sat Aug 29 18:09:44 2009 +0100

    debian/rules: Remove leftover CDBS variables and move f-spot-screensaver
    
    * 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)

diff --git a/debian/changelog b/debian/changelog
index cf1ed15..7917b74 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -20,8 +20,12 @@ f-spot (0.6.1.1-1) karmic; urgency=low
     directory to XDG_PICTURES_DIR/Photos (localised) as the location to import
     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)
 
- -- Iain Lane <laney at ubuntu.com>  Sat, 29 Aug 2009 17:00:02 +0100
+ -- Iain Lane <laney at ubuntu.com>  Sat, 29 Aug 2009 18:08:28 +0100
 
 f-spot (0.6.0.0-1) unstable; urgency=low
 
diff --git a/debian/rules b/debian/rules
index fe2760f..71dc493 100755
--- a/debian/rules
+++ b/debian/rules
@@ -7,10 +7,6 @@ UPVERSION = $(shell echo $(VERSION) | sed 's,-.*,,' | sed 's,+dfsg.*,,')
 
 LDFLAGS += -Wl,-z,defs -Wl,-O1 -Wl,--as-needed
 
-DEB_CONFIGURE_SCRIPT_ENV := LDFLAGS="-Wl,-O1 -Wl,--as-needed"
-DEB_CONFIGURE_USER_FLAGS += MCS=/usr/bin/csc CSC=/usr/bin/csc
-DEB_CONFIGURE_EXTRA_FLAGS := --disable-scrollkeeper
-
 # robbed from tomboy
 autoreconf: autoreconf-stamp
 autoreconf-stamp:
@@ -31,9 +27,12 @@ override_dh_auto_configure: autoreconf-stamp
 		MCS=/usr/bin/csc
 
 override_dh_install:
-	rm $(CURDIR)/debian/f-spot/usr/lib/f-spot/*.a \
+	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 \
 	   $(CURDIR)/debian/f-spot/usr/lib/f-spot/*.la \
-	   $(CURDIR)/debian/f-spot/usr/lib/f-spot/*.so
+	   $(CURDIR)/debian/f-spot/usr/lib/f-spot/*.so \
+	   $(CURDIR)/debian/f-spot/usr/libexec
 	dh_install
 
 # disable tests

-- 
Packaging for f-spot