Update for new upstream snapshot

Update copyright dates and upstream URL.
Refresh patches.
Update installation paths.
Restore memories.docs since upstream includes the version from 1.1-1
and we cannot patch it away.

diff --git a/debian/changelog b/debian/changelog
index 498f7e8a5e2ff895d1be8b4c08a521923131a44d..9dfaf10c61d3c0f7706b029c32862e96ed8e85db 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+memories (1.2+svn20070808-1) unstable; urgency=low
+
+  * New upstream snapshot
+
+ -- Ben Hutchings <ben@decadent.org.uk>  Sun, 09 Nov 2008 16:37:02 +0000
+
 memories (1.2-5) unstable; urgency=low
 
   * Changed to work with Apache 2, using Maypole 2.111 - closes: #432504

diff --git a/debian/copyright b/debian/copyright
index 0512b3b14f88a22f35f940cae91603f89c2ec7ca..9103bd8445162df08377d080efd458af36f98970 100644 (file)
--- a/debian/copyright
+++ b/debian/copyright
@@ -1,9 +1,9 @@
 This is the Debian-packaged version of Memories, put together by Ben
 Hutchings <ben@decadent.org.uk> using source from:
 
-  http://maypole.perl.org/?Applications
+  http://svn.simon-cozens.org/memories/
 
-Copyright 2005, 2006 Simon Cozens <simon@simon-cozens.org>.
+Copyright 2005-2007 Simon Cozens <simon@simon-cozens.org>.
 
 This software is licensed under the GPL version 2 or higher, or the Perl
 Artistic License, at your choice.

diff --git a/debian/memories.docs b/debian/memories.docs
new file mode 100644 (file)
index 0000000..e845566
--- /dev/null
+++ b/debian/memories.docs
@@ -0,0 +1 @@
+README

diff --git a/debian/patches/102_fix-uris.diff b/debian/patches/102_fix-uris.diff
index 1fa0c8b62bea9d47990e603580dcf9ec2b39d9d5..cff7e54092f9ea3461120c504384e2aaf69a7779 100644 (file)
--- a/debian/patches/102_fix-uris.diff
+++ b/debian/patches/102_fix-uris.diff
@@ -4,7 +4,7 @@
      [% FOR album = minilist %]
          <td>
          <a href="[%base%]/album/view/[%album.id%]">[% album %]<br/>
--        <img src="[% album.photos.last.thumb_url |uri%]"></a><br/>
+-        <img src="[% album.photos.last.thumb_url %]"></a><br/>
 +        <img src="[% album.photos.last.thumb_url |html%]"></a><br/>
          <span class="info">
              [%album.photos.size %] 
@@ -14,18 +14,19 @@
 @@ -8,7 +8,7 @@
      [% FOR object = minilist %]
          <td>
-         <a href="[%base%]/object/view/[%object.id%]">[% object %]<br/>
--        <img src="[% object.photos.last.thumb_url |uri%]"></a><br/>
+         <a href="[%base%]/[%object.moniker%]/view/[%object.id%]">[% object %]<br/>
+-        <img src="[% object.photos.last.thumb_url %]"></a><br/>
 +        <img src="[% object.photos.last.thumb_url |html%]"></a><br/>
          <span class="info">
              [%object.photos.size %] 
          photo[%-"s" IF object.photos.size != 1 %]</span>
 --- memories.orig/templates/macros
 +++ memories/templates/macros
-@@ -1,6 +1,6 @@
+@@ -6,7 +6,7 @@
+ [% END; END %]
  [% 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 %]" alt="[%photo.title|html%]"/>
 +        <img src="[% photo.thumb_url |html%]" alt="[%photo.title|html%]"/>
          </a>
  [% END; MACRO thumb(photo, album) BLOCK %]
@@ -34,9 +35,9 @@
 +++ memories/templates/nav
 @@ -4,7 +4,7 @@
  </td><td align="right">
- [% FOR photo = request.recent_uploads %]
+ [% FOR photo = request.recent %]
          <a href="[%base%]/photo/view/[%photo.id%]">
--        <img src="[% photo.thumb_url |uri%]" alt="[%photo.title|html%]"/>
+-        <img src="[% photo.thumb_url%]" alt="[%photo.title|html%]"/>
 +        <img src="[% photo.thumb_url |html%]" alt="[%photo.title|html%]"/>
          </a>
  [% END %]
@@ -47,7 +48,7 @@
          <description>
  [% FILTER html %]
          <a href="[%base%]/photo/view/[%photo.id%]">
--        <img src="[% photo.thumb_url |uri%]" alt="[%photo.title|html%]"/>
+-        <img src="[% photo.thumb_url %]" alt="[%photo.title|html%]"/>
 +        <img src="[% photo.thumb_url |html%]" alt="[%photo.title|html%]"/>
          </a>
  [% END %]
@@ -57,8 +58,8 @@
 @@ -14,7 +14,7 @@
          [% IF photos.last %]
          <tr><td>
-         <a href="[%base%]/tag/view/[%tag.name |html|uri%]">
--            <img src="[% photos.last.thumb_url |uri%]">
+         <a href="[%base%]/tag/view/[%tag.name |html%]">
+-            <img src="[% photos.last.thumb_url %]">
 +            <img src="[% photos.last.thumb_url |html%]">
          </a>
          </td></tr>
@@ -68,8 +69,8 @@
 @@ -14,7 +14,7 @@
          [% IF photos.last %]
          <tr><td>
-         <a href="[%base%]/tag/view/[%tag.name |html|uri%]">
--            <img src="[% photos.last.thumb_url |uri%]">
+         <a href="[%base%]/tag/view/[%tag.name |html%]">
+-            <img src="[% photos.last.thumb_url%]">
 +            <img src="[% photos.last.thumb_url |html%]">
          </a>
          </td></tr>
@@ -80,7 +81,7 @@
          [% SET photos = user.photos %]
          <a href="[%base%]/user/view/[%user.id%]">[% user %]<br/>
          [% IF photos.last %]
--        <img src="[% photos.last.thumb_url |uri%]"></a><br/>
+-        <img src="[% photos.last.thumb_url %]"></a><br/>
 +        <img src="[% photos.last.thumb_url |html%]"></a><br/>
          <span class="info">
              [%photos.size %] 

diff --git a/debian/patches/201_use-debian-paths.diff b/debian/patches/201_use-debian-paths.diff
index d2a1be846c1bdeb621c5a9db4e60dfec4d1748b7..ff6f7bcb1da93c41051e77f82851e7f9e79107dd 100644 (file)
--- a/debian/patches/201_use-debian-paths.diff
+++ b/debian/patches/201_use-debian-paths.diff
@@ -1,6 +1,6 @@
---- memories.orig/Memories/Config.pm
-+++ memories/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.

diff --git a/debian/rules b/debian/rules
index 7d4e3ed58ade5a55e8c42c0f3f26e57f5ebc7381..9617ce7a5b7ec06b12ecaf422f1aacafc00863c0 100755 (executable)
--- a/debian/rules
+++ b/debian/rules
@@ -16,12 +16,13 @@ binary-indep :
        install -d debian/memories/usr/lib/cgi-bin
        install -m 755 debian/memories.cgi debian/memories/usr/lib/cgi-bin/
        install -d debian/memories/etc/memories
-       mv debian/memories/usr/share/perl5/Memories/Config.pm debian/memories/etc/memories/
-       cp -dR templates debian/memories/etc/memories/
+       install -m 644 Memories/Config.pm.example debian/memories/etc/memories/Config.pm
        ln -s /etc/memories/Config.pm debian/memories/usr/share/perl5/Memories/
+       install -d debian/memories/etc/memories/templates
        install -m 644 debian/apache.conf debian/memories/etc/memories/
        install -d debian/memories/usr/share/memories
-       install -m 644 memories.sql tag_dates debian/memories/usr/share/memories/
+       cp -dR templates debian/memories/usr/share/memories/
+       install -m 644 memories.sql debian/memories/usr/share/memories/
        install -d debian/memories/var/lib/memories
        install -d -o www-data -g www-data -m 770 debian/memories/var/lib/memories/sessions debian/memories/var/lib/memories/sessionlock
        install -d debian/memories/usr/share/linda/overrides
@@ -30,7 +31,7 @@ binary-indep :
        install -m 644 debian/lintian-overrides debian/memories/usr/share/lintian/overrides/memories
        dh_perl
        dh_installchangelogs Changes
-       dh_installdocs README
+       dh_installdocs
        dh_compress
        dh_fixperms -X /var/lib/memories/session
        dh_installdeb
@@ -39,6 +40,6 @@ binary-indep :
        dh_builddeb
 
 clean : 
-       dh_clean
+       dh_clean -Xtemplates/header.orig
 
 .PHONY : build binary binary-arch binary-dep clean