[DRE-commits] [origami] 11/19: use stuff from /usr/share/origami-pdf

[Antonio Terceiro]

This is an automated email from the git hooks/post-receive script.

terceiro pushed a commit to branch master
in repository origami.

commit 0a6c37b33625006319fa775425609e11b791e83c
Author: Antonio Terceiro <terceiro at softwarelivre.org>
Date:   Thu Nov 6 17:19:20 2014 -0200

    use stuff from /usr/share/origami-pdf
---
 debian/patches/paths.patch | 32 ++++++++++++++++++++++++++++++++
 debian/patches/series      |  1 +
 2 files changed, 33 insertions(+)

diff --git a/debian/patches/paths.patch b/debian/patches/paths.patch
new file mode 100644
index 0000000..86d503d
--- /dev/null
+++ b/debian/patches/paths.patch
@@ -0,0 +1,32 @@
+Description: Adjust paths to work against installed code
+ Packages in Debian must not put files in subdirectories of /usr/bin
+Author: Antonio Terceiro <terceiro at debian.org>
+Origin: vendor
+Forwarded: not-needed
+Last-Update: 2014-11-06
+---
+This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
+--- a/bin/pdfcop
++++ b/bin/pdfcop
+@@ -41,7 +41,7 @@ require 'yaml'
+ require 'rexml/document'
+ require 'digest/md5'
+ 
+-DEFAULT_CONFIG_FILE = "#{File.dirname(__FILE__)}/config/pdfcop.conf.yml"
++DEFAULT_CONFIG_FILE = "/etc/origami-pdf/pdfcop.conf.yml"
+ DEFAULT_POLICY = "standard"
+ SECURITY_POLICIES = {}
+ 
+--- a/bin/pdfsh
++++ b/bin/pdfsh
+@@ -6,8 +6,8 @@ rescue LoadError
+   abort "Error: you need to install irb to run this application."
+ end
+ 
+-$:.unshift "#{File.dirname(__FILE__)}/shell"
+-ENV["IRBRC"] = "#{File.dirname(__FILE__)}/shell/.irbrc"
++$:.unshift "/usr/share/origami-pdf/shell"
++ENV["IRBRC"] = "/usr/share/origami-pdf/shell/.irbrc"
+ 
+ IRB.start
+ 
diff --git a/debian/patches/series b/debian/patches/series
index 640e97b..af4353b 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1 +1,2 @@
 gemspec.patch
+paths.patch

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-ruby-extras/origami.git