From 618480140c3f5b3cac1f55036d3d2f12560e7f60 Mon Sep 17 00:00:00 2001 From: Joachim Nilsson Date: Wed, 7 Jan 2015 02:11:05 +0100 Subject: [PATCH] Update copyright years and reflow LICENSE file. Update copyright years of all sources. Reflow/reformat paragraphs in MIT license to match Finit, i.e., no content changes only whitespace/linebreak changes. Signed-off-by: Joachim Nilsson --- LICENSE | 38 +++++++++++++++++--------------------- Makefile | 6 +++--- io.c | 4 ++-- joystick.c | 2 +- main.c | 4 ++-- signal.c | 4 ++-- test.c | 4 ++-- timer.c | 4 ++-- uev.h | 4 ++-- 9 files changed, 33 insertions(+), 37 deletions(-) diff --git a/LICENSE b/LICENSE index a5938e5..7d0f1e0 100644 --- a/LICENSE +++ b/LICENSE @@ -1,24 +1,20 @@ -Copyright (c) 2012 Flemming Madsen -Copyright (c) 2013 Joachim Nilsson +Copyright (c) 2012 Flemming Madsen +Copyright (c) 2013-2015 Joachim Nilsson -Permission is hereby granted, free of charge, to any person obtaining -a copy of this software and associated documentation files (the -"Software"), to deal in the Software without restriction, including -without limitation the rights to use, copy, modify, merge, publish, -distribute, sublicense, and/or sell copies of the Software, and to -permit persons to whom the Software is furnished to do so, subject to -the following conditions: +Permission is hereby granted, free of charge, to any person obtaining a copy +of this software and associated documentation files (the "Software"), to deal +in the Software without restriction, including without limitation the rights +to use, copy, modify, merge, publish, distribute, sublicense, and/or sell +copies of the Software, and to permit persons to whom the Software is +furnished to do so, subject to the following conditions: -The above copyright notice and this permission notice shall be -included in all copies or substantial portions of the Software. +The above copyright notice and this permission notice shall be included in +all copies or substantial portions of the Software. -THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, -EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF -MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. -IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY -CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, -TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE -SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. - -For an explanation and background of the MIT license, see the Wikipedia -article https://en.wikipedia.org/wiki/MIT_License +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, +OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN +THE SOFTWARE. diff --git a/Makefile b/Makefile index 5b9d255..68de204 100644 --- a/Makefile +++ b/Makefile @@ -1,7 +1,7 @@ # -*-Makefile-*- for libuEv # -# Copyright (c) 2012 Flemming Madsen -# Copyright (c) 2013 Joachim Nilsson +# Copyright (c) 2012 Flemming Madsen +# Copyright (c) 2013-2015 Joachim Nilsson # # Permission is hereby granted, free of charge, to any person obtaining # a copy of this software and associated documentation files (the @@ -116,7 +116,7 @@ check: clean @scan-build $(MAKE) all clean: - -@$(RM) $(TARGET) *.o test + -@$(RM) $(TARGET) *.o test joystick bench distclean: clean -@$(RM) $(DEPS) $(JUNK) diff --git a/io.c b/io.c index fa5ceba..7dfa15f 100644 --- a/io.c +++ b/io.c @@ -1,7 +1,7 @@ /* libuEv - Micro event loop library * - * Copyright (c) 2012 Flemming Madsen - * Copyright (c) 2013 Joachim Nilsson + * Copyright (c) 2012 Flemming Madsen + * Copyright (c) 2013-2015 Joachim Nilsson * * Permission is hereby granted, free of charge, to any person obtaining * a copy of this software and associated documentation files (the diff --git a/joystick.c b/joystick.c index a3020ac..ecd783d 100644 --- a/joystick.c +++ b/joystick.c @@ -1,6 +1,6 @@ /* Simple example of how to use libuEv with Linux joystick API * - * Copyright (c) 2014 Joachim Nilsson + * Copyright (c) 2014-2015 Joachim Nilsson * * Permission is hereby granted, free of charge, to any person obtaining * a copy of this software and associated documentation files (the diff --git a/main.c b/main.c index e3d390e..4b6f492 100644 --- a/main.c +++ b/main.c @@ -1,7 +1,7 @@ /* libuEv - Micro event loop library * - * Copyright (c) 2012 Flemming Madsen - * Copyright (c) 2013 Joachim Nilsson + * Copyright (c) 2012 Flemming Madsen + * Copyright (c) 2013-2015 Joachim Nilsson * * Permission is hereby granted, free of charge, to any person obtaining * a copy of this software and associated documentation files (the diff --git a/signal.c b/signal.c index 0150bcd..a94660f 100644 --- a/signal.c +++ b/signal.c @@ -1,7 +1,7 @@ /* libuEv - Micro event loop library * - * Copyright (c) 2012 Flemming Madsen - * Copyright (c) 2013 Joachim Nilsson + * Copyright (c) 2012 Flemming Madsen + * Copyright (c) 2013-2015 Joachim Nilsson * * Permission is hereby granted, free of charge, to any person obtaining * a copy of this software and associated documentation files (the diff --git a/test.c b/test.c index 64ba6c0..f7daf30 100644 --- a/test.c +++ b/test.c @@ -1,7 +1,7 @@ /* Test libuEv event library * - * Copyright (c) 2012 Flemming Madsen - * Copyright (c) 2013 Joachim Nilsson + * Copyright (c) 2012 Flemming Madsen + * Copyright (c) 2013-2015 Joachim Nilsson * * Permission is hereby granted, free of charge, to any person obtaining * a copy of this software and associated documentation files (the diff --git a/timer.c b/timer.c index 76c5a3d..fdbba81 100644 --- a/timer.c +++ b/timer.c @@ -1,7 +1,7 @@ /* libuEv - Micro event loop library * - * Copyright (c) 2012 Flemming Madsen - * Copyright (c) 2013 Joachim Nilsson + * Copyright (c) 2012 Flemming Madsen + * Copyright (c) 2013-2015 Joachim Nilsson * * Permission is hereby granted, free of charge, to any person obtaining * a copy of this software and associated documentation files (the diff --git a/uev.h b/uev.h index 96865bd..64e45ff 100644 --- a/uev.h +++ b/uev.h @@ -1,7 +1,7 @@ /* libuEv - Micro event loop library * - * Copyright (c) 2012 Flemming Madsen - * Copyright (c) 2013 Joachim Nilsson + * Copyright (c) 2012 Flemming Madsen + * Copyright (c) 2013-2015 Joachim Nilsson * * Permission is hereby granted, free of charge, to any person obtaining * a copy of this software and associated documentation files (the