[Pkg-shadow-commits] r620 - trunk/debian

[Christian Perrier]

Author: bubulle
Date: 2005-10-27 04:49:29 +0000 (Thu, 27 Oct 2005)
New Revision: 620

Modified:
   trunk/debian/changelog
   trunk/debian/copyright
Log:
Should make our license nitpicker happy


Modified: trunk/debian/changelog
===================================================================
--- trunk/debian/changelog	2005-10-23 16:06:02 UTC (rev 619)
+++ trunk/debian/changelog	2005-10-27 04:49:29 UTC (rev 620)
@@ -12,6 +12,9 @@
     - early release of a (currently not used) udeb to allow user creation
       and password setting to be done in D-I first stage
       Patch taken from Ubuntu. Thanks to Colin Watson for providing it.
+    - debian/copyright:
+      - for RMS clones sake, stop breaking Thy Holy GNU Copyright
+        Closes: #334870
   * Patches to upstream man pages, not yet applied upstream:
     - debian/patches/457_document_useradd_groupadd_nis:
       Document that low level utilities will certainly never

Modified: trunk/debian/copyright
===================================================================
--- trunk/debian/copyright	2005-10-23 16:06:02 UTC (rev 619)
+++ trunk/debian/copyright	2005-10-27 04:49:29 UTC (rev 620)
@@ -75,8 +75,19 @@
 * merchantibility and fitness for any particular purpose.
 ************************************************************************/
 
-Source file src/su.c contains a chunk of code cribbed from the GNU su.c,
-which is covered by the GNU General Public License:
+Some parts substantially in src/su.c derived from an ancestor of
+su for GNU.  Run a shell with substitute user and group IDs.
+Copyright (C) 1992-2003 Free Software Foundation, Inc.
 
-On Debian GNU/Linux systems, the complete text of the GNU General Public
-License can be found in '/usr/share/common-licenses/GPL'
+   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, 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.
+
+   On Debian GNU/Linux systems, the complete text of the GNU General Public
+   License can be found in '/usr/share/common-licenses/GPL'