[DRE-commits] [origami-pdf] 05/14: update patches
Antonio Terceiro
terceiro at moszumanska.debian.org
Fri Oct 28 19:31:14 UTC 2016
This is an automated email from the git hooks/post-receive script.
terceiro pushed a commit to branch master
in repository origami-pdf.
commit ed5e5fccbc52482bc6c3f75220394729861df5a5
Author: Antonio Terceiro <terceiro at debian.org>
Date: Fri Oct 28 16:56:59 2016 -0200
update patches
---
debian/changelog | 2 +
...just-paths-to-work-against-installed-code.patch | 50 ++++++
debian/patches/dont_include_before_requiring.patch | 199 ---------------------
debian/patches/paths.patch | 42 -----
debian/patches/series | 3 +-
5 files changed, 53 insertions(+), 243 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index 327c059..8ba2ddf 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -8,6 +8,8 @@ origami-pdf (2.0.0-1) UNRELEASED; urgency=medium
+ refresh debian/rules to make gem2deb-test-runner check dependencies
during build.
* debian/patches/gemspec.patch: dropped, not needed anymore
+ * debian/patches/dont_include_before_requiring.patch: dropped, not needed
+ anymore
-- Antonio Terceiro <terceiro at debian.org> Fri, 28 Oct 2016 16:35:27 -0200
diff --git a/debian/patches/0001-Adjust-paths-to-work-against-installed-code.patch b/debian/patches/0001-Adjust-paths-to-work-against-installed-code.patch
new file mode 100644
index 0000000..a187502
--- /dev/null
+++ b/debian/patches/0001-Adjust-paths-to-work-against-installed-code.patch
@@ -0,0 +1,50 @@
+From: Antonio Terceiro <terceiro at debian.org>
+Date: Fri, 28 Oct 2016 16:46:14 -0200
+Subject: Adjust paths to work against installed code
+
+Packages in Debian must not put files in subdirectories of /usr/bin
+---
+ bin/pdfcop | 2 +-
+ bin/pdfsh | 4 ++--
+ bin/pdfwalker | 2 +-
+ 3 files changed, 4 insertions(+), 4 deletions(-)
+
+diff --git a/bin/pdfcop b/bin/pdfcop
+index d87041c..c001f4b 100755
+--- a/bin/pdfcop
++++ b/bin/pdfcop
+@@ -39,7 +39,7 @@ require 'rexml/document'
+ require 'digest/md5'
+ require 'colorize'
+
+-DEFAULT_CONFIG_FILE = "#{File.dirname(__FILE__)}/config/pdfcop.conf.yml"
++DEFAULT_CONFIG_FILE = "/etc/origami/pdfcop.conf.yml"
+ DEFAULT_POLICY = "standard"
+ SECURITY_POLICIES = {}
+
+diff --git a/bin/pdfsh b/bin/pdfsh
+index 035d76d..a6ad2b6 100755
+--- a/bin/pdfsh
++++ b/bin/pdfsh
+@@ -6,7 +6,7 @@ rescue LoadError
+ abort "Error: you need to install irb to run this application."
+ end
+
+-$:.unshift File.join(__dir__, 'shell')
+-ENV["IRBRC"] = File.join(__dir__, "shell", ".irbrc")
++$:.unshift "/usr/share/origami/shell"
++ENV["IRBRC"] = "/usr/share/origami/shell/.irbrc"
+
+ IRB.start
+diff --git a/bin/pdfwalker b/bin/pdfwalker
+index d0c64e2..32b920e 100755
+--- a/bin/pdfwalker
++++ b/bin/pdfwalker
+@@ -1,6 +1,6 @@
+ #!/usr/bin/env ruby
+
+-$:.unshift(__dir__)
++$:.unshift "/usr/share/origami"
+ require 'gui/walker'
+
+ PDFWalker::Walker.start(ARGV[0])
diff --git a/debian/patches/dont_include_before_requiring.patch b/debian/patches/dont_include_before_requiring.patch
deleted file mode 100644
index bcec5b9..0000000
--- a/debian/patches/dont_include_before_requiring.patch
+++ /dev/null
@@ -1,199 +0,0 @@
-Description: don't include modules at the global namespace before requiring libraries
- This does not work on Ruby 2.2+. See the bug report at the Ruby upstream bug
- tracker: https://bugs.ruby-lang.org/issues/11714#change-54967
-Author: Antonio Terceiro
-Origin: vendor
-Bug-Debian: https://bugs.debian.org/806133
-Forwarded: no
-Last-Update: 2015-12-03
----
-This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
---- a/bin/gui/walker.rb
-+++ b/bin/gui/walker.rb
-@@ -30,7 +30,6 @@ begin
- rescue LoadError
- abort('Error: you need to install ruby-gtk2 to run this application')
- end
--include Gtk
-
- begin
- require 'origami'
-@@ -40,6 +39,8 @@ rescue LoadError
- require 'origami'
- end
-
-+include Gtk
-+
- require 'gui/menu'
- require 'gui/about'
- require 'gui/file'
---- a/bin/pdf2graph
-+++ b/bin/pdf2graph
-@@ -31,10 +31,11 @@ rescue LoadError
- $: << ORIGAMIDIR
- require 'origami'
- end
--include Origami
-
- require 'optparse'
-
-+include Origami
-+
- class OptParser
- BANNER = <<USAGE
- Usage: #{$0} <PDF-file> [-f <format>] [-o <output-file>]
---- a/bin/pdf2pdfa
-+++ b/bin/pdf2pdfa
-@@ -32,9 +32,10 @@ rescue LoadError
- $: << ORIGAMIDIR
- require 'origami'
- end
-+require 'optparse'
-+
- include Origami
-
--require 'optparse'
-
- class OptParser
- BANNER = <<USAGE
---- a/bin/pdfcocoon
-+++ b/bin/pdfcocoon
-@@ -31,10 +31,11 @@ rescue LoadError
- $: << ORIGAMIDIR
- require 'origami'
- end
--include Origami
-
- require 'optparse'
-
-+include Origami
-+
- class OptParser
- BANNER = <<USAGE
- Usage: #{$0} [<PDF-file>] [-o <output-file>]
---- a/bin/pdfcop
-+++ b/bin/pdfcop
-@@ -34,13 +34,14 @@ rescue LoadError
- $: << ORIGAMIDIR
- require 'origami'
- end
--include Origami
-
- require 'optparse'
- require 'yaml'
- require 'rexml/document'
- require 'digest/md5'
-
-+include Origami
-+
- DEFAULT_CONFIG_FILE = "/etc/origami/pdfcop.conf.yml"
- DEFAULT_POLICY = "standard"
- SECURITY_POLICIES = {}
---- a/bin/pdfdecompress
-+++ b/bin/pdfdecompress
-@@ -31,10 +31,11 @@ rescue LoadError
- $: << ORIGAMIDIR
- require 'origami'
- end
--include Origami
-
- require 'optparse'
-
-+include Origami
-+
- class OptParser
- BANNER = <<USAGE
- Usage: #{$0} [<PDF-file>] [-p <password>] [-o <output-file>]
---- a/bin/pdfdecrypt
-+++ b/bin/pdfdecrypt
-@@ -31,10 +31,11 @@ rescue LoadError
- $: << ORIGAMIDIR
- require 'origami'
- end
--include Origami
-
- require 'optparse'
-
-+include Origami
-+
- class OptParser
- BANNER = <<USAGE
- Usage: #{$0} [<PDF-file>] [-p <password>] [-o <output-file>]
---- a/bin/pdfencrypt
-+++ b/bin/pdfencrypt
-@@ -31,10 +31,10 @@ rescue LoadError
- $: << ORIGAMIDIR
- require 'origami'
- end
--include Origami
--
- require 'optparse'
-
-+include Origami
-+
- class OptParser
- BANNER = <<USAGE
- Usage: #{$0} [<PDF-file>] [-p <password>] [-c <cipher>] [-s <key-size>] [--hardened] [-o <output-file>]
---- a/bin/pdfexplode
-+++ b/bin/pdfexplode
-@@ -30,11 +30,12 @@ rescue LoadError
- $: << ORIGAMIDIR
- require 'origami'
- end
--include Origami
-
- require 'optparse'
- require 'rexml/document'
-
-+include Origami
-+
- class OptParser
- BANNER = <<USAGE
- Usage: #{$0} <PDF-file> [-r <range>] [-t pages|rsrc] [-d <output-directory>]
---- a/bin/pdfextract
-+++ b/bin/pdfextract
-@@ -34,11 +34,12 @@ rescue LoadError
- $: << ORIGAMIDIR
- require 'origami'
- end
--include Origami
-
- require 'optparse'
- require 'rexml/document'
-
-+include Origami
-+
- class OptParser
- BANNER = <<USAGE
- Usage: #{$0} <PDF-file> [-afjms] [-d <output-directory>]
---- a/bin/pdfmetadata
-+++ b/bin/pdfmetadata
-@@ -31,10 +31,11 @@ rescue LoadError
- $: << ORIGAMIDIR
- require 'origami'
- end
--include Origami
-
- require 'optparse'
-
-+include Origami
-+
- class OptParser
- BANNER = <<USAGE
- Usage: #{$0} [<PDF-file>] [-i] [-x]
---- a/bin/shell/.irbrc
-+++ b/bin/shell/.irbrc
-@@ -5,11 +5,12 @@ rescue LoadError
- $: << ORIGAMIDIR
- require 'origami'
- end
--include Origami
-
- require 'console.rb'
- require 'readline'
-
-+include Origami
-+
- OPENSSL_SUPPORT = (defined?(OpenSSL).nil?) ? 'no' : 'yes'
- JAVASCRIPT_SUPPORT = (defined?(PDF::JavaScript::Engine).nil?) ? 'no' : 'yes'
- DEFAULT_BANNER = "Welcome to the PDF shell (Origami release #{Origami::VERSION}) [OpenSSL: #{OPENSSL_SUPPORT}, JavaScript: #{JAVASCRIPT_SUPPORT}]\n\n"
diff --git a/debian/patches/paths.patch b/debian/patches/paths.patch
deleted file mode 100644
index 09f427a..0000000
--- a/debian/patches/paths.patch
+++ /dev/null
@@ -1,42 +0,0 @@
-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/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/shell"
-+ENV["IRBRC"] = "/usr/share/origami/shell/.irbrc"
-
- IRB.start
-
---- a/bin/pdfwalker
-+++ b/bin/pdfwalker
-@@ -1,6 +1,6 @@
- #!/usr/bin/env ruby
-
--$:.unshift "#{File.dirname(__FILE__)}"
-+$:.unshift "/usr/share/origami"
- require 'gui/walker'
-
- PDFWalker::Walker.start(ARGV[0])
diff --git a/debian/patches/series b/debian/patches/series
index 2468612..033b4ce 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1 @@
-paths.patch
-dont_include_before_requiring.patch
+0001-Adjust-paths-to-work-against-installed-code.patch
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-ruby-extras/origami-pdf.git
More information about the Pkg-ruby-extras-commits
mailing list