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

[Iain Lane]

The following commit has been merged in the master branch:
commit 0849c79c6311b6f0716d920c836cdaffad1f28a0
Author: Iain Lane <laney at ubuntu.com>
Date:   Wed May 19 15:36:30 2010 +0100

    Incorporate Ubuntu debian/rules changes, guarded by dpkg-vendor
    
    * debian/rules: Incorporate Ubuntu specific changes, and guard by a call to
      dpkg-vendor.

diff --git a/debian/changelog b/debian/changelog
index 1b09154..8f466ad 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -49,6 +49,8 @@ f-spot (0.6.2-1) UNRELEASED; urgency=low
     --view mode and add an undo/redo stack. Rebase on new upstream version.
     Thanks to Chris Halse Rogers.
   * debian/patches/ubuntu_fname_quote_percent.patch: Drop, now upstream.
+  * debian/rules: Incorporate Ubuntu specific changes, and guard by a call to
+    dpkg-vendor.
 
  -- Iain Lane <laney at ubuntu.com>  Mon, 17 May 2010 11:59:58 +0100
 
diff --git a/debian/rules b/debian/rules
index 804f1e7..54e3deb 100755
--- a/debian/rules
+++ b/debian/rules
@@ -32,8 +32,15 @@ override_dh_install:
 	   $(CURDIR)/debian/f-spot/usr/lib/f-spot/*.la \
 	   $(CURDIR)/debian/f-spot/usr/lib/f-spot/*.so
 	dh_install
+ifeq ($(shell dpkg-vendor --query vendor), Ubuntu)
 	cd po; intltool-update --pot
 
+	for d in $$(find debian/f-spot -type f \( -name "*.desktop" -o -name "*.directory" \) ); do \
+	    sed -ri '/^(Name|GenericName|Comment|X-GNOME-FullName)\[/d' $$d; \
+	    echo "X-Ubuntu-Gettext-Domain=f-spot" >> $$d; \
+	done 
+endif
+
 # disable tests
 override_dh_auto_test:
 

-- 
f-spot