Final NMU patch.

[userv.git] / debian / copyright

diff --git a/debian/copyright b/debian/copyright
index 8f6ef1c81fa37cb900f280f21239423efda4f6ed..41b1bb3b56b5b6ac1741f53d6f15d051f32e84d4 100644 (file)
--- a/debian/copyright
+++ b/debian/copyright
@@ -3,7 +3,7 @@ This is Debian/GNU Linux's prepackaged version of Ian Jackson's
 
 This package was put together from the upstream sources by the
 upstream author.  Please contact Ian Jackson at
 
 This package was put together from the upstream sources by the
 upstream author.  Please contact Ian Jackson at

-<ian@chiark.greenend.org.uk> for matters relating to the Debian
+<ian@davenant.greenend.org.uk> for matters relating to the Debian

 package in particular or <userv-maint@chiark.greenend.org.uk> for
 general enquiries about userv.
 
 package in particular or <userv-maint@chiark.greenend.org.uk> for
 general enquiries about userv.
 


@@ -12,7 +12,8 @@ scheme, by adding various debian/* files and arranging for the uservd
 daemon to be started automatically.
 
 
 daemon to be started automatically.
 
 

-userv is Copyright (C)1996-9 Ian Jackson <ian@chiark.greenend.org.uk>.
+Copyright (C)1996-2000 Ian Jackson <ian@davenant.greenend.org.uk>.
+Copyright (C)2000      Ben Harris <bjh21@cam.ac.uk>.

 
 userv 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
 
 userv 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


@@ -25,7 +26,7 @@ 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 with
 General Public License for more details.
 
 You should have received a copy of the GNU General Public License with

-your Debian GNU/Linux system, in /usr/doc/copyright/GPL, or with the
-Debian GNU/Linux userv source package as the file COPYING; if not,
+your Debian GNU/Linux system, in /usr/share/common-licenses/GPL, or with
+the Debian GNU/Linux userv source package as the file COPYING; if not,

 email me at one of the addresses above or write to the Free Software
 Foundation, 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
 email me at one of the addresses above or write to the Free Software
 Foundation, 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.