#! /bin/sh /usr/share/dpatch/dpatch-run
## 02_fix_mlmmj_php.dpatch by  <boll@tristram.fork.dk>
##
## All lines beginning with `## DP:' are a description of the patch.
## DP: Makes it so that mlmmj-php-web-admin uses the FHS of Debian 
## DP: with correct dirs.

@DPATCH@
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
--- mlmmj-1.2.7/contrib/web/php-admin/conf/config.php	2005-05-12 18:36:37.000000000 +0200
+++ /tmp/dpep.1ZV6mc/mlmmj-1.2.7/contrib/web/php-admin/conf/config.php	2005-05-12 18:52:05.000000000 +0200
@@ -1,6 +1,6 @@
 <?php
 
 $topdir = "/var/spool/mlmmj";
-$templatedir = "/home/mlmmj/templates";
+$templatedir = "/usr/share/mlmmj-php-web-admin/templates/";
 
 ?>
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
--- mlmmj-1.2.7/contrib/web/php-admin/htdocs/dot.htaccess	2005-05-12 18:36:37.000000000 +0200
+++ /tmp/dpep.1ZV6mc/mlmmj-1.2.7/contrib/web/php-admin/htdocs/dot.htaccess	2005-05-12 18:52:05.000000000 +0200
@@ -1,4 +1,5 @@
 Require valid-user
 AuthType Basic
-AuthName "mlmmj web-interface"
-AuthUserFile /home/mlmmj/htpasswd
+AuthName "mlmmj web-interface on Debian GNU/Linux"
+AuthUserFile /etc/mlmmj-php-web-admin/htpasswd
+php_value include_path "/usr/share/mlmmj-php-web-admin"
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
--- mlmmj-1.2.7/contrib/web/php-admin/htdocs/edit.php	2005-05-12 18:36:37.000000000 +0200
+++ /tmp/dpep.1ZV6mc/mlmmj-1.2.7/contrib/web/php-admin/htdocs/edit.php	2005-05-12 18:52:05.000000000 +0200
@@ -26,7 +26,7 @@
  * IN THE SOFTWARE.
  */
 
-require("../conf/config.php");
+require("conf/config.php");
 require("class.rFastTemplate.php");
 
 function mlmmj_boolean($name, $nicename, $text) 
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
--- mlmmj-1.2.7/contrib/web/php-admin/htdocs/index.php	2005-05-12 18:36:37.000000000 +0200
+++ /tmp/dpep.1ZV6mc/mlmmj-1.2.7/contrib/web/php-admin/htdocs/index.php	2005-05-12 18:52:05.000000000 +0200
@@ -27,7 +27,7 @@
  */
 
 require("class.rFastTemplate.php");
-require("../conf/config.php");
+require("conf/config.php");
 
 $tpl = new FastTemplate($templatedir);
 
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
--- mlmmj-1.2.7/contrib/web/php-admin/htdocs/save.php	2005-05-12 18:36:37.000000000 +0200
+++ /tmp/dpep.1ZV6mc/mlmmj-1.2.7/contrib/web/php-admin/htdocs/save.php	2005-05-12 18:52:05.000000000 +0200
@@ -26,7 +26,7 @@
  * IN THE SOFTWARE.
  */
 
-require("../conf/config.php");
+require("conf/config.php");
 require("class.rFastTemplate.php");
 
 function mlmmj_boolean($name, $nicename, $text)
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
--- mlmmj-1.2.7/contrib/web/php-user/example.html	2004-07-09 22:28:16.000000000 +0200
+++ /tmp/dpep.1ZV6mc/mlmmj-1.2.7/contrib/web/php-user/example.html	2005-05-12 18:53:51.000000000 +0200
@@ -1,7 +1,7 @@
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 3.2//EN">
 <html>
 <head>
-<title>mlmmj-webinterface</title>
+<title>mlmmj web interface</title>
 </head>
 <body>
 
