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

Sun May 6 10:50:24 UTC 2012

The following commit has been merged in the master branch:
commit 322a35679da8eef0944519b39ab5cd443386d5e8
Author: Taku YASUI <tach at debian.org>
Date:   Sun May 6 16:49:16 2012 +0900

    Temporary commit for installing

diff --git a/debian/rules b/debian/rules
index 40c179c..8da8a1e 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,134 +1,47 @@
 #!/usr/bin/make -f
 
-# Uncomment this to turn on verbose mode.
-#export DH_VERBOSE=1
+include /usr/share/cdbs/1/rules/debhelper.mk
+include /usr/share/cdbs/1/rules/patchsys-quilt.mk
 
 BUILDROOT=`pwd`/debian/tdiary
-TDIARY=$(BUILDROOT)/usr/share/tdiary
-DOC_TDIARY=$(BUILDROOT)/usr/share/doc/tdiary
-WWW=$(TDIARY)
-MANDEST=$(BUILDROOT)/usr/share/man/man1
-QUILT_STAMPFN=patch-stamp
+TDIARY_ROOT=$(DEB_DESTDIR)/usr/share/tdiary
 
 manpages = tdiary-setup.1 tdiary-convert2.1
 
 $(manpages): %.1: debian/%.sgml
 	docbook-to-man $< > $@
 
