[Pkg-cli-apps-commits] [SCM] Packaging for f-spot branch, master, updated. debian/0.6.1.3-1-2-g47be235

[Iain Lane]

The following commit has been merged in the master branch:
commit 47be235dc9ce6ad705c68e976fe595ea795a5e12
Author: Iain Lane <laney at ubuntu.com>
Date:   Wed Sep 30 20:54:58 2009 +0100

    Update intltool pot files in build for Ubuntu
    
    Change to stay in sync - has no effect for Debian

diff --git a/debian/changelog b/debian/changelog
index 7a822cf..f06e878 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,11 +1,18 @@
-f-spot (0.6.1.3-2) karmic; urgency=low
+f-spot (0.6.1.3-2) UNRELEASED; urgency=low
 
+  [ Iain Lane ]
   * debian/rules, debian/control: Use mono-csc instead of csc to build. Bump
     mono-devel build-dep version to 2.4.2.3 for this.
   * debian/rules: Remove LDFLAGS definition and set flags in dh_auto_configure
     override. Somehow it was being parsed twice - this was only used in one
     place so just setting it directly in the target doesn't hurt.
 
+  [ Sebastien Bacher ]
+  * debian/rules: update the translation template after the build, the change
+    doesn't make a difference for debian but is required for ubuntu and will
+    let the package stay in sync between distributions (Closes: #549019)
+
+
  -- Iain Lane <laney at ubuntu.com>  Mon, 28 Sep 2009 22:32:46 +0100
 
 f-spot (0.6.1.3-1) unstable; urgency=low
diff --git a/debian/rules b/debian/rules
index 8493554..a0dc6a5 100755
--- a/debian/rules
+++ b/debian/rules
@@ -15,7 +15,7 @@ autoreconf-stamp:
 
 override_dh_clean:
 	dh_clean
-	rm -rf autoreconf-stamp configure config.sub config.guess ltmain.sh aclocal.m4 autom4te.cache/
+	rm -rf autoreconf-stamp configure config.sub config.guess ltmain.sh aclocal.m4 autom4te.cache/ po/*.pot
 	find . -name "Makefile.in" -delete
 
 override_dh_auto_configure: autoreconf-stamp
@@ -29,6 +29,7 @@ override_dh_install:
 	   $(CURDIR)/debian/f-spot/usr/lib/f-spot/*.la \
 	   $(CURDIR)/debian/f-spot/usr/lib/f-spot/*.so
 	dh_install
+	cd po; intltool-update --pot
 
 # disable tests
 override_dh_auto_test:

-- 
Packaging for f-spot