[libkml] 05/13: Drop patches, applied upstream.

[Sebastiaan Couwenberg]

This is an automated email from the git hooks/post-receive script.

sebastic pushed a commit to branch master
in repository libkml.

commit 96ddf21575ff22c5cb682f9f80be790d924aeacb
Author: Bas Couwenberg <sebastic at xs4all.nl>
Date:   Sun Aug 2 17:42:31 2015 +0200

    Drop patches, applied upstream.
---
 debian/changelog                         |  1 +
 debian/patches/python-install-path.patch | 36 --------------------------------
 debian/patches/series                    |  1 -
 3 files changed, 1 insertion(+), 37 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 326ca51..bafc1b7 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,6 +2,7 @@ libkml (1.3.0~rc0-1) UNRELEASED; urgency=medium
 
   * Update watch file to support pre-releases.
   * New upstream release candidate.
+  * Drop patches, applied upstream.
 
  -- Bas Couwenberg <sebastic at debian.org>  Sun, 02 Aug 2015 17:40:59 +0200
 
diff --git a/debian/patches/python-install-path.patch b/debian/patches/python-install-path.patch
deleted file mode 100644
index 9d106b2..0000000
--- a/debian/patches/python-install-path.patch
+++ /dev/null
@@ -1,36 +0,0 @@
-Description: Default to python interpreter library path when none is specified
-Author: Bas Couwenberg <sebastic at debian.org>
-Forwarded: https://github.com/libkml/libkml/pull/202
-Applied-Upstream: https://github.com/libkml/libkml/commit/282c1a1201fb38c961b7873351c2e84f745e92e0
-
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -49,9 +49,6 @@ endif(NOT DEFINED RESOURCE_INSTALL_DIR)
- if(NOT DEFINED LOCALE_INSTALL_DIR)
-   set(LOCALE_INSTALL_DIR "${DATA_INSTALL_DIR}/locale/")
- endif(NOT DEFINED LOCALE_INSTALL_DIR)
--if(NOT DEFINED PYTHON_INSTALL_DIR)
--  set(PYTHON_INSTALL_DIR "${LIB_INSTALL_DIR}/python")
--endif(NOT DEFINED PYTHON_INSTALL_DIR)
- if(NOT DEFINED JAVA_INSTALL_DIR)
-   set(JAVA_INSTALL_DIR "${DATA_INSTALL_DIR}/java")
- endif(NOT DEFINED JAVA_INSTALL_DIR)
---- a/src/swig/CMakeLists.txt
-+++ b/src/swig/CMakeLists.txt
-@@ -11,10 +11,12 @@ if(WITH_PYTHON)
- 
-   include_directories(${PYTHON_INCLUDE_PATH})
- 
--  # execute_process(COMMAND
--  #   python -c "from distutils.sysconfig import get_python_lib; print get_python_lib(True)"
--  #   OUTPUT_VARIABLE PYTHON_SITE_PACKAGES
--  #   OUTPUT_STRIP_TRAILING_WHITESPACE )
-+  if(NOT DEFINED PYTHON_INSTALL_DIR)
-+    execute_process(COMMAND
-+      ${PYTHON_EXECUTABLE} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(True)"
-+      OUTPUT_VARIABLE PYTHON_INSTALL_DIR
-+      OUTPUT_STRIP_TRAILING_WHITESPACE )
-+  endif(NOT DEFINED PYTHON_INSTALL_DIR)
- 
-   file(GLOB IFILES "kml*.i")
-   foreach(INTERFACE_FILE ${IFILES})
diff --git a/debian/patches/series b/debian/patches/series
deleted file mode 100644
index e4d93c3..0000000
--- a/debian/patches/series
+++ /dev/null
@@ -1 +0,0 @@
-python-install-path.patch

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-grass/libkml.git