[SCM] proftpd-mod-geoip branch, master, updated. 5088385c2cadb15e479dbe6a9861fa64bbf02ff5

Mon Mar 7 13:43:59 UTC 2011

The following commit has been merged in the master branch:
commit 5088385c2cadb15e479dbe6a9861fa64bbf02ff5
Author: Fabrizio Regalli <fabreg at fabreg.it>
Date:   Mon Mar 7 14:46:18 2011 +0100

    Fix debian/copyright

diff --git a/debian/copyright b/debian/copyright
index 4f6d5df..a68fc2f 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -1,114 +1,30 @@
-This package was debianized by Johnie Ingram (johnie at debian.org)
-Mon,  2 Jun 1997 12:43:52 -0400, two minutes after its first public release.
-Since 2001 maintained on best effort basis by 
-Francesco Paolo Lovergine <frankie at debian.org>
+Format: http://dep.debian.net/deps/dep5/
+Upstream-Name: mod_geoip
+Upstream-Contact: TJ Saunders
+Source: http://www.castaglia.org/proftpd/modules/mod_geoip.html
+
+Files: *
+Copyright: 	2007-2010, TJ Saunders
+License: GPL-2+
+
+License: GPL-2+
+ This package 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 2 of the License, or
+ (at your option) any later version.
+ .
+ This package is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ GNU General Public License for more details.
+ .
+ You should have received a copy of the GNU General Public License
+ along with this program. If not, see <http://www.gnu.org/licenses/>
+ .
+ On Debian systems, the complete text of the GNU General
+ Public License version 2 can be found in "/usr/share/common-licenses/GPL-2".
+
+Files: debian/*
+Copyright: 2011, Fabrizio Regalli <fabreg at fabreg.it>
+License: GPL-2+
 
-The canonical location is:
-	ftp://ftp.proftpd.org/distrib/source/	
-
-Authors: The ProFTPD Project team i.e.
-	 	TJ Saunders 
-	 	John Morrissey
-		Habeeb J. Dihu
-		Johnie Ingram
-		James Dogopoulos
-		and other past and present contributors.
-
-Copyright:
-
-The core code is made available under the terms of the GPL2+:
-
- * ProFTPD - FTP server daemon
- * Copyright (c) 1997, 1998 Public Flood Software
- * Copyright (c) 1999, 2000 MacGyver aka Habeeb J. Dihu <macgyver at tos.net>
- * Copyright (c) 2001-2008 The ProFTPD Project team
- * Copyright (c) 2001-2008 TJ Saunders <tj at castaglia.org>
- *
- * 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 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the 
- * Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston,
- * MA 02110-1301, USA.
- *
- * As a special exemption, Public Flood Software/MacGyver aka Habeeb J. Dihu
- * and other respective copyright holders give permission to link this program
- * with OpenSSL, and distribute the resulting executable, without including
- * the source code for OpenSSL in the source distribution.
-
-On Debian GNU/Linux systems, the text of the GPL can be found in
-/usr/share/common-licenses/GPL.
-
-This package includes xferlog.5 and the xferstats program from
-wu-ftpd-academ, as modified by Holger Preiss (TU Dresden):
-
-    Copyright (c) 1994  Washington University in Saint Louis.
-    All rights reserved.
-
-    This product includes software developed by Washington University
-    in Saint Louis and its contributors.
-
-    Copyright (c) 1980, 1985, 1988, 1989, 1990  The Regents of the
-    University of California.  All rights reserved.
-
-    This product includes software developed by the University of
-    California, Berkeley and its contributors.
-
-    THIS SOFTWARE IS PROVIDED BY WASHINGTON UNIVERSITY 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 WASHINGTON
-    UNIVERSITY 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.
-
-
-Modifications for Debian are copyright (C) 1997-2000 Johnie Ingram,
-copyright (C) 2001-2009 Francesco Paolo Lovergine,
-and also released under the terms of the GPL -- version 2, or any
-later version.
-
-mod_tls.c is distributed under the following terms (BSD license):
-
- * AUTH/TLS module for ProFTPD, based on the mod_sample.c file.
- *
- * Copyright (c) 2000 - 2002 Peter 'Luna' Runestig <peter at runestig.com>
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without modifi-
- * cation, are permitted provided that the following conditions are met:
- *
- *    o Redistributions of source code must retain the above copyright notice,
- *      this list of conditions and the following disclaimer.
- *
- *    o Redistributions in binary form must reproduce the above copyright no-
- *      tice, this list of conditions and the following disclaimer in the do-
- *      cumentation and/or other materials provided with the distribution.
- *
- *    o The names of the contributors may not be used to endorse or promote
- *      products derived from this software without specific prior written
- *      permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS 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 REGENTS OR CONTRIBUTORS BE LI-
- * ABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUEN-
- * TIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEV-
- * ER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABI-
- * LITY, 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.

-- 
Packaging for mod_geoip proftpd module.

