~ubuntu-branches/ubuntu/trusty/websvn/trusty-security

« back to all changes in this revision

Viewing changes to debian/patches/20_use_global_geshi.patch

  • Committer: Bazaar Package Importer
  • Author(s): Pierre Chifflier
  • Date: 2009-03-24 09:25:32 UTC
  • Revision ID: james.westby@ubuntu.com-20090324092532-qea4npg4d6xe9j25
Tags: 2.1.0-3
* Fix RSS feed by adding lib/feedcreator.class.php (Closes: #520061)
* Update copyright file to mention LGPL2 license of feed creator.
* Fix GeSHi syntax highlighting (Closes: #518965)
* Bump standards version to 3.8.1 (no changes)

Show diffs side-by-side

added added

removed removed

Lines of Context:
1
1
Index: websvn/include/svnlook.php
2
2
===================================================================
3
 
--- websvn.orig/include/svnlook.php     2009-02-25 14:47:10.000000000 +0100
4
 
+++ websvn/include/svnlook.php  2009-02-25 14:47:31.000000000 +0100
5
 
@@ -624,7 +624,7 @@
 
3
--- websvn.orig/include/svnlook.php     2009-03-24 09:34:33.000000000 +0100
 
4
+++ websvn/include/svnlook.php  2009-03-24 09:42:46.000000000 +0100
 
5
@@ -624,7 +624,8 @@
6
6
     @exec($cmd);
7
7
 
8
8
     $source = file_get_contents($filename);
9
9
-    require_once 'lib/geshi.php';
 
10
+    set_include_path(get_include_path() . PATH_SEPARATOR.  '/usr/share/php-geshi');
10
11
+    require_once 'geshi.php';
11
12
     $geshi = new GeSHi($source, $l);
12
13
     if ($return) {