[Pkg-cyrus-sasl2-commits] r630 - in /cyrus-sasl-2.1/trunk/debian: changelog copyright
roberto at users.alioth.debian.org
roberto at users.alioth.debian.org
Tue Mar 15 01:14:34 UTC 2011
Author: roberto
Date: Tue Mar 15 01:14:32 2011
New Revision: 630
URL: http://svn.debian.org/wsvn/pkg-cyrus-sasl2/?sc=1&rev=630
Log:
Change to machine readable copyright file (Closes: 470948)
Modified:
cyrus-sasl-2.1/trunk/debian/changelog
cyrus-sasl-2.1/trunk/debian/copyright
Modified: cyrus-sasl-2.1/trunk/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-cyrus-sasl2/cyrus-sasl-2.1/trunk/debian/changelog?rev=630&op=diff
==============================================================================
--- cyrus-sasl-2.1/trunk/debian/changelog (original)
+++ cyrus-sasl-2.1/trunk/debian/changelog Tue Mar 15 01:14:32 2011
@@ -17,8 +17,9 @@
Thanks to Raoul Bhatia for the patch (Closes: #589181)
* Fix documentation on saslauthd runtime directory perms (Closes: #528554)
* Add Danish translation, thanks to Joe Dalton. (Closes: #585553)
-
- -- Roberto C. Sanchez <roberto at connexer.com> Mon, 14 Mar 2011 16:44:52 -0400
+ * Change to machine readable copyright file (Closes: 470948)
+
+ -- Roberto C. Sanchez <roberto at connexer.com> Mon, 14 Mar 2011 21:13:47 -0400
cyrus-sasl2 (2.1.23.dfsg1-7) unstable; urgency=low
Modified: cyrus-sasl-2.1/trunk/debian/copyright
URL: http://svn.debian.org/wsvn/pkg-cyrus-sasl2/cyrus-sasl-2.1/trunk/debian/copyright?rev=630&op=diff
==============================================================================
--- cyrus-sasl-2.1/trunk/debian/copyright (original)
+++ cyrus-sasl-2.1/trunk/debian/copyright Tue Mar 15 01:14:32 2011
@@ -1,64 +1,63 @@
-This package was debianized by Fabian Fagerholm <fabbe at debian.org> on
-Fri, 28 May 2006 10:03:07 -0300.
+Format: http://svn.debian.org/wsvn/dep/web/deps/dep5.mdwn?op=file&rev=173
+Upstream-Name: Cyrus SASL
+Source: ftp://ftp.andrew.cmu.edu/pub/cyrus-mail/
-It was downloaded from ftp://ftp.andrew.cmu.edu/pub/cyrus-mail/
+Files: *
+Copyright: 1998-2003, Carnegie Mellon University
+License: BSD-4-clause
+ /*
+ * Copyright (c) 1998-2003 Carnegie Mellon University. All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ *
+ * 1. Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ *
+ * 2. Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in
+ * the documentation and/or other materials provided with the
+ * distribution.
+ *
+ * 3. The name "Carnegie Mellon University" must not be used to
+ * endorse or promote products derived from this software without
+ * prior written permission. For permission or any other legal
+ * details, please contact
+ * Office of Technology Transfer
+ * Carnegie Mellon University
+ * 5000 Forbes Avenue
+ * Pittsburgh, PA 15213-3890
+ * (412) 268-4387, fax: (412) 268-7395
+ * tech-transfer at andrew.cmu.edu
+ *
+ * 4. Redistributions of any form whatsoever must retain the following
+ * acknowledgment:
+ * "This product includes software developed by Computing Services
+ * at Carnegie Mellon University (http://www.cmu.edu/computing/)."
+ *
+ * CARNEGIE MELLON UNIVERSITY DISCLAIMS ALL WARRANTIES WITH REGARD TO
+ * THIS SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY
+ * AND FITNESS, IN NO EVENT SHALL CARNEGIE MELLON UNIVERSITY BE LIABLE
+ * FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
+ * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN
+ * AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING
+ * OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+ */
-Copyright Holder: Carnegie Mellon University
+Files: debian/*
+Copyright: 2002-2004, Dima Barsky <dima at debian.org>
+ 2006-2009, Fabian Fagerholm <fabbe at debian.org>
+ 2006-2011, Roberto C. Sanchez <roberto at connexer.com>
+License: GPL-2+ or BSD-2-clause
+ On Debian systems, the complete text of the GNU General Public License,
+ version 2, can be found in /usr/share/common-licenses/GPL-2.
-Authors: Tim Martin, Rob Earhart, Rob Siemborski
+Files: debian/saslfinger/*
+Copyright: 2004, Patrick Koetter
+License: GPL-3+
+ On Debian systems, the complete text of the GNU General Public License,
+ version 3, can be found in /usr/share/common-licenses/GPL-3.
+Comment: The saslfinger utility was downloaded from
+ http://postfix.state-of-mind.de/patrick.koetter/saslfinger/
-License:
-/*
- * Copyright (c) 1998-2003 Carnegie Mellon University. All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- *
- * 1. Redistributions of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer.
- *
- * 2. Redistributions in binary form must reproduce the above copyright
- * notice, this list of conditions and the following disclaimer in
- * the documentation and/or other materials provided with the
- * distribution.
- *
- * 3. The name "Carnegie Mellon University" must not be used to
- * endorse or promote products derived from this software without
- * prior written permission. For permission or any other legal
- * details, please contact
- * Office of Technology Transfer
- * Carnegie Mellon University
- * 5000 Forbes Avenue
- * Pittsburgh, PA 15213-3890
- * (412) 268-4387, fax: (412) 268-7395
- * tech-transfer at andrew.cmu.edu
- *
- * 4. Redistributions of any form whatsoever must retain the following
- * acknowledgment:
- * "This product includes software developed by Computing Services
- * at Carnegie Mellon University (http://www.cmu.edu/computing/)."
- *
- * CARNEGIE MELLON UNIVERSITY DISCLAIMS ALL WARRANTIES WITH REGARD TO
- * THIS SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY
- * AND FITNESS, IN NO EVENT SHALL CARNEGIE MELLON UNIVERSITY BE LIABLE
- * FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
- * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN
- * AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING
- * OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
- */
-
-The saslfinger utility was downloaded from
-http://postfix.state-of-mind.de/patrick.koetter/saslfinger/
-
-The following copyright and license terms apply:
-
-Copyright © 2004 Patrick Koetter
-
-This program is free software: you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation, either version 3 of the License, or (at
-your option) any later version.
-
-On Debian systems, the complete text of the GNU General Public License,
-version 3, can be found in /usr/share/common-licenses/GPL-3.
More information about the Pkg-cyrus-sasl2-commits
mailing list