[SCM] librdf-endpoint-perl Debian packaging branch, master, updated. debian/0.04-1-27-gaed461e

Tue Jun 12 21:02:09 UTC 2012

The following commit has been merged in the master branch:
commit 4626a8fedc0d3d66326000533e9778d113d58c96
Author: Jonas Smedegaard <dr at jones.dk>
Date:   Tue Jun 12 21:46:04 2012 +0200

    Add patch 1002 to fix serve HTML-friendly XHTML, and improve patch 1001 to include Codemirror config inline. Thanks to Toby Inkster.

diff --git a/debian/patches/1001_use_codemirror2.patch b/debian/patches/1001_use_codemirror2.patch
index 8f11935..dd8bb8c 100644
--- a/debian/patches/1001_use_codemirror2.patch
+++ b/debian/patches/1001_use_codemirror2.patch
@@ -4,7 +4,7 @@ Last-Update: 2012-06-12
 
 --- a/share/index.html
 +++ b/share/index.html
-@@ -3,10 +3,11 @@
+@@ -3,10 +3,19 @@
  <html xmlns="http://www.w3.org/1999/xhtml">
  <head>
  	<title>SPARQL</title>
@@ -15,11 +15,19 @@ Last-Update: 2012-06-12
 -	<script type="text/javascript" src="/js/sparql_form.js"></script>
 +	<script type="text/javascript" src="/js/codemirror/codemirror.js"></script>
 +	<script type="text/javascript" src="/js/codemirror/mode/sparql/sparql.js"></script>
-+	<script type="text/javascript" src="/js/codemirror-config.js"></script>
++<script type="text/javascript">
++function init() {
++	var editor = CodeMirror.fromTextArea(document.getElementById("query"), {
++		mode: "application/x-sparql-query",
++		tabMode: "indent",
++		matchBrackets: true
++	});
++}
++</script>
  <style type="text/css">
  <!--
  tr:nth-child(odd) {
-@@ -21,7 +22,7 @@
+@@ -21,7 +30,7 @@
  }
  // -->
  </style>
@@ -28,13 +36,3 @@ Last-Update: 2012-06-12
  	<form id="queryform" action="" method="get">
  	<p>
  		<textarea id="query" name="query" rows="10" cols="60">
---- /dev/null
-+++ b/share/www/js/codemirror-config.js
-@@ -0,0 +1,7 @@
-+function init() {
-+	var editor = CodeMirror.fromTextArea(document.getElementById("query"), {
-+		mode: "application/x-sparql-query",
-+		tabMode: "indent",
-+		matchBrackets: true
-+	});
-+}
diff --git a/debian/patches/1002_fix_serve_html-friendly-xhtml.patch b/debian/patches/1002_fix_serve_html-friendly-xhtml.patch
new file mode 100644
index 0000000..330528a
--- /dev/null
+++ b/debian/patches/1002_fix_serve_html-friendly-xhtml.patch
@@ -0,0 +1,15 @@
+Description: Fix serve HTML-friendly XHTML
+Author: Jonas Smedegaard <dr at jones.dk>
+Last-Update: 2012-06-12
+
+--- a/lib/RDF/Endpoint.pm
++++ b/lib/RDF/Endpoint.pm
+@@ -413,7 +413,7 @@
+ 			my $gen			= RDF::RDFa::Generator->new( style => 'HTML::Head', namespaces => { %$ns } );
+ 			$gen->inject_document($doc, $sdmodel);
+ 			
+-			my $writer	= HTML::HTML5::Writer->new( markup => 'xhtml', doctype => DOCTYPE_XHTML_RDFA );
++			my $writer	= HTML::HTML5::Writer->new( markup => 'xhtml', polyglot => 1, doctype => DOCTYPE_XHTML_RDFA );
+ 			$content	= encode_utf8( $writer->document($doc) );
+ 			$response->status(200);
+ 			$response->headers->content_type('text/html');
diff --git a/debian/patches/series b/debian/patches/series
index 157c434..4c176f7 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1 +1,2 @@
 1001_use_codemirror2.patch
+1002_fix_serve_html-friendly-xhtml.patch

-- 
librdf-endpoint-perl Debian packaging

