[DRE-commits] [SCM] mdpress.git branch, master, updated. upstream/0.0.12-14-gceee563

[Cédric Boutillier]

The following commit has been merged in the master branch:
commit 390cb5f857f39d0a7a5c3a5575fc909ebee40ebe
Author: Cédric Boutillier <boutil at debian.org>
Date:   Sun Jun 16 11:32:38 2013 +0200

    several patches

diff --git a/debian/patches/change_basedir.patch b/debian/patches/change_basedir.patch
new file mode 100644
index 0000000..66a95ec
--- /dev/null
+++ b/debian/patches/change_basedir.patch
@@ -0,0 +1,17 @@
+Description: use /usr/share/mdpress as base_dir
+Origin: vendor
+Author: Cédric Boutillier <boutil at debian.org>
+Forwarded: not-needed
+Last-Update: 2013-06-16
+
+--- a/bin/mdpress
++++ b/bin/mdpress
+@@ -14,7 +14,7 @@
+ end
+ 
+ def base_dir
+-  File.dirname(__FILE__) + "/../lib/"
++  "/usr/share/mdpress/"
+ end
+ 
+ def list_available_stylesheets
diff --git a/debian/patches/copy_system_js_libs.patch b/debian/patches/copy_system_js_libs.patch
new file mode 100644
index 0000000..ffd2123
--- /dev/null
+++ b/debian/patches/copy_system_js_libs.patch
@@ -0,0 +1,25 @@
+Description: copy system javascript libraries and css files
+ instead of the embedded ones that are removed from the upstream tarball
+Origin: vendor
+Author: Cédric Boutillier <boutil at debian.org>
+Last-Update: 2013-06-16
+--- a/bin/mdpress
++++ b/bin/mdpress
+@@ -140,8 +140,15 @@
+ render OPTS
+ 
+ log "copying files"
+-FileUtils.cp_r(base_dir + "js", DIRNAME)
+-FileUtils.cp_r(base_dir + "css", DIRNAME)
++#FileUtils.cp_r(base_dir + "js", DIRNAME)
++# copy JavaScript files from libjs-impress and libjs-highlight
++Dir.mkdir(DIRNAME+"/js") unless File.directory?(DIRNAME+"/js")
++FileUtils.cp("/usr/share/javascript/impress/impress.js", DIRNAME+"/js/")
++FileUtils.cp("/usr/share/javascript/highlight/highlight.min.js", DIRNAME+"/js/highlight.pack.js")
++Dir.mkdir(DIRNAME+"/css") unless File.directory?(DIRNAME+"/css")
++Dir.glob(base_dir+"css/*").each do |f|
++  FileUtils.cp_r(f, DIRNAME+"/css", :dereference_root => true)
++end
+ FileUtils.cp(STYLESHEET, DIRNAME + "/css/style.css")
+ 
+ def auto
diff --git a/debian/patches/remove_rubygems.patch b/debian/patches/remove_rubygems.patch
new file mode 100644
index 0000000..a92e57c
--- /dev/null
+++ b/debian/patches/remove_rubygems.patch
@@ -0,0 +1,15 @@
+Description: do not use rubygems
+Origin: vendor
+Author: Cédric Boutillier <boutil at debian.org>
+Forwarded: not-needed
+Last-Update: 2013-06-16
+
+--- a/bin/mdpress
++++ b/bin/mdpress
+@@ -1,5 +1,5 @@
+ #!/usr/bin/env ruby
+-require 'rubygems'
++#require 'rubygems'
+ require 'redcarpet'
+ require 'fileutils'
+ require 'impress_renderer'
diff --git a/debian/patches/replace_launchy.patch b/debian/patches/replace_launchy.patch
new file mode 100644
index 0000000..c06a9f8
--- /dev/null
+++ b/debian/patches/replace_launchy.patch
@@ -0,0 +1,27 @@
+Description: replace for the moment ruby-launchy by xdg-open
+ ruby-launchy is not packaged yet, and it is not critical here.
+Author: Cédric Boutillier <boutil at debian.org>
+Origin: vendor
+Forwarded: not-needed
+Last-Update: 2013-06-16
+
+--- a/bin/mdpress
++++ b/bin/mdpress
+@@ -5,7 +5,7 @@
+ require 'impress_renderer'
+ require 'trollop'
+ require 'tempfile'
+-require 'launchy'
++#require 'launchy'
+ 
+ THEMES_DIRNAME = './themes/'
+ 
+@@ -168,7 +168,7 @@
+   end
+ elsif OPTS[:run]
+   log "opening in browser."
+-  Launchy.open(DIRNAME + "/index.html", :application => :browser)
++  `xdg-open #{DIRNAME + "/index.html"}`
+ else
+   log "done."
+ end
diff --git a/debian/patches/series b/debian/patches/series
new file mode 100644
index 0000000..d9b0501
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1,4 @@
+remove_rubygems.patch
+replace_launchy.patch
+change_basedir.patch
+copy_system_js_libs.patch

-- 
mdpress.git