[DRE-commits] [SCM] tdiary-contrib.git branch, master, updated. upstream/3.1.20120506-9-gf012457

[Taku YASUI]

The following commit has been merged in the master branch:
commit a7e2a28c4d64047a2e2ea1c5810a4ef0a2271fb4
Author: Taku YASUI <tach at debian.org>
Date:   Mon May 7 02:48:54 2012 +0900

    Fix lintian errors

diff --git a/debian/control b/debian/control
index b12302d..f84b4c8 100644
--- a/debian/control
+++ b/debian/control
@@ -3,7 +3,7 @@ Section: web
 Priority: extra
 Maintainer: Debian Ruby Extras Maintainers <pkg-ruby-extras-maintainers at lists.alioth.debian.org>
 Uploaders: Daigo Moriwaki <daigo at debian.org>, Taku YASUI <tach at debian.org>
-Build-Depends: debhelper (>= 8), cdbs
+Build-Depends: debhelper (>= 8), cdbs, quilt
 Standards-Version: 3.9.3
 Homepage: http://www.tdiary.org/
 Vcs-Git: git://git.debian.org/pkg-ruby-extras/tdiary-contrib.git
diff --git a/debian/patches/010_disable_unexecutable_shebang b/debian/patches/010_disable_unexecutable_shebang
new file mode 100644
index 0000000..cd90b65
--- /dev/null
+++ b/debian/patches/010_disable_unexecutable_shebang
@@ -0,0 +1,7 @@
+--- a/style/hatena_style.rb
++++ b/style/hatena_style.rb
+@@ -1,4 +1,3 @@
+-#!/usr/bin/env ruby -Ke
+ # Copyright(c) 2004 URABE, Shyouhei.
+ #
+ # Permission is hereby granted, free of  charge, to any person obtaining a copy
diff --git a/debian/patches/series b/debian/patches/series
new file mode 100644
index 0000000..78f7e90
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1 @@
+010_disable_unexecutable_shebang
diff --git a/debian/rules b/debian/rules
index ee38edb..9a159b1 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,7 +1,7 @@
 #!/usr/bin/make -f
 
 include /usr/share/cdbs/1/rules/debhelper.mk
-#include /usr/share/cdbs/1/rules/patchsys-quilt.mk
+include /usr/share/cdbs/1/rules/patchsys-quilt.mk
 
 TDIARY_DIR = $(CURDIR)/debian/$(cdbs_curpkg)/usr/share/tdiary
 ELISP_DIR = $(CURDIR)/debian/$(cdbs_curpkg)/usr/share/emacs/site-lisp/$(cdbs_curpkg)
@@ -16,9 +16,27 @@ install/tdiary-contrib::
 
 	# Fix permissions
 	find $(TDIARY_DIR) -type f -exec chmod 644 {} +
+	chmod 755 $(TDIARY_DIR)/contrib/plugin/git-register.rb
+	chmod 755 $(TDIARY_DIR)/contrib/plugin/windex.rb
+	chmod 755 $(TDIARY_DIR)/contrib/util/clean-spam/tdiary-comment-clean
+	chmod 755 $(TDIARY_DIR)/contrib/util/clean-spam/tdiary-comment-clean2
+	chmod 755 $(TDIARY_DIR)/contrib/util/clean-spam/tdiary-referer-clean
+	chmod 755 $(TDIARY_DIR)/contrib/util/estraier-search/estraier-register.rb
+	chmod 755 $(TDIARY_DIR)/contrib/util/estraier-search/estraier-search.rb
+	chmod 755 $(TDIARY_DIR)/contrib/util/image-gallery/image-gallery.rb
+	chmod 755 $(TDIARY_DIR)/contrib/util/image-gallery/image-gallery.rb.euc-jp
+	chmod 755 $(TDIARY_DIR)/contrib/util/image2flickr.rb
+	chmod 755 $(TDIARY_DIR)/contrib/util/posttdiary/posttdiary-ex.rb
+	chmod 755 $(TDIARY_DIR)/contrib/util/posttdiary/posttdiary.rb
+	chmod 755 $(TDIARY_DIR)/contrib/util/rast-search/rast-register.rb
+	chmod 755 $(TDIARY_DIR)/contrib/util/rast-search/rast-search.rb
+	chmod 755 $(TDIARY_DIR)/contrib/util/tdiary-grep/grep.rb
+	chmod 755 $(TDIARY_DIR)/contrib/util/tdiarysearch/search.rb
+	chmod 755 $(TDIARY_DIR)/exifparser/makernote/mk_nikonflensname.rb
 
 	# Cleanup
 	rm -rf $(TDIARY_DIR)/contrib/util/tdiary-mode
+	find $(TDIARY_DIR) -name license.txt -exec rm {} +
 
 	# Remove due to copyright or license issue
 	rm $(TDIARY_DIR)/contrib/plugin/coderwall.rb

-- 
tdiary-contrib.git