[Pkg-samba-maint] r4022 - trunk/samba/debian

[vorlon at alioth.debian.org]

Author: vorlon
Date: 2012-02-25 06:48:21 +0000 (Sat, 25 Feb 2012)
New Revision: 4022

Modified:
   trunk/samba/debian/changelog
   trunk/samba/debian/copyright
Log:
Use Debian copyright-format 1.0 in debian/copyright.

Modified: trunk/samba/debian/changelog
===================================================================
--- trunk/samba/debian/changelog	2012-02-24 22:11:53 UTC (rev 4021)
+++ trunk/samba/debian/changelog	2012-02-25 06:48:21 UTC (rev 4022)
@@ -9,6 +9,9 @@
   [ Christian Perrier ]
   * slo slk sk Slovak (Ivan Masár).  Closes: #661125
 
+  [ Steve Langasek ]
+  * Use Debian copyright-format 1.0 in debian/copyright.
+
  -- Christian Perrier <bubulle at debian.org>  Sun, 05 Feb 2012 18:53:23 +0100
 
 samba (2:3.6.3-1) unstable; urgency=low

Modified: trunk/samba/debian/copyright
===================================================================
--- trunk/samba/debian/copyright	2012-02-24 22:11:53 UTC (rev 4021)
+++ trunk/samba/debian/copyright	2012-02-25 06:48:21 UTC (rev 4022)
@@ -1,30 +1,33 @@
-This is the Debian Linux prepackaged version of the Samba SMB
-(LAN-Manager) server.
+Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
+Upstream-Name: samba
+Upstream-Contact: samba-technical at lists.samba.org
+Source: ftp://ftp.samba.org/pub/samba
 
-This package was put together by Steve Langasek <vorlon at debian.org>,
-Noèl Köthe <noel at debian.org> and Christian Perrier
-<bubulle at debian.org>, based on previous work by Eloy Paris
-<peloy at debian.org>, Peter Eisentraut <petere at debian.org>, Víctor Pérez
-Pereira <vperez at debianvenezuela.org>, Klee Dienes <klee at debian.org>,
-Andrew Howell <andrew at it.com.au> and Bruce Perens <bruce at pixar.com>
-from sources found at <URL:ftp://ftp.samba.org/pub/samba>.
+Files: *
+Copyright: 1992-2012 Andrew Tridgell and the Samba Team
+License: GPL-3
 
-Copyright © 1992-2009 Andrew Tridgell and the Samba Team
+Files: debian/*
+Copyright: 2001-2011 Steve Langasek <vorlon at debian.org>,
+	2005-2012 Christian Perrier <bubulle at debian.org>,
+	2005-2008 Noèl Köthe <noel at debian.org>,
+	2005-2008 Peter Eisentraut <petere at debian.org>, et al.
+License: GPL-3
 
+License: GPL-3
    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; version 3 dated June, 2007.
-
+   .
    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.
-
-
-On Debian GNU/Linux systems, the complete text of the GNU General
-Public License can be found in `/usr/share/common-licenses/GPL-3'.
+   .
+   On Debian GNU/Linux systems, the complete text of the GNU General
+   Public License can be found in `/usr/share/common-licenses/GPL-3'.