[Glibc-bsd-commits] r3436 - in trunk/freebsd-quota/debian: . patches

[Mats Erik Andersson]

Author: meand-guest
Date: 2011-06-09 23:55:47 +0000 (Thu, 09 Jun 2011)
New Revision: 3436

Modified:
   trunk/freebsd-quota/debian/copyright
   trunk/freebsd-quota/debian/patches/07_cdevname.diff
Log:
One patch description and an incomplete copyright survey.


Modified: trunk/freebsd-quota/debian/copyright
===================================================================
--- trunk/freebsd-quota/debian/copyright	2011-06-09 15:49:25 UTC (rev 3435)
+++ trunk/freebsd-quota/debian/copyright	2011-06-09 23:55:47 UTC (rev 3436)
@@ -1,17 +1,51 @@
-Format-Specification: http://dep.debian.net/deps/dep5/
+Format: http://anonscm.debian.org/viewvc/dep/web/deps/dep5.mdwn?revision=174
 Upstream-Name: FreeBSD source tree
 Upstream-Contact: The FreeBSD Project
 Source: http://ftp.freebsd.org/pub/FreeBSD/releases/
 
-Files: *
+Files: */Makefile
 Copyright: 2010, The FreeBSD Project
 License: FreeBSD
 
+Files: libexec/rpc.rquotad/rpc.rquotad.8
+Copyright: 1994, Theo de Raadt
+License: 4-clause BSD
+
+Files: libexec/rpc.rquotad/rquotad.c
+Copyright: Manuel Bouyer <bouyer at ensta.fr>
+License: public-domain
+
+Files: sbin/fsck/*
+Copyright: 1980-1993, Regents of the Univ. of California
+           1996 Christos Zoulas
+License: 4-clause BSD, 3-clause BSD
+
+Files: sbin/fsck_ffs/*
+Copyright: 1980-1993, Regents of the Univ. of California
+           2002, Poul-Henning Kamp
+           2002, Networks Associates Technology, Inc.
+           2006, Pawel Jakub Dawidek <pjd at FreeBSD.org>
+License: 4-clause BSD, 3-clause BSD, 2-clause BSD
+
+Files: sbin/quotacheck/*
+Copyright: 1983-1993, Regents of the Univ. of California
+License: 3-clause BSD
+
+Files: usr.bin/quota/*
+Copyright: 1980-1993, Regents of the Univ. of California
+License: 3-clause BSD
+
+Files: usr.sbin/edquota/*, usr.sbin/quotaon/*, usr.sbin/repquota/*
+Copyright: 1983-1993, Regents of the Univ. of California
+License: 3-clause BSD
+
 Files: debian/*
 Copyright: 2011, Mats Erik Andersson <debian at gisladisker.se>
+           2011, Petr Salinger <petr.salinger at seznam.cz>
+           2011, Guillem Jover <guillem at debian.org>
 License: FreeBSD
 
-License: FreeBSD
+License: 4-clause BSD
  Copyright (c) 1980, 1990, 1993
  The Regents of the University of California.  All rights reserved.
  .

Modified: trunk/freebsd-quota/debian/patches/07_cdevname.diff
===================================================================
--- trunk/freebsd-quota/debian/patches/07_cdevname.diff	2011-06-09 15:49:25 UTC (rev 3435)
+++ trunk/freebsd-quota/debian/patches/07_cdevname.diff	2011-06-09 23:55:47 UTC (rev 3436)
@@ -1,6 +1,11 @@
-cdevname is also variable in fsck_ffs/fsutil.c
+Description: Avoid name duplication of 'cdevname'.
+ The identifier 'cdevname' exists in 'sbin/fsck/fsutils.*'
+ as well as in 'sbin/fsck_ffs/fsutil.*'. Hide the former
+ occurrences.
+Author: Petr Salinger <petr.salinger at seznam.cz>
+Forwarded: not-needed
+Last-Update: 2011-03-01
 
-
 --- freebsd-quota-8.2.orig/sbin/fsck/fsutil.c
 +++ freebsd-quota-8.2/sbin/fsck/fsutil.c
 @@ -64,11 +64,13 @@ setcdevname(const char *cd, int pr)