The following commit has been merged in the master branch:
commit 521138cc13660cfeb22825da490366abdb96e295
Merge: f6464d1fb22b000dd685aeb6f6e7cb9c09609cf0 
977fc73c45d270c273f875ebadcff3a1b1b86162
Author: Francesco Paolo Lovergine <fran...@debian.org>
Date:   Thu Oct 10 15:06:51 2013 +0200

    Merge branch 'master' of ssh://git.debian.org/git/pkg-grass/libkml
    
    Conflicts:
        debian/changelog
        debian/control
        debian/patches/reautoconfiscated.diff
        debian/patches/series
        debian/patches/swig.diff
        debian/rules

diff --combined debian/rules
index 5335b57,a295754..25c8f08
--- a/debian/rules
+++ b/debian/rules
@@@ -1,62 -1,45 +1,104 @@@
  #!/usr/bin/make -f
  
++<<<<<<< HEAD
 +PY_VERSIONS = $(shell pyversions --requested debian/control)
 +
++=======
++>>>>>>> 977fc73c45d270c273f875ebadcff3a1b1b86162
  JAVA_HOME = /usr/lib/jvm/default-java
  
- include /usr/share/cdbs/1/rules/debhelper.mk
- include /usr/share/cdbs/1/class/autotools.mk
- 
  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)
+ 
+ %:
+       dh $@ --with autoreconf,python2
+ 
+ override_dh_auto_configure:
+       dh_auto_configure -- $(DEB_CONFIGURE_EXTRA_FLAGS)
+ 
+ override_dh_auto_install:
+       dh_auto_install
+ 
+       # Strip RPATH
+       chrpath --delete $(CURDIR)/debian/tmp/usr/lib/python*/*-packages/*.so
+ 
+       # Remove autotools stuff
+       find $(CURDIR)/examples/ -type f -name "Makefile*" -delete
+ 
+       # Remove python swig
+       find $(CURDIR)/debian/tmp/usr/lib -name "libkml*python*.so*" -delete
+ 
+       # Remove la files
+       find $(CURDIR)/debian/tmp/usr/lib -name "*.la" -delete
+ 
+       # Move libraries from libkml subdirectory
+       mv $(CURDIR)/debian/tmp/usr/lib/$(DEB_HOST_MULTIARCH)/libkml/* 
$(CURDIR)/debian/tmp/usr/lib/$(DEB_HOST_MULTIARCH)/
+ 
+       # libminizip headers
+       install -m755 -d $(CURDIR)/debian/tmp/usr/include/minizip
+       install -m644 $(CURDIR)/third_party/zlib-*/contrib/minizip/*h 
$(CURDIR)/debian/tmp/usr/include/minizip/
+ 
+ override_dh_install:
+       dh_install --autodest --list-missing
+ 
+ override_dh_makeshlibs:
+       dh_makeshlibs -Xpython-kml
+ 
+ override_dh_python:
+       dh_python2 -ppython-kml
++>>>>>>> 977fc73c45d270c273f875ebadcff3a1b1b86162
  

-- 
A library to manipulate KML 2.2 OGC standard files

_______________________________________________
Pkg-grass-devel mailing list
Pkg-grass-devel@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-grass-devel

Reply via email to