From e08008a548b1cd363a7cc89b0c7f28b07f0f1c0b Mon Sep 17 00:00:00 2001 From: Simon Josefsson Date: Mon, 23 Jan 2012 20:10:35 +0100 Subject: [PATCH] Bump version. Use silent rules. Bump copyright years. --- COPYING | 2 +- Makefile.am | 2 +- NEWS | 2 ++ configure.ac | 5 +++-- libykpers-1.map | 2 +- tests/Makefile.am | 2 +- tests/selftest.c | 2 +- tests/test_args_to_config.c | 2 +- tests/test_key_generation.c | 2 +- ykchalresp.1 | 2 +- ykchalresp.c | 2 +- ykcore/Makefile.am | 2 +- ykcore/ykcore.c | 2 +- ykcore/ykcore.h | 2 +- ykcore/ykcore_backend.h | 2 +- ykcore/ykcore_lcl.h | 2 +- ykcore/ykcore_libusb-1.0.c | 4 ++-- ykcore/ykcore_libusb.c | 2 +- ykcore/ykcore_osx.c | 4 ++-- ykcore/ykcore_stub.c | 2 +- ykcore/ykcore_windows.c | 2 +- ykcore/ykstatus.c | 2 +- ykcore/ykstatus.h | 2 +- ykcore/yktsd.h | 1 + ykpbkdf2.c | 2 +- ykpbkdf2.h | 2 +- ykpers-args.c | 4 ++-- ykpers-args.h | 2 +- ykpers.c | 2 +- ykpers.h | 2 +- ykpers4win.mk | 2 +- ykpersonalize.1 | 2 +- ykpersonalize.c | 4 ++-- 33 files changed, 40 insertions(+), 36 deletions(-) diff --git a/COPYING b/COPYING index cf711ee..1c7eaf3 100644 --- a/COPYING +++ b/COPYING @@ -1,4 +1,4 @@ -Copyright (c) 2008, Yubico AB +Copyright (c) 2008-2012 Yubico AB All rights reserved. Redistribution and use in source and binary forms, with or without diff --git a/Makefile.am b/Makefile.am index b46ede2..df31d20 100644 --- a/Makefile.am +++ b/Makefile.am @@ -1,5 +1,5 @@ # Written by Richard Levitte . -# Copyright (c) 2008, 2009, 2010, 2011 Yubico AB +# Copyright (c) 2008-2012 Yubico AB # All rights reserved. # # Redistribution and use in source and binary forms, with or without diff --git a/NEWS b/NEWS index c28e779..ac59055 100644 --- a/NEWS +++ b/NEWS @@ -1,5 +1,7 @@ Yubikey-personalize NEWS -- History of user-visible changes. -*- outline -*- +* Version 1.6.4 (unreleased) + * Version 1.6.3 (released 2011-12-15) ** No real change for regular users. Fix a bug in a test case for diff --git a/configure.ac b/configure.ac index 66f176d..b5277af 100644 --- a/configure.ac +++ b/configure.ac @@ -1,5 +1,5 @@ # Written by Richard Levitte . -# Copyright (c) 2008, 2009, 2010, 2011, Yubico AB +# Copyright (c) 2008-2012 Yubico AB # All rights reserved. # # Redistribution and use in source and binary forms, with or without @@ -26,7 +26,7 @@ # (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE # OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -AC_INIT([yubikey-personalization], [1.6.2], +AC_INIT([yubikey-personalization], [1.6.4], [yubico-devel@googlegroups.com], [ykpers], [http://code.google.com/p/yubikey-personalization/]) AC_CONFIG_AUX_DIR([build-aux]) @@ -41,6 +41,7 @@ AC_SUBST(LT_REVISION, 2) AC_SUBST(LT_AGE, 6) AM_INIT_AUTOMAKE([-Wall -Werror]) +AM_SILENT_RULES([yes]) AC_PROG_CC ACX_PTHREAD diff --git a/libykpers-1.map b/libykpers-1.map index caa916c..ea3b55a 100644 --- a/libykpers-1.map +++ b/libykpers-1.map @@ -1,5 +1,5 @@ # Written by Simon Josefsson . -# Copyright (c) 2008, 2009, 2011 Yubico AB +# Copyright (c) 2008-2012 Yubico AB # All rights reserved. # # Redistribution and use in source and binary forms, with or without diff --git a/tests/Makefile.am b/tests/Makefile.am index 989f11d..06d890a 100644 --- a/tests/Makefile.am +++ b/tests/Makefile.am @@ -1,4 +1,4 @@ -# Copyright (c) 2011 Yubico AB +# Copyright (c) 2011-2012 Yubico AB # All rights reserved. # # Redistribution and use in source and binary forms, with or without diff --git a/tests/selftest.c b/tests/selftest.c index c64aecd..e81301a 100644 --- a/tests/selftest.c +++ b/tests/selftest.c @@ -1,6 +1,6 @@ /* -*- mode:C; c-file-style: "bsd" -*- */ /* - * Copyright (c) 2009, Yubico AB + * Copyright (c) 2009-2012 Yubico AB * All rights reserved. * * Redistribution and use in source and binary forms, with or without diff --git a/tests/test_args_to_config.c b/tests/test_args_to_config.c index edb8e19..e33c9d0 100644 --- a/tests/test_args_to_config.c +++ b/tests/test_args_to_config.c @@ -1,6 +1,6 @@ /* -*- mode:C; c-file-style: "bsd" -*- */ /* - * Copyright (c) 2011, Yubico AB + * Copyright (c) 2011-2012 Yubico AB * All rights reserved. * * Redistribution and use in source and binary forms, with or without diff --git a/tests/test_key_generation.c b/tests/test_key_generation.c index 57c226d..c836b94 100644 --- a/tests/test_key_generation.c +++ b/tests/test_key_generation.c @@ -1,6 +1,6 @@ /* -*- mode:C; c-file-style: "bsd" -*- */ /* - * Copyright (c) 2011, Yubico AB + * Copyright (c) 2011-2012 Yubico AB * All rights reserved. * * Redistribution and use in source and binary forms, with or without diff --git a/ykchalresp.1 b/ykchalresp.1 index d217b04..8613436 100644 --- a/ykchalresp.1 +++ b/ykchalresp.1 @@ -1,4 +1,4 @@ -.\" Copyright (c) 2011 Yubico AB +.\" Copyright (c) 2011-2012 Yubico AB .\" All rights reserved. .\" .\" Redistribution and use in source and binary forms, with or without diff --git a/ykchalresp.c b/ykchalresp.c index f7c8b6c..0d719d1 100644 --- a/ykchalresp.c +++ b/ykchalresp.c @@ -1,6 +1,6 @@ /* -*- mode:C; c-file-style: "bsd" -*- */ /* - * Copyright (c) 2011 Yubico AB. + * Copyright (c) 2011-2012 Yubico AB. * All rights reserved. * * Author : Fredrik Thulin diff --git a/ykcore/Makefile.am b/ykcore/Makefile.am index 03ac1e4..dcc64d8 100644 --- a/ykcore/Makefile.am +++ b/ykcore/Makefile.am @@ -1,4 +1,4 @@ -# Copyright (c) 2008, 2009, 2011, Yubico AB +# Copyright (c) 2008-2012 Yubico AB # All rights reserved. # # Redistribution and use in source and binary forms, with or without diff --git a/ykcore/ykcore.c b/ykcore/ykcore.c index 10fb39b..35a07d8 100644 --- a/ykcore/ykcore.c +++ b/ykcore/ykcore.c @@ -1,6 +1,6 @@ /* -*- mode:C; c-file-style: "bsd" -*- */ /* - * Copyright (c) 2008, 2009, 2010, 2011, Yubico AB + * Copyright (c) 2008-2012 Yubico AB * All rights reserved. * * Redistribution and use in source and binary forms, with or without diff --git a/ykcore/ykcore.h b/ykcore/ykcore.h index d44722e..d45524e 100644 --- a/ykcore/ykcore.h +++ b/ykcore/ykcore.h @@ -1,6 +1,6 @@ /* -*- mode:C; c-file-style: "bsd" -*- */ /* - * Copyright (c) 2008-2011, Yubico AB + * Copyright (c) 2008-2012 Yubico AB * All rights reserved. * * Redistribution and use in source and binary forms, with or without diff --git a/ykcore/ykcore_backend.h b/ykcore/ykcore_backend.h index 7a01525..d8a6497 100644 --- a/ykcore/ykcore_backend.h +++ b/ykcore/ykcore_backend.h @@ -1,7 +1,7 @@ /* -*- mode:C; c-file-style: "bsd" -*- */ /* * Written by Richard Levitte - * Copyright (c) 2008, Yubico AB + * Copyright (c) 2008-2012 Yubico AB * All rights reserved. * * Redistribution and use in source and binary forms, with or without diff --git a/ykcore/ykcore_lcl.h b/ykcore/ykcore_lcl.h index 425f147..3438c03 100644 --- a/ykcore/ykcore_lcl.h +++ b/ykcore/ykcore_lcl.h @@ -1,6 +1,6 @@ /* -*- mode:C; c-file-style: "bsd" -*- */ /* - * Copyright (c) 2008, 2009, Yubico AB + * Copyright (c) 2008-2012 Yubico AB * All rights reserved. * * Redistribution and use in source and binary forms, with or without diff --git a/ykcore/ykcore_libusb-1.0.c b/ykcore/ykcore_libusb-1.0.c index 35f7bb0..138e85c 100644 --- a/ykcore/ykcore_libusb-1.0.c +++ b/ykcore/ykcore_libusb-1.0.c @@ -1,7 +1,7 @@ /* -*- mode:C; c-file-style: "bsd" -*- */ /* - * Copyright (c) 2009, Tollef Fog Heen - * Copyright (c) 2008, 2009, Yubico AB + * Copyright (c) 2008-2012 Yubico AB + * Copyright (c) 2009 Tollef Fog Heen * All rights reserved. * * Redistribution and use in source and binary forms, with or without diff --git a/ykcore/ykcore_libusb.c b/ykcore/ykcore_libusb.c index 73cf583..fb8f17e 100644 --- a/ykcore/ykcore_libusb.c +++ b/ykcore/ykcore_libusb.c @@ -1,6 +1,6 @@ /* -*- mode:C; c-file-style: "bsd" -*- */ /* - * Copyright (c) 2008, 2009, Yubico AB + * Copyright (c) 2008-2012 Yubico AB * All rights reserved. * * Redistribution and use in source and binary forms, with or without diff --git a/ykcore/ykcore_osx.c b/ykcore/ykcore_osx.c index 0ab2f78..58e3bd2 100644 --- a/ykcore/ykcore_osx.c +++ b/ykcore/ykcore_osx.c @@ -1,7 +1,7 @@ /* -*- mode:C; c-file-style: "bsd" -*- */ /* - * Copyright (c) 2008, 2009, Yubico AB - * Copyright (c) 2009, Christer Kaivo-oja + * Copyright (c) 2008-2012 Yubico AB + * Copyright (c) 2009 Christer Kaivo-oja * All rights reserved. * * Redistribution and use in source and binary forms, with or without diff --git a/ykcore/ykcore_stub.c b/ykcore/ykcore_stub.c index 891a16e..ef1671f 100644 --- a/ykcore/ykcore_stub.c +++ b/ykcore/ykcore_stub.c @@ -1,6 +1,6 @@ /* -*- mode:C; c-file-style: "bsd" -*- */ /* - * Copyright (c) 2008, 2011, Yubico AB + * Copyright (c) 2008-2012 Yubico AB * All rights reserved. * * Redistribution and use in source and binary forms, with or without diff --git a/ykcore/ykcore_windows.c b/ykcore/ykcore_windows.c index 45c656e..796ce37 100644 --- a/ykcore/ykcore_windows.c +++ b/ykcore/ykcore_windows.c @@ -1,6 +1,6 @@ /* -*- mode:C; c-file-style: "bsd" -*- */ /* - * Copyright (c) 2008, 2011, Yubico AB + * Copyright (c) 2008-2012 Yubico AB * All rights reserved. * * Redistribution and use in source and binary forms, with or without diff --git a/ykcore/ykstatus.c b/ykcore/ykstatus.c index f4aff01..4677fef 100644 --- a/ykcore/ykstatus.c +++ b/ykcore/ykstatus.c @@ -1,7 +1,7 @@ /* -*- mode:C; c-file-style: "bsd" -*- */ /* * Written by Richard Levitte - * Copyright (c) 2008, Yubico AB + * Copyright (c) 2008-2012 Yubico AB * All rights reserved. * * Redistribution and use in source and binary forms, with or without diff --git a/ykcore/ykstatus.h b/ykcore/ykstatus.h index df3c25b..74fd95e 100644 --- a/ykcore/ykstatus.h +++ b/ykcore/ykstatus.h @@ -1,7 +1,7 @@ /* -*- mode:C; c-file-style: "bsd" -*- */ /* * Written by Richard Levitte - * Copyright (c) 2008-2011, Yubico AB + * Copyright (c) 2008-2012 Yubico AB * All rights reserved. * * Redistribution and use in source and binary forms, with or without diff --git a/ykcore/yktsd.h b/ykcore/yktsd.h index 615e49a..9b5e526 100644 --- a/ykcore/yktsd.h +++ b/ykcore/yktsd.h @@ -2,6 +2,7 @@ /* Note: this file is copied from Levitte Programming's LPlib and reworked for ykcore */ /* + * Copyright (c) 2008-2012 Yubico AB * Copyright (c) 2010 Simon Josefsson * Copyright (c) 2003, 2004 Richard Levitte . * All rights reserved. diff --git a/ykpbkdf2.c b/ykpbkdf2.c index 9273d1c..119c971 100644 --- a/ykpbkdf2.c +++ b/ykpbkdf2.c @@ -1,5 +1,5 @@ /* -*- mode:C; c-file-style: "bsd" -*- */ -/* Copyright (c) 2008, Yubico AB +/* Copyright (c) 2008-2012 Yubico AB * All rights reserved. * * Redistribution and use in source and binary forms, with or without diff --git a/ykpbkdf2.h b/ykpbkdf2.h index 836eb1b..f443dba 100644 --- a/ykpbkdf2.h +++ b/ykpbkdf2.h @@ -1,5 +1,5 @@ /* -*- mode:C; c-file-style: "bsd" -*- */ -/* Copyright (c) 2008, Yubico AB +/* Copyright (c) 2008-2012 Yubico AB * All rights reserved. * * Redistribution and use in source and binary forms, with or without diff --git a/ykpers-args.c b/ykpers-args.c index c21dab1..6617de2 100644 --- a/ykpers-args.c +++ b/ykpers-args.c @@ -1,7 +1,7 @@ /* -*- mode:C; c-file-style: "bsd" -*- */ /* - * Copyright (c) 2008, 2009, 2010, 2011, Yubico AB - * Copyright (c) 2010 Tollef Fog Heen + * Copyright (c) 2008-2012 Yubico AB + * Copyright (c) 2010 Tollef Fog Heen * All rights reserved. * * Redistribution and use in source and binary forms, with or without diff --git a/ykpers-args.h b/ykpers-args.h index 873b2ef..d45caf6 100644 --- a/ykpers-args.h +++ b/ykpers-args.h @@ -1,6 +1,6 @@ /* -*- mode:C; c-file-style: "bsd" -*- */ /* - * Copyright (c) 2008, 2009, 2010, 2011, Yubico AB + * Copyright (c) 2008-2012 Yubico AB * All rights reserved. * * Redistribution and use in source and binary forms, with or without diff --git a/ykpers.c b/ykpers.c index 760941b..cd1f442 100644 --- a/ykpers.c +++ b/ykpers.c @@ -1,6 +1,6 @@ /* -*- mode:C; c-file-style: "bsd" -*- */ /* - * Copyright (c) 2008, 2009, 2010, 2011 Yubico AB + * Copyright (c) 2008-2012 Yubico AB * All rights reserved. * * Redistribution and use in source and binary forms, with or without diff --git a/ykpers.h b/ykpers.h index f5c59e0..2bc4c8b 100644 --- a/ykpers.h +++ b/ykpers.h @@ -1,6 +1,6 @@ /* -*- mode:C; c-file-style: "bsd" -*- */ /* - * Copyright (c) 2008-2011 Yubico AB + * Copyright (c) 2008-2012 Yubico AB * All rights reserved. * * Redistribution and use in source and binary forms, with or without diff --git a/ykpers4win.mk b/ykpers4win.mk index 0596262..7a34303 100644 --- a/ykpers4win.mk +++ b/ykpers4win.mk @@ -1,5 +1,5 @@ # Written by Simon Josefsson . -# Copyright (c) 2010, 2011 Yubico AB +# Copyright (c) 2010-2012 Yubico AB # All rights reserved. # # Redistribution and use in source and binary forms, with or without diff --git a/ykpersonalize.1 b/ykpersonalize.1 index 8d03d4d..cccd24b 100644 --- a/ykpersonalize.1 +++ b/ykpersonalize.1 @@ -1,5 +1,5 @@ +.\" Copyright (c) 2009-2012 Yubico AB .\" Copyright (C) 2009, 2010 Tollef Fog Heen -.\" Copyright (c) 2009 Yubico AB .\" All rights reserved. .\" .\" Redistribution and use in source and binary forms, with or without diff --git a/ykpersonalize.c b/ykpersonalize.c index 581c829..57490e9 100644 --- a/ykpersonalize.c +++ b/ykpersonalize.c @@ -1,7 +1,7 @@ /* -*- mode:C; c-file-style: "bsd" -*- */ /* - * Copyright (c) 2008, 2009, 2010, 2011, Yubico AB - * Copyright (c) 2010 Tollef Fog Heen + * Copyright (c) 2008-2012 Yubico AB + * Copyright (c) 2010 Tollef Fog Heen * All rights reserved. * * Redistribution and use in source and binary forms, with or without -- 2.39.5