Package: opencl-1.2-html-doc Version: 1.0~svn22836-1 Tags: patch Control: tags 735653 patch
The index.html from this package has 3 frames whose contents are all missing because get-orig-source deletes them, and a favicon which is an inline link to the Khronos website, which is now discouraged (http://lintian.debian.org/tags/privacy-breach-logo.html).
The attached patch is the Debian directory only: as the fix is partly in get-orig-source, rerunning this is required. It also includes a fix for a broken build script in current upstream, and one to allow building with Ruby 1.9+ (#735653).
diff -uprN /home/palmer/fs_dev/khronos-opencl-man-1.0~svn22836/debian/changelog /home/palmer/fs_dev/khronos-opencl-man-1.0~svn25290/debian/changelog --- /home/palmer/fs_dev/khronos-opencl-man-1.0~svn22836/debian/changelog 2013-08-26 13:20:15.000000000 +0100 +++ /home/palmer/fs_dev/khronos-opencl-man-1.0~svn25290/debian/changelog 2014-02-11 12:27:54.999709030 +0000 @@ -1,3 +1,13 @@ +khronos-opencl-man (1.0~svn25290-1) UNRELEASED; urgency=low + + * Explicitly set text encoding to UTF-8 to allow building with newer + Ruby versions. Closes: #735653. + * Do not delete Opencl_header.html, Opencl_tofc.html, + oclRefPages-Title.html + * Remove runtime-fetched favicon. Closes: $this_bug + + -- Rebecca Palmer <r.pal...@bham.ac.uk> Mon, 10 Feb 2014 22:32:21 +0000 + khronos-opencl-man (1.0~svn22836-1) unstable; urgency=low * Do not delete index.html, remove lintian error diff -uprN /home/palmer/fs_dev/khronos-opencl-man-1.0~svn22836/debian/control /home/palmer/fs_dev/khronos-opencl-man-1.0~svn25290/debian/control --- /home/palmer/fs_dev/khronos-opencl-man-1.0~svn22836/debian/control 2013-08-26 13:07:31.000000000 +0100 +++ /home/palmer/fs_dev/khronos-opencl-man-1.0~svn25290/debian/control 2014-02-11 11:30:19.831799600 +0000 @@ -3,7 +3,7 @@ Section: doc Priority: extra Maintainer: Debian OpenCL Maintainers <pkg-opencl-de...@lists.alioth.debian.org> Uploaders: Mathieu Malaterre <ma...@debian.org>, Giuseppe Bilotta <giuseppe.bilo...@gmail.com> -Build-Depends: debhelper (>= 9), docbook-mathml (>= 1.1~), w3-dtd-mathml, docbook-xsl, xsltproc, ruby1.8 +Build-Depends: debhelper (>= 9), docbook-mathml (>= 1.1~), w3-dtd-mathml, docbook-xsl, xsltproc, ruby Standards-Version: 3.9.4 Homepage: http://www.khronos.org/registry/cl/sdk/1.2/docs/man/xhtml/ Vcs-Svn: svn://anonscm.debian.org/pkg-nvidia/packages/khronos-opencl-man/trunk diff -uprN /home/palmer/fs_dev/khronos-opencl-man-1.0~svn22836/debian/get-orig-source /home/palmer/fs_dev/khronos-opencl-man-1.0~svn25290/debian/get-orig-source --- /home/palmer/fs_dev/khronos-opencl-man-1.0~svn22836/debian/get-orig-source 2013-05-30 14:00:51.000000000 +0100 +++ /home/palmer/fs_dev/khronos-opencl-man-1.0~svn25290/debian/get-orig-source 2014-02-10 22:07:47.146486236 +0000 @@ -23,7 +23,7 @@ URL=https://cvs.khronos.org/svn/repos/re svn export --quiet --revision ${REVISION} ${URL} ${FOLDER} # we will re-generate them anyway: -find ${FOLDER}/xhtml -name \*.html -not -name index.html -delete +find ${FOLDER}/xhtml -name \*.html -not -name index.html -not -name Opencl_header.html -not -name Opencl_tofc.html -not -name oclRefPages-Title.html -delete URL2=https://cvs.khronos.org/svn/repos/ogl/trunk/ecosystem/public/sdk/docs/man4 cd ${FOLDER} diff -uprN /home/palmer/fs_dev/khronos-opencl-man-1.0~svn22836/debian/patches/fix_dir_name.patch /home/palmer/fs_dev/khronos-opencl-man-1.0~svn25290/debian/patches/fix_dir_name.patch --- /home/palmer/fs_dev/khronos-opencl-man-1.0~svn22836/debian/patches/fix_dir_name.patch 1970-01-01 01:00:00.000000000 +0100 +++ /home/palmer/fs_dev/khronos-opencl-man-1.0~svn25290/debian/patches/fix_dir_name.patch 2014-02-11 12:46:44.311679427 +0000 @@ -0,0 +1,17 @@ +Description: Fix directory name error +Author: Rebecca Palmer +Forwarded: no +Last-Update: 2014-02-10 + +--- khronos-opencl-man-1.0~svn21772.orig/Makefile ++++ khronos-opencl-man-1.0~svn21772/Makefile +@@ -36,7 +36,7 @@ COMMONPREF = standard + include $(ROOT)/usr/include/make/commondefs + + SUBDIRS = \ +- html \ ++ xhtml \ + $(NULL) + + default $(ALLTARGS): $(_FORCE) + diff -uprN /home/palmer/fs_dev/khronos-opencl-man-1.0~svn22836/debian/patches/privacy_remove_favicon.patch /home/palmer/fs_dev/khronos-opencl-man-1.0~svn25290/debian/patches/privacy_remove_favicon.patch --- /home/palmer/fs_dev/khronos-opencl-man-1.0~svn22836/debian/patches/privacy_remove_favicon.patch 1970-01-01 01:00:00.000000000 +0100 +++ /home/palmer/fs_dev/khronos-opencl-man-1.0~svn25290/debian/patches/privacy_remove_favicon.patch 2014-02-10 22:18:26.966467331 +0000 @@ -0,0 +1,22 @@ +Description: Remove favicon + +The favicon in index.html is fetched from upstream every time the +document is opened, which is now discouraged in Debian for privacy +reasons (http://lintian.debian.org/tags/privacy-breach-logo.html) + +The 'o' from KhronosLogo.jpg could be used to replace it, +but I can't be bothered right now. + +Author: Rebecca Palmer +Forwarded: not-needed + +--- khronos-opencl-man-1.0~svn22836.orig/xhtml/index.html ++++ khronos-opencl-man-1.0~svn22836/xhtml/index.html +@@ -2,7 +2,6 @@ + <html> + <head> + <title>OpenCL 1.2 Reference Pages</title> +-<link rel="Shortcut Icon" href="http://www.khronos.org/favicon.ico" type="image/x-icon" /> + </HEAD> + <frameset rows="85,*"> + <frame src="Opencl_header.html" scrolling="no" noresize frameborder="0" marginwidth="0" marginheight="0"> diff -uprN /home/palmer/fs_dev/khronos-opencl-man-1.0~svn22836/debian/patches/series /home/palmer/fs_dev/khronos-opencl-man-1.0~svn25290/debian/patches/series --- /home/palmer/fs_dev/khronos-opencl-man-1.0~svn22836/debian/patches/series 2013-05-30 13:28:40.000000000 +0100 +++ /home/palmer/fs_dev/khronos-opencl-man-1.0~svn25290/debian/patches/series 2014-02-11 12:44:59.495682175 +0000 @@ -1,2 +1,5 @@ #addingmanpages.patch +fix_dir_name.patch addingmanpages2.patch +privacy_remove_favicon.patch +set_encoding.patch diff -uprN /home/palmer/fs_dev/khronos-opencl-man-1.0~svn22836/debian/patches/set_encoding.patch /home/palmer/fs_dev/khronos-opencl-man-1.0~svn25290/debian/patches/set_encoding.patch --- /home/palmer/fs_dev/khronos-opencl-man-1.0~svn22836/debian/patches/set_encoding.patch 1970-01-01 01:00:00.000000000 +0100 +++ /home/palmer/fs_dev/khronos-opencl-man-1.0~svn25290/debian/patches/set_encoding.patch 2014-02-11 12:47:00.827678994 +0000 @@ -0,0 +1,19 @@ +Description: Explicitly set text encoding + +(In Ruby 1.9+ without this, you get the message +./pageNumberLookup.rb:229:in `match': invalid byte sequence in US-ASCII (ArgumentError) +and a "successfully" built but nearly empty package) + +Author: Rebecca Palmer +Bug-Debian: http://bugs.debian.org/735653 +Forwarded: no + + +--- khronos-opencl-man-1.0~svn25290.orig/xhtml/pageNumberLookup.rb ++++ khronos-opencl-man-1.0~svn25290/xhtml/pageNumberLookup.rb +@@ -1,4 +1,4 @@ +-#!/usr/bin/ruby ++#!/usr/bin/ruby -EUTF-8 + + # for Ruby 1.9 +