[Debpool-commits] [SCM] Debpool Project Repository branch, andres, updated. 0.2.3-78-g407119d

[Andres Mejia]

The following commit has been merged in the andres branch:
commit 407119d558a7af37a3cf18e98c3dd6a84a054e11
Author: Andres Mejia <mcitadel at gmail.com>
Date:   Wed Oct 15 15:35:51 2008 -0400

      * Changed copyright format, included myself in copyright. It uses the format
        proposed in http://wiki.debian.org/Proposals/CopyrightFormat.

diff --git a/debian/changelog b/debian/changelog
index 523e1cb..91ec9e4 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -69,7 +69,8 @@ debpool (0.3.6) experimental; urgency=low
     could not be overridden.
   * Wrote a proper manpage for debpool.
   * Minor edit in description for DebPool::Config.
-  * Changed copyright format, included myself in copyright.
+  * Changed copyright format, included myself in copyright. It uses the format
+    proposed in http://wiki.debian.org/Proposals/CopyrightFormat.
   * Removed LICENSE file, as it was redundant to debian/copyright.
   * Changed Maintainer to use debpool developer's email.
     + Added most active developers to Uploaders field.
@@ -103,7 +104,7 @@ debpool (0.3.6) experimental; urgency=low
   * Updated TODO list.
   * Bumped debhelper build depends to (>= 5).
 
- -- Andres Mejia <mcitadel at gmail.com>  Wed, 15 Oct 2008 15:01:18 -0400
+ -- Andres Mejia <mcitadel at gmail.com>  Wed, 15 Oct 2008 15:35:31 -0400
 
 debpool (0.2.3) experimental; urgency=low
 
diff --git a/debian/copyright b/debian/copyright
index 7a0d5ae..feb1103 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -1,36 +1,30 @@
-This is a Debian Native package.
+Format-Specification:
+ http://wiki.debian.org/Proposals/CopyrightFormat?action=recall&rev=237
 
 Files: *
 Copyright: (C) 2003-2004 Joel Aelwyn <fenton at debian.org>
-           (C) 2007-2008 Andres Mejia <mcitadel at gmail.com>
+Copyright: (C) 2007-2008 Andres Mejia <mcitadel at gmail.com>
 License: BSD-3
-#####
-#
-# Copyright (C) 2003-2004 Joel Aelwyn. All rights reserved.
-# Copyright (C) 2007-2008 Andres Mejia. 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. Neither the name of the Author nor the names of any contributors
-#    may be used to endorse or promote products derived from this software
-#    without specific prior written permission.
-# 
-# THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
-# ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-# IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-# ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
-# FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
-# DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
-# OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
-# HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
-# LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
-# OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
-# SUCH DAMAGE.
-#
-#####
+ 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. Neither the name of the Author nor the names of any contributors
+    may be used to endorse or promote products derived from this software
+    without specific prior written permission.
+ .
+ THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
+ ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
+ FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+ OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+ OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ SUCH DAMAGE.

-- 
Debpool Project Repository