[Pkg-samba-maint] r2001 - branches/samba/experimental/debian

[bubulle at alioth.debian.org]

Author: bubulle
Date: 2008-07-06 07:36:51 +0000 (Sun, 06 Jul 2008)
New Revision: 2001

Modified:
   branches/samba/experimental/debian/README.debian
   branches/samba/experimental/debian/changelog
   branches/samba/experimental/debian/copyright
Log:
Merge r1827

Modified: branches/samba/experimental/debian/README.debian
===================================================================
--- branches/samba/experimental/debian/README.debian	2008-07-06 07:35:40 UTC (rev 2000)
+++ branches/samba/experimental/debian/README.debian	2008-07-06 07:36:51 UTC (rev 2001)
@@ -2,14 +2,13 @@
 ----------------
 
 This package was built by Eloy Paris <peloy at debian.org>, Steve
-Langasek <vorlon at debian.org>, Noèl Köthe <noel at debian.org>, Peter
-Eisentraut <petere at debian.org> and Christian Perrier
-<bubulle at debian.org>, current maintainers of the Samba packages for
-Debian, based on previous work from Bruce Perens <Bruce at Pixar.com>,
-Andrew Howell <andrew at it.com.au>, Klee Dienes <klee at debian.org> and
-Michael Meskes <meskes at topsystem.de>, all previous maintainers of the
-packages samba and sambades (merged together for longer than we can
-remember.)
+Langasek <vorlon at debian.org>, Noèl Köthe <noel at debian.org> and
+Christian Perrier <bubulle at debian.org>, current maintainers of the
+Samba packages for Debian, based on previous work from Peter
+Eisentraut <petere at debian.org>, Bruce Perens <Bruce at Pixar.com>, Andrew
+Howell <andrew at it.com.au>, Klee Dienes <klee at debian.org> and Michael
+Meskes <meskes at topsystem.de>, all previous maintainers of the packages
+samba and sambades (merged together for longer than we can remember.)
 
 Contents of this README file:
 

Modified: branches/samba/experimental/debian/changelog
===================================================================
--- branches/samba/experimental/debian/changelog	2008-07-06 07:35:40 UTC (rev 2000)
+++ branches/samba/experimental/debian/changelog	2008-07-06 07:36:51 UTC (rev 2001)
@@ -26,6 +26,8 @@
   * Create the entire set of directories needed by clients for
     Point-and-Click printing (including old clients!) in
     /var/lib/samba/printers (idea taken from SerNet packages)
+  * Update copyright and README.debian information for current and past
+    maintainers. Remove redundant mention of Tridge (the copyright is enough)
 
   [ Steve Langasek ]
   * New upstream release

Modified: branches/samba/experimental/debian/copyright
===================================================================
--- branches/samba/experimental/debian/copyright	2008-07-06 07:35:40 UTC (rev 2000)
+++ branches/samba/experimental/debian/copyright	2008-07-06 07:36:51 UTC (rev 2001)
@@ -1,13 +1,13 @@
 This is the Debian Linux prepackaged version of the Samba SMB
-(LAN-Manager) server. Samba was written by Andrew Tridgell
-<Andrew.Tridgell at anu.edu.au> and many others.
+(LAN-Manager) server.
 
-This package was put together by Eloy Paris <peloy at debian.org>,
-Steve Langasek <vorlon at debian.org>, and Víctor Pérez Pereira 
-<vperez at debianvenezuela.org> based on previous work by 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>.
+This package was put together by Eloy Paris <peloy at debian.org>, 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
+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>.
 
 Copyright © 1992-2008 Andrew Tridgell and the Samba Team