[SCM] flowblade/master: Tidy rules file: Adapt for source now in subdir.

[js at users.alioth.debian.org]

The following commit has been merged in the master branch:
commit 23b8d6c1eeda1d142eb25a5213ce23ef034f7fd2
Author: Jonas Smedegaard <dr at jones.dk>
Date:   Sat May 16 10:42:17 2015 +0200

    Tidy rules file: Adapt for source now in subdir.

diff --git a/debian/rules b/debian/rules
index 05e7c74..6db9b40 100755
--- a/debian/rules
+++ b/debian/rules
@@ -37,6 +37,9 @@ deps += , python-mlt | python-mlt5 | python-mlt2
 deps += , gtk2-engines-pixbuf, librsvg2-common, frei0r-plugins, swh-plugins
 CDBS_DEPENDS_$(pkg) = $(deps)
 
+DEB_SRCDIR = flowblade-trunk
+src = $(patsubst ./,,$(addsuffix /,$(DEB_SRCDIR)))
+
 # extract metadata from images before copyright check
 #  * also suppress gettext MO files
 CDBS_BUILD_DEPENDS +=, libregexp-assemble-perl, libimage-exiftool-perl
@@ -56,13 +59,13 @@ clean::
 	find -type f -name '*.metadata_dump' -delete
 	rm -f debian/stamp-extract-copyright
 
-DEB_DH_INSTALL_ARGS_$(pkg) = installdata/flowblade.png usr/share/pixmaps
+DEB_DH_INSTALL_ARGS_$(pkg) = $(src)installdata/flowblade.png usr/share/pixmaps
 DEB_PYTHON_INSTALL_ARGS_$(pkg) += --install-lib=/usr/share/flowblade
 
 install/flowblade::
-	cp installdata/flowblade debian/flowblade.mime
-	cp installdata/flowblade.desktop debian/flowblade.desktop
-	cp installdata/flowblade.xml debian/flowblade.sharedmimeinfo
+	cp $(src)installdata/flowblade debian/flowblade.mime
+	cp $(src)installdata/flowblade.desktop debian/flowblade.desktop
+	cp $(src)installdata/flowblade.xml debian/flowblade.sharedmimeinfo
 clean::
 	rm -f $(patsubst %,debian/flowblade.%,mime sharedmimeinfo desktop)
 
@@ -74,9 +77,9 @@ binary-fixup/$(pkg)::
 	chmod -x $(cdbs_curdestdir)usr/share/pixmaps/flowblade.png
 
 DEB_CLEAN_EXCLUDE = \
- Flowblade/locale/cs/LC_MESSAGES/Flowblade.po~ \
- Flowblade/locale/de/LC_MESSAGES/Flowblade.po~ \
- Flowblade/locale/es/LC_MESSAGES/Flowblade.po~ \
- Flowblade/locale/fi/LC_MESSAGES/Flowblade.po~ \
- Flowblade/locale/fr/LC_MESSAGES/Flowblade.po~ \
- Flowblade/locale/it/LC_MESSAGES/Flowblade.po~
+ $(src)Flowblade/locale/cs/LC_MESSAGES/Flowblade.po~ \
+ $(src)Flowblade/locale/de/LC_MESSAGES/Flowblade.po~ \
+ $(src)Flowblade/locale/es/LC_MESSAGES/Flowblade.po~ \
+ $(src)Flowblade/locale/fi/LC_MESSAGES/Flowblade.po~ \
+ $(src)Flowblade/locale/fr/LC_MESSAGES/Flowblade.po~ \
+ $(src)Flowblade/locale/it/LC_MESSAGES/Flowblade.po~

-- 
flowblade packaging