[SCM] libkml branch, master, updated. upstream/1.3.0_r863-51-g02f8e96

[Francesco Paolo Lovergine]

The following commit has been merged in the master branch:
commit 02f8e9667892cf389f023524adefa0c03e7490e1
Author: Francesco Paolo Lovergine <frankie at debian.org>
Date:   Thu Oct 10 15:10:57 2013 +0200

    Merged Bas' changes to move to dhelper

diff --git a/debian/rules b/debian/rules
index 25c8f08..a295754 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,66 +1,8 @@
 #!/usr/bin/make -f
 
-<<<<<<< HEAD
-PY_VERSIONS = $(shell pyversions --requested debian/control)
-
-=======
->>>>>>> 977fc73c45d270c273f875ebadcff3a1b1b86162
 JAVA_HOME = /usr/lib/jvm/default-java
 
 DEB_CONFIGURE_EXTRA_FLAGS = --enable-systempython --with-java-include-dir=$(JAVA_HOME)/include
-<<<<<<< HEAD
-DEB_MAKE_CHECK_TARGET = check
-
-DEB_BUILDDIR := build
-
-# These targets do allow building multiple Python versions extensions
-# when autoconf is used - as in this case - instead of Distutils.
-
-configure/python-kml:: $(addprefix configure-stamp-, $(PY_VERSIONS))
-
-configure-stamp-%:
-	mkdir build-$*
-	cd build-$* && PYTHON=`which $*` $(DEB_CONFIGURE_SCRIPT_ENV) \
-			$(DEB_CONFIGURE_SCRIPT) \
-			$(DEB_CONFIGURE_NORMAL_ARGS) \
-			--disable-maintainer-mode \
-			$(cdbs_configure_flags) \
-			$(DEB_CONFIGURE_EXTRA_FLAGS) \
-			$(DEB_CONFIGURE_USER_FLAGS)
-	touch $@
-
-build-stamp-%:
-	$(MAKE) -C build-$* PYTHON=`which $*`
-	touch $@
-
-build/python-kml:: $(addprefix build-stamp-, $(PY_VERSIONS))
-
-install-stamp-%:
-	$(MAKE) -C build-$* PYTHON=`which $*` DESTDIR=$(CURDIR)/debian/tmp install
-	touch $@
-
-install/python-kml:: $(addprefix install-stamp-, $(PY_VERSIONS))
-
-binary-install/python-kml:: install/python-kml
-	# removes build-time rpaths
-	for version in $(PY_VERSIONS); \
-	do \
-		chrpath --delete $(CURDIR)/debian/python-kml/usr/lib/$$version/*-packages/*.so ; \
-	done
-	dh_python2 -ppython-kml
-
-binary-install/libkml-dev::
-	# removes autotools stuff
-	find $(CURDIR)/debian/libkml-dev/usr/share/doc/libkml-dev/examples -type f -name "Makefile.*" -delete
-	# removes python related stuff
-	find $(CURDIR)/debian/libkml-dev/usr/lib -name "libkml*python*.so*" -delete
-
-clean::
-	-rm -rf $(addprefix build-, $(PY_VERSIONS))
-	-rm -rf $(addprefix configure-stamp-, $(PY_VERSIONS))
-	-rm -rf $(addprefix build-stamp-, $(PY_VERSIONS))
-	-rm -rf $(addprefix install-stamp-, $(PY_VERSIONS))
-=======
 
 DEB_HOST_MULTIARCH ?= $(shell dpkg-architecture -qDEB_HOST_MULTIARCH)
 
@@ -100,5 +42,4 @@ override_dh_makeshlibs:
 
 override_dh_python:
 	dh_python2 -ppython-kml
->>>>>>> 977fc73c45d270c273f875ebadcff3a1b1b86162
 

-- 
A library to manipulate KML 2.2 OGC standard files