From: Ben Hutchings Date: Sun, 16 Sep 2007 23:29:01 +0000 (+0000) Subject: Split changes into patches managed with quilt. X-Git-Tag: 1.2-5~8 X-Git-Url: https://git.decadent.org.uk/gitweb/?a=commitdiff_plain;h=d2078abf95935788db273194cec72ab184adacce;p=memories.git Split changes into patches managed with quilt. --- diff --git a/Memories/Config.pm b/Memories/Config.pm index 8318369..f874eff 100644 --- a/Memories/Config.pm +++ b/Memories/Config.pm @@ -3,19 +3,19 @@ package Memories::Config; # This parameter should be the external address of your Memories # installation -Memories->config->uri_base("http://localhost/memories/"); +Memories->config->uri_base("http://memories.simon-cozens.org/"); # This is where your templates will live. -Memories->config->{template_root} = "/etc/memories/templates/"; +Memories->config->{template_root} = "/home/simon/maypole-sites/memories/templates"; # Here is where uploaded photos will be stored. Your web server user # should own this directory. -Memories->config->{data_store} = "/var/www/memories/store/"; +Memories->config->{data_store} = "/web/photostore/"; # You also need to configure your web server so that it serves files out # of the data store; this URL should be where that data store directory # is exposed on the web. -Memories->config->{data_store_external} = "http://localhost/memories/store/"; +Memories->config->{data_store_external} = "http://memories.simon-cozens.org/store/"; # Your database server: the first part should always be "dbi"; the # second, the name of the DBD driver you're using (usually mysql unless diff --git a/README b/README index 5b1fc00..b58ec3e 100644 --- a/README +++ b/README @@ -24,7 +24,7 @@ application, but you're on your own. 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 /etc/memories/Config.pm to your site, and follow the instructions in +Configure Maypole/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: diff --git a/debian/control b/debian/control index c473715..e466ce3 100644 --- a/debian/control +++ b/debian/control @@ -2,6 +2,7 @@ Source: memories Maintainer: Ben Hutchings Section: web Priority: extra +Build-Depends: quilt Build-Depends-Indep: debhelper (>= 4), perl (>= 5.6.0-16) Standards-Version: 3.6.2 diff --git a/debian/patches/101_remove-ancc-refs.diff b/debian/patches/101_remove-ancc-refs.diff new file mode 100644 index 0000000..1982369 --- /dev/null +++ b/debian/patches/101_remove-ancc-refs.diff @@ -0,0 +1,32 @@ +--- trunk.orig/templates/frontpage ++++ trunk/templates/frontpage +@@ -2,8 +2,7 @@ +

Welcome to Memories

+ +

+- Memories is a site where you can upload and share your photos of +- college life with your friends. ++ Memories is a site where you can upload and share your photos. +

+

+ To view other people's photos, look at the + +- Memories - ANCC Photo Sharing ++ Memories - Photo Sharing + + [% IF photos %] + + +- Memories - ANCC Photo Sharing ++ Memories - Photo Sharing + + + diff --git a/debian/patches/201_use-debian-paths.diff b/debian/patches/201_use-debian-paths.diff new file mode 100644 index 0000000..b4ccb0f --- /dev/null +++ b/debian/patches/201_use-debian-paths.diff @@ -0,0 +1,37 @@ +--- trunk.orig/Memories/Config.pm ++++ trunk/Memories/Config.pm +@@ -3,19 +3,19 @@ + + # This parameter should be the external address of your Memories + # installation +-Memories->config->uri_base("http://memories.simon-cozens.org/"); ++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/"; + + # Here is where uploaded photos will be stored. Your web server user + # should own this directory. +-Memories->config->{data_store} = "/web/photostore/"; ++Memories->config->{data_store} = "/var/www/memories/store/"; + + # You also need to configure your web server so that it serves files out + # of the data store; this URL should be where that data store directory + # is exposed on the web. +-Memories->config->{data_store_external} = "http://memories.simon-cozens.org/store/"; ++Memories->config->{data_store_external} = "http://localhost/memories/store/"; + + # 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: diff --git a/debian/patches/series b/debian/patches/series new file mode 100644 index 0000000..df3b4aa --- /dev/null +++ b/debian/patches/series @@ -0,0 +1,2 @@ +101_remove-ancc-refs.diff +201_use-debian-paths.diff diff --git a/debian/rules b/debian/rules index 5a8e7f5..e77dd54 100755 --- a/debian/rules +++ b/debian/rules @@ -1,6 +1,8 @@ #!/usr/bin/make -f -build : +include /usr/share/quilt/quilt.make + +build : $(QUILT_STAMPFN) binary : binary-arch binary-indep diff --git a/templates/frontpage b/templates/frontpage index 9bd9576..2b36f1e 100644 --- a/templates/frontpage +++ b/templates/frontpage @@ -2,7 +2,8 @@

Welcome to Memories

- Memories is a site where you can upload and share your photos. + Memories is a site where you can upload and share your photos of + college life with your friends.

To view other people's photos, look at the - Memories - Photo Sharing + Memories - ANCC Photo Sharing [% IF photos %] - Memories - Photo Sharing + Memories - ANCC Photo Sharing