← Back to branch summary

~ubuntu-branches/ubuntu/maverick/ilohamail/maverick

« back to all changes in this revision

Viewing changes to debian/patches/01-debianpath.dpatch

  • Committer: Bazaar Package Importer
  • Author(s): Joerg Jaspert
  • Date: 2005-02-07 20:53:16 UTC
  • Revision ID: james.westby@ubuntu.com-20050207205316-483kt8csr6hj5obk
Tags: 0.8.14-0rc3
http://bugs.debian.org/294025
Bug fix: "ilohamail: PHP applications should never depend on
phpapi-12345", thanks to Adam Conrad (Closes: #294025).

Show diffs side-by-side

added added

removed removed

Lines of Context:
debian/patches/01-debianpath.dpatch
23
23
exit 0
24
24
 
25
25
@DPATCH@
26
 
diff -urNad /develop/Debian/ilohamail/ilohamail/IlohaMail/conf/conf.inc ilohamail/IlohaMail/conf/conf.inc
27
 
--- /develop/Debian/ilohamail/ilohamail/IlohaMail/conf/conf.inc 2003-07-06 23:57:19.000000000 +0200
28
 
+++ ilohamail/IlohaMail/conf/conf.inc   2003-09-01 21:01:04.000000000 +0200
 
26
diff -urNad ilohamail-0.8.14/IlohaMail/conf/conf.inc /home/joerg/tmp/dpep.7l7Zwc/ilohamail-0.8.14/IlohaMail/conf/conf.inc
 
27
--- ilohamail-0.8.14/IlohaMail/conf/conf.inc    2005-01-08 21:18:14.513437312 +0100
 
28
+++ /home/joerg/tmp/dpep.7l7Zwc/ilohamail-0.8.14/IlohaMail/conf/conf.inc        2005-01-08 21:20:54.447086854 +0100
 
29
@@ -4,5 +4,5 @@
 
30
        Please use conf.php instead.
 
31
 */
 
32
 
 
33
-include('../conf/conf.php');
 
34
-?>
 
35
\ Kein Zeilenumbruch am Dateiende.
 
36
+include('/etc/IlohaMail/conf.php');
 
37
+?>
 
38
diff -urNad ilohamail-0.8.14/IlohaMail/conf/conf.php /home/joerg/tmp/dpep.7l7Zwc/ilohamail-0.8.14/IlohaMail/conf/conf.php
 
39
--- ilohamail-0.8.14/IlohaMail/conf/conf.php    2004-12-31 03:39:11.000000000 +0100
 
40
+++ /home/joerg/tmp/dpep.7l7Zwc/ilohamail-0.8.14/IlohaMail/conf/conf.php        2005-01-08 21:20:16.031695669 +0100
29
41
@@ -28,22 +28,22 @@
30
42
 //     $UPLOAD_DIR path to uploads dir
31
43
 //     MUST HAVE TRAILING '/'
32
44
 //     REQUIRED:  Always
33
45
-$UPLOAD_DIR = "../data/uploads/";
 
46
-
34
47
+$UPLOAD_DIR = "/var/cache/IlohaMail/uploads/";
35
 
 
 
48
+  
36
49
 //     $CACHE_DIR path to cache dir
37
50
 //     MUST HAVE TRAILING '/'
38
51
 //  REQUIRED:  Always (folder it self does not need to exist)
39
52
-$CACHE_DIR = "../data/cache/";
 
53
-
40
54
+$CACHE_DIR = "/var/cache/IlohaMail/cache/";
41
 
 
 
55
+ 
42
56
 //     $USER_DIR path to users dir
43
57
 //     MUST HAVE TRAILING'/'
44
58
 //     REQUIRED:  For FS-backend
53
67
 
54
68
 
55
69
 /********************* LOG *****************
56
 
@@ -373,7 +373,7 @@
 
70
@@ -384,7 +384,7 @@
57
71
 
58
72
 $GPG_ENABLE=0;
59
73
 $GPG_PATH = "/usr/bin/gpg";
62
76
 //$GPG_HOME_STR = "/home/%u";
63
77
 
64
78
 
 
79
@@ -393,4 +393,4 @@
 
80
        the '?>' below!!  Blank lines will cause
 
81
        all kinds of problems!!
 
82
 *******************/
 
83
-?>
 
84
\ Kein Zeilenumbruch am Dateiende.
 
85
+?>