[DRE-commits] [SCM] adlint.git branch, master, updated. debian/1.10.0-1-4-g8411515

[TANIGUCHI Takaki]

The following commit has been merged in the master branch:
commit 84115156a99281accff689deff2221a15ade791e
Author: TANIGUCHI Takaki <takaki at asis.media-as.org>
Date:   Mon May 6 11:24:15 2013 +0900

    refresh debian/patches/fix_etc_path

diff --git a/debian/changelog b/debian/changelog
index b8ffae8..d396d18 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,7 @@
 adlint (3.0.4-1) unstable; urgency=low
 
   * Imported Upstream version 3.0.4
+  * refresh debian/patches/fix_etc_path
 
  -- TANIGUCHI Takaki <takaki at debian.org>  Mon, 06 May 2013 11:18:01 +0900
 
diff --git a/debian/patches/fix_etc_path b/debian/patches/fix_etc_path
index b5b616d..98b4c0e 100644
--- a/debian/patches/fix_etc_path
+++ b/debian/patches/fix_etc_path
@@ -1,65 +1,11 @@
-Index: adlint/bin/adlint
-===================================================================
---- adlint.orig/bin/adlint	2012-03-02 10:28:48.039548163 +0900
-+++ adlint/bin/adlint	2012-03-02 11:27:56.451702350 +0900
-@@ -36,7 +36,7 @@
- $bindir = Pathname.new(__FILE__).realpath.dirname
- $prefix = Pathname.new("..").expand_path($bindir)
- $libdir = Pathname.new("lib").expand_path($prefix)
--$etcdir = Pathname.new("etc").expand_path($prefix)
-+$etcdir = Pathname.new("etc/adlint").expand_path("/")
- 
- $stdout.set_encoding(Encoding.default_external)
- $stderr.set_encoding(Encoding.default_external)
-Index: adlint/bin/adlint_chk
-===================================================================
---- adlint.orig/bin/adlint_chk	2012-03-02 10:28:48.039548163 +0900
-+++ adlint/bin/adlint_chk	2012-03-02 11:28:08.619702829 +0900
-@@ -36,7 +36,7 @@
- $bindir = Pathname.new(__FILE__).realpath.dirname
- $prefix = Pathname.new("..").expand_path($bindir)
- $libdir = Pathname.new("lib").expand_path($prefix)
--$etcdir = Pathname.new("etc").expand_path($prefix)
-+$etcdir = Pathname.new("etc/adlint").expand_path("/")
- 
- $stdout.set_encoding(Encoding.default_external)
- $stderr.set_encoding(Encoding.default_external)
-Index: adlint/bin/adlint_cma
-===================================================================
---- adlint.orig/bin/adlint_cma	2012-03-02 10:28:48.039548163 +0900
-+++ adlint/bin/adlint_cma	2012-03-02 11:28:22.111703359 +0900
-@@ -36,7 +36,7 @@
- $bindir = Pathname.new(__FILE__).realpath.dirname
- $prefix = Pathname.new("..").expand_path($bindir)
- $libdir = Pathname.new("lib").expand_path($prefix)
--$etcdir = Pathname.new("etc").expand_path($prefix)
-+$etcdir = Pathname.new("etc/adlint").expand_path("/")
- 
- $stdout.set_encoding(Encoding.default_external)
- $stderr.set_encoding(Encoding.default_external)
-Index: adlint/bin/adlint_sma
-===================================================================
---- adlint.orig/bin/adlint_sma	2012-03-02 10:28:48.039548163 +0900
-+++ adlint/bin/adlint_sma	2012-03-02 11:28:34.779703860 +0900
-@@ -36,7 +36,7 @@
- $bindir = Pathname.new(__FILE__).realpath.dirname
- $prefix = Pathname.new("..").expand_path($bindir)
- $libdir = Pathname.new("lib").expand_path($prefix)
--$etcdir = Pathname.new("etc").expand_path($prefix)
-+$etcdir = Pathname.new("etc/adlint").expand_path("/")
- 
- $stdout.set_encoding(Encoding.default_external)
- $stderr.set_encoding(Encoding.default_external)
-Index: adlint/bin/adlintize
-===================================================================
---- adlint.orig/bin/adlintize	2012-03-02 10:28:48.039548163 +0900
-+++ adlint/bin/adlintize	2012-03-02 11:28:44.731704252 +0900
-@@ -36,7 +36,7 @@
- $bindir = Pathname.new(__FILE__).realpath.dirname
- $prefix = Pathname.new("..").expand_path($bindir)
- $libdir = Pathname.new("lib").expand_path($prefix)
--$etcdir = Pathname.new("etc").expand_path($prefix)
-+$etcdir = Pathname.new("etc/adlint").expand_path("/")
- 
- $:.unshift($libdir.to_s)
- 
+Index: adlint/lib/adlint.rb
+===================================================================
+--- adlint.orig/lib/adlint.rb	2013-05-06 11:22:51.779959736 +0900
++++ adlint/lib/adlint.rb	2013-05-06 11:23:13.948068102 +0900
+@@ -74,5 +74,5 @@
+   Config[:libdir] = Pathname.new(__FILE__).realpath.dirname
+   Config[:prefix] = Pathname.new("..").expand_path(Config[:libdir])
+   Config[:bindir] = Pathname.new("bin").expand_path(Config[:prefix])
+-  Config[:etcdir] = Pathname.new("etc").expand_path(Config[:prefix])
++  Config[:etcdir] = Pathname.new("etc/adlint").expand_path('/')
+ end

-- 
adlint.git