[DRE-commits] [SCM] rdtool.git branch, master, updated. upstream/0.6.22-28-gf8749af

[Taku YASUI]

The following commit has been merged in the master branch:
commit c3c87137adc53c099babc69a7533c55ffa4ffa3f
Author: Taku YASUI <tach at debian.org>
Date:   Sat May 5 20:34:15 2012 +0900

    Fix dot.rd2rc path

diff --git a/debian/patches/010_change_dot_rd2rc_path b/debian/patches/010_change_dot_rd2rc_path
new file mode 100644
index 0000000..cd76cbe
--- /dev/null
+++ b/debian/patches/010_change_dot_rd2rc_path
@@ -0,0 +1,17 @@
+--- a/bin/rd2
++++ b/bin/rd2
+@@ -77,11 +77,11 @@
+     load "~/.rd2rc"
+     #  STDERR << "#{$0}: loading ~/.rd2rc\n"
+   else
+-    load "rd/dot.rd2rc"
+-    #  STDERR << "#{$0}: loading rd/dot.rd2rc\n"
++    load "/etc/rdtool/rd2rc"
++    #  STDERR << "#{$0}: loading /etc/rdtool/rd2rc\n"
+   end
+ rescue
+-  load "rd/dot.rd2rc"
++  load "/etc/rdtool/rd2rc"
+ end
+ 
+ # initialize OptionParser
diff --git a/debian/patches/series b/debian/patches/series
new file mode 100644
index 0000000..b9f6f6a
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1 @@
+010_change_dot_rd2rc_path
diff --git a/debian/rules b/debian/rules
index ab732c6..e33ca60 100755
--- a/debian/rules
+++ b/debian/rules
@@ -19,7 +19,7 @@ build/rdtool::
 
 install/rdtool::
 	ruby setup.rb install --prefix=$(DEB_DESTDIR)/usr
-	#cp lib/rd/dot.rd2rc $(CURDIR)/debian/tmp$(libdir)/rd/
+	install -D -m644 lib/rd/dot.rd2rc $(DEB_DESTDIR)/etc/rdtool/rd2rc
 
 install/rdtool-elisp::
-	install -D -m 444 utils/rd-mode.el $(DEB_DESTDIR)/usr/share/emacs/site-lisp/$(cdbs_curpkg)/rd-mode.el
+	install -D -m644 utils/rd-mode.el $(DEB_DESTDIR)/usr/share/emacs/site-lisp/$(cdbs_curpkg)/rd-mode.el

-- 
rdtool.git