From 3b96cacb21a7599b3b404fc116ca9e859f042ea0 Mon Sep 17 00:00:00 2001
From: Michael Spang <mspang@uwaterloo.ca>
Date: Sat, 7 Jul 2007 04:03:27 -0400
Subject: [PATCH 1/4] Move xml2ics.pl into scripts/.

---
 Makefile                         | 2 +-
 xml2ics.pl => scripts/xml2ics.pl | 0
 2 files changed, 1 insertion(+), 1 deletion(-)
 rename xml2ics.pl => scripts/xml2ics.pl (100%)

diff --git a/Makefile b/Makefile
index 79a0586..34c3763 100644
--- a/Makefile
+++ b/Makefile
@@ -26,7 +26,7 @@ books.xml:
 	echo '</booklist>' >> $@
 
 events.ics:
-	perl xml2ics.pl events.xml > events.ics
+	perl scripts/xml2ics.pl events.xml > events.ics
 
 include default.mk
 
diff --git a/xml2ics.pl b/scripts/xml2ics.pl
similarity index 100%
rename from xml2ics.pl
rename to scripts/xml2ics.pl

From 4bf8f8cba0d46168a734253c00c3b3f87ecc2573 Mon Sep 17 00:00:00 2001
From: Holden Karau <hkarau@caffeine.csclub.uwaterloo.ca>
Date: Mon, 16 Jul 2007 14:08:36 -0400
Subject: [PATCH 2/4] Turned on buttons for PMC/SAMS

---
 media/index.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/media/index.xml b/media/index.xml
index 0533129..5c0102c 100644
--- a/media/index.xml
+++ b/media/index.xml
@@ -11,7 +11,7 @@
     CD or DVD should you so choose.
     <ul>
 
-<mediaitem title="PMAMC&amp;OC SASMS - Spring 2007">
+<mediaitem title="PMAMC&amp;OC SASMS - Spring 2007" buttons="true">
   <mediafile file="pmc-sasms-spring-2007.avi" type="XviD" size="643M" />
   <mediafile file="pmc-sasms-spring-2007.ogg" type="OGG/Theora" size="598M" />
   <mediafile file="pmc-sasms-spring-2007.mp4" type="MP4" size="625M" />

From 0b91f807766bf32eed4583d1d156d4e1c891de70 Mon Sep 17 00:00:00 2001
From: David Tenty <daltenty@csclub.uwaterloo.ca>
Date: Mon, 16 Jul 2007 16:28:02 -0400
Subject: [PATCH 3/4] fixed pmc site

---
 clubs/index.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/clubs/index.xml b/clubs/index.xml
index 868d472..57d7e5f 100644
--- a/clubs/index.xml
+++ b/clubs/index.xml
@@ -42,7 +42,7 @@
     <li><a href="http://www.mathsoc.uwaterloo.ca/">The Mathematics Society (MathSoc)</a></li>
     <li><a href="http://csclub.uwaterloo.ca/~ndp/">UW New Democratic Party Club</a></li>
     <li>Ontario Sikh Students Association</li>
-    <li><a href="http://www.undergrad.math.uwaterloo.ca/%7Epmclub/">Pure Math, Applied Math, and C&amp;O Club</a></li>
+    <li><a href="http://www.student.math.uwaterloo.ca/~pmclub/">Pure Math, Applied Math, and C&amp;O Club</a></li>
     <li><a href="http://csclub.uwaterloo.ca/~skiclub/">UW Ski Club</a></li>
     <li><a href="http://csclub.uwaterloo.ca/~spanish/">UW Spanish Club</a></li>
     <li><a href="http://csclub.uwaterloo.ca/~spp/">Student Programming Project</a></li>

From aca12e3b5b2eb3b82d7fd47f1470bfe842c97130 Mon Sep 17 00:00:00 2001
From: Michael Spang <mspang@uwaterloo.ca>
Date: Mon, 16 Jul 2007 16:58:43 -0400
Subject: [PATCH 4/4] Fix cow Makefile to install to /usr/local

This makes it safe to build on multiple machines
of different architectures.
---
 cow/.gitignore |  4 +++-
 cow/Makefile   | 11 +++++++++--
 cow/cow        |  2 ++
 3 files changed, 14 insertions(+), 3 deletions(-)
 create mode 100755 cow/cow

diff --git a/cow/.gitignore b/cow/.gitignore
index 7651631..50fd5e2 100644
--- a/cow/.gitignore
+++ b/cow/.gitignore
@@ -1,2 +1,4 @@
 *.o
-/cow
+/i686
+/x86_64
+/alpha
diff --git a/cow/Makefile b/cow/Makefile
index 4465291..8db51e4 100644
--- a/cow/Makefile
+++ b/cow/Makefile
@@ -1,10 +1,17 @@
-MAIN = cow
+ARCH=$(shell uname -m)
+MAIN = $(ARCH)/cow
 CFLAGS = -I/usr/include/libxml2 -DDEBUG -pedantic -ansi -Wall
 LDFLAGS = $(CFLAGS) -lxml2 -lxslt
 SOURCES = $(wildcard *.c)
-OBJECTS = $(SOURCES:.c=.o)
+OBJECTS = $(addprefix $(ARCH)/,$(SOURCES:.c=.o))
 
 all: $(MAIN)
 
+$(ARCH):
+	mkdir -p $(ARCH)
+
 $(MAIN): $(OBJECTS)
 	$(CC) $(LDFLAGS) -o $@ $(OBJECTS)
+
+$(ARCH)/%.o: %.c $(ARCH)
+	$(CC) -c $(CFLAGS) -o $@ $<
diff --git a/cow/cow b/cow/cow
new file mode 100755
index 0000000..2cfccc3
--- /dev/null
+++ b/cow/cow
@@ -0,0 +1,2 @@
+#!/bin/sh
+exec "$(dirname $0)/$(uname -m)/$(basename $0)" "$@"