Merged branch 'tg/master'.

[pkg-mlmmj.git] / debian / patches / 02_fix_mlmmj_php.dpatch

diff --git a/debian/patches/02_fix_mlmmj_php.dpatch b/debian/patches/02_fix_mlmmj_php.dpatch
index 97c8e1f2241ea9d944ca9dabecf483ec6c747944..2df52a22ef9dc44ad15b6c9d70bce32a05c2b5fe 100644 (file)
--- a/debian/patches/02_fix_mlmmj_php.dpatch
+++ b/debian/patches/02_fix_mlmmj_php.dpatch
@@ -1,13 +1,14 @@
 #! /bin/sh /usr/share/dpatch/dpatch-run
-## 02_fix_mlmmj_php.dpatch by  <boll@tristram.fork.dk>
+## 02_fix_mlmmj_php.dpatch by Søren Boll Overgaard <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 with correct dirs.
+## DP: Adapt pathes and settings used in the web interface to match the
+## DP: (FHS compliant) installation paths.
 
 @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
+
+diff a/contrib/web/php-admin/conf/config.php b/contrib/web/php-admin/conf/config.php
+--- a/contrib/web/php-admin/conf/config.php
++++ b/contrib/web/php-admin/conf/config.php
 @@ -1,6 +1,6 @@
  <?php
  
@@ -16,20 +17,19 @@ diff -urNad mlmmj-1.2.7/contrib/web/php-admin/conf/config.php /tmp/dpep.1ZV6mc/m
 +$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 @@
+diff a/contrib/web/php-admin/htdocs/dot.htaccess b/contrib/web/php-admin/htdocs/dot.htaccess
+--- a/contrib/web/php-admin/htdocs/dot.htaccess
++++ b/contrib/web/php-admin/htdocs/dot.htaccess
+@@ -1,4 +1,4 @@
  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
+diff a/contrib/web/php-admin/htdocs/edit.php b/contrib/web/php-admin/htdocs/edit.php
+--- a/contrib/web/php-admin/htdocs/edit.php
++++ b/contrib/web/php-admin/htdocs/edit.php
 @@ -26,7 +26,7 @@
   * IN THE SOFTWARE.
   */
@@ -39,9 +39,9 @@ diff -urNad mlmmj-1.2.7/contrib/web/php-admin/htdocs/edit.php /tmp/dpep.1ZV6mc/m
  require("class.FastTemplate.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
+diff a/contrib/web/php-admin/htdocs/index.php b/contrib/web/php-admin/htdocs/index.php
+--- a/contrib/web/php-admin/htdocs/index.php
++++ b/contrib/web/php-admin/htdocs/index.php
 @@ -27,7 +27,7 @@
   */
  
@@ -51,9 +51,9 @@ diff -urNad mlmmj-1.2.7/contrib/web/php-admin/htdocs/index.php /tmp/dpep.1ZV6mc/
  
  $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
+diff a/contrib/web/php-admin/htdocs/save.php b/contrib/web/php-admin/htdocs/save.php
+--- a/contrib/web/php-admin/htdocs/save.php
++++ b/contrib/web/php-admin/htdocs/save.php
 @@ -26,7 +26,7 @@
   * IN THE SOFTWARE.
   */
@@ -63,9 +63,9 @@ diff -urNad mlmmj-1.2.7/contrib/web/php-admin/htdocs/save.php /tmp/dpep.1ZV6mc/m
  require("class.FastTemplate.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
+diff a/contrib/web/php-user/example.html b/contrib/web/php-user/example.html
+--- a/contrib/web/php-user/example.html
++++ b/contrib/web/php-user/example.html
 @@ -1,7 +1,7 @@
  <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 3.2//EN">
  <html>