[SCM] exiv2 packaging branch, master, updated. debian/0.25-3.1-3734-gdcbc29a

Thu Jul 13 17:38:51 UTC 2017

Gitweb-URL: http://git.debian.org/?p=pkg-kde/kde-extras/exiv2.git;a=commitdiff;h=ccd51b4

The following commit has been merged in the master branch:
commit ccd51b4bc47239e1338864c402055f767b929996
Author: Andreas Huggel <ahuggel at gmx.net>
Date:   Tue Oct 2 14:19:35 2007 +0000

    Tweaked README, added COPYING file with XMP SDK license agreements.
---
 xmpsdk/{README => COPYING} | 67 ++++++++++++++++------------------------------
 xmpsdk/README              | 34 +++--------------------
 2 files changed, 27 insertions(+), 74 deletions(-)

diff --git a/xmpsdk/README b/xmpsdk/COPYING
similarity index 52%
copy from xmpsdk/README
copy to xmpsdk/COPYING
index d8f2c43..0220577 100644
--- a/xmpsdk/README
+++ b/xmpsdk/COPYING
@@ -1,50 +1,8 @@
-XMP Toolkit
-***********
-
-Exiv2 uses the XMPCore component of the Adobe XMP Toolkit (XMP SDK) to
-parse and serialize XMP packets. Temporarily, it is integrated and
-distributed together with Exiv2. The xmpsdk/ directory of the Exiv2
-distribution (this directory) contains the XMP SDK source code. The
-final solution will rely on an external XMP Toolkit, once it is
-available as a standalone package from Linux distros.
-
-Building the XMP Toolkit is transparent. Following the installation
-steps described in the top-level Exiv2 README file will ensure that
-the XMP Toolkit is compiled if necessary. It is only needed if XMP
-support is enabled. Building the XMP Toolkit results in a static
-library xmpsdk/lib/libxmpsdk.a. This library is not installed on the
-system and is not meant to be used as a standalone library. It is
-only used to build exiv2.
-
-If you experience problems building this library, please email to the
-Exiv2 support forum for help, see http://www.exiv2.org/support.html
-and not to Adobe directly.
-
-
-Source
-======
-
-XMP Toolkit 4.1.1 (xmp_v411_sdk.zip) from
-http://www.adobe.com/devnet/xmp/sdk/eula.html
-
-The following files were copied from the original XMP SDK
-distribution:
-
-public/include/*      -> include
-source/common/*       -> src
-source/XMPCore/*      -> src
-build/XMP_BuildInfo.h -> src
-third-party/MD5/*     -> src
-
-
-License
-=======
+Copyright (c) 2007 Andreas Huggel <ahuggel at gmx.net>
+Copyright (c) 1999 - 2007, Adobe Systems Incorporated
 
 The BSD License
 
-Copyright (c) 1999 - 2007, Adobe Systems Incorporated
-All rights reserved.
-
 Redistribution and use in source and binary forms, with or without
 modification, are permitted provided that the following conditions are
 met:
@@ -71,3 +29,24 @@ 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.
+
+
+Copyright (C) 1991-2, RSA Data Security, Inc.
+
+License to copy and use this software is granted provided that it is
+identified as the "RSA Data Security, Inc. MD5 Message-Digest
+Algorithm" in all material mentioning or referencing this software or
+this function.
+
+License is also granted to make and use derivative works provided that
+such works are identified as "derived from the RSA Data Security,
+Inc. MD5 Message-Digest Algorithm" in all material mentioning or
+referencing the derived work.
+
+RSA Data Security, Inc. makes no representations concerning either the
+merchantability of this software or the suitability of this software
+for any particular purpose. It is provided "as is" without express or
+implied warranty of any kind.
+
+These notices must be retained in any copies of any part of this
+documentation and/or software.
diff --git a/xmpsdk/README b/xmpsdk/README
index d8f2c43..b37944e 100644
--- a/xmpsdk/README
+++ b/xmpsdk/README
@@ -14,7 +14,7 @@ the XMP Toolkit is compiled if necessary. It is only needed if XMP
 support is enabled. Building the XMP Toolkit results in a static
 library xmpsdk/lib/libxmpsdk.a. This library is not installed on the
 system and is not meant to be used as a standalone library. It is
-only used to build exiv2.
+only used to build Exiv2.
 
 If you experience problems building this library, please email to the
 Exiv2 support forum for help, see http://www.exiv2.org/support.html
@@ -40,34 +40,8 @@ third-party/MD5/*     -> src
 License
 =======
 
-The BSD License
-
+Copyright (c) 2007 Andreas Huggel <ahuggel at gmx.net>
 Copyright (c) 1999 - 2007, Adobe Systems Incorporated
-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.
- 
-* Neither the name of Adobe Systems Incorporated, nor the names of its
-  contributors may be used to endorse or promote products derived from
-  this software without specific prior written permission.
+Copyright (c) 1991-2, RSA Data Security, Inc.
 
-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.
+See the file COPYING in the same directory for license agreements.

-- 
exiv2 packaging

