[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 cc535019b5805d1422580b7567b84393d124ef82
Author: Taku YASUI <tach at debian.org>
Date:   Sun May 6 18:36:26 2012 +0900

    Installing file fix

diff --git a/debian/rules b/debian/rules
index 6c66ff8..e72ff01 100755
--- a/debian/rules
+++ b/debian/rules
@@ -22,7 +22,7 @@ common-install-indep::
 	echo $(cdbs_curpkg)
 	mkdir -p $(TDIARY_ROOT)/theme
 	install -m 755 index.rb index.fcgi update.rb $(TDIARY_ROOT)/
-	install -m 644 tdiary.rb dot.htaccess tdiary.conf.sample $(TDIARY_ROOT)/
+	install -m 644 tdiary.rb dot.htaccess tdiary.conf.* $(TDIARY_ROOT)/
 	rsync -rlpqHSC js misc skel spec plugin tdiary $(TDIARY_ROOT)/
 	rsync -rlpqHSC theme/*.css theme/*.png theme/default $(TDIARY_ROOT)/theme/
 	#rm -f tdiary/wiki_style.rb
@@ -32,11 +32,11 @@ common-install-indep::
 	install -m 755 debian/TC_tdiary-setup.rb $(TDIARY_ROOT)/
 	install -m 644 debian/20theme_url.rb     $(TDIARY_ROOT)/plugin/
 	install -D -m 755 debian/tdiary-setup.rb    $(cdbs_curdestdir)/usr/bin/tdiary-setup
-	install -D -m 755 misc/convert2.rb          $(cdbs_curdestdir)/usr/bin/tdiary-convert2
 
 	# Fix permissions
-	find $(TDIARY_ROOT)/misc/plugin -type f | xargs chmod 644
+	find $(TDIARY_ROOT)/misc/plugin -type f -exec chmod 644 {} +
 	chmod 755 $(TDIARY_ROOT)/misc/plugin/squeeze.rb
+	chmod 755 $(TDIARY_ROOT)/debian-tools/*.rb
 
 	# Cleanup
 	find $(cdbs_curdestdir) -type d -empty -exec rmdir {} +
diff --git a/debian/tdiary.install b/debian/tdiary.install
index ab65d47..0f002fe 100644
--- a/debian/tdiary.install
+++ b/debian/tdiary.install
@@ -3,7 +3,8 @@ usr/share/tdiary/*.rb
 usr/share/tdiary/*.fcgi
 usr/share/tdiary/dot.htaccess
 usr/share/tdiary/tdiary.conf.sample
-usr/share/tdiary/debian-tools
+usr/share/tdiary/debian-tools/debian-index.rb
+usr/share/tdiary/debian-tools/debian-update.rb
 usr/share/tdiary/skel
 usr/share/tdiary/theme/default
 usr/share/tdiary/theme/*.css

-- 
tdiary.git