debian/patches/02_fix_mlmmj_php.dpatch

   1 #! /bin/sh /usr/share/dpatch/dpatch-run
   2 ## 02_fix_mlmmj_php.dpatch by  <boll@tristram.fork.dk>
   3 ##
   4 ## All lines beginning with `## DP:' are a description of the patch.
   5 ## DP: Makes it so that mlmmj-php-web-admin uses the FHS of Debian with correct dirs.
   6
   7 @DPATCH@
   8 diff -urNad mlmmj-1.2.7/contrib/web/php-admin/conf/config.php /tmp/dpep.1ZV6mc/mlmmj-1.2.7/contrib/web/php-admin/conf/config.php
   9 --- mlmmj-1.2.7/contrib/web/php-admin/conf/config.php   2005-05-12 18:36:37.000000000 +0200
  10 +++ /tmp/dpep.1ZV6mc/mlmmj-1.2.7/contrib/web/php-admin/conf/config.php  2005-05-12 18:52:05.000000000 +0200
  11 @@ -1,6 +1,6 @@
  12  <?php
  13
  14  $topdir = "/var/spool/mlmmj";
  15 -$templatedir = "/home/mlmmj/templates";
  16 +$templatedir = "/usr/share/mlmmj-php-web-admin/templates/";
  17
  18  ?>
  19 diff -urNad mlmmj-1.2.7/contrib/web/php-admin/htdocs/dot.htaccess /tmp/dpep.1ZV6mc/mlmmj-1.2.7/contrib/web/php-admin/htdocs/dot.htaccess
  20 --- mlmmj-1.2.7/contrib/web/php-admin/htdocs/dot.htaccess       2005-05-12 18:36:37.000000000 +0200
  21 +++ /tmp/dpep.1ZV6mc/mlmmj-1.2.7/contrib/web/php-admin/htdocs/dot.htaccess      2005-05-12 18:52:05.000000000 +0200
  22 @@ -1,4 +1,5 @@
  23  Require valid-user
  24  AuthType Basic
  25 -AuthName "mlmmj web-interface"
  26 -AuthUserFile /home/mlmmj/htpasswd
  27 +AuthName "mlmmj web-interface on Debian GNU/Linux"
  28 +AuthUserFile /etc/mlmmj-php-web-admin/htpasswd
  29 +php_value include_path "/usr/share/mlmmj-php-web-admin"
  30 diff -urNad mlmmj-1.2.7/contrib/web/php-admin/htdocs/edit.php /tmp/dpep.1ZV6mc/mlmmj-1.2.7/contrib/web/php-admin/htdocs/edit.php
  31 --- mlmmj-1.2.7/contrib/web/php-admin/htdocs/edit.php   2005-05-12 18:36:37.000000000 +0200
  32 +++ /tmp/dpep.1ZV6mc/mlmmj-1.2.7/contrib/web/php-admin/htdocs/edit.php  2005-05-12 18:52:05.000000000 +0200
  33 @@ -26,7 +26,7 @@
  34   * IN THE SOFTWARE.
  35   */
  36
  37 -require("../conf/config.php");
  38 +require("conf/config.php");
  39  require("class.FastTemplate.php");
  40
  41  function mlmmj_boolean($name, $nicename, $text)
  42 diff -urNad mlmmj-1.2.7/contrib/web/php-admin/htdocs/index.php /tmp/dpep.1ZV6mc/mlmmj-1.2.7/contrib/web/php-admin/htdocs/index.php
  43 --- mlmmj-1.2.7/contrib/web/php-admin/htdocs/index.php  2005-05-12 18:36:37.000000000 +0200
  44 +++ /tmp/dpep.1ZV6mc/mlmmj-1.2.7/contrib/web/php-admin/htdocs/index.php 2005-05-12 18:52:05.000000000 +0200
  45 @@ -27,7 +27,7 @@
  46   */
  47
  48  require("class.FastTemplate.php");
  49 -require("../conf/config.php");
  50 +require("conf/config.php");
  51
  52  $tpl = new FastTemplate($templatedir);
  53
  54 diff -urNad mlmmj-1.2.7/contrib/web/php-admin/htdocs/save.php /tmp/dpep.1ZV6mc/mlmmj-1.2.7/contrib/web/php-admin/htdocs/save.php
  55 --- mlmmj-1.2.7/contrib/web/php-admin/htdocs/save.php   2005-05-12 18:36:37.000000000 +0200
  56 +++ /tmp/dpep.1ZV6mc/mlmmj-1.2.7/contrib/web/php-admin/htdocs/save.php  2005-05-12 18:52:05.000000000 +0200
  57 @@ -26,7 +26,7 @@
  58   * IN THE SOFTWARE.
  59   */
  60
  61 -require("../conf/config.php");
  62 +require("conf/config.php");
  63  require("class.FastTemplate.php");
  64
  65  function mlmmj_boolean($name, $nicename, $text)
  66 diff -urNad mlmmj-1.2.7/contrib/web/php-user/example.html /tmp/dpep.1ZV6mc/mlmmj-1.2.7/contrib/web/php-user/example.html
  67 --- mlmmj-1.2.7/contrib/web/php-user/example.html       2004-07-09 22:28:16.000000000 +0200
  68 +++ /tmp/dpep.1ZV6mc/mlmmj-1.2.7/contrib/web/php-user/example.html      2005-05-12 18:53:51.000000000 +0200
  69 @@ -1,7 +1,7 @@
  70  <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 3.2//EN">
  71  <html>
  72  <head>
  73 -<title>mlmmj-webinterface</title>
  74 +<title>mlmmj web interface</title>
  75  </head>
  76  <body>
  77