[Pkg-owncloud-commits] [owncloud-client] 01/06: Use GNUInstallDirs.cmake from debian (Closes: #738512)
Sandro Knauß
hefee-guest at moszumanska.debian.org
Thu Feb 13 00:41:12 UTC 2014
This is an automated email from the git hooks/post-receive script.
hefee-guest pushed a commit to branch master
in repository owncloud-client.
commit 8bf0464e828a82238fe8d836ea6486aabc637a7c
Author: Sandro Knauß <bugs at sandroknauss.de>
Date: Wed Feb 12 16:44:16 2014 +0100
Use GNUInstallDirs.cmake from debian (Closes: #738512)
---
debian/libowncloudsync0.install | 2 +-
debian/patches/series | 1 +
debian/patches/use_system_GNUInstallDirs.cmake | 195 +++++++++++++++++++++++++
3 files changed, 197 insertions(+), 1 deletion(-)
diff --git a/debian/libowncloudsync0.install b/debian/libowncloudsync0.install
index 9de0c15..07e42d6 100644
--- a/debian/libowncloudsync0.install
+++ b/debian/libowncloudsync0.install
@@ -1 +1 @@
-usr/lib/libowncloudsync.so.*
+usr/lib/*/libowncloudsync.so.*
diff --git a/debian/patches/series b/debian/patches/series
index 06e8f77..3b7c8da 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,3 +1,4 @@
0001-disable-updatecheck.patch
0002-create-manpage.patch
0003-respect-the-XDG_CONFIG_HOME-env-variable.patch
+use_system_GNUInstallDirs.cmake
diff --git a/debian/patches/use_system_GNUInstallDirs.cmake b/debian/patches/use_system_GNUInstallDirs.cmake
new file mode 100644
index 0000000..053cebf
--- /dev/null
+++ b/debian/patches/use_system_GNUInstallDirs.cmake
@@ -0,0 +1,195 @@
+Description: libowncloudsync0: Please ship binaries in multiarch locations
+ Remove cmake/Modules/GNUInstallDirs.cmake to use the shipped version from debian.
+Author: Sandro Knauß <bugs at sandroknauss.de>
+Origin: debian
+Bug-Debian: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=738512
+Last-Update: 2013-02-12
+---
+This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
+Index: owncloud-client/cmake/modules/GNUInstallDirs.cmake
+===================================================================
+--- owncloud-client.orig/cmake/modules/GNUInstallDirs.cmake 2014-02-06 12:44:40.365355482 +0100
++++ /dev/null 1970-01-01 00:00:00.000000000 +0000
+@@ -1,182 +0,0 @@
+-# - Define GNU standard installation directories
+-# Provides install directory variables as defined for GNU software:
+-# http://www.gnu.org/prep/standards/html_node/Directory-Variables.html
+-# Inclusion of this module defines the following variables:
+-# CMAKE_INSTALL_<dir> - destination for files of a given type
+-# CMAKE_INSTALL_FULL_<dir> - corresponding absolute path
+-# where <dir> is one of:
+-# BINDIR - user executables (bin)
+-# SBINDIR - system admin executables (sbin)
+-# LIBEXECDIR - program executables (libexec)
+-# SYSCONFDIR - read-only single-machine data (etc)
+-# SHAREDSTATEDIR - modifiable architecture-independent data (com)
+-# LOCALSTATEDIR - modifiable single-machine data (var)
+-# LIBDIR - object code libraries (lib or lib64)
+-# INCLUDEDIR - C header files (include)
+-# OLDINCLUDEDIR - C header files for non-gcc (/usr/include)
+-# DATAROOTDIR - read-only architecture-independent data root (share)
+-# DATADIR - read-only architecture-independent data (DATAROOTDIR)
+-# INFODIR - info documentation (DATAROOTDIR/info)
+-# LOCALEDIR - locale-dependent data (DATAROOTDIR/locale)
+-# MANDIR - man documentation (DATAROOTDIR/man)
+-# DOCDIR - documentation root (DATAROOTDIR/doc/PROJECT_NAME)
+-# Each CMAKE_INSTALL_<dir> value may be passed to the DESTINATION options of
+-# install() commands for the corresponding file type. If the includer does
+-# not define a value the above-shown default will be used and the value will
+-# appear in the cache for editing by the user.
+-# Each CMAKE_INSTALL_FULL_<dir> value contains an absolute path constructed
+-# from the corresponding destination by prepending (if necessary) the value
+-# of CMAKE_INSTALL_PREFIX.
+-
+-#=============================================================================
+-# Copyright 2011 Nikita Krupen'ko <krnekit at gmail.com>
+-# Copyright 2011 Kitware, Inc.
+-#
+-# Distributed under the OSI-approved BSD License (the "License");
+-# see accompanying file Copyright.txt for details.
+-#
+-# This software is distributed WITHOUT ANY WARRANTY; without even the
+-# implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+-# See the License for more information.
+-#=============================================================================
+-# (To distribute this file outside of CMake, substitute the full
+-# License text for the above reference.)
+-
+-# Installation directories
+-#
+-if(NOT DEFINED CMAKE_INSTALL_BINDIR)
+- set(CMAKE_INSTALL_BINDIR "bin" CACHE PATH "user executables (bin)")
+-endif()
+-
+-if(NOT DEFINED CMAKE_INSTALL_SBINDIR)
+- set(CMAKE_INSTALL_SBINDIR "sbin" CACHE PATH "system admin executables (sbin)")
+-endif()
+-
+-if(NOT DEFINED CMAKE_INSTALL_LIBEXECDIR)
+- set(CMAKE_INSTALL_LIBEXECDIR "libexec" CACHE PATH "program executables (libexec)")
+-endif()
+-
+-if(NOT DEFINED CMAKE_INSTALL_SYSCONFDIR)
+- set(CMAKE_INSTALL_SYSCONFDIR "etc" CACHE PATH "read-only single-machine data (etc)")
+-endif()
+-
+-if(NOT DEFINED CMAKE_INSTALL_SHAREDSTATEDIR)
+- set(CMAKE_INSTALL_SHAREDSTATEDIR "com" CACHE PATH "modifiable architecture-independent data (com)")
+-endif()
+-
+-if(NOT DEFINED CMAKE_INSTALL_LOCALSTATEDIR)
+- set(CMAKE_INSTALL_LOCALSTATEDIR "var" CACHE PATH "modifiable single-machine data (var)")
+-endif()
+-
+-if(NOT DEFINED CMAKE_INSTALL_LIBDIR)
+- set(_LIBDIR_DEFAULT "lib")
+- # Override this default 'lib' with 'lib64' iff:
+- # - we are on Linux system but NOT cross-compiling
+- # - we are NOT on debian
+- # - we are on a 64 bits system
+- # reason is: amd64 ABI: http://www.x86-64.org/documentation/abi.pdf
+- # Note that the future of multi-arch handling may be even
+- # more complicated than that: http://wiki.debian.org/Multiarch
+- if(CMAKE_SYSTEM_NAME MATCHES "Linux"
+- AND NOT CMAKE_CROSSCOMPILING
+- AND NOT EXISTS "/etc/debian_version")
+- if(NOT DEFINED CMAKE_SIZEOF_VOID_P)
+- message(AUTHOR_WARNING
+- "Unable to determine default CMAKE_INSTALL_LIBDIR directory because no target architecture is known. "
+- "Please enable at least one language before including GNUInstallDirs.")
+- else()
+- if("${CMAKE_SIZEOF_VOID_P}" EQUAL "8")
+- set(_LIBDIR_DEFAULT "lib64")
+- endif()
+- endif()
+- endif()
+- set(CMAKE_INSTALL_LIBDIR "${_LIBDIR_DEFAULT}" CACHE PATH "object code libraries (${_LIBDIR_DEFAULT})")
+-endif()
+-
+-if(NOT DEFINED CMAKE_INSTALL_INCLUDEDIR)
+- set(CMAKE_INSTALL_INCLUDEDIR "include" CACHE PATH "C header files (include)")
+-endif()
+-
+-if(NOT DEFINED CMAKE_INSTALL_OLDINCLUDEDIR)
+- set(CMAKE_INSTALL_OLDINCLUDEDIR "/usr/include" CACHE PATH "C header files for non-gcc (/usr/include)")
+-endif()
+-
+-if(NOT DEFINED CMAKE_INSTALL_DATAROOTDIR)
+- set(CMAKE_INSTALL_DATAROOTDIR "share" CACHE PATH "read-only architecture-independent data root (share)")
+-endif()
+-
+-#-----------------------------------------------------------------------------
+-# Values whose defaults are relative to DATAROOTDIR. Store empty values in
+-# the cache and store the defaults in local variables if the cache values are
+-# not set explicitly. This auto-updates the defaults as DATAROOTDIR changes.
+-
+-if(NOT CMAKE_INSTALL_DATADIR)
+- set(CMAKE_INSTALL_DATADIR "" CACHE PATH "read-only architecture-independent data (DATAROOTDIR)")
+- set(CMAKE_INSTALL_DATADIR "${CMAKE_INSTALL_DATAROOTDIR}")
+-endif()
+-
+-if(NOT CMAKE_INSTALL_INFODIR)
+- set(CMAKE_INSTALL_INFODIR "" CACHE PATH "info documentation (DATAROOTDIR/info)")
+- set(CMAKE_INSTALL_INFODIR "${CMAKE_INSTALL_DATAROOTDIR}/info")
+-endif()
+-
+-if(NOT CMAKE_INSTALL_LOCALEDIR)
+- set(CMAKE_INSTALL_LOCALEDIR "" CACHE PATH "locale-dependent data (DATAROOTDIR/locale)")
+- set(CMAKE_INSTALL_LOCALEDIR "${CMAKE_INSTALL_DATAROOTDIR}/locale")
+-endif()
+-
+-if(NOT CMAKE_INSTALL_MANDIR)
+- set(CMAKE_INSTALL_MANDIR "" CACHE PATH "man documentation (DATAROOTDIR/man)")
+- set(CMAKE_INSTALL_MANDIR "${CMAKE_INSTALL_DATAROOTDIR}/man")
+-endif()
+-
+-if(NOT CMAKE_INSTALL_DOCDIR)
+- set(CMAKE_INSTALL_DOCDIR "" CACHE PATH "documentation root (DATAROOTDIR/doc/PROJECT_NAME)")
+- set(CMAKE_INSTALL_DOCDIR "${CMAKE_INSTALL_DATAROOTDIR}/doc/${PROJECT_NAME}")
+-endif()
+-
+-#-----------------------------------------------------------------------------
+-
+-mark_as_advanced(
+- CMAKE_INSTALL_BINDIR
+- CMAKE_INSTALL_SBINDIR
+- CMAKE_INSTALL_LIBEXECDIR
+- CMAKE_INSTALL_SYSCONFDIR
+- CMAKE_INSTALL_SHAREDSTATEDIR
+- CMAKE_INSTALL_LOCALSTATEDIR
+- CMAKE_INSTALL_LIBDIR
+- CMAKE_INSTALL_INCLUDEDIR
+- CMAKE_INSTALL_OLDINCLUDEDIR
+- CMAKE_INSTALL_DATAROOTDIR
+- CMAKE_INSTALL_DATADIR
+- CMAKE_INSTALL_INFODIR
+- CMAKE_INSTALL_LOCALEDIR
+- CMAKE_INSTALL_MANDIR
+- CMAKE_INSTALL_DOCDIR
+- )
+-
+-# Result directories
+-#
+-foreach(dir
+- BINDIR
+- SBINDIR
+- LIBEXECDIR
+- SYSCONFDIR
+- SHAREDSTATEDIR
+- LOCALSTATEDIR
+- LIBDIR
+- INCLUDEDIR
+- OLDINCLUDEDIR
+- DATAROOTDIR
+- DATADIR
+- INFODIR
+- LOCALEDIR
+- MANDIR
+- DOCDIR
+- )
+- if(NOT IS_ABSOLUTE ${CMAKE_INSTALL_${dir}})
+- set(CMAKE_INSTALL_FULL_${dir} "${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_${dir}}")
+- else()
+- set(CMAKE_INSTALL_FULL_${dir} "${CMAKE_INSTALL_${dir}}")
+- endif()
+-endforeach()
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-owncloud/owncloud-client.git
More information about the Pkg-owncloud-commits
mailing list