[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 1d72cb9421616e6bf86ecf59dd118b50c0c19219
Author: Taku YASUI <tach at debian.org>
Date:   Sun May 6 19:45:28 2012 +0900

    Minor fix

diff --git a/debian/rules b/debian/rules
index 337cfd7..373ccd1 100755
--- a/debian/rules
+++ b/debian/rules
@@ -4,10 +4,7 @@ include /usr/share/cdbs/1/rules/debhelper.mk
 include /usr/share/cdbs/1/rules/patchsys-quilt.mk
 
 DEB_INSTALL_DIRS = usr/share/tdiary
-
-BUILDROOT=`pwd`/debian/tdiary
-TDIARY_ROOT=$(DEB_DESTDIR)/usr/share/tdiary
-
+TDIARY_ROOT = $(DEB_DESTDIR)/usr/share/tdiary
 manpages = tdiary-setup.1 tdiary-convert2.1
 
 $(manpages): %.1: debian/%.sgml
@@ -19,25 +16,29 @@ clean::
 common-build-indep:: $(manpages)
 
 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.* $(TDIARY_ROOT)/
 	rsync -rlpqHSC js misc skel spec plugin tdiary $(TDIARY_ROOT)/
+
+	# Install default theme
+	mkdir -p $(TDIARY_ROOT)/theme
 	rsync -rlpqHSC theme/*.css theme/*.png theme/default $(TDIARY_ROOT)/theme/
+
+	# Install vendor libraries
 	install -m 644 vendor/hikidoc-0.0.6/lib/hikidoc.rb $(TDIARY_ROOT)/
 
 	# Install Debian original scripts
 	rsync -rlpqHSC debian/debian-tools $(TDIARY_ROOT)/
 	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 debian/tdiary-setup.rb $(DEB_DESTDIR)/usr/bin/tdiary-setup
 
 	# Fix permissions
 	find $(TDIARY_ROOT)/misc/plugin -type f -exec chmod 644 {} +
 	chmod 755 $(TDIARY_ROOT)/misc/plugin/squeeze.rb
 	chmod 755 $(TDIARY_ROOT)/misc/plugin/xmlrpc/xmlrpc.rb
 	chmod 755 $(TDIARY_ROOT)/misc/plugin/amazon/amazonimg.rb
+	chmod 755 $(TDIARY_ROOT)/misc/standalone_cgi/bin/server
 	chmod 755 $(TDIARY_ROOT)/debian-tools/*.rb
 
 	# Cleanup

-- 
tdiary.git