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

Thu Jul 13 17:42:59 UTC 2017

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

The following commit has been merged in the master branch:
commit faf00a64511f0cdddecb89527a6511732011a89d
Author: HumanDynamo <caulier.gilles at gmail.com>
Date:   Tue Mar 27 11:11:28 2012 +0000

    polish
---
 CMakeLists.txt         |  2 +-
 po/CMakeLists.txt      | 32 ++++----------------------------
 samples/CMakeLists.txt | 32 ++++----------------------------
 src/CMakeLists.txt     | 31 ++++---------------------------
 xmpsdk/CMakeLists.txt  | 44 +++++++++++---------------------------------
 5 files changed, 24 insertions(+), 117 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 318ed96..2331c76 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -86,7 +86,7 @@ if( MSVC )
     #    ..\xmpsdk\Win32\Debug\xmpsdk.lib
     #    ..\zlib\Win32\Debug\zlib1d.lib
     #endif( EXIV2_ENABLE_XMP )
-    
+
 endif( MSVC )
 
 #IF( MINGW OR UNIX )
diff --git a/po/CMakeLists.txt b/po/CMakeLists.txt
index b82796f..0403fc2 100644
--- a/po/CMakeLists.txt
+++ b/po/CMakeLists.txt
@@ -1,33 +1,9 @@
 # CMake build system for exiv2 library and executables
-# Copyright 2008 by Patrick Spendrin <ps_ml at gmx.de>
-# Copyright 2010 by Gilles Caulier <caulier dot gilles at gmail dot com>
+# Copyright 2008      by Patrick Spendrin <ps_ml at gmx.de>
+# Copyright 2010-2012 by Gilles Caulier <caulier dot gilles at gmail dot com>
 #
-# 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.
-#    3. The name of the author may not be used to endorse or promote
-#       products derived from this software without specific prior
-#       written permission.
-#
-# 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.
-
+# Redistribution and use is allowed according to the terms of the BSD license.
+# For details see the accompanying COPYING-CMAKE-SCRIPTS file.
 
 # automatically include all po files in the directory
 FILE(GLOB PO_FILES *.po)
diff --git a/samples/CMakeLists.txt b/samples/CMakeLists.txt
index 558f8cf..cf5a51d 100644
--- a/samples/CMakeLists.txt
+++ b/samples/CMakeLists.txt
@@ -1,33 +1,9 @@
 # CMake build system for exiv2 library and executables
-# Copyright 2008 by Patrick Spendrin <ps_ml at gmx.de>
-# Copyright 2010 by Gilles Caulier <caulier dot gilles at gmail dot com>
+# Copyright 2008      by Patrick Spendrin <ps_ml at gmx.de>
+# Copyright 2010-2012 by Gilles Caulier <caulier dot gilles at gmail dot com>
 #
-# 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.
-#    3. The name of the author may not be used to endorse or promote
-#       products derived from this software without specific prior
-#       written permission.
-#
-# 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.
-
+# Redistribution and use is allowed according to the terms of the BSD license.
+# For details see the accompanying COPYING-CMAKE-SCRIPTS file.
 
 SET( SAMPLES addmoddel.cpp
              convert-test.cpp
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 676e46d..ad4d0aa 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -1,32 +1,9 @@
 # CMake build system for exiv2 library and executables
-# Copyright 2008 by Patrick Spendrin <ps_ml at gmx.de>
-# Copyright 2010 by Gilles Caulier <caulier dot gilles at gmail dot com>
+# Copyright 2008      by Patrick Spendrin <ps_ml at gmx.de>
+# Copyright 2010-2012 by Gilles Caulier <caulier dot gilles at gmail dot com>
 #
-# 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.
-#    3. The name of the author may not be used to endorse or promote
-#       products derived from this software without specific prior
-#       written permission.
-#
-# 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.
+# Redistribution and use is allowed according to the terms of the BSD license.
+# For details see the accompanying COPYING-CMAKE-SCRIPTS file.
 
 # Private headers which are only needed for the library itself
 SET( LIBEXIV2_PRIVATE_HDR canonmn_int.hpp
diff --git a/xmpsdk/CMakeLists.txt b/xmpsdk/CMakeLists.txt
index 691608a..ef4c130 100644
--- a/xmpsdk/CMakeLists.txt
+++ b/xmpsdk/CMakeLists.txt
@@ -1,36 +1,14 @@
 # CMake build system for exiv2 library and executables
-# Copyright 2008 by Patrick Spendrin <ps_ml at gmx.de>
+# Copyright 2008      by Patrick Spendrin <ps_ml at gmx dot de>
+# Copyright 2010-2012 by Gilles Caulier <caulier dot gilles at gmail dot com>
 #
-# 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.
-#    3. The name of the author may not be used to endorse or promote
-#       products derived from this software without specific prior
-#       written permission.
-#
-# 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.
+# Redistribution and use is allowed according to the terms of the BSD license.
+# For details see the accompanying COPYING-CMAKE-SCRIPTS file.
+
+IF( EXIV2_ENABLE_XMP AND EXIV2_ENABLE_LIBXMP )
+    ADD_LIBRARY( xmp STATIC ${XMPSRC} )
+    GET_TARGET_PROPERTY( XMPLIB xmp LOCATION )
+    SET( XMPLIB ${XMPLIB} PARENT_SCOPE )
 
-if( EXIV2_ENABLE_XMP AND EXIV2_ENABLE_LIBXMP )
-    add_library( xmp STATIC ${XMPSRC} )
-    get_target_property( XMPLIB xmp LOCATION )
-    set( XMPLIB ${XMPLIB} PARENT_SCOPE )
-    
-    install(TARGETS xmp ${INSTALL_TARGET_STANDARD_ARGS} )
-endif( EXIV2_ENABLE_XMP AND EXIV2_ENABLE_LIBXMP )
+    INSTALL(TARGETS xmp ${INSTALL_TARGET_STANDARD_ARGS} )
+ENDIF( EXIV2_ENABLE_XMP AND EXIV2_ENABLE_LIBXMP )

-- 
exiv2 packaging

