Your message dated Fri, 15 Aug 2014 17:50:06 +0000 with message-id <[email protected]> and subject line Bug#757680: fixed in ikiwiki 3.20140815 has caused the Debian Bug report #757680, regarding ikiwiki: support for multiple language definition directories for highlight to be marked as done.
This means that you claim that the problem has been dealt with. If this is not the case it is now your responsibility to reopen the Bug report if necessary, and/or fix the problem forthwith. (NB: If you are a system administrator and have no idea what this message is talking about, this may indicate a serious mail system misconfiguration somewhere. Please contact [email protected] immediately.) -- 757680: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=757680 Debian Bug Tracking System Contact [email protected] with problems
--- Begin Message ---Package: ikiwiki Version: 3.20140613 Severity: wishlist Tags: patch -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA256 The second patch mentioned in http://ikiwiki.info/bugs/Please_update_highlight_plugin_for_highlight_3.18/ is not really needed for fixing the crash, but it is needed to make the support for search paths of language definitions accessible from ikiwiki. - -- System Information: Debian Release: jessie/sid APT prefers testing APT policy: (900, 'testing') Architecture: amd64 (x86_64) Kernel: Linux 3.14-1-amd64 (SMP w/4 CPU cores) Locale: LANG=en_CA.UTF-8, LC_CTYPE=en_CA.UTF-8 (charmap=UTF-8) Shell: /bin/sh linked to /bin/dash Versions of packages ikiwiki depends on: ii libhtml-parser-perl 3.71-1+b1 ii libhtml-scrubber-perl 0.11-1 ii libhtml-template-perl 2.95-1 ii libjson-perl 2.61-1 ii libtext-markdown-discount-perl 0.11-1 ii liburi-perl 1.60-1 ii libyaml-libyaml-perl 0.41-5 ii perl 5.18.2-7 Versions of packages ikiwiki recommends: ii bzr 2.6.0+bzr6595-1 ii darcs 2.8.4-3+b2 ii gcc [c-compiler] 4:4.9.0-4 ii gcc-4.6 [c-compiler] 4.6.4-7 ii gcc-4.9 [c-compiler] 4.9.0-7 ii git [git-core] 1:2.0.1-1 ii git-core 1:2.0.1-1 ii libauthen-passphrase-perl 0.008-1 ii libc6-dev [libc-dev] 2.19-7 ii libcgi-formbuilder-perl 3.08-2 ii libcgi-session-perl 4.48-1 ii libcrypt-ssleay-perl 0.58-1+b1 ii libgravatar-url-perl 1.06-1 ii liblwpx-paranoidagent-perl 1.10-3 ii libmail-sendmail-perl 0.79.16-1 ii libnet-openid-consumer-perl 1.15-1 ii librpc-xml-perl 0.78-1 ii libterm-readline-gnu-perl 1.24-2 ii libtimedate-perl 2.3000-2 ii libxml-simple-perl 2.20-1 ii mercurial 3.0.1-1 ii subversion 1.8.9-1 Versions of packages ikiwiki suggests: ii dvipng 1.14-2 ii file 1:5.19-1 ii gettext 0.18.3.2-3 ii graphviz 2.26.3-17.1 ii libfile-mimeinfo-perl 0.26-1 ii libhighlight-perl 3.18-2 ii libhtml-tree-perl 5.03-1 ii liblocale-gettext-perl 1.05-8 ii libmailtools-perl 2.12-1 pn libnet-amazon-s3-perl <none> pn libnet-inet6glue-perl <none> pn libsearch-xapian-perl <none> ii libsort-naturally-perl 1.03-1 pn libsparkline-php <none> ii libtext-csv-perl 1.32-1 pn libtext-multimarkdown-perl <none> pn libtext-textile-perl <none> pn libtext-typography-perl <none> pn libtext-wikicreole-perl <none> pn libtext-wikiformat-perl <none> pn libxml-feed-perl <none> ii libxml-writer-perl 0.625-1 ii perlmagick 8:6.7.7.10+dfsg-4 pn po4a <none> pn polygen <none> ii python 2.7.6-2 ii python-docutils 0.11-3 ii texlive 2014.20140626-1 pn tidy <none> pn viewvc | gitweb | viewcvs <none> pn xapian-omega <none> - -- no debconf information -----BEGIN PGP SIGNATURE----- Version: GnuPG v1 iQGcBAEBCAAGBQJT51rwAAoJEPIClx2kp54sJrEL/33x7dDJY+eMMqBaGgJOnlKV DVLtrCUnZXX21DsHVKZ48iEVpCYvXQlQEzvxvuQPC4LSTKhcTHWDBmWRxbWaO/wV kr6LIBk1hQUqvtWfwHUQYDQPef0PTBzGswVeZ8FnhrbiSGwcJzaQNTcxqTC/VxPO QijBvGW/8KJy/cNihvSA/GNgAeEze217dhh+YNuI9wqP+ILcoPWHDx/czVzYGMEo Tv0W0Qb+JrWiDYQ6IhqycS9C4A1un7jCVKZJ4oyMm8xb1ErJ6YUwoCrYuDNNMXuN Z2bxrZnKxx9tmRpsZxsqErZD+LJCI+93bvTqumd1FZ+TfiYxfDm2xCVilhPkUne9 op5x8dUBOJ1tpKyPeh/YHHYjAA1x6kiqgSzfHZ8BAnSaz9OepdaoC4Q1F0UbxAde Qeka1geoaWf4RupjHpVt/QZ/Bs1XV5g2juQb4M37IclvcLmPvR12p3xVMFra3dvp NZhBlea31cdUFV0EKYPWF8pVa2phr6vuzH7aYsRDjw== =RcLu -----END PGP SIGNATURE----->From adbc9cb8d6a6001bd63da7e68ebc31b71e522225 Mon Sep 17 00:00:00 2001 From: David Bremner <[email protected]> Date: Mon, 4 Aug 2014 12:26:52 -0300 Subject: [PATCH 2/2] Plugins::highlight: replace use of langdefdir with searchFile In recent versions of highlight there can be more than one langdefdir. This patch fixes the ensuing hilarity when the user adds a single highlight lang definition and highlight.pm expects all definitions to be in the same place. --- IkiWiki/Plugin/highlight.pm | 20 +++++++++++++++----- 1 file changed, 15 insertions(+), 5 deletions(-) diff --git a/IkiWiki/Plugin/highlight.pm b/IkiWiki/Plugin/highlight.pm index 0aa7386..ce91974 100644 --- a/IkiWiki/Plugin/highlight.pm +++ b/IkiWiki/Plugin/highlight.pm @@ -72,10 +72,10 @@ sub checkconfig () { $data_dir -> getConfDir() . "/filetypes.conf"; } } + # note that this is only used for old versions of highlight + # where $data_dir will not be defined. if (! exists $config{langdefdir}) { - $config{langdefdir}= - ($data_dir ? $data_dir->getLangPath("") - : "/usr/share/highlight/langDefs"); + $config{langdefdir}= "/usr/share/highlight/langDefs"; } if (exists $config{tohighlight} && read_filetypes()) { @@ -155,17 +155,27 @@ sub read_filetypes () { } +sub searchlangdef { + my $lang=shift; + + if ($data_dir) { + return $data_dir->getLangPath($lang . ".lang"); + } else { + return "$config{langdefdir}/$lang.lang"; + } + +} # Given a filename extension, determines the language definition to # use to highlight it. sub ext2langfile ($) { my $ext=shift; - my $langfile="$config{langdefdir}/$ext.lang"; + my $langfile=searchlangdef($ext); return $langfile if exists $highlighters{$langfile}; read_filetypes() unless $filetypes_read; if (exists $ext2lang{$ext}) { - return "$config{langdefdir}/$ext2lang{$ext}.lang"; + return searchlangdef($ext2lang{$ext}); } # If a language only has one common extension, it will not # be listed in filetypes, so check the langfile. -- 2.0.1
--- End Message ---
--- Begin Message ---Source: ikiwiki Source-Version: 3.20140815 We believe that the bug you reported is fixed in the latest version of ikiwiki, which is due to be installed in the Debian FTP archive. A summary of the changes between this version and the previous one is attached. Thank you for reporting the bug, which will now be closed. If you have further comments please address them to [email protected], and the maintainer will reopen the bug report if appropriate. Debian distribution maintenance software pp. Joey Hess <[email protected]> (supplier of updated ikiwiki package) (This message was generated automatically at their request; if you believe that there is a problem with it please contact the archive administrators by mailing [email protected]) -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 Format: 1.8 Date: Fri, 15 Aug 2014 12:58:08 -0400 Source: ikiwiki Binary: ikiwiki Architecture: source all Version: 3.20140815 Distribution: unstable Urgency: medium Maintainer: Joey Hess <[email protected]> Changed-By: Joey Hess <[email protected]> Description: ikiwiki - a wiki compiler Closes: 757679 757680 Changes: ikiwiki (3.20140815) unstable; urgency=medium . * Add google back to openid selector. Apparently this has gotten a stay of execution until April 2015. (It may continue to work until 2017.) * highlight: Add compatibility with highlight 3.18, while still supporting 3.9+. Closes: #757679 Thanks, David Bremner * highlight: Add support for multiple language definition directories Closes: #757680 Thanks, David Bremner Checksums-Sha1: 33ae55c43ab18f3436aca829028ccf426e8a1241 1883 ikiwiki_3.20140815.dsc 069b14c8cc22ef7db1a4f162763312c54379042d 3261039 ikiwiki_3.20140815.tar.gz 77fd6a24354e235d8ecd67a6770adfcef5fe663e 1907538 ikiwiki_3.20140815_all.deb Checksums-Sha256: 087d004e0ac345be46120d42671ef4b86d51371fd11c5155d47810a10165638a 1883 ikiwiki_3.20140815.dsc 990fde69dbbc3ef5903cc9402a61c85389a1813c624635fb174c614ae3771651 3261039 ikiwiki_3.20140815.tar.gz 06f0ecbd90b160bcda29d65b2abfcbe85f9e18d9a7d2f8cbeb47420684bc3869 1907538 ikiwiki_3.20140815_all.deb Files: f52a7c0397dc7d4e393c508044eb6464 1907538 web optional ikiwiki_3.20140815_all.deb 8f716aa3722c64d8e70179f332e23540 1883 web optional ikiwiki_3.20140815.dsc 7290df17473c9e200c5296f793e74f85 3261039 web optional ikiwiki_3.20140815.tar.gz -----BEGIN PGP SIGNATURE----- Version: GnuPG v1 iQIVAwUBU+5A0ckQ2SIlEuPHAQLJew//aQxBpriCsx4hBPmlVs43jLhnY0Yu5cbt I2BLcILfSq5xkmi9VIZF/CCXRHaNwz/Z0VsL4Ib15y/bcyvTrkwfvB5B+73ZZF8w +fsm3pnqrQn+HpxRk0r/C7B3XLQcHuRfVGnZXqc32GKcEbkec3MCTg/jSL6p+VJo bjvA4NdhjQj7i2+7auH2USl3R7ZLxuEgNfgr6+4yhjY6dRfbbm8bEQFf4AAKW5oC PkCIBbl9FPkRrCUucgu/o7DuPTNtC8NFzsC1UQO6+5O1Zfky8A20c0M9R3Qb86tN Mtv3JPBtgHnkeWeHdflaUO0tre7izPXJZ7gOvs+RXpq2Lc05nnX0siH1tQtnOoCz 08d8qb5FRILlAzG87N3iewpyTBgLLme0oY1+nPLlzPhaMpw2/lyVBkdFEY5aPen+ xfaiksM0prAGPwCVVA7tT/iaDTsscT0A3Ww8HLyV8nLHAfxK52lqsuvKYZXV0sNi BAB4x7GklDPrpb4LqsNvS9utYN90o250TAKDu0W7n6ug/qlLdromujkXIk6eodO3 lisCre3L0CayWDQF98kvlsrGx2bGZjp7PU3CunwDWnbo3tkSbI/tGxMTNb+In7tR gJWaJcPQixfEhMwbVha7He+aYxMknyWY/8el/2fSWIBISOkfRVk54uQW23HOg0mz iIEkIit4inA= =VzRX -----END PGP SIGNATURE-----
--- End Message ---
