Subversion Repositories prayer

Compare Revisions

Ignore whitespace Rev 90 → Rev 91

/trunk/debian/changelog
1,6 → 1,10
prayer (1.3.2-1) experimental; urgency=low
prayer (1.3.2-dfsg1-1) experimental; urgency=low
 
* New upstream release.
* New upstream release (Closes: #546918).
- Repacked without University of Cambridge logos with dubious
copyright/license status (more info in debian/copyright).
- unbrand_cam_template.patch: Remove said Cambridge-specific graphics
from 'cam' template set.
- Drop unlimit_login_username.patch (fixed upstream when replacing
the old login screen with frontend templates) and
usernames_with_at.patch (incorporated upstream).
9,7 → 13,7
* dlopen_templates.patch: Experimental support for dynamically loading
templates.
 
-- Magnus Holmgren <holmgren@debian.org> Sun, 13 Sep 2009 00:44:09 +0200
-- Magnus Holmgren <holmgren@debian.org> Mon, 28 Sep 2009 23:08:14 +0200
 
prayer (1.2.3-2) unstable; urgency=low
 
/trunk/debian/patches/unbrand_cam_template.patch
0,0 → 1,40
--- a/templates/cam/compose_toolbar.t
+++ b/templates/cam/compose_toolbar.t
@@ -2,8 +2,6 @@
<div id="skip"> <a href="#skip-content" accesskey="2">Skip to content</a></div>
<div id="header">
<div id="branding">
- <a href="http://www.cam.ac.uk/" accesskey="1">
- <img src="/icons/ucs-id-small.jpg" alt="" class="logo" /></a>
</div>
<div id="change-to">
<div class="change">
--- a/templates/cam/login.t
+++ b/templates/cam/login.t
@@ -41,13 +41,6 @@ table#login td input {margin:0 0 0.5em 0
<div id="skip"> <a
href="#skip-content" accesskey="2">Skip to content</a> </div>
<div id="header">
-<div id="branding">
-<a href="http://www.cam.ac.uk/" accesskey="1">
- <img src="/icons/identifier.gif"
- alt="University of Cambridge" class="ucam" />
- <img src="/icons/ucs.gif" alt="" class="logo" />
-</a>
-</div>
</div>
%
<div id="dept-title">
--- a/templates/cam/toolbar.t
+++ b/templates/cam/toolbar.t
@@ -4,9 +4,7 @@
href="#skip-content" accesskey="2">Skip to content</a> </div>
<div id="header">
<div id="branding">
- <a href="http://www.cam.ac.uk/" accesskey="1">
- <img src="/icons/ucs-id-small.jpg" alt="" class="logo" />
-</a></div>
+</div>
<div id="change-to">
<form method="post" accept-charset="UTF-8"
enctype="multipart/form-data" action="<% change |s %>">
/trunk/debian/patches/series
3,3 → 3,4
kfreebsd.patch
clean_completely.patch
dlopen_templates.patch
unbrand_cam_template.patch
/trunk/debian/watch
6,4 → 6,5
# Compulsory line, this is a version 3 file
version=3
 
ftp://ftp.csx.cam.ac.uk/pub/software/email/prayer/prayer-(.*)\.tar\.gz debian uupdate
opts=dversionmangle=s/-dfsg\d*$// \
ftp://ftp.csx.cam.ac.uk/pub/software/email/prayer/prayer-(.*)\.tar\.gz
/trunk/debian/copyright
3,6 → 3,16
 
It was downloaded from ftp://ftp.csx.cam.ac.uk/pub/software/email/prayer
 
However, due to dubious copyright/licensing status of the coat of
arms/logo of the University of Cambridge, the upstream (.orig) tarball
has been modified by removing the following files from the files/icons
directory:
 
identifier.gif
identifier800.gif
ucs-id-small.jpg
univheader.gif
 
Upstream author/maintainer: David Carter <dpc22@cam.ac.uk> et al.
 
The Debian packaging is © 2006-2008 Magnus Holmgren <holmgren@debian.org>