]> git.decadent.org.uk Git - memories.git/commitdiff
projects / memories.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 5acf53e)
Refresh patches
authorBen Hutchings <ben@decadent.org.uk>
Tue, 4 Nov 2008 04:36:08 +0000 (04:36 +0000)
committerBen Hutchings <ben@decadent.org.uk>
Tue, 4 Nov 2008 04:36:08 +0000 (04:36 +0000)
debian/patches/101_remove-ancc-refs.diff [deleted file] patch | blob | history
debian/patches/102_fix-uris.diff patch | blob | history
debian/patches/201_use-debian-paths.diff patch | blob | history
debian/patches/series patch | blob | history

diff --git a/debian/patches/101_remove-ancc-refs.diff b/debian/patches/101_remove-ancc-refs.diff
deleted file mode 100644 (file)
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 @@
- <h1> Welcome to Memories </h1>
- 
- <p>
-- 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.
- </p>
- <p>
-  To view other people's photos, look at the <a
---- trunk.orig/templates/header
-+++ trunk/templates/header
-@@ -1,6 +1,6 @@
- <html>
- <head>
--    <title> Memories - ANCC Photo Sharing </title>
-+    <title> Memories - Photo Sharing </title>
-     <link title="Maypole" href="[%base%]/static/memories.css" type="text/css" rel="stylesheet"/>
-     [% IF photos %]
- <link rel="alternate" type="application/rdf+xml" title="RSS"
---- trunk.orig/templates/photo/upload
-+++ trunk/templates/photo/upload
-@@ -1,6 +1,6 @@
- <html>
- <head>
--    <title> Memories - ANCC Photo Sharing </title>
-+    <title> Memories - Photo Sharing </title>
-     <link title="Maypole" href="[%base%]/static/memories.css" type="text/css" rel="stylesheet"/>
-     <script type="text/javascript" src="[%base%]/tag/list_js"></script>
-     <script type="text/javascript" src="[%base%]/static/upload.js"></script>
diff --git a/debian/patches/102_fix-uris.diff b/debian/patches/102_fix-uris.diff
index 8e79469d66fcf2ae14a9c5560debb520567998ff..1fa0c8b62bea9d47990e603580dcf9ec2b39d9d5 100644 (file)
--- 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 %]
          <td>
@@ -9,8 +9,8 @@
          <span class="info">
              [%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 %]
          <td>
@@ -20,19 +20,18 @@
          <span class="info">
              [%object.photos.size %] 
          photo[%-"s" IF object.photos.size != 1 %]</span>
---- trunk.orig/templates/macros
-+++ trunk/templates/macros
-@@ -2,7 +2,7 @@
- <table class="thumb">
-     <tr><td>
+--- memories.orig/templates/macros
++++ memories/templates/macros
+@@ -1,6 +1,6 @@
+ [% MACRO minithumb(photo) BLOCK %]
          <a href="[%base%]/photo/view/[%photo.id%]">
 -        <img src="[% photo.thumb_url |uri%]" alt="[%photo.title|html%]"/>
 +        <img src="[% photo.thumb_url |html%]" alt="[%photo.title|html%]"/>
          </a>
-         </td> </tr>
-     <tr><td> 
---- trunk.orig/templates/nav
-+++ trunk/templates/nav
+ [% END; MACRO thumb(photo, album) BLOCK %]
+ <table class="thumb">
+--- memories.orig/templates/nav
++++ memories/templates/nav
 @@ -4,7 +4,7 @@
  </td><td align="right">
  [% FOR photo = request.recent_uploads %]
@@ -42,8 +41,8 @@
          </a>
  [% END %]
  </td></tr></table>
---- trunk.orig/templates/recent.rss
-+++ trunk/templates/recent.rss
+--- memories.orig/templates/recent.rss
++++ memories/templates/recent.rss
 @@ -12,7 +12,7 @@
          <description>
  [% FILTER html %]
@@ -53,8 +52,8 @@
          </a>
  [% END %]
          </description>
---- 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 %]
          <tr><td>
@@ -64,8 +63,8 @@
          </a>
          </td></tr>
          <tr><td class="info">
---- 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 %]
          <tr><td>
@@ -75,8 +74,8 @@
          </a>
          </td></tr>
          <tr><td class="info">
---- 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 %]
          <a href="[%base%]/user/view/[%user.id%]">[% user %]<br/>
diff --git a/debian/patches/201_use-debian-paths.diff b/debian/patches/201_use-debian-paths.diff
index b4ccb0f0f18576158cce5e695287dfd6d50ea2ff..d2a1be846c1bdeb621c5a9db4e60dfec4d1748b7 100644 (file)
--- 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 30a4a702d8530371f03c40a7332110f346d84a37..83a63bffdb0c94e57552b2e0184b62a3459b6056 100644 (file)
--- 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
Package: Memories [unmaintained]