- refer to upstream pull

[packages/dokuwiki.git] / dokuwiki-config.patch

diff --git a/dokuwiki-config.patch b/dokuwiki-config.patch
index 523becdf9ab1061dee8d32bceea8276841fd05df..0e956349d7a9a1fa0dbf4f0d05ecc112b3a50ce0 100644 (file)
--- a/dokuwiki-config.patch
+++ b/dokuwiki-config.patch
@@ -1,25 +1,26 @@
-NOTE:
-you need to update checksum when you modify docuwiki.php
-
---- docuwiki/conf/dokuwiki.php~        2007-06-26 21:27:15.000000000 +0300
-+++ docuwiki/conf/dokuwiki.php 2007-08-19 19:39:43.468686519 +0300
-@@ -18,7 +18,7 @@
- $conf['lang']        = 'en';              //your language
+--- dokuwiki-2012-06-23/conf/dokuwiki.php      2012-06-23 13:09:12.871130284 +0300
++++ dokuwiki-2012-06-24/conf/dokuwiki.php      2012-07-07 15:08:02.939975138 +0300
+@@ -19,8 +19,9 @@
+ $conf['template']    = 'dokuwiki';         //see lib/tpl directory
+ $conf['tagline']     = '';                //tagline in header (if template supports it)
+ $conf['sidebar']     = 'sidebar';         //name of sidebar in root namespace (if template supports it)
+-$conf['license']     = 'cc-by-nc-sa';     //see conf/license.php
+-$conf['savedir']     = './data';          //where to store all the files
++$conf['license']     = 'publicdomain';    //see conf/license.php
++$conf['savedir']     = '/var/lib/dokuwiki';  //where to store all the files
++$conf['cachedir']    = '/var/cache/dokuwiki';  //where cache files are stored
  $conf['basedir']     = '';                //absolute dir from serveroot - blank for autodetection
  $conf['baseurl']     = '';                //URL to server including protocol - blank for autodetect
--$conf['savedir']     = './data';          //where to store all the files
-+$conf['savedir']     = '/var/lib/dokuwiki';          //where to store all the files
- $conf['allowdebug']  = 0;                 //allow debug output, enable if needed 0|1
- 
- /* Display Options */
---- dokuwiki-2008-05-05/install.php~   2008-05-05 21:33:44.000000000 +0300
-+++ dokuwiki-2008-05-05/install.php    2008-05-05 21:33:49.877839346 +0300
-@@ -44,6 +44,8 @@
-     '2007-05-24'   => 'd80f2740c84c4a6a791fd3c7a353536f',
-     '2007-06-26'   => 'b3ca19c7a654823144119980be73cd77',
-     '2008-05-04'   => '1e5c42eac3219d9e21927c39e3240aad',
-+      # md5sum -b conf/dokuwiki.php
-+    '2008-05-04-pld'   => '12f43c697bd6405854685c2cb4aaeaad',
+ $conf['cookiedir']   = '';                //path to use in cookies - blank for basedir
+--- dokuwiki-2012-06-24/install.php    2012-06-24 21:56:11.184049230 +0300
++++ dokuwiki-2012-06-24/install.php    2012-07-07 15:10:52.440544560 +0300
+@@ -54,7 +54,8 @@
+     '2011-05-25'   => '4241865472edb6fa14a1227721008072',
+     '2011-11-10'   => 'b46ff19a7587966ac4df61cbab1b8b31',
+     '2012-01-25'   => '72c083c73608fc43c586901fd5dabb74',
+-    'devel'        => 'eb0b3fc90056fbc12bac6f49f7764df3'
++    'devel'        => 'eb0b3fc90056fbc12bac6f49f7764df3',
++    'devel-pld'    => '19465557caebbf3fdd381a658196d5c0',
  );