[DRE-commits] [SCM] tdiary.git branch, master, updated. debian/3.0.1-3-42-g5c33597

[Taku YASUI]

The following commit has been merged in the master branch:
commit f1a6cbf5d6fdd1065e6d0810eb142ef2eaadd5c0
Author: Taku YASUI <tach at debian.org>
Date:   Sun May 6 18:04:06 2012 +0900

    Fix correct tdiary-theme installation

diff --git a/debian/rules b/debian/rules
index 0f149a2..1e4b01f 100755
--- a/debian/rules
+++ b/debian/rules
@@ -43,11 +43,11 @@ common-install-indep::
 	find $(cdbs_curdestdir) -name license.txt -exec rm -f {} +
 
 install/tdiary-theme::
-	rsync -rlpqHSC --exclude=/theme/default/ theme $(CURDIR)/debian/$(cdbs_curpkg)/usr/share/tdiary/
+	# Install themes except default
+	rsync -rlpqHSC \
+		--exclude=/theme/default/ \
+		--exclude='/theme/*' \
+		theme $(CURDIR)/debian/$(cdbs_curpkg)/usr/share/tdiary/
 
 	# Fix permissions
-	find $(TDIARY_ROOT)/theme -type f -exec chmod 644 {} +
-
-	# Cleanup
-	find $(cdbs_curdestdir) -type d -empty -exec rmdir {} +
-	find $(cdbs_curdestdir) -name license.txt -exec rm -f {} +
+	find $(CURDIR)/debian/$(cdbs_curpkg) -type f -exec chmod 644 {} +
diff --git a/debian/tdiary-theme.install b/debian/tdiary-theme.install
deleted file mode 100644
index e69de29..0000000

-- 
tdiary.git