[Glibc-bsd-commits] r4450 - trunk/freebsd-quota/debian

[Guillem Jover]

Author: guillem
Date: 2013-05-18 18:56:28 +0000 (Sat, 18 May 2013)
New Revision: 4450

Modified:
   trunk/freebsd-quota/debian/changelog
   trunk/freebsd-quota/debian/copyright
Log:
Use canonical license names (w/o aliases) in copyright file


Modified: trunk/freebsd-quota/debian/changelog
===================================================================
--- trunk/freebsd-quota/debian/changelog	2013-05-18 18:39:34 UTC (rev 4449)
+++ trunk/freebsd-quota/debian/changelog	2013-05-18 18:56:28 UTC (rev 4450)
@@ -13,6 +13,7 @@
   * Use correct continuation line in field paragraph on copyright file.
   * Do not pass obsolete COPTS to upstream build system.
   * Use current copyright format 1.0 format URI.
+  * Use canonical license names (w/o aliases) in copyright file.
 
  -- Guillem Jover <guillem at debian.org>  Wed, 01 May 2013 16:42:02 +0200
 

Modified: trunk/freebsd-quota/debian/copyright
===================================================================
--- trunk/freebsd-quota/debian/copyright	2013-05-18 18:39:34 UTC (rev 4449)
+++ trunk/freebsd-quota/debian/copyright	2013-05-18 18:56:28 UTC (rev 4450)
@@ -5,11 +5,11 @@
 
 Files: */Makefile
 Copyright: 2010, The FreeBSD Project
-License: FreeBSD
+License: BSD-2-clause
 
 Files: libexec/rpc.rquotad/rpc.rquotad.8
 Copyright: 1994, Theo de Raadt
-License: 4-clause BSD
+License: BSD-4-clause
 
 Files: libexec/rpc.rquotad/rquotad.c
 Copyright: none
@@ -19,16 +19,16 @@
 
 Files: sbin/fsck/fsck.8 sbin/fsck/fsutil.h
 Copyright: 1996, Christos Zoulas
-License: 4-clause BSD
+License: BSD-4-clause
 
 Files: sbin/fsck/fsck.c
 Copyright: 1980-1994, Regents of the Univ. of California
            1996 Christos Zoulas
-License: 4-clause BSD
+License: BSD-4-clause
 
 Files: sbin/fsck/fsutil.c sbin/fsck/preen.c
 Copyright: 1990,1993, Regents of the Univ. of California
-License: 3-clause BSD
+License: BSD-3-clause
 
 Files: sbin/fsck_ffs/SMM.doc/* sbin/fsck_ffs/dir.c sbin/fsck_ffs/fsck_ffs.8
  sbin/fsck_ffs/fsck.h sbin/fsck_ffs/fsutil.c sbin/fsck_fss/gjournal.c
@@ -37,42 +37,42 @@
  sbin/fsck_fss/pass4.c sbin/fsck_fss/pass5.c sbin/fsck_fss/setup.c
  sbin/fsck_fss/utilities.c
 Copyright: 1980-1996, Regents of the Univ. of California
-License: 3-clause BSD
+License: BSD-3-clause
 
 Files: sbin/fsck_ffs/fsck.h
 Copyright: 2002, Networks Associates Technology, Inc.
-License: 2-clause BSD
+License: BSD-2-clause
 Comment: Shared copyright
 
 Files: sbin/fsck_ffs/gjournal.c
 Copyright: 2006, Pawel Jakub Dawidek <pjd at FreeBSD.org>
-License: 2-clause BSD
+License: BSD-2-clause
 Comment: Shared copyright
 
 Files: sbin/fsck_ffs/ea.c
 Copyright: 2002, Poul-Henning Kamp
            2002, Networks Associates Technology, Inc.
-License: 3-clause BSD
+License: BSD-3-clause
 
 Files: sbin/quotacheck/*
 Copyright: 1983-1993, Regents of the Univ. of California
-License: 3-clause BSD
+License: BSD-3-clause
 
 Files: usr.bin/quota/*
 Copyright: 1980-1993, Regents of the Univ. of California
-License: 4-clause BSD
+License: BSD-4-clause
 
 Files: usr.sbin/edquota/* usr.sbin/quotaon/* usr.sbin/repquota/*
 Copyright: 1980-1993, Regents of the Univ. of California
-License: 3-clause BSD
+License: BSD-3-clause
 
 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: BSD-2-clause
 
-License: 4-clause BSD
+License: BSD-4-clause
  Redistribution and use in source and binary forms, with or without
  modification, are permitted provided that the following conditions
  are met:
@@ -101,7 +101,7 @@
  OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  SUCH DAMAGE.
 
-License: 3-clause BSD
+License: BSD-3-clause
  Redistribution and use in source and binary forms, with or without
  modification, are permitted provided that the following conditions
  are met:
@@ -128,7 +128,7 @@
 Comment: Some files name the third condition as "4.", but the wording
  remains the same.
 
-License: 2-clause BSD, FreeBSD
+License: BSD-2-clause
  Redistribution and use in source and binary forms, with or without
  modification, are permitted provided that the following conditions
  are met: