From: Simon Josefsson Date: Tue, 10 May 2011 08:23:16 +0000 (+0200) Subject: Fix license and dist ykpers4win.mk. X-Git-Tag: v1.5.2~3 X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=25b17fc35e1bcce9ab85dade83be27d9d98d3c95;p=yubikey-personalization Fix license and dist ykpers4win.mk. --- diff --git a/Makefile.am b/Makefile.am index 3dacae0..b08f458 100644 --- a/Makefile.am +++ b/Makefile.am @@ -77,6 +77,9 @@ EXTRA_DIST = doc/Compatibility.asciidoc doc/Make-Release.asciidoc doc/Read-Me.as # Dist contrib stuff. EXTRA_DIST += contrib/README contrib/programming.sh +# Windows rules. +EXTRA_DIST += ykpers4win.mk + udevrulesdir=@udevrulesdir@ dist_udevrules_DATA = \ 70-yubikey.rules diff --git a/NEWS b/NEWS index 1a44b2d..2c85786 100644 --- a/NEWS +++ b/NEWS @@ -2,6 +2,8 @@ Yubikey-personalize NEWS -- History of user-visible changes. -*- outline -*- * Version 1.5.2 (unreleased) +** Improve and distribute ykpers4win.mk. + * Version 1.5.1 (released 2011-04-11) ** Added native Windows backend. diff --git a/ykpers4win.mk b/ykpers4win.mk index f1c41b0..061e1ef 100644 --- a/ykpers4win.mk +++ b/ykpers4win.mk @@ -1,3 +1,31 @@ +# Written by Simon Josefsson . +# Copyright (c) 2010, 2011 Yubico AB +# All rights reserved. +# +# Redistribution and use in source and binary forms, with or without +# modification, are permitted provided that the following conditions are +# met: +# +# * Redistributions of source code must retain the above copyright +# notice, this list of conditions and the following disclaimer. +# +# * 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 COPYRIGHT HOLDERS AND CONTRIBUTORS +# "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 COPYRIGHT +# OWNER OR CONTRIBUTORS 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. + LIBYUBIKEYVERSION=1.7 PROJECT=yubikey-personalization PACKAGE=ykpers