-build-arch: build
-build-indep: build
- 
-build: build-stamp
-build-stamp: $(manpages)
-	@echo "--- Compiling"
-	dh_testdir
-	# Do something to build your package here
-	# touch build-stamp
-
-
-clean: clean1
-	rm -f debian/*.debhelper.log
-
-clean1:
-	@echo "--- Cleaning"
-	dh_testdir
-	dh_testroot
-	dh_clean
-
-	# Add here commands to clean up after the build process.
+clean::
 	rm -f $(manpages)
 
-install: build
-	dh_testdir
-	dh_testroot
-	dh_prep
-	dh_installdirs
-
-	# Add here commands to install the package into debian/tdiary.
-	# --- Main files  ---
-	#  TODO
-	rm -f tdiary/wiki_style.rb
-	#  
-	install -m 755 index.rb index.fcgi update.rb $(TDIARY)/
-	install -m 644 tdiary.rb ChangeLog dot.htaccess README tdiary.conf.sample $(TDIARY)/
-	cp -a js misc skel spec plugin tdiary $(TDIARY)/
-	cp -a contrib2 $(TDIARY)/contrib
-	mv $(TDIARY)/misc/plugin/trackback/tb.rb $(TDIARY)/
-
-	# - copy themes into the web directory
-	install -m 755 theme/themebench.rhtml $(BUILDROOT)/usr/lib/cgi-bin/tdiary/theme
-	cp -ar theme $(WWW)
-	find $(WWW) -name "*.png" -or -name "*.jpg" -or -name "*.css" | xargs chmod a-x 
-	rm -r  $(WWW)/theme/themebench.rhtml
-	for f in $(WWW)/theme/* ; do \
-	  if [ "$${f##*/}" = 'default' ] || \
-	     [ "$${f##*/}" = 'README' ] || \
-	     [ "$${f##*/}" = 'base.css' ]; then \
-	    continue ; \
-	  fi ; \
-	  dh_movefiles -ptdiary-theme --sourcedir=debian/tdiary -X.svn \
-	               "usr/share/tdiary/theme/$${f##*/}" ; \
-	done
-
-	# - debian original scripts
-	cp -ar debian/debian-tools $(TDIARY)/
-	install -m 644 debian/20theme_url.rb      $(TDIARY)/plugin
-	install -m 755 debian/tdiary-setup.rb     $(BUILDROOT)/usr/bin/tdiary-setup
-	install -m 755 misc/convert2.rb           $(BUILDROOT)/usr/bin/tdiary-convert2
-	install -m 755 debian/TC_tdiary-setup.rb  $(TDIARY)/
-
-	# - Fix permissions
-	find $(TDIARY)/misc/plugin -type f | xargs chmod 644
-	find $(WWW)/theme -type f | xargs chmod 644
-	chmod a+x $(TDIARY)/misc/plugin/squeeze.rb
-	chmod a+x $(TDIARY)/contrib/util/posttdiary/posttdiary.rb
-	chmod a+x $(TDIARY)/contrib/util/tdiarysearch/search.rb
-	chmod a+x $(TDIARY)/contrib/util/posttdiary/posttdiary-ex.rb
-	chmod a+x $(TDIARY)/contrib/util/clean-spam/tdiary-comment-clean
-	chmod a+x $(TDIARY)/contrib/util/clean-spam/tdiary-referer-clean
-	chmod a+x $(TDIARY)/contrib/util/rast-search/rast-register.rb
-	chmod a+x $(TDIARY)/contrib/util/rast-search/rast-search.rb
-
-	# --- Move files for tdiary-mode.deb ---
-	mv $(TDIARY)/contrib/util/tdiary-mode/*.el \
-	  $(CURDIR)/debian/tdiary-mode/usr/share/emacs/site-lisp/tdiary-mode/
-  	
-	# --- Move files for tdiary-{theme,plugin,contrib}.deb ---
-	find $(BUILDROOT) -type d -empty -print | xargs rm -rf
-	dh_movefiles --sourcedir=debian/tdiary -X.svn 
-	for d in tdiary tdiary-contrib tdiary-mode tdiary-theme tdiary-plugin ; do \
-	  find $(CURDIR)/debian/$$d -type d -name ".svn" | xargs rm -rf ; \
-	done 
-
-	find debian -name license.txt | xargs -r rm -f
-
-# Build architecture-independent files here.
-binary-indep: build install
-	dh_testdir -i
-	dh_testroot -i
-#	dh_installdebconf -i
-	dh_installdocs -i -X.svn
-	dh_installexamples -i -X.svn
-#	dh_installlogrotate -i
-	dh_installemacsen -i -X.svn --priority=50
-#	dh_installcron -i
-	dh_installman -i -X.svn
-#	dh_installinfo -i
-	dh_installchangelogs ChangeLog
-	dh_installchangelogs -ptdiary ChangeLog
-	dh_installchangelogs -ptdiary-plugin misc/plugin/ChangeLog.DO_NOT_UPDATE
-	dh_link -i
-	dh_strip -i
-	dh_compress -i
-	dh_fixperms -i
-	dh_installdeb -i
-	dh_gencontrol -i
-	dh_md5sums -i
-	dh_builddeb -i
-
-# Build architecture-dependent files here.
-binary-arch: build install
-
-binary: binary-indep binary-arch
-.PHONY: build clean binary-indep binary-arch binary install
-
+install/tdiary::
+	install -m 755 index.rb index.fcgi update.rb $(TDIARY_ROOT)/
+	install -m 644 tdiary.rb ChangeLog dot.htaccess README tdiary.conf.sample $(TDIARY_ROOT)/
+	rsync -rlpqHSC js misc skel spec plugin tdiary $(TDIARY_ROOT)/
+	rsync -rlpqHSC theme/README theme/*.css theme/*.png theme/default $(TDIARY_ROOT)/theme/
+	#rm -f tdiary/wiki_style.rb
+
+	# 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 -m 755 debian/tdiary-setup.rb    $(cdbs_curdestdir)/usr/bin/tdiary-setup
+	install -m 755 misc/convert2.rb          $(cdbs_curdestdir)/usr/bin/tdiary-convert2
+
+	# Fix permissions
+	find $(TDIARY_ROOT)/misc/plugin -type f | xargs chmod 644
+	chmod 755 $(TDIARY_ROOT)/misc/plugin/squeeze.rb
+
+	# Cleanup
+	find $(cdbs_curdestdir) -type d -empty -exec rmdir {} +
+	find $(cdbs_curdestdir) -name license.txt -exec rm -f {} +
+
+install/tdiary-theme::
+	rsync -rlpqHSC --exclude=/theme/default/ theme $(TDIARY_ROOT)/
+
+	# 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 {} +

-- 
tdiary.git

