Refresh patches

[memories.git] / debian / patches / 102_fix-uris.diff

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/>