[Debpool-commits] [SCM] Debpool Project Repository branch, master, updated. 0.2.3-63-g38a32aa

[ceros-guest]

The following commit has been merged in the master branch:
commit 3cbd885bdad7da0f03895bbdf4383671d73714a9
Author: ceros-guest <ceros-guest>
Date:   Thu Jan 10 05:20:27 2008 +0000

    Removed LICENSE text as it was redundant to debian/copyright

diff --git a/LICENSE b/LICENSE
deleted file mode 100644
index aff36df..0000000
--- a/LICENSE
+++ /dev/null
@@ -1,25 +0,0 @@
-Copyright © 2003-2004 Joel Aelwyn. 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.
diff --git a/debian/changelog b/debian/changelog
index fc5dd3e..58082a9 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -57,6 +57,8 @@ debpool (0.2.4~unreleased0) experimental; urgency=low
   * Autogenerate man page for DebPool::Config during build.
   * Wrote a proper manpage for debpool.
   * Minor edit in description for DebPool::Config.
+  * Changed copyright format, included myself in copyright.
+  * Removed LICENSE file, as it was redundant to debian/copyright.
 
  -- Andres Mejia <mcitadel at gmail.com>  Tue, 08 Jan 2008 02:06:32 -0500
 
diff --git a/debian/copyright b/debian/copyright
index 2f3244b..7a0d5ae 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -1,11 +1,13 @@
 This is a Debian Native package.
 
-DebPool is Copyright © 2003-2004 by Joel Aelwyn (aka Joel Baker), and is
-released under the following license:
-
+Files: *
+Copyright: (C) 2003-2004 Joel Aelwyn <fenton at debian.org>
+           (C) 2007-2008 Andres Mejia <mcitadel at gmail.com>
+License: BSD-3
 #####
 #
-# Copyright © 2003-2004 Joel Aelwyn. All rights reserved.
+# 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

-- 
Debpool Project Repository