[Pkg-cgit-commits] [pkg-cgit] 35/49: Use debians rst2html and hilight 3.x

[Peter Colberg]

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

pc-guest pushed a commit to branch master
in repository pkg-cgit.

commit 5352316b172951d9df18d3e1f3cf615059578d35
Author: Alexander Wirt <formorer at debian.org>
Date:   Mon Aug 10 22:14:30 2015 +0200

    Use debians rst2html and hilight 3.x
    
    Closes: #765806
---
 debian/patches/Use-debian-binary-name-rst2html     | 16 +++++++++++
 debian/patches/add-highlighting-rules-to-cgit.css  | 31 ++++++++++++++++++++++
 .../assume-highlight-version-3-in-filter-script    | 20 ++++++++++++++
 debian/patches/series                              |  3 +++
 4 files changed, 70 insertions(+)

diff --git a/debian/patches/Use-debian-binary-name-rst2html b/debian/patches/Use-debian-binary-name-rst2html
new file mode 100644
index 0000000..47387cd
--- /dev/null
+++ b/debian/patches/Use-debian-binary-name-rst2html
@@ -0,0 +1,16 @@
+From: =?UTF-8?q?Stefan=20B=C3=BChler?= <stbuehler at web.de>
+Date: Wed, 29 May 2013 14:34:15 +0200
+Subject: Use debian binary name rst2html
+
+---
+ filters/html-converters/rst2html |    2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/filters/html-converters/rst2html b/filters/html-converters/rst2html
+index c51f5be..a1ba574 100755
+--- a/filters/html-converters/rst2html
++++ b/filters/html-converters/rst2html
+@@ -1,2 +1,2 @@
+ #!/bin/sh
+-rst2html.py --template="$(dirname $0)/resources/rst-template.txt"
++rst2html --template="$(dirname $0)/resources/rst-template.txt"
diff --git a/debian/patches/add-highlighting-rules-to-cgit.css b/debian/patches/add-highlighting-rules-to-cgit.css
new file mode 100644
index 0000000..087e035
--- /dev/null
+++ b/debian/patches/add-highlighting-rules-to-cgit.css
@@ -0,0 +1,31 @@
+From: =?UTF-8?q?Stefan=20B=C3=BChler?= <stbuehler at web.de>
+Date: Wed, 29 May 2013 11:23:53 +0200
+Subject: add highlighting rules to cgit.css
+
+---
+ cgit.css |   17 +++++++++++++++++
+ 1 file changed, 17 insertions(+)
+
+--- a/cgit.css
++++ b/cgit.css
+@@ -809,3 +809,20 @@
+ div#cgit table.ssdiff td.space div {
+ 	min-height: 3em;
+ }
++
++/* Style definition file generated by highlight 3.9, http://www.andre-simon.de/ */
++/* Highlighting theme: Kwrite Editor */
++/* adapted for cgit */
++div#cgit table.blob .num { color:#b07e00; }
++div#cgit table.blob .esc { color:#ff00ff; }
++div#cgit table.blob .str { color:#bf0303; }
++div#cgit table.blob .pps { color:#818100; }
++div#cgit table.blob .slc { color:#838183; font-style:italic; }
++div#cgit table.blob .com { color:#838183; font-style:italic; }
++div#cgit table.blob .ppc { color:#008200; }
++div#cgit table.blob .opt { color:#000000; }
++div#cgit table.blob .lin { color:#555555; }
++div#cgit table.blob .kwa { color:#000000; font-weight:bold; }
++div#cgit table.blob .kwb { color:#0057ae; }
++div#cgit table.blob .kwc { color:#000000; font-weight:bold; }
++div#cgit table.blob .kwd { color:#010181; }
diff --git a/debian/patches/assume-highlight-version-3-in-filter-script b/debian/patches/assume-highlight-version-3-in-filter-script
new file mode 100644
index 0000000..4f0e4b1
--- /dev/null
+++ b/debian/patches/assume-highlight-version-3-in-filter-script
@@ -0,0 +1,20 @@
+From: =?UTF-8?q?Stefan=20B=C3=BChler?= <stbuehler at web.de>
+Date: Fri, 10 May 2013 09:53:00 +0200
+Subject: assume highlight version 3 in filter script
+
+---
+ filters/syntax-highlighting.sh |    4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+--- a/filters/syntax-highlighting.sh
++++ b/filters/syntax-highlighting.sh
+@@ -115,7 +115,7 @@
+ # found (for example) on EPEL 6.
+ #
+ # This is for version 2
+-exec highlight --force -f -I -X -S "$EXTENSION" 2>/dev/null
++#exec highlight --force -f -I -X -S "$EXTENSION" 2>/dev/null
+ 
+ # This is for version 3
+-#exec highlight --force -f -I -O xhtml -S "$EXTENSION" 2>/dev/null
++exec highlight --force -f -I -O xhtml -S "$EXTENSION" 2>/dev/null
diff --git a/debian/patches/series b/debian/patches/series
index f27658d..972d846 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -5,3 +5,6 @@
 debianize_makefile
 fix_status_code_for_unknown_repos
 hardening
+assume-highlight-version-3-in-filter-script
+add-highlighting-rules-to-cgit.css
+Use-debian-binary-name-rst2html

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