Update for new upstream snapshot

[memories.git] / debian / patches / 201_use-debian-paths.diff

diff --git a/debian/patches/201_use-debian-paths.diff b/debian/patches/201_use-debian-paths.diff
index b4ccb0f0f18576158cce5e695287dfd6d50ea2ff..ff6f7bcb1da93c41051e77f82851e7f9e79107dd 100644 (file)
--- a/debian/patches/201_use-debian-paths.diff
+++ b/debian/patches/201_use-debian-paths.diff
@@ -1,6 +1,6 @@
---- trunk.orig/Memories/Config.pm
-+++ trunk/Memories/Config.pm
-@@ -3,19 +3,19 @@
+--- memories.orig/Memories/Config.pm.example
++++ memories/Memories/Config.pm.example
+@@ -3,22 +3,22 @@
  
  # This parameter should be the external address of your Memories
  # installation
@@ -8,8 +8,12 @@
 +Memories->config->uri_base("http://localhost/memories/");
  
  # This is where your templates will live.
--Memories->config->{template_root} = "/home/simon/maypole-sites/memories/templates";
-+Memories->config->{template_root} = "/etc/memories/templates/";
+ Memories->config->{template_root} = [
+-    "/web/memories/mytemplates/", # User-defined templates
+-    "/etc/memories/templates/",   # Factory templates
++    "/etc/memories/templates/",       # User-defined templates
++    "/usr/share/memories/templates/", # Factory templates
+ ];
  
  # Here is where uploaded photos will be stored. Your web server user
  # should own this directory.
@@ -24,14 +28,3 @@
  
  # Your database server: the first part should always be "dbi"; the
  # second, the name of the DBD driver you're using (usually mysql unless
---- trunk.orig/README
-+++ trunk/README
-@@ -24,7 +24,7 @@
- You will also need a MySQL database. Again, in theory other databases
- can be used, but in practice, you're on your own again.
- 
--Configure Maypole/Config.pm to your site, and follow the instructions in
-+Configure /etc/memories/Config.pm to your site, and follow the instructions in
- there - it will require you to set other things up as well.
- 
- Test that everything works: