From a4a531068f79a043ed052584047a59ecc8c64ada Mon Sep 17 00:00:00 2001 From: Philippe Teuwen Date: Sun, 10 Mar 2013 00:32:05 +0100 Subject: [PATCH 1/2] Update ChangeLog --- ChangeLog | 1 + 1 file changed, 1 insertion(+) diff --git a/ChangeLog b/ChangeLog index 3636b5e..4b25acc 100644 --- a/ChangeLog +++ b/ChangeLog @@ -9,6 +9,7 @@ Fixes: - Fix warnings returned by cppcheck & clang/scan-build - Obsolete function 'usleep' => nanosleep() - Non reentrant function 'readdir' => readdir_r() + - Non reentrant function 'strtok' => new connstring_decode() - Buffer may not be null-terminated after call to strncpy() - scanf without field width limits can crash with huge input data - Resource leaks: missing fclose() From bf164220ee3b1f7ff9a1977774eeb2460043b686 Mon Sep 17 00:00:00 2001 From: Philippe Teuwen Date: Sun, 10 Mar 2013 16:15:23 +0100 Subject: [PATCH 2/2] Unify copyright notices & update authors lists --- AUTHORS | 13 +++++++- README | 13 ++++++-- README-Windows.txt | 15 +++++++--- contrib/win32/stdlib.c | 11 +++++-- contrib/win32/sys/select.h | 9 ++++-- contrib/win32/unistd.h | 10 +++++-- contrib/windows.h | 12 ++++++-- debian/copyright | 50 ++++++++++++++++++++++++++----- examples/nfc-anticol.c | 10 +++++-- examples/nfc-dep-initiator.c | 11 +++++-- examples/nfc-dep-target.c | 11 +++++-- examples/nfc-emulate-forum-tag2.c | 10 +++++-- examples/nfc-emulate-tag.c | 10 +++++-- examples/nfc-emulate-uid.c | 11 +++++-- examples/nfc-mfsetuid.c | 12 ++++++-- examples/nfc-poll.c | 11 +++++-- examples/nfc-relay.c | 11 +++++-- examples/pn53x-diagnose.c | 10 +++++-- examples/pn53x-sam.c | 11 +++++-- examples/pn53x-tamashell.c | 10 +++++-- include/nfc/nfc-emulation.h | 11 +++++-- include/nfc/nfc-types.h | 14 +++++---- include/nfc/nfc.h | 11 +++++-- libnfc/buses/uart.c | 11 +++++-- libnfc/buses/uart.h | 12 +++++--- libnfc/buses/uart_posix.c | 12 +++++--- libnfc/buses/uart_win32.c | 11 +++++-- libnfc/buses/usbbus.c | 10 +++++-- libnfc/buses/usbbus.h | 10 +++++-- libnfc/chips/pn53x-internal.h | 11 +++++-- libnfc/chips/pn53x.c | 12 +++++--- libnfc/chips/pn53x.h | 12 +++++--- libnfc/conf.c | 11 +++++-- libnfc/conf.h | 10 ++++++- libnfc/drivers.h | 12 +++++--- libnfc/drivers/acr122_pcsc.c | 12 +++++--- libnfc/drivers/acr122_pcsc.h | 12 +++++--- libnfc/drivers/acr122_usb.c | 12 +++++--- libnfc/drivers/acr122_usb.h | 12 +++++--- libnfc/drivers/acr122s.c | 12 ++++++-- libnfc/drivers/acr122s.h | 11 +++++-- libnfc/drivers/arygon.c | 12 +++++--- libnfc/drivers/arygon.h | 12 +++++--- libnfc/drivers/pn532_uart.h | 12 +++++--- libnfc/drivers/pn53x_usb.c | 12 +++++--- libnfc/drivers/pn53x_usb.h | 12 +++++--- libnfc/iso14443-subr.c | 10 +++++-- libnfc/iso7816.h | 11 +++++-- libnfc/log-internal.h | 10 ++++++- libnfc/log.c | 10 ++++++- libnfc/log.h | 11 +++++-- libnfc/log_posix.c | 13 ++++++-- libnfc/log_win32.c | 13 ++++++-- libnfc/mirror-subr.c | 10 +++++-- libnfc/mirror-subr.h | 12 ++++++-- libnfc/nfc-device.c | 11 +++++-- libnfc/nfc-emulation.c | 11 +++++-- libnfc/nfc-internal.c | 10 +++++-- libnfc/nfc-internal.h | 11 +++++-- libnfc/nfc.c | 12 +++++--- libnfc/target-subr.c | 12 +++++--- libnfc/target-subr.h | 12 +++++--- utils/mifare.c | 12 +++++--- utils/mifare.h | 12 +++++--- utils/nfc-emulate-forum-tag4.c | 12 +++++--- utils/nfc-list.c | 12 +++++--- utils/nfc-mfclassic.c | 14 +++++---- utils/nfc-mfultralight.c | 11 +++++-- utils/nfc-read-forum-tag3.c | 10 +++++-- utils/nfc-relay-picc.c | 10 +++++-- utils/nfc-scan-device.c | 12 +++++--- utils/nfc-utils.c | 12 +++++--- utils/nfc-utils.h | 12 +++++--- 73 files changed, 644 insertions(+), 226 deletions(-) diff --git a/AUTHORS b/AUTHORS index 13e8b34..c5fc004 100644 --- a/AUTHORS +++ b/AUTHORS @@ -1,3 +1,14 @@ +# Alphabetical cleaned output of "git shortlog -s -e|cut -c 8-" : +Adam Laurie +Ahti Legonkov +Alex Lian +Anugrah Redja Kusuma +Audrey Diacre +Emanuele Bertoldi +Francois Kooman +Ludovic Rousseau +Nobuhiro Iwamatsu +Philippe Teuwen Roel Verdult -Romain Tartière +Romain Tartiere Romuald Conty diff --git a/README b/README index 5f44476..bb4d7c0 100644 --- a/README +++ b/README @@ -1,7 +1,14 @@ *- -* Public platform independent Near Field Communication (NFC) library -* Copyright (C) 2009, Roel Verdult -* Copyright (C) 2010, Romain Tartière, Romuald Conty +* Free/Libre Near Field Communication (NFC) library +* +* Libnfc historical contributors: +* Copyright (C) 2009 Roel Verdult +* Copyright (C) 2009-2013 Romuald Conty +* Copyright (C) 2010-2012 Romain Tartière +* Copyright (C) 2010-2013 Philippe Teuwen +* Copyright (C) 2012-2013 Ludovic Rousseau +* Additional contributors: +* See AUTHORS file -* General Information diff --git a/README-Windows.txt b/README-Windows.txt index 3f07cfa..06b9efc 100644 --- a/README-Windows.txt +++ b/README-Windows.txt @@ -1,8 +1,15 @@ *- -* Public platform independent Near Field Communication (NFC) library -* Windows-specific parts: -* Copyright (C) 2010, Glenn Ergeerts -* Copyright (C) 2013, Alex Lian +* Free/Libre Near Field Communication (NFC) library +* +* Libnfc historical contributors: +* Copyright (C) 2009 Roel Verdult +* Copyright (C) 2009-2013 Romuald Conty +* Copyright (C) 2010-2012 Romain Tartière +* Copyright (C) 2010-2013 Philippe Teuwen +* Copyright (C) 2012-2013 Ludovic Rousseau +* Additional contributors of Windows-specific parts: +* Copyright (C) 2010 Glenn Ergeerts +* Copyright (C) 2013 Alex Lian -* Requirements diff --git a/contrib/win32/stdlib.c b/contrib/win32/stdlib.c index 87cbd4e..04a3b96 100644 --- a/contrib/win32/stdlib.c +++ b/contrib/win32/stdlib.c @@ -1,7 +1,14 @@ /*- - * Public platform independent Near Field Communication (NFC) library + * Free/Libre Near Field Communication (NFC) library * - * Copyright (C) 2013 Alex Lian + * Libnfc historical contributors: + * Copyright (C) 2009 Roel Verdult + * Copyright (C) 2009-2013 Romuald Conty + * Copyright (C) 2010-2012 Romain Tartière + * Copyright (C) 2010-2013 Philippe Teuwen + * Copyright (C) 2012-2013 Ludovic Rousseau + * Additional contributors of this file: + * Copyright (C) 2013 Alex Lian * * This program is free software: you can redistribute it and/or modify it * under the terms of the GNU Lesser General Public License as published by the diff --git a/contrib/win32/sys/select.h b/contrib/win32/sys/select.h index 6016f79..80878d3 100644 --- a/contrib/win32/sys/select.h +++ b/contrib/win32/sys/select.h @@ -1,7 +1,12 @@ /*- - * Public platform independent Near Field Communication (NFC) library + * Free/Libre Near Field Communication (NFC) library * - * Copyright (C) 2011 Romuald Conty + * Libnfc historical contributors: + * Copyright (C) 2009 Roel Verdult + * Copyright (C) 2009-2013 Romuald Conty + * Copyright (C) 2010-2012 Romain Tartière + * Copyright (C) 2010-2013 Philippe Teuwen + * Copyright (C) 2012-2013 Ludovic Rousseau * * This program is free software: you can redistribute it and/or modify it * under the terms of the GNU Lesser General Public License as published by the diff --git a/contrib/win32/unistd.h b/contrib/win32/unistd.h index 89aeda8..9ea5972 100644 --- a/contrib/win32/unistd.h +++ b/contrib/win32/unistd.h @@ -1,7 +1,13 @@ /*- - * Public platform independent Near Field Communication (NFC) library + * Free/Libre Near Field Communication (NFC) library * - * Copyright (C) 2011, 2012, 2013 Romuald Conty + * Libnfc historical contributors: + * Copyright (C) 2009 Roel Verdult + * Copyright (C) 2009-2013 Romuald Conty + * Copyright (C) 2010-2012 Romain Tartière + * Copyright (C) 2010-2013 Philippe Teuwen + * Copyright (C) 2012-2013 Ludovic Rousseau + * Additional contributors of this file: * * This program is free software: you can redistribute it and/or modify it * under the terms of the GNU Lesser General Public License as published by the diff --git a/contrib/windows.h b/contrib/windows.h index 2384d59..872f829 100644 --- a/contrib/windows.h +++ b/contrib/windows.h @@ -1,8 +1,14 @@ /*- - * Public platform independent Near Field Communication (NFC) library + * Free/Libre Near Field Communication (NFC) library * - * Copyright (C) 2010 Romuald Conty - * Copyright (C) 2011 Glenn Ergeerts + * Libnfc historical contributors: + * Copyright (C) 2009 Roel Verdult + * Copyright (C) 2009-2013 Romuald Conty + * Copyright (C) 2010-2012 Romain Tartière + * Copyright (C) 2010-2013 Philippe Teuwen + * Copyright (C) 2012-2013 Ludovic Rousseau + * Additional contributors of this file: + * Copyright (C) 2011 Glenn Ergeerts * * This program is free software: you can redistribute it and/or modify it * under the terms of the GNU Lesser General Public License as published by the diff --git a/debian/copyright b/debian/copyright index b1d6826..2e38b37 100644 --- a/debian/copyright +++ b/debian/copyright @@ -3,8 +3,11 @@ Upstream-Name: libnfc Source: http://libnfc.googlecode.com/ Files: * -Copyright: 2009, Roel Verdult , Romuald Conty - 2010-2011, Romain Tartière , Romuald Conty +Copyright: 2009, Roel Verdult + 2009-2013, Romuald Conty + 2010-2012, Romain Tartière + 2010-2013, Philippe Teuwen + 2012-2013, Ludovic Rousseau License: LGPL-3 This program is free software; you can redistribute it and/or modify it under the terms of the GNU Lesser General Public License version 3 @@ -23,8 +26,39 @@ License: LGPL-3 /usr/share/common-licenses/LGPL-3. Files: examples/* -Copyright: 2009, Roel Verdult , Romuald Conty - 2010-2011, Romain Tartière , Romuald Conty +Copyright: 2009, Roel Verdult + 2009-2013, Romuald Conty + 2010-2012, Romain Tartière + 2010-2013, Philippe Teuwen + 2012-2013, Ludovic Rousseau +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: + 1. Redistributions of source code must retain the above copyright + notice, this list of conditions and the following disclaimer. + 2. Redistributions in binary form must reproduce the above copyright + notice, this list of conditions and the following disclaimer in the + documentation and/or other materials provided with the distribution. + . + THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR + IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED + WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE + DISCLAIMED. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, + INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES + (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR + SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) + HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, + STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING + IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE + POSSIBILITY OF SUCH DAMAGE. + +Files: utils/* +Copyright: 2009, Roel Verdult + 2009-2013, Romuald Conty + 2010-2012, Romain Tartière + 2010-2013, Philippe Teuwen + 2012-2013, Ludovic Rousseau License: BSD-2-clause Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions @@ -48,9 +82,11 @@ License: BSD-2-clause POSSIBILITY OF SUCH DAMAGE. Files: debian/* -Copyright: 2009-2011, Romuald Conty - 2011, Thomas Hood - 2013, Nobuhiro Iwamatsu +Copyright: 2009-2013, Romuald Conty + 2010-2013, Philippe Teuwen + 2012-2013, Ludovic Rousseau + 2011, Thomas Hood + 2013, Nobuhiro Iwamatsu License: GPL-2 The Debian packaging is licensed under the GPL, version 2. . diff --git a/examples/nfc-anticol.c b/examples/nfc-anticol.c index bbbdb1b..b8368c3 100644 --- a/examples/nfc-anticol.c +++ b/examples/nfc-anticol.c @@ -1,7 +1,13 @@ /*- - * Public platform independent Near Field Communication (NFC) library examples + * Free/Libre Near Field Communication (NFC) library * - * Copyright (C) 2009 Roel Verdult + * Libnfc historical contributors: + * Copyright (C) 2009 Roel Verdult + * Copyright (C) 2009-2013 Romuald Conty + * Copyright (C) 2010-2012 Romain Tartière + * Copyright (C) 2010-2013 Philippe Teuwen + * Copyright (C) 2012-2013 Ludovic Rousseau + * Additional contributors of this file: * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions are met: diff --git a/examples/nfc-dep-initiator.c b/examples/nfc-dep-initiator.c index 36033a8..8eb3037 100644 --- a/examples/nfc-dep-initiator.c +++ b/examples/nfc-dep-initiator.c @@ -1,8 +1,13 @@ /*- - * Public platform independent Near Field Communication (NFC) library examples + * Free/Libre Near Field Communication (NFC) library * - * Copyright (C) 2009 Roel Verdult - * Copyright (C) 2010 Romuald Conty + * Libnfc historical contributors: + * Copyright (C) 2009 Roel Verdult + * Copyright (C) 2009-2013 Romuald Conty + * Copyright (C) 2010-2012 Romain Tartière + * Copyright (C) 2010-2013 Philippe Teuwen + * Copyright (C) 2012-2013 Ludovic Rousseau + * Additional contributors of this file: * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions are met: diff --git a/examples/nfc-dep-target.c b/examples/nfc-dep-target.c index fe1bd38..b395ec5 100644 --- a/examples/nfc-dep-target.c +++ b/examples/nfc-dep-target.c @@ -1,8 +1,13 @@ /*- - * Public platform independent Near Field Communication (NFC) library examples + * Free/Libre Near Field Communication (NFC) library * - * Copyright (C) 2009 Roel Verdult - * Copyright (C) 2010 Romuald Conty + * Libnfc historical contributors: + * Copyright (C) 2009 Roel Verdult + * Copyright (C) 2009-2013 Romuald Conty + * Copyright (C) 2010-2012 Romain Tartière + * Copyright (C) 2010-2013 Philippe Teuwen + * Copyright (C) 2012-2013 Ludovic Rousseau + * Additional contributors of this file: * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions are met: diff --git a/examples/nfc-emulate-forum-tag2.c b/examples/nfc-emulate-forum-tag2.c index e008379..2d70b1d 100644 --- a/examples/nfc-emulate-forum-tag2.c +++ b/examples/nfc-emulate-forum-tag2.c @@ -1,7 +1,13 @@ /*- - * Public platform independent Near Field Communication (NFC) library examples + * Free/Libre Near Field Communication (NFC) library * - * Copyright (C) 2011 Romuald Conty + * Libnfc historical contributors: + * Copyright (C) 2009 Roel Verdult + * Copyright (C) 2009-2013 Romuald Conty + * Copyright (C) 2010-2012 Romain Tartière + * Copyright (C) 2010-2013 Philippe Teuwen + * Copyright (C) 2012-2013 Ludovic Rousseau + * Additional contributors of this file: * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions are met: diff --git a/examples/nfc-emulate-tag.c b/examples/nfc-emulate-tag.c index 94368c8..fa90cd3 100644 --- a/examples/nfc-emulate-tag.c +++ b/examples/nfc-emulate-tag.c @@ -1,7 +1,13 @@ /*- - * Public platform independent Near Field Communication (NFC) library examples + * Free/Libre Near Field Communication (NFC) library * - * Copyright (C) 2010 Romuald Conty + * Libnfc historical contributors: + * Copyright (C) 2009 Roel Verdult + * Copyright (C) 2009-2013 Romuald Conty + * Copyright (C) 2010-2012 Romain Tartière + * Copyright (C) 2010-2013 Philippe Teuwen + * Copyright (C) 2012-2013 Ludovic Rousseau + * Additional contributors of this file: * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions are met: diff --git a/examples/nfc-emulate-uid.c b/examples/nfc-emulate-uid.c index 408ee3a..978c3c9 100644 --- a/examples/nfc-emulate-uid.c +++ b/examples/nfc-emulate-uid.c @@ -1,8 +1,13 @@ /*- - * Public platform independent Near Field Communication (NFC) library examples + * Free/Libre Near Field Communication (NFC) library * - * Copyright (C) 2009 Roel Verdult - * Copyright (C) 2010 Romuald Conty + * Libnfc historical contributors: + * Copyright (C) 2009 Roel Verdult + * Copyright (C) 2009-2013 Romuald Conty + * Copyright (C) 2010-2012 Romain Tartière + * Copyright (C) 2010-2013 Philippe Teuwen + * Copyright (C) 2012-2013 Ludovic Rousseau + * Additional contributors of this file: * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions are met: diff --git a/examples/nfc-mfsetuid.c b/examples/nfc-mfsetuid.c index b785a65..5bc2e25 100644 --- a/examples/nfc-mfsetuid.c +++ b/examples/nfc-mfsetuid.c @@ -1,8 +1,14 @@ /*- - * Public platform independent Near Field Communication (NFC) library examples + * Free/Libre Near Field Communication (NFC) library * - * Copyright (C) 2009 Roel Verdult - * Copyright (C) 2011 Adam Laurie + * Libnfc historical contributors: + * Copyright (C) 2009 Roel Verdult + * Copyright (C) 2009-2013 Romuald Conty + * Copyright (C) 2010-2012 Romain Tartière + * Copyright (C) 2010-2013 Philippe Teuwen + * Copyright (C) 2012-2013 Ludovic Rousseau + * Additional contributors of this file: + * Copyright (C) 2011 Adam Laurie * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions are met: diff --git a/examples/nfc-poll.c b/examples/nfc-poll.c index 6ef1805..5f55aca 100644 --- a/examples/nfc-poll.c +++ b/examples/nfc-poll.c @@ -1,8 +1,13 @@ /*- - * Public platform independent Near Field Communication (NFC) library examples + * Free/Libre Near Field Communication (NFC) library * - * Copyright (C) 2011 Romain Tartiere - * Copyright (C) 2010, 2011 Romuald Conty + * Libnfc historical contributors: + * Copyright (C) 2009 Roel Verdult + * Copyright (C) 2009-2013 Romuald Conty + * Copyright (C) 2010-2012 Romain Tartière + * Copyright (C) 2010-2013 Philippe Teuwen + * Copyright (C) 2012-2013 Ludovic Rousseau + * Additional contributors of this file: * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions are met: diff --git a/examples/nfc-relay.c b/examples/nfc-relay.c index 9d1061c..bad2773 100644 --- a/examples/nfc-relay.c +++ b/examples/nfc-relay.c @@ -1,8 +1,13 @@ /*- - * Public platform independent Near Field Communication (NFC) library examples + * Free/Libre Near Field Communication (NFC) library * - * Copyright (C) 2009 Roel Verdult - * Copyright (C) 2010 Romuald Conty + * Libnfc historical contributors: + * Copyright (C) 2009 Roel Verdult + * Copyright (C) 2009-2013 Romuald Conty + * Copyright (C) 2010-2012 Romain Tartière + * Copyright (C) 2010-2013 Philippe Teuwen + * Copyright (C) 2012-2013 Ludovic Rousseau + * Additional contributors of this file: * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions are met: diff --git a/examples/pn53x-diagnose.c b/examples/pn53x-diagnose.c index f747b39..afa15ec 100644 --- a/examples/pn53x-diagnose.c +++ b/examples/pn53x-diagnose.c @@ -1,7 +1,13 @@ /*- - * Public platform independent Near Field Communication (NFC) library examples + * Free/Libre Near Field Communication (NFC) library * - * Copyright (C) 2010 Romuald Conty + * Libnfc historical contributors: + * Copyright (C) 2009 Roel Verdult + * Copyright (C) 2009-2013 Romuald Conty + * Copyright (C) 2010-2012 Romain Tartière + * Copyright (C) 2010-2013 Philippe Teuwen + * Copyright (C) 2012-2013 Ludovic Rousseau + * Additional contributors of this file: * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions are met: diff --git a/examples/pn53x-sam.c b/examples/pn53x-sam.c index c6eea4f..d29b13e 100644 --- a/examples/pn53x-sam.c +++ b/examples/pn53x-sam.c @@ -1,7 +1,14 @@ /*- - * Public platform independent Near Field Communication (NFC) library examples + * Free/Libre Near Field Communication (NFC) library * - * Copyright (C) 2010 Emanuele Bertoldi + * Libnfc historical contributors: + * Copyright (C) 2009 Roel Verdult + * Copyright (C) 2009-2013 Romuald Conty + * Copyright (C) 2010-2012 Romain Tartière + * Copyright (C) 2010-2013 Philippe Teuwen + * Copyright (C) 2012-2013 Ludovic Rousseau + * Additional contributors of this file: + * Copyright (C) 2010 Emanuele Bertoldi * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions are met: diff --git a/examples/pn53x-tamashell.c b/examples/pn53x-tamashell.c index 8a6f575..b60ec5a 100644 --- a/examples/pn53x-tamashell.c +++ b/examples/pn53x-tamashell.c @@ -1,7 +1,13 @@ /*- - * Public platform independent Near Field Communication (NFC) library examples + * Free/Libre Near Field Communication (NFC) library * - * Copyright (C) 2010 Romuald Conty + * Libnfc historical contributors: + * Copyright (C) 2009 Roel Verdult + * Copyright (C) 2009-2013 Romuald Conty + * Copyright (C) 2010-2012 Romain Tartière + * Copyright (C) 2010-2013 Philippe Teuwen + * Copyright (C) 2012-2013 Ludovic Rousseau + * Additional contributors of this file: * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions are met: diff --git a/include/nfc/nfc-emulation.h b/include/nfc/nfc-emulation.h index 430f5b1..bbbf1a8 100644 --- a/include/nfc/nfc-emulation.h +++ b/include/nfc/nfc-emulation.h @@ -1,8 +1,13 @@ /*- - * Public platform independent Near Field Communication (NFC) library + * Free/Libre Near Field Communication (NFC) library * - * Copyright (C) 2011 Romain Tartière - * Copyright (C) 2011 Romuald Conty + * Libnfc historical contributors: + * Copyright (C) 2009 Roel Verdult + * Copyright (C) 2009-2013 Romuald Conty + * Copyright (C) 2010-2012 Romain Tartière + * Copyright (C) 2010-2013 Philippe Teuwen + * Copyright (C) 2012-2013 Ludovic Rousseau + * Additional contributors of this file: * * This program is free software: you can redistribute it and/or modify it * under the terms of the GNU Lesser General Public License as published by the diff --git a/include/nfc/nfc-types.h b/include/nfc/nfc-types.h index 71326e8..56e3e98 100644 --- a/include/nfc/nfc-types.h +++ b/include/nfc/nfc-types.h @@ -1,9 +1,13 @@ -/** - * Public platform independent Near Field Communication (NFC) library +/*- + * Free/Libre Near Field Communication (NFC) library * - * Copyright (C) 2009 Roel Verdult - * Copyright (C) 2010, 2011 Romain Tartière - * Copyright (C) 2010, 2011, 2012, 2013 Romuald Conty + * Libnfc historical contributors: + * Copyright (C) 2009 Roel Verdult + * Copyright (C) 2009-2013 Romuald Conty + * Copyright (C) 2010-2012 Romain Tartière + * Copyright (C) 2010-2013 Philippe Teuwen + * Copyright (C) 2012-2013 Ludovic Rousseau + * Additional contributors of this file: * * This program is free software: you can redistribute it and/or modify it * under the terms of the GNU Lesser General Public License as published by the diff --git a/include/nfc/nfc.h b/include/nfc/nfc.h index 6862db0..6fa05d8 100644 --- a/include/nfc/nfc.h +++ b/include/nfc/nfc.h @@ -1,8 +1,13 @@ /*- - * Public platform independent Near Field Communication (NFC) library + * Free/Libre Near Field Communication (NFC) library * - * Copyright (C) 2009 Roel Verdult - * Copyright (C) 2009, 2010, 2011, 2012 Romuald Conty + * Libnfc historical contributors: + * Copyright (C) 2009 Roel Verdult + * Copyright (C) 2009-2013 Romuald Conty + * Copyright (C) 2010-2012 Romain Tartière + * Copyright (C) 2010-2013 Philippe Teuwen + * Copyright (C) 2012-2013 Ludovic Rousseau + * Additional contributors of this file: * * This program is free software: you can redistribute it and/or modify it * under the terms of the GNU Lesser General Public License as published by the diff --git a/libnfc/buses/uart.c b/libnfc/buses/uart.c index 274deb9..b468428 100644 --- a/libnfc/buses/uart.c +++ b/libnfc/buses/uart.c @@ -1,8 +1,13 @@ /*- - * Public platform independent Near Field Communication (NFC) library + * Free/Libre Near Field Communication (NFC) library * - * Copyright (C) 2009, 2010 Roel Verdult - * Copyright (C) 2009, 2010 Romuald Conty + * Libnfc historical contributors: + * Copyright (C) 2009 Roel Verdult + * Copyright (C) 2009-2013 Romuald Conty + * Copyright (C) 2010-2012 Romain Tartière + * Copyright (C) 2010-2013 Philippe Teuwen + * Copyright (C) 2012-2013 Ludovic Rousseau + * Additional contributors of this file: * * This program is free software: you can redistribute it and/or modify it * under the terms of the GNU Lesser General Public License as published by the diff --git a/libnfc/buses/uart.h b/libnfc/buses/uart.h index bb056e6..1faeb77 100644 --- a/libnfc/buses/uart.h +++ b/libnfc/buses/uart.h @@ -1,9 +1,13 @@ /*- - * Public platform independent Near Field Communication (NFC) library + * Free/Libre Near Field Communication (NFC) library * - * Copyright (C) 2009, 2010 Roel Verdult - * Copyright (C) 2010, 2011 Romain Tartière - * Copyright (C) 2009, 2010, 2011 Romuald Conty + * Libnfc historical contributors: + * Copyright (C) 2009 Roel Verdult + * Copyright (C) 2009-2013 Romuald Conty + * Copyright (C) 2010-2012 Romain Tartière + * Copyright (C) 2010-2013 Philippe Teuwen + * Copyright (C) 2012-2013 Ludovic Rousseau + * Additional contributors of this file: * * This program is free software: you can redistribute it and/or modify it * under the terms of the GNU Lesser General Public License as published by the diff --git a/libnfc/buses/uart_posix.c b/libnfc/buses/uart_posix.c index 081d399..8fbe743 100644 --- a/libnfc/buses/uart_posix.c +++ b/libnfc/buses/uart_posix.c @@ -1,9 +1,13 @@ /*- - * Public platform independent Near Field Communication (NFC) library + * Free/Libre Near Field Communication (NFC) library * - * Copyright (C) 2009, 2010, 2011 Roel Verdult - * Copyright (C) 2009, 2010, 2011, 2012 Romuald Conty - * Copyright (C) 2011 Romain Tartière + * Libnfc historical contributors: + * Copyright (C) 2009 Roel Verdult + * Copyright (C) 2009-2013 Romuald Conty + * Copyright (C) 2010-2012 Romain Tartière + * Copyright (C) 2010-2013 Philippe Teuwen + * Copyright (C) 2012-2013 Ludovic Rousseau + * Additional contributors of this file: * * This program is free software: you can redistribute it and/or modify it * under the terms of the GNU Lesser General Public License as published by the diff --git a/libnfc/buses/uart_win32.c b/libnfc/buses/uart_win32.c index 0c675ad..941bde0 100644 --- a/libnfc/buses/uart_win32.c +++ b/libnfc/buses/uart_win32.c @@ -1,8 +1,13 @@ /*- - * Public platform independent Near Field Communication (NFC) library + * Free/Libre Near Field Communication (NFC) library * - * Copyright (C) 2009, 2010 Roel Verdult - * Copyright (C) 2009, 2010, 2012 Romuald Conty + * Libnfc historical contributors: + * Copyright (C) 2009 Roel Verdult + * Copyright (C) 2009-2013 Romuald Conty + * Copyright (C) 2010-2012 Romain Tartière + * Copyright (C) 2010-2013 Philippe Teuwen + * Copyright (C) 2012-2013 Ludovic Rousseau + * Additional contributors of this file: * * This program is free software: you can redistribute it and/or modify it * under the terms of the GNU Lesser General Public License as published by the diff --git a/libnfc/buses/usbbus.c b/libnfc/buses/usbbus.c index a3e2f99..6e0e9d4 100644 --- a/libnfc/buses/usbbus.c +++ b/libnfc/buses/usbbus.c @@ -1,7 +1,13 @@ /*- - * Public platform independent Near Field Communication (NFC) library + * Free/Libre Near Field Communication (NFC) library * - * Copyright (C) 2013, Romuald Conty + * Libnfc historical contributors: + * Copyright (C) 2009 Roel Verdult + * Copyright (C) 2009-2013 Romuald Conty + * Copyright (C) 2010-2012 Romain Tartière + * Copyright (C) 2010-2013 Philippe Teuwen + * Copyright (C) 2012-2013 Ludovic Rousseau + * Additional contributors of this file: * * This program is free software: you can redistribute it and/or modify it * under the terms of the GNU Lesser General Public License as published by the diff --git a/libnfc/buses/usbbus.h b/libnfc/buses/usbbus.h index 329160a..9115976 100644 --- a/libnfc/buses/usbbus.h +++ b/libnfc/buses/usbbus.h @@ -1,7 +1,13 @@ /*- - * Public platform independent Near Field Communication (NFC) library + * Free/Libre Near Field Communication (NFC) library * - * Copyright (C) 2013, Romuald Conty + * Libnfc historical contributors: + * Copyright (C) 2009 Roel Verdult + * Copyright (C) 2009-2013 Romuald Conty + * Copyright (C) 2010-2012 Romain Tartière + * Copyright (C) 2010-2013 Philippe Teuwen + * Copyright (C) 2012-2013 Ludovic Rousseau + * Additional contributors of this file: * * This program is free software: you can redistribute it and/or modify it * under the terms of the GNU Lesser General Public License as published by the diff --git a/libnfc/chips/pn53x-internal.h b/libnfc/chips/pn53x-internal.h index d0cd01e..6d0f07e 100644 --- a/libnfc/chips/pn53x-internal.h +++ b/libnfc/chips/pn53x-internal.h @@ -1,8 +1,13 @@ /*- - * Public platform independent Near Field Communication (NFC) library + * Free/Libre Near Field Communication (NFC) library * - * Copyright (C) 2011 Romain Tartière - * Copyright (C) 2011, 2012 Romuald Conty + * Libnfc historical contributors: + * Copyright (C) 2009 Roel Verdult + * Copyright (C) 2009-2013 Romuald Conty + * Copyright (C) 2010-2012 Romain Tartière + * Copyright (C) 2010-2013 Philippe Teuwen + * Copyright (C) 2012-2013 Ludovic Rousseau + * Additional contributors of this file: * * This program is free software: you can redistribute it and/or modify it * under the terms of the GNU Lesser General Public License as published by the diff --git a/libnfc/chips/pn53x.c b/libnfc/chips/pn53x.c index a4a5153..988b89f 100644 --- a/libnfc/chips/pn53x.c +++ b/libnfc/chips/pn53x.c @@ -1,9 +1,13 @@ /*- - * Public platform independent Near Field Communication (NFC) library + * Free/Libre Near Field Communication (NFC) library * - * Copyright (C) 2009, 2010 Roel Verdult - * Copyright (C) 2010, 2011 Romain Tartière - * Copyright (C) 2009, 2010, 2011, 2012 Romuald Conty + * Libnfc historical contributors: + * Copyright (C) 2009 Roel Verdult + * Copyright (C) 2009-2013 Romuald Conty + * Copyright (C) 2010-2012 Romain Tartière + * Copyright (C) 2010-2013 Philippe Teuwen + * Copyright (C) 2012-2013 Ludovic Rousseau + * Additional contributors of this file: * * This program is free software: you can redistribute it and/or modify it * under the terms of the GNU Lesser General Public License as published by the diff --git a/libnfc/chips/pn53x.h b/libnfc/chips/pn53x.h index be67ef8..15dae18 100644 --- a/libnfc/chips/pn53x.h +++ b/libnfc/chips/pn53x.h @@ -1,9 +1,13 @@ /*- - * Public platform independent Near Field Communication (NFC) library + * Free/Libre Near Field Communication (NFC) library * - * Copyright (C) 2009, 2010 Roel Verdult - * Copyright (C) 2010, 2011 Romain Tartière - * Copyright (C) 2009, 2010, 2011 Romuald Conty + * Libnfc historical contributors: + * Copyright (C) 2009 Roel Verdult + * Copyright (C) 2009-2013 Romuald Conty + * Copyright (C) 2010-2012 Romain Tartière + * Copyright (C) 2010-2013 Philippe Teuwen + * Copyright (C) 2012-2013 Ludovic Rousseau + * Additional contributors of this file: * * This program is free software: you can redistribute it and/or modify it * under the terms of the GNU Lesser General Public License as published by the diff --git a/libnfc/conf.c b/libnfc/conf.c index 2ec348b..607118a 100644 --- a/libnfc/conf.c +++ b/libnfc/conf.c @@ -1,6 +1,13 @@ - /*- - * Copyright (C) 2012, 2013 Romuald Conty + * Free/Libre Near Field Communication (NFC) library + * + * Libnfc historical contributors: + * Copyright (C) 2009 Roel Verdult + * Copyright (C) 2009-2013 Romuald Conty + * Copyright (C) 2010-2012 Romain Tartière + * Copyright (C) 2010-2013 Philippe Teuwen + * Copyright (C) 2012-2013 Ludovic Rousseau + * Additional contributors of this file: * * This program is free software: you can redistribute it and/or modify it * under the terms of the GNU Lesser General Public License as published by the diff --git a/libnfc/conf.h b/libnfc/conf.h index ce7b8e2..5349f9b 100644 --- a/libnfc/conf.h +++ b/libnfc/conf.h @@ -1,5 +1,13 @@ /*- - * Copyright (C) 2012 Romuald Conty + * Free/Libre Near Field Communication (NFC) library + * + * Libnfc historical contributors: + * Copyright (C) 2009 Roel Verdult + * Copyright (C) 2009-2013 Romuald Conty + * Copyright (C) 2010-2012 Romain Tartière + * Copyright (C) 2010-2013 Philippe Teuwen + * Copyright (C) 2012-2013 Ludovic Rousseau + * Additional contributors of this file: * * This program is free software: you can redistribute it and/or modify it * under the terms of the GNU Lesser General Public License as published by the diff --git a/libnfc/drivers.h b/libnfc/drivers.h index ac333ed..b807a19 100644 --- a/libnfc/drivers.h +++ b/libnfc/drivers.h @@ -1,9 +1,13 @@ /*- - * Public platform independent Near Field Communication (NFC) library + * Free/Libre Near Field Communication (NFC) library * - * Copyright (C) 2009 Roel Verdult - * Copyright (C) 2011 Romain Tartière - * Copyright (C) 2011 Romuald Conty + * Libnfc historical contributors: + * Copyright (C) 2009 Roel Verdult + * Copyright (C) 2009-2013 Romuald Conty + * Copyright (C) 2010-2012 Romain Tartière + * Copyright (C) 2010-2013 Philippe Teuwen + * Copyright (C) 2012-2013 Ludovic Rousseau + * Additional contributors of this file: * * This program is free software: you can redistribute it and/or modify it * under the terms of the GNU Lesser General Public License as published by the diff --git a/libnfc/drivers/acr122_pcsc.c b/libnfc/drivers/acr122_pcsc.c index a60825c..578c21f 100644 --- a/libnfc/drivers/acr122_pcsc.c +++ b/libnfc/drivers/acr122_pcsc.c @@ -1,9 +1,13 @@ /*- - * Public platform independent Near Field Communication (NFC) library + * Free/Libre Near Field Communication (NFC) library * - * Copyright (C) 2009 Roel Verdult - * Copyright (C) 2011 Romain Tartiere - * Copyright (C) 2011, 2012 Romuald Conty + * Libnfc historical contributors: + * Copyright (C) 2009 Roel Verdult + * Copyright (C) 2009-2013 Romuald Conty + * Copyright (C) 2010-2012 Romain Tartière + * Copyright (C) 2010-2013 Philippe Teuwen + * Copyright (C) 2012-2013 Ludovic Rousseau + * Additional contributors of this file: * * This program is free software: you can redistribute it and/or modify it * under the terms of the GNU Lesser General Public License as published by the diff --git a/libnfc/drivers/acr122_pcsc.h b/libnfc/drivers/acr122_pcsc.h index 61b90e8..e99d128 100644 --- a/libnfc/drivers/acr122_pcsc.h +++ b/libnfc/drivers/acr122_pcsc.h @@ -1,9 +1,13 @@ /*- - * Public platform independent Near Field Communication (NFC) library + * Free/Libre Near Field Communication (NFC) library * - * Copyright (C) 2009 Roel Verdult - * Copyright (C) 2011 Romain Tartiere - * Copyright (C) 2011, 2012 Romuald Conty + * Libnfc historical contributors: + * Copyright (C) 2009 Roel Verdult + * Copyright (C) 2009-2013 Romuald Conty + * Copyright (C) 2010-2012 Romain Tartière + * Copyright (C) 2010-2013 Philippe Teuwen + * Copyright (C) 2012-2013 Ludovic Rousseau + * Additional contributors of this file: * * This program is free software: you can redistribute it and/or modify it * under the terms of the GNU Lesser General Public License as published by the diff --git a/libnfc/drivers/acr122_usb.c b/libnfc/drivers/acr122_usb.c index e4ccae2..b5bc387 100644 --- a/libnfc/drivers/acr122_usb.c +++ b/libnfc/drivers/acr122_usb.c @@ -1,9 +1,13 @@ /*- - * Public platform independent Near Field Communication (NFC) library + * Free/Libre Near Field Communication (NFC) library * - * Copyright (C) 2009 Roel Verdult - * Copyright (C) 2010, 2011 Romain Tartière - * Copyright (C) 2010, 2011, 2012 Romuald Conty + * Libnfc historical contributors: + * Copyright (C) 2009 Roel Verdult + * Copyright (C) 2009-2013 Romuald Conty + * Copyright (C) 2010-2012 Romain Tartière + * Copyright (C) 2010-2013 Philippe Teuwen + * Copyright (C) 2012-2013 Ludovic Rousseau + * Additional contributors of this file: * * This program is free software: you can redistribute it and/or modify it * under the terms of the GNU Lesser General Public License as published by the diff --git a/libnfc/drivers/acr122_usb.h b/libnfc/drivers/acr122_usb.h index ebf7950..108f24b 100644 --- a/libnfc/drivers/acr122_usb.h +++ b/libnfc/drivers/acr122_usb.h @@ -1,9 +1,13 @@ /*- - * Public platform independent Near Field Communication (NFC) library + * Free/Libre Near Field Communication (NFC) library * - * Copyright (C) 2009 Roel Verdult - * Copyright (C) 2011 Romain Tartière - * Copyright (C) 2011, 2012 Romuald Conty + * Libnfc historical contributors: + * Copyright (C) 2009 Roel Verdult + * Copyright (C) 2009-2013 Romuald Conty + * Copyright (C) 2010-2012 Romain Tartière + * Copyright (C) 2010-2013 Philippe Teuwen + * Copyright (C) 2012-2013 Ludovic Rousseau + * Additional contributors of this file: * * This program is free software: you can redistribute it and/or modify it * under the terms of the GNU Lesser General Public License as published by the diff --git a/libnfc/drivers/acr122s.c b/libnfc/drivers/acr122s.c index f6e69e1..4665053 100644 --- a/libnfc/drivers/acr122s.c +++ b/libnfc/drivers/acr122s.c @@ -1,8 +1,14 @@ /*- - * Public platform independent Near Field Communication (NFC) library + * Free/Libre Near Field Communication (NFC) library * - * Copyright (C) 2011 Anugrah Redja Kusuma - * Copyright (C) 2012 Romuald Conty + * Libnfc historical contributors: + * Copyright (C) 2009 Roel Verdult + * Copyright (C) 2009-2013 Romuald Conty + * Copyright (C) 2010-2012 Romain Tartière + * Copyright (C) 2010-2013 Philippe Teuwen + * Copyright (C) 2012-2013 Ludovic Rousseau + * Additional contributors of this file: + * Copyright (C) 2011 Anugrah Redja Kusuma * * This program is free software: you can redistribute it and/or modify it * under the terms of the GNU Lesser General Public License as published by the diff --git a/libnfc/drivers/acr122s.h b/libnfc/drivers/acr122s.h index 81b0ecf..1f55e12 100644 --- a/libnfc/drivers/acr122s.h +++ b/libnfc/drivers/acr122s.h @@ -1,8 +1,13 @@ /*- - * Public platform independent Near Field Communication (NFC) library + * Free/Libre Near Field Communication (NFC) library * - * Copyright (C) 2011 Anugrah Redja Kusuma - * Copyright (C) 2012 Romuald Conty + * Libnfc historical contributors: + * Copyright (C) 2009 Roel Verdult + * Copyright (C) 2009-2013 Romuald Conty + * Copyright (C) 2010-2012 Romain Tartière + * Copyright (C) 2010-2013 Philippe Teuwen + * Copyright (C) 2012-2013 Ludovic Rousseau + * Additional contributors of this file: * * This program is free software: you can redistribute it and/or modify it * under the terms of the GNU Lesser General Public License as published by the diff --git a/libnfc/drivers/arygon.c b/libnfc/drivers/arygon.c index d7f78d7..dc52ad9 100644 --- a/libnfc/drivers/arygon.c +++ b/libnfc/drivers/arygon.c @@ -1,9 +1,13 @@ /*- - * Public platform independent Near Field Communication (NFC) library + * Free/Libre Near Field Communication (NFC) library * - * Copyright (C) 2009 Roel Verdult - * Copyright (C) 2011 Romain Tartière - * Copyright (C) 2010, 2011, 2012 Romuald Conty + * Libnfc historical contributors: + * Copyright (C) 2009 Roel Verdult + * Copyright (C) 2009-2013 Romuald Conty + * Copyright (C) 2010-2012 Romain Tartière + * Copyright (C) 2010-2013 Philippe Teuwen + * Copyright (C) 2012-2013 Ludovic Rousseau + * Additional contributors of this file: * * This program is free software: you can redistribute it and/or modify it * under the terms of the GNU Lesser General Public License as published by the diff --git a/libnfc/drivers/arygon.h b/libnfc/drivers/arygon.h index b64580f..83d742b 100644 --- a/libnfc/drivers/arygon.h +++ b/libnfc/drivers/arygon.h @@ -1,9 +1,13 @@ /*- - * Public platform independent Near Field Communication (NFC) library + * Free/Libre Near Field Communication (NFC) library * - * Copyright (C) 2009 Roel Verdult - * Copyright (C) 2011 Romain Tartière - * Copyright (C) 2010, 2011, 2012 Romuald Conty + * Libnfc historical contributors: + * Copyright (C) 2009 Roel Verdult + * Copyright (C) 2009-2013 Romuald Conty + * Copyright (C) 2010-2012 Romain Tartière + * Copyright (C) 2010-2013 Philippe Teuwen + * Copyright (C) 2012-2013 Ludovic Rousseau + * Additional contributors of this file: * * This program is free software: you can redistribute it and/or modify it * under the terms of the GNU Lesser General Public License as published by the diff --git a/libnfc/drivers/pn532_uart.h b/libnfc/drivers/pn532_uart.h index 66cbd90..18cf47a 100644 --- a/libnfc/drivers/pn532_uart.h +++ b/libnfc/drivers/pn532_uart.h @@ -1,9 +1,13 @@ /*- - * Public platform independent Near Field Communication (NFC) library + * Free/Libre Near Field Communication (NFC) library * - * Copyright (C) 2010 Roel Verdult - * Copyright (C) 2011 Romain Tartière - * Copyright (C) 2010, 2011, 2012 Romuald Conty + * Libnfc historical contributors: + * Copyright (C) 2009 Roel Verdult + * Copyright (C) 2009-2013 Romuald Conty + * Copyright (C) 2010-2012 Romain Tartière + * Copyright (C) 2010-2013 Philippe Teuwen + * Copyright (C) 2012-2013 Ludovic Rousseau + * Additional contributors of this file: * * This program is free software: you can redistribute it and/or modify it * under the terms of the GNU Lesser General Public License as published by the diff --git a/libnfc/drivers/pn53x_usb.c b/libnfc/drivers/pn53x_usb.c index 6ef3f16..ed08c76 100644 --- a/libnfc/drivers/pn53x_usb.c +++ b/libnfc/drivers/pn53x_usb.c @@ -1,9 +1,13 @@ /*- - * Public platform independent Near Field Communication (NFC) library + * Free/Libre Near Field Communication (NFC) library * - * Copyright (C) 2009 Roel Verdult - * Copyright (C) 2010, 2011 Romain Tartière - * Copyright (C) 2010, 2011, 2012 Romuald Conty + * Libnfc historical contributors: + * Copyright (C) 2009 Roel Verdult + * Copyright (C) 2009-2013 Romuald Conty + * Copyright (C) 2010-2012 Romain Tartière + * Copyright (C) 2010-2013 Philippe Teuwen + * Copyright (C) 2012-2013 Ludovic Rousseau + * Additional contributors of this file: * * This program is free software: you can redistribute it and/or modify it * under the terms of the GNU Lesser General Public License as published by the diff --git a/libnfc/drivers/pn53x_usb.h b/libnfc/drivers/pn53x_usb.h index 81af2cf..d94f6dd 100644 --- a/libnfc/drivers/pn53x_usb.h +++ b/libnfc/drivers/pn53x_usb.h @@ -1,9 +1,13 @@ /*- - * Public platform independent Near Field Communication (NFC) library + * Free/Libre Near Field Communication (NFC) library * - * Copyright (C) 2009 Roel Verdult - * Copyright (C) 2010, 2011 Romain Tartière - * Copyright (C) 2010, 2011, 2012 Romuald Conty + * Libnfc historical contributors: + * Copyright (C) 2009 Roel Verdult + * Copyright (C) 2009-2013 Romuald Conty + * Copyright (C) 2010-2012 Romain Tartière + * Copyright (C) 2010-2013 Philippe Teuwen + * Copyright (C) 2012-2013 Ludovic Rousseau + * Additional contributors of this file: * * This program is free software: you can redistribute it and/or modify it * under the terms of the GNU Lesser General Public License as published by the diff --git a/libnfc/iso14443-subr.c b/libnfc/iso14443-subr.c index db724fa..a350ec8 100644 --- a/libnfc/iso14443-subr.c +++ b/libnfc/iso14443-subr.c @@ -1,7 +1,13 @@ /*- - * Public platform independent Near Field Communication (NFC) library + * Free/Libre Near Field Communication (NFC) library * - * Copyright (C) 2009 Roel Verdult + * Libnfc historical contributors: + * Copyright (C) 2009 Roel Verdult + * Copyright (C) 2009-2013 Romuald Conty + * Copyright (C) 2010-2012 Romain Tartière + * Copyright (C) 2010-2013 Philippe Teuwen + * Copyright (C) 2012-2013 Ludovic Rousseau + * Additional contributors of this file: * * This program is free software: you can redistribute it and/or modify it * under the terms of the GNU Lesser General Public License as published by the diff --git a/libnfc/iso7816.h b/libnfc/iso7816.h index 9789488..efa0645 100644 --- a/libnfc/iso7816.h +++ b/libnfc/iso7816.h @@ -1,8 +1,13 @@ /*- - * Public platform independent Near Field Communication (NFC) library + * Free/Libre Near Field Communication (NFC) library * - * Copyright (C) 2011 Romain Tartière - * Copyright (C) 2011 Romuald Conty + * Libnfc historical contributors: + * Copyright (C) 2009 Roel Verdult + * Copyright (C) 2009-2013 Romuald Conty + * Copyright (C) 2010-2012 Romain Tartière + * Copyright (C) 2010-2013 Philippe Teuwen + * Copyright (C) 2012-2013 Ludovic Rousseau + * Additional contributors of this file: * * This program is free software: you can redistribute it and/or modify it * under the terms of the GNU Lesser General Public License as published by the diff --git a/libnfc/log-internal.h b/libnfc/log-internal.h index f8bcb2d..7c2f9dd 100644 --- a/libnfc/log-internal.h +++ b/libnfc/log-internal.h @@ -1,5 +1,13 @@ /*- - * Copyright (C) 2013 Romuald Conty + * Free/Libre Near Field Communication (NFC) library + * + * Libnfc historical contributors: + * Copyright (C) 2009 Roel Verdult + * Copyright (C) 2009-2013 Romuald Conty + * Copyright (C) 2010-2012 Romain Tartière + * Copyright (C) 2010-2013 Philippe Teuwen + * Copyright (C) 2012-2013 Ludovic Rousseau + * Additional contributors of this file: * * This program is free software: you can redistribute it and/or modify it * under the terms of the GNU Lesser General Public License as published by the diff --git a/libnfc/log.c b/libnfc/log.c index 66556ef..785dc94 100644 --- a/libnfc/log.c +++ b/libnfc/log.c @@ -1,5 +1,13 @@ /*- - * Copyright (C) 2012 Romuald Conty + * Free/Libre Near Field Communication (NFC) library + * + * Libnfc historical contributors: + * Copyright (C) 2009 Roel Verdult + * Copyright (C) 2009-2013 Romuald Conty + * Copyright (C) 2010-2012 Romain Tartière + * Copyright (C) 2010-2013 Philippe Teuwen + * Copyright (C) 2012-2013 Ludovic Rousseau + * Additional contributors of this file: * * This program is free software: you can redistribute it and/or modify it * under the terms of the GNU Lesser General Public License as published by the diff --git a/libnfc/log.h b/libnfc/log.h index 64228f2..9d12e64 100644 --- a/libnfc/log.h +++ b/libnfc/log.h @@ -1,6 +1,13 @@ /*- - * Copyright (C) 2011 Romain Tartière - * Copyright (C) 2011, 2012 Romuald Conty + * Free/Libre Near Field Communication (NFC) library + * + * Libnfc historical contributors: + * Copyright (C) 2009 Roel Verdult + * Copyright (C) 2009-2013 Romuald Conty + * Copyright (C) 2010-2012 Romain Tartière + * Copyright (C) 2010-2013 Philippe Teuwen + * Copyright (C) 2012-2013 Ludovic Rousseau + * Additional contributors of this file: * * This program is free software: you can redistribute it and/or modify it * under the terms of the GNU Lesser General Public License as published by the diff --git a/libnfc/log_posix.c b/libnfc/log_posix.c index b7c4371..4a4d016 100644 --- a/libnfc/log_posix.c +++ b/libnfc/log_posix.c @@ -1,7 +1,14 @@ /*- - * Copyright (C) 2011 Romain Tartière - * Copyright (C) 2011, 2012 Romuald Conty - * Copyright (C) 2013 Alex Lian + * Free/Libre Near Field Communication (NFC) library + * + * Libnfc historical contributors: + * Copyright (C) 2009 Roel Verdult + * Copyright (C) 2009-2013 Romuald Conty + * Copyright (C) 2010-2012 Romain Tartière + * Copyright (C) 2010-2013 Philippe Teuwen + * Copyright (C) 2012-2013 Ludovic Rousseau + * Additional contributors of this file: + * Copyright (C) 2013 Alex Lian * * This program is free software: you can redistribute it and/or modify it * under the terms of the GNU Lesser General Public License as published by the diff --git a/libnfc/log_win32.c b/libnfc/log_win32.c index a302097..00058f6 100644 --- a/libnfc/log_win32.c +++ b/libnfc/log_win32.c @@ -1,7 +1,14 @@ /*- - * Copyright (C) 2011 Romain Tartière - * Copyright (C) 2011, 2012 Romuald Conty - * Copyright (C) 2013 Alex Lian + * Free/Libre Near Field Communication (NFC) library + * + * Libnfc historical contributors: + * Copyright (C) 2009 Roel Verdult + * Copyright (C) 2009-2013 Romuald Conty + * Copyright (C) 2010-2012 Romain Tartière + * Copyright (C) 2010-2013 Philippe Teuwen + * Copyright (C) 2012-2013 Ludovic Rousseau + * Additional contributors of this file: + * Copyright (C) 2013 Alex Lian * * This program is free software: you can redistribute it and/or modify it * under the terms of the GNU Lesser General Public License as published by the diff --git a/libnfc/mirror-subr.c b/libnfc/mirror-subr.c index f0ad8b4..4bcc10b 100644 --- a/libnfc/mirror-subr.c +++ b/libnfc/mirror-subr.c @@ -1,7 +1,13 @@ /*- - * Public platform independent Near Field Communication (NFC) library + * Free/Libre Near Field Communication (NFC) library * - * Copyright (C) 2009 Roel Verdult + * Libnfc historical contributors: + * Copyright (C) 2009 Roel Verdult + * Copyright (C) 2009-2013 Romuald Conty + * Copyright (C) 2010-2012 Romain Tartière + * Copyright (C) 2010-2013 Philippe Teuwen + * Copyright (C) 2012-2013 Ludovic Rousseau + * Additional contributors of this file: * * This program is free software: you can redistribute it and/or modify it * under the terms of the GNU Lesser General Public License as published by the diff --git a/libnfc/mirror-subr.h b/libnfc/mirror-subr.h index e3960f4..d81bbc1 100644 --- a/libnfc/mirror-subr.h +++ b/libnfc/mirror-subr.h @@ -1,7 +1,13 @@ -/** - * Public platform independent Near Field Communication (NFC) library +/*- + * Free/Libre Near Field Communication (NFC) library * - * Copyright (C) 2009 Roel Verdult + * Libnfc historical contributors: + * Copyright (C) 2009 Roel Verdult + * Copyright (C) 2009-2013 Romuald Conty + * Copyright (C) 2010-2012 Romain Tartière + * Copyright (C) 2010-2013 Philippe Teuwen + * Copyright (C) 2012-2013 Ludovic Rousseau + * Additional contributors of this file: * * This program is free software: you can redistribute it and/or modify it * under the terms of the GNU Lesser General Public License as published by the diff --git a/libnfc/nfc-device.c b/libnfc/nfc-device.c index 4e5d883..3abfd9c 100644 --- a/libnfc/nfc-device.c +++ b/libnfc/nfc-device.c @@ -1,8 +1,13 @@ /*- - * Public platform independent Near Field Communication (NFC) library + * Free/Libre Near Field Communication (NFC) library * - * Copyright (C) 2011 Romain Tartière - * Copyright (C) 2011, 2012 Romuald Conty + * Libnfc historical contributors: + * Copyright (C) 2009 Roel Verdult + * Copyright (C) 2009-2013 Romuald Conty + * Copyright (C) 2010-2012 Romain Tartière + * Copyright (C) 2010-2013 Philippe Teuwen + * Copyright (C) 2012-2013 Ludovic Rousseau + * Additional contributors of this file: * * This program is free software: you can redistribute it and/or modify it * under the terms of the GNU Lesser General Public License as published by the diff --git a/libnfc/nfc-emulation.c b/libnfc/nfc-emulation.c index e98d625..b7f21fa 100644 --- a/libnfc/nfc-emulation.c +++ b/libnfc/nfc-emulation.c @@ -1,8 +1,13 @@ /*- - * Public platform independent Near Field Communication (NFC) library + * Free/Libre Near Field Communication (NFC) library * - * Copyright (C) 2011 Romain Tartière - * Copyright (C) 2011 Romuald Conty + * Libnfc historical contributors: + * Copyright (C) 2009 Roel Verdult + * Copyright (C) 2009-2013 Romuald Conty + * Copyright (C) 2010-2012 Romain Tartière + * Copyright (C) 2010-2013 Philippe Teuwen + * Copyright (C) 2012-2013 Ludovic Rousseau + * Additional contributors of this file: * * This program is free software: you can redistribute it and/or modify it * under the terms of the GNU Lesser General Public License as published by the diff --git a/libnfc/nfc-internal.c b/libnfc/nfc-internal.c index 39d7f2e..e38a887 100644 --- a/libnfc/nfc-internal.c +++ b/libnfc/nfc-internal.c @@ -1,7 +1,13 @@ /*- - * Public platform independent Near Field Communication (NFC) library + * Free/Libre Near Field Communication (NFC) library * - * Copyright (C) 2011, 2012 Romuald Conty + * Libnfc historical contributors: + * Copyright (C) 2009 Roel Verdult + * Copyright (C) 2009-2013 Romuald Conty + * Copyright (C) 2010-2012 Romain Tartière + * Copyright (C) 2010-2013 Philippe Teuwen + * Copyright (C) 2012-2013 Ludovic Rousseau + * Additional contributors of this file: * * This program is free software: you can redistribute it and/or modify it * under the terms of the GNU Lesser General Public License as published by the diff --git a/libnfc/nfc-internal.h b/libnfc/nfc-internal.h index f0f396d..6b5eeef 100644 --- a/libnfc/nfc-internal.h +++ b/libnfc/nfc-internal.h @@ -1,8 +1,13 @@ /*- - * Public platform independent Near Field Communication (NFC) library + * Free/Libre Near Field Communication (NFC) library * - * Copyright (C) 2011 Romain Tartière - * Copyright (C) 2011, 2012 Romuald Conty + * Libnfc historical contributors: + * Copyright (C) 2009 Roel Verdult + * Copyright (C) 2009-2013 Romuald Conty + * Copyright (C) 2010-2012 Romain Tartière + * Copyright (C) 2010-2013 Philippe Teuwen + * Copyright (C) 2012-2013 Ludovic Rousseau + * Additional contributors of this file: * * This program is free software: you can redistribute it and/or modify it * under the terms of the GNU Lesser General Public License as published by the diff --git a/libnfc/nfc.c b/libnfc/nfc.c index 473af3f..dcb2273 100644 --- a/libnfc/nfc.c +++ b/libnfc/nfc.c @@ -1,9 +1,13 @@ /*- - * Public platform independent Near Field Communication (NFC) library + * Free/Libre Near Field Communication (NFC) library * - * Copyright (C) 2009, 2010 Roel Verdult - * Copyright (C) 2010, 2011 Romain Tartière - * Copyright (C) 2009, 2010, 2011, 2012, 2013 Romuald Conty + * Libnfc historical contributors: + * Copyright (C) 2009 Roel Verdult + * Copyright (C) 2009-2013 Romuald Conty + * Copyright (C) 2010-2012 Romain Tartière + * Copyright (C) 2010-2013 Philippe Teuwen + * Copyright (C) 2012-2013 Ludovic Rousseau + * Additional contributors of this file: * * This program is free software: you can redistribute it and/or modify it * under the terms of the GNU Lesser General Public License as published by the diff --git a/libnfc/target-subr.c b/libnfc/target-subr.c index 9429839..52cfbd2 100644 --- a/libnfc/target-subr.c +++ b/libnfc/target-subr.c @@ -1,9 +1,13 @@ /*- - * Public platform independent Near Field Communication (NFC) library + * Free/Libre Near Field Communication (NFC) library * - * Copyright (C) 2009 Roel Verdult - * Copyright (C) 2010, 2011 Romain Tartière - * Copyright (C) 2009, 2010, 2011, 2012 Romuald Conty + * Libnfc historical contributors: + * Copyright (C) 2009 Roel Verdult + * Copyright (C) 2009-2013 Romuald Conty + * Copyright (C) 2010-2012 Romain Tartière + * Copyright (C) 2010-2013 Philippe Teuwen + * Copyright (C) 2012-2013 Ludovic Rousseau + * Additional contributors of this file: * * This program is free software: you can redistribute it and/or modify it * under the terms of the GNU Lesser General Public License as published by the diff --git a/libnfc/target-subr.h b/libnfc/target-subr.h index a1b9d60..0dfa0db 100644 --- a/libnfc/target-subr.h +++ b/libnfc/target-subr.h @@ -1,9 +1,13 @@ /*- - * Public platform independent Near Field Communication (NFC) library + * Free/Libre Near Field Communication (NFC) library * - * Copyright (C) 2009 Roel Verdult - * Copyright (C) 2010, 2011 Romain Tartière - * Copyright (C) 2009, 2010, 2011, 2012 Romuald Conty + * Libnfc historical contributors: + * Copyright (C) 2009 Roel Verdult + * Copyright (C) 2009-2013 Romuald Conty + * Copyright (C) 2010-2012 Romain Tartière + * Copyright (C) 2010-2013 Philippe Teuwen + * Copyright (C) 2012-2013 Ludovic Rousseau + * Additional contributors of this file: * * This program is free software: you can redistribute it and/or modify it * under the terms of the GNU Lesser General Public License as published by the diff --git a/utils/mifare.c b/utils/mifare.c index d1d7809..fde3cc5 100644 --- a/utils/mifare.c +++ b/utils/mifare.c @@ -1,9 +1,13 @@ /*- - * Public platform independent Near Field Communication (NFC) library examples + * Free/Libre Near Field Communication (NFC) library * - * Copyright (C) 2009 Roel Verdult - * Copyright (C) 2010 Romain Tartière - * Copyright (C) 2010, 2011 Romuald Conty + * Libnfc historical contributors: + * Copyright (C) 2009 Roel Verdult + * Copyright (C) 2009-2013 Romuald Conty + * Copyright (C) 2010-2012 Romain Tartière + * Copyright (C) 2010-2013 Philippe Teuwen + * Copyright (C) 2012-2013 Ludovic Rousseau + * Additional contributors of this file: * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions are met: diff --git a/utils/mifare.h b/utils/mifare.h index fb90fea..4498c10 100644 --- a/utils/mifare.h +++ b/utils/mifare.h @@ -1,9 +1,13 @@ /*- - * Public platform independent Near Field Communication (NFC) library examples + * Free/Libre Near Field Communication (NFC) library * - * Copyright (C) 2009 Roel Verdult - * Copyright (C) 2010 Romain Tartière - * Copyright (C) 2010, 2011 Romuald Conty + * Libnfc historical contributors: + * Copyright (C) 2009 Roel Verdult + * Copyright (C) 2009-2013 Romuald Conty + * Copyright (C) 2010-2012 Romain Tartière + * Copyright (C) 2010-2013 Philippe Teuwen + * Copyright (C) 2012-2013 Ludovic Rousseau + * Additional contributors of this file: * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions are met: diff --git a/utils/nfc-emulate-forum-tag4.c b/utils/nfc-emulate-forum-tag4.c index 47335ba..4bae3c8 100644 --- a/utils/nfc-emulate-forum-tag4.c +++ b/utils/nfc-emulate-forum-tag4.c @@ -1,9 +1,13 @@ /*- - * Public platform independent Near Field Communication (NFC) library examples + * Free/Libre Near Field Communication (NFC) library * - * Copyright (C) 2010 Roel Verdult - * Copyright (C) 2011 Romain Tartière - * Copyright (C) 2010, 2011 Romuald Conty + * Libnfc historical contributors: + * Copyright (C) 2009 Roel Verdult + * Copyright (C) 2009-2013 Romuald Conty + * Copyright (C) 2010-2012 Romain Tartière + * Copyright (C) 2010-2013 Philippe Teuwen + * Copyright (C) 2012-2013 Ludovic Rousseau + * Additional contributors of this file: * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions are met: diff --git a/utils/nfc-list.c b/utils/nfc-list.c index 251ede2..0f8eef6 100644 --- a/utils/nfc-list.c +++ b/utils/nfc-list.c @@ -1,9 +1,13 @@ /*- - * Public platform independent Near Field Communication (NFC) library examples + * Free/Libre Near Field Communication (NFC) library * - * Copyright (C) 2009 Roel Verdult - * Copyright (C) 2010 Romain Tartière - * Copyright (C) 2010 Romuald Conty + * Libnfc historical contributors: + * Copyright (C) 2009 Roel Verdult + * Copyright (C) 2009-2013 Romuald Conty + * Copyright (C) 2010-2012 Romain Tartière + * Copyright (C) 2010-2013 Philippe Teuwen + * Copyright (C) 2012-2013 Ludovic Rousseau + * Additional contributors of this file: * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions are met: diff --git a/utils/nfc-mfclassic.c b/utils/nfc-mfclassic.c index 964bfeb..4661467 100644 --- a/utils/nfc-mfclassic.c +++ b/utils/nfc-mfclassic.c @@ -1,10 +1,14 @@ /*- - * Public platform independent Near Field Communication (NFC) library examples + * Free/Libre Near Field Communication (NFC) library * - * Copyright (C) 2009 Roel Verdult - * Copyright (C) 2010 Romain Tartière - * Copyright (C) 2010 Romuald Conty - * Copyright (C) 2011 Adam Laurie + * Libnfc historical contributors: + * Copyright (C) 2009 Roel Verdult + * Copyright (C) 2009-2013 Romuald Conty + * Copyright (C) 2010-2012 Romain Tartière + * Copyright (C) 2010-2013 Philippe Teuwen + * Copyright (C) 2012-2013 Ludovic Rousseau + * Additional contributors of this file: + * Copyright (C) 2011 Adam Laurie * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions are met: diff --git a/utils/nfc-mfultralight.c b/utils/nfc-mfultralight.c index b1e3e79..d012b90 100644 --- a/utils/nfc-mfultralight.c +++ b/utils/nfc-mfultralight.c @@ -1,8 +1,13 @@ /*- - * Public platform independent Near Field Communication (NFC) library examples + * Free/Libre Near Field Communication (NFC) library * - * Copyright (C) 2009 Roel Verdult - * Copyright (C) 2010 Romuald Conty + * Libnfc historical contributors: + * Copyright (C) 2009 Roel Verdult + * Copyright (C) 2009-2013 Romuald Conty + * Copyright (C) 2010-2012 Romain Tartière + * Copyright (C) 2010-2013 Philippe Teuwen + * Copyright (C) 2012-2013 Ludovic Rousseau + * Additional contributors of this file: * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions are met: diff --git a/utils/nfc-read-forum-tag3.c b/utils/nfc-read-forum-tag3.c index 7b60f8d..53d80f2 100644 --- a/utils/nfc-read-forum-tag3.c +++ b/utils/nfc-read-forum-tag3.c @@ -1,7 +1,13 @@ /*- - * Public platform independent Near Field Communication (NFC) library examples + * Free/Libre Near Field Communication (NFC) library * - * Copyright (C) 2011 Romuald Conty + * Libnfc historical contributors: + * Copyright (C) 2009 Roel Verdult + * Copyright (C) 2009-2013 Romuald Conty + * Copyright (C) 2010-2012 Romain Tartière + * Copyright (C) 2010-2013 Philippe Teuwen + * Copyright (C) 2012-2013 Ludovic Rousseau + * Additional contributors of this file: * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions are met: diff --git a/utils/nfc-relay-picc.c b/utils/nfc-relay-picc.c index dd92607..5932152 100644 --- a/utils/nfc-relay-picc.c +++ b/utils/nfc-relay-picc.c @@ -1,7 +1,13 @@ /*- - * Public platform independent Near Field Communication (NFC) library examples + * Free/Libre Near Field Communication (NFC) library * - * Copyright (C) 2010 Romuald Conty + * Libnfc historical contributors: + * Copyright (C) 2009 Roel Verdult + * Copyright (C) 2009-2013 Romuald Conty + * Copyright (C) 2010-2012 Romain Tartière + * Copyright (C) 2010-2013 Philippe Teuwen + * Copyright (C) 2012-2013 Ludovic Rousseau + * Additional contributors of this file: * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions are met: diff --git a/utils/nfc-scan-device.c b/utils/nfc-scan-device.c index 9bfebee..30c7009 100644 --- a/utils/nfc-scan-device.c +++ b/utils/nfc-scan-device.c @@ -1,9 +1,13 @@ /*- - * Public platform independent Near Field Communication (NFC) library examples + * Free/Libre Near Field Communication (NFC) library * - * Copyright (C) 2009 Roel Verdult - * Copyright (C) 2010 Romain Tartière - * Copyright (C) 2010, 2011, 2012 Romuald Conty + * Libnfc historical contributors: + * Copyright (C) 2009 Roel Verdult + * Copyright (C) 2009-2013 Romuald Conty + * Copyright (C) 2010-2012 Romain Tartière + * Copyright (C) 2010-2013 Philippe Teuwen + * Copyright (C) 2012-2013 Ludovic Rousseau + * Additional contributors of this file: * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions are met: diff --git a/utils/nfc-utils.c b/utils/nfc-utils.c index 4d714bf..5c0a264 100644 --- a/utils/nfc-utils.c +++ b/utils/nfc-utils.c @@ -1,9 +1,13 @@ /*- - * Public platform independent Near Field Communication (NFC) library examples + * Free/Libre Near Field Communication (NFC) library * - * Copyright (C) 2009 Roel Verdult - * Copyright (C) 2010, 2011 Romain Tartière - * Copyright (C) 2009, 2010, 2011, 2012 Romuald Conty + * Libnfc historical contributors: + * Copyright (C) 2009 Roel Verdult + * Copyright (C) 2009-2013 Romuald Conty + * Copyright (C) 2010-2012 Romain Tartière + * Copyright (C) 2010-2013 Philippe Teuwen + * Copyright (C) 2012-2013 Ludovic Rousseau + * Additional contributors of this file: * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions are met: diff --git a/utils/nfc-utils.h b/utils/nfc-utils.h index 6203d0f..8c52d4c 100644 --- a/utils/nfc-utils.h +++ b/utils/nfc-utils.h @@ -1,9 +1,13 @@ /*- - * Public platform independent Near Field Communication (NFC) library examples + * Free/Libre Near Field Communication (NFC) library * - * Copyright (C) 2009 Roel Verdult - * Copyright (C) 2010 Romain Tartière - * Copyright (C) 2010, 2011, 2012 Romuald Conty + * Libnfc historical contributors: + * Copyright (C) 2009 Roel Verdult + * Copyright (C) 2009-2013 Romuald Conty + * Copyright (C) 2010-2012 Romain Tartière + * Copyright (C) 2010-2013 Philippe Teuwen + * Copyright (C) 2012-2013 Ludovic Rousseau + * Additional contributors of this file: * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions are met: