]> git.decadent.org.uk Git - memories.git/commitdiff
Split changes into patches managed with quilt.
authorBen Hutchings <ben@decadent.org.uk>
Sun, 16 Sep 2007 23:29:01 +0000 (23:29 +0000)
committerBen Hutchings <ben@decadent.org.uk>
Tue, 4 Nov 2008 04:14:14 +0000 (04:14 +0000)
Memories/Config.pm
README
debian/control
debian/patches/101_remove-ancc-refs.diff [new file with mode: 0644]
debian/patches/201_use-debian-paths.diff [new file with mode: 0644]
debian/patches/series [new file with mode: 0644]
debian/rules
templates/frontpage
templates/header
templates/photo/upload

index 8318369d3530040c8f841b1a1365f7117b34ac8b..f874eff4d64462fbd9f104f6cd34d7d51085011a 100644 (file)
@@ -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 5b1fc004dbe95a6c70c508a494b96324b7187832..b58ec3e608dc9a6b96c346446bb032bbeed2b3fe 100644 (file)
--- 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:
index c473715001683fb1e2ae88c2e0c5d821d9b10ee3..e466ce333c870231af07abf57ee2c36558ef6e1f 100644 (file)
@@ -2,6 +2,7 @@ Source: memories
 Maintainer: Ben Hutchings <ben@decadent.org.uk>
 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 (file)
index 0000000..1982369
--- /dev/null
@@ -0,0 +1,32 @@
+--- 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/201_use-debian-paths.diff b/debian/patches/201_use-debian-paths.diff
new file mode 100644 (file)
index 0000000..b4ccb0f
--- /dev/null
@@ -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 (file)
index 0000000..df3b4aa
--- /dev/null
@@ -0,0 +1,2 @@
+101_remove-ancc-refs.diff
+201_use-debian-paths.diff
index 5a8e7f51f87d24dd999823ff91ad68ec1a5a61bd..e77dd54e908ccf36eee3acb47a3319fa2566572e 100755 (executable)
@@ -1,6 +1,8 @@
 #!/usr/bin/make -f
 
-build :
+include /usr/share/quilt/quilt.make
+
+build :  $(QUILT_STAMPFN)
 
 binary : binary-arch binary-indep
 
index 9bd95766eba306d8e062f70253708713830a4f29..2b36f1e533460956d6a7fcf1655d9e385d5512d8 100644 (file)
@@ -2,7 +2,8 @@
 <h1> Welcome to Memories </h1>
 
 <p>
- 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.
 </p>
 <p>
  To view other people's photos, look at the <a
index f39e8b5dd969f75c89799ad66e0c59b947aa313f..2ac00f446bd1961a1d6c6a70f8a95eb649e5af88 100644 (file)
@@ -1,6 +1,6 @@
 <html>
 <head>
-    <title> Memories - Photo Sharing </title>
+    <title> Memories - ANCC 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"
index ad88ff84974eb0c8c6c483aaadfc8ef39a086bb1..d17d3cb322fc348029e99c576367a249a120384b 100644 (file)
@@ -1,6 +1,6 @@
 <html>
 <head>
-    <title> Memories - Photo Sharing </title>
+    <title> Memories - ANCC 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>