From: Ben Hutchings Date: Tue, 4 Nov 2008 04:36:08 +0000 (+0000) Subject: Refresh patches X-Git-Url: https://git.decadent.org.uk/gitweb/?a=commitdiff_plain;h=6c828edcb380b80c77f01caecd306337a954de36;p=memories.git Refresh patches --- diff --git a/debian/patches/101_remove-ancc-refs.diff b/debian/patches/101_remove-ancc-refs.diff deleted file mode 100644 index 1982369..0000000 --- a/debian/patches/101_remove-ancc-refs.diff +++ /dev/null @@ -1,32 +0,0 @@ ---- 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/102_fix-uris.diff b/debian/patches/102_fix-uris.diff index 8e79469..1fa0c8b 100644 --- a/debian/patches/102_fix-uris.diff +++ b/debian/patches/102_fix-uris.diff @@ -1,5 +1,5 @@ ---- trunk.orig/templates/album/list -+++ trunk/templates/album/list +--- memories.orig/templates/album/list ++++ memories/templates/album/list @@ -8,7 +8,7 @@ [% FOR album = minilist %] @@ -9,8 +9,8 @@ [%album.photos.size %] photo[%-"s" IF album.photos.size != 1 %] ---- trunk.orig/templates/custom/list -+++ trunk/templates/custom/list +--- memories.orig/templates/custom/list ++++ memories/templates/custom/list @@ -8,7 +8,7 @@ [% FOR object = minilist %] @@ -20,19 +20,18 @@ [%object.photos.size %] photo[%-"s" IF object.photos.size != 1 %] ---- trunk.orig/templates/macros -+++ trunk/templates/macros -@@ -2,7 +2,7 @@ - - -
+--- memories.orig/templates/macros ++++ memories/templates/macros +@@ -1,6 +1,6 @@ + [% MACRO minithumb(photo) BLOCK %] - [%photo.title|html%] + [%photo.title|html%] -
---- trunk.orig/templates/nav -+++ trunk/templates/nav + [% END; MACRO thumb(photo, album) BLOCK %] + +--- memories.orig/templates/nav ++++ memories/templates/nav @@ -4,7 +4,7 @@
[% FOR photo = request.recent_uploads %] @@ -42,8 +41,8 @@ [% END %]
---- trunk.orig/templates/recent.rss -+++ trunk/templates/recent.rss +--- memories.orig/templates/recent.rss ++++ memories/templates/recent.rss @@ -12,7 +12,7 @@ [% FILTER html %] @@ -53,8 +52,8 @@ [% END %] ---- trunk.orig/templates/systemtag/list -+++ trunk/templates/systemtag/list +--- memories.orig/templates/systemtag/list ++++ memories/templates/systemtag/list @@ -14,7 +14,7 @@ [% IF photos.last %]
@@ -64,8 +63,8 @@
---- trunk.orig/templates/tag/list -+++ trunk/templates/tag/list +--- memories.orig/templates/tag/list ++++ memories/templates/tag/list @@ -14,7 +14,7 @@ [% IF photos.last %]
@@ -75,8 +74,8 @@
---- trunk.orig/templates/user/list -+++ trunk/templates/user/list +--- memories.orig/templates/user/list ++++ memories/templates/user/list @@ -10,7 +10,7 @@ [% SET photos = user.photos %] [% user %]
diff --git a/debian/patches/201_use-debian-paths.diff b/debian/patches/201_use-debian-paths.diff index b4ccb0f..d2a1be8 100644 --- a/debian/patches/201_use-debian-paths.diff +++ b/debian/patches/201_use-debian-paths.diff @@ -1,5 +1,5 @@ ---- trunk.orig/Memories/Config.pm -+++ trunk/Memories/Config.pm +--- memories.orig/Memories/Config.pm ++++ memories/Memories/Config.pm @@ -3,19 +3,19 @@ # This parameter should be the external address of your Memories @@ -24,14 +24,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: diff --git a/debian/patches/series b/debian/patches/series index 30a4a70..83a63bf 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -1,3 +1,2 @@ -101_remove-ancc-refs.diff 102_fix-uris.diff 201_use-debian-paths.diff