[SCM] libkml branch, master, updated. upstream/1.3.0_r863-50-g521138c
The following commit has been merged in the master branch: commit 26d5f27e647bfe17fe21eae8401b344381f77b5c Author: Francesco Paolo Lovergine Date: Wed Mar 14 13:30:25 2012 +0100 Closing residual reports. diff --git a/debian/changelog b/debian/changelog index 7ea1833..14b88f7 100644 --- a/debian/changelog +++ b/debian/changelog @@ -4,8 +4,12 @@ libkml (1.3.0~r863-4) unstable; urgency=low * Moved to dh_python2 instead of python-central. * Policy bumped to 3.9.3, no changes required. * Debhelper level set to 9. + * Refreshed reautoconfiscated.diff to remove a backup file. Thanks doko. +(closes: #650525) + * The ld-as-needed case has been already managed. +(closes: #641681) - -- Francesco Paolo Lovergine Wed, 14 Mar 2012 13:15:52 +0100 + -- Francesco Paolo Lovergine Wed, 14 Mar 2012 13:29:51 +0100 libkml (1.3.0~r863-3) unstable; urgency=low diff --git a/debian/patches/reautoconfiscated.diff b/debian/patches/reautoconfiscated.diff index 7722b8c..ae03793 100644 --- a/debian/patches/reautoconfiscated.diff +++ b/debian/patches/reautoconfiscated.diff @@ -1,116 +1,3 @@ -Index: git/config.h.in~ -=== /dev/null 1970-01-01 00:00:00.0 + -+++ git/config.h.in~ 2011-03-29 14:52:31.0 +0200 -@@ -0,0 +1,108 @@ -+/* config.h.in. Generated from configure.ac by autoheader. */ -+ -+/* Define to 1 if you have the header file. */ -+#undef HAVE_DLFCN_H -+ -+/* Define to 1 if you have the header file. */ -+#undef HAVE_EXPAT_H -+ -+/* Define to 1 if you have the header file. */ -+#undef HAVE_FLOAT_H -+ -+/* Define to 1 if you have the `floor' function. */ -+#undef HAVE_FLOOR -+ -+/* Define to 1 if you have the header file. */ -+#undef HAVE_INTTYPES_H -+ -+/* Define to 1 if you have the `expat' library (-lexpat). */ -+#undef HAVE_LIBEXPAT -+ -+/* Define to 1 if you have the header file. */ -+#undef HAVE_LIMITS_H -+ -+/* Define to 1 if your system has a GNU libc compatible `malloc' function, and -+ to 0 otherwise. */ -+#undef HAVE_MALLOC -+ -+/* Define to 1 if you have the header file. */ -+#undef HAVE_MEMORY_H -+ -+/* Define to 1 if you have the `memset' function. */ -+#undef HAVE_MEMSET -+ -+/* Define to 1 if stdbool.h conforms to C99. */ -+#undef HAVE_STDBOOL_H -+ -+/* Define to 1 if you have the header file. */ -+#undef HAVE_STDINT_H -+ -+/* Define to 1 if you have the header file. */ -+#undef HAVE_STDLIB_H -+ -+/* Define to 1 if you have the header file. */ -+#undef HAVE_STRINGS_H -+ -+/* Define to 1 if you have the header file. */ -+#undef HAVE_STRING_H -+ -+/* Define to 1 if you have the `strstr' function. */ -+#undef HAVE_STRSTR -+ -+/* Define to 1 if you have the header file. */ -+#undef HAVE_SYS_STAT_H -+ -+/* Define to 1 if you have the header file. */ -+#undef HAVE_SYS_TYPES_H -+ -+/* Define to 1 if you have the header file. */ -+#undef HAVE_UNISTD_H -+ -+/* Define to 1 if the system has the type `_Bool'. */ -+#undef HAVE__BOOL -+ -+/* Define to the sub-directory in which libtool stores uninstalled libraries. -+ */ -+#undef LT_OBJDIR -+ -+/* Name of package */ -+#undef PACKAGE -+ -+/* Define to the address where bug reports for this package should be sent. */ -+#undef PACKAGE_BUGREPORT -+ -+/* Define to the full name of this package. */ -+#undef PACKAGE_NAME -+ -+/* Define to the full name and version of this package. */ -+#undef PACKAGE_STRING -+ -+/* Define to the one symbol short name of this package. */ -+#undef PACKAGE_TARNAME -+ -+/* Define to the home page for this package. */ -+#undef PACKAGE_URL -+ -+/* Define to the version of this package. */ -+#undef PACKAGE_VERSION -+ -+/* Define to 1 if you have the ANSI C header files. */ -+#undef STDC_HEADERS -+ -+/* Version number of package */ -+#undef VERSION -+ -+/* Define to empty if `const' does not conform to ANSI C. */ -+#undef const -+ -+/* Define to `__inline__' or `__inline' if that's what the C compiler -+ calls it, or to nothing if 'inline' is not supported under any name. */ -+#ifndef __cplusplus -+#undef inline -+#endif -+ -+/* Define to rpl_malloc if the replacement function should be used. */ -+#undef malloc -+ -+/* Define to `unsigned int' if does not define. */ -+#undef size_t Index: git/configure === --- git.orig/configure 2011-03-29 14:50:08.0 +0200 diff --git a/debian/patches/series b/debian/patches/series index 8033dd2..9c7fd47 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -6,3 +6,5 @@ ld-as-needed.diff feature_view_test.diff geometry_test.diff swig +ldasneeded.diff +ldasneeded -- 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
[SCM] libkml branch, master, updated. upstream/1.3.0_r863-50-g521138c
The following commit has been merged in the master branch: commit f6464d1fb22b000dd685aeb6f6e7cb9c09609cf0 Author: Francesco Paolo Lovergine Date: Wed Mar 14 13:45:13 2012 +0100 Renamed a patch for homogeneity. diff --git a/debian/patches/series b/debian/patches/series index 9c7fd47..350042a 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -5,6 +5,4 @@ clone.diff ld-as-needed.diff feature_view_test.diff geometry_test.diff -swig -ldasneeded.diff -ldasneeded +swig.diff diff --git a/debian/patches/swig b/debian/patches/swig.diff similarity index 100% rename from debian/patches/swig rename to debian/patches/swig.diff -- 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
[SCM] libkml branch, master, updated. upstream/1.3.0_r863-50-g521138c
The following commit has been merged in the master branch: commit 521138cc13660cfeb22825da490366abdb96e295 Merge: f6464d1fb22b000dd685aeb6f6e7cb9c09609cf0 977fc73c45d270c273f875ebadcff3a1b1b86162 Author: Francesco Paolo Lovergine 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
[SCM] libkml branch, master, updated. upstream/1.3.0_r863-50-g521138c
The following commit has been merged in the master branch: commit 7fce7fa6f2f89d049bae01b38e67580f71cff7f1 Author: Francesco Paolo Lovergine Date: Wed Mar 14 13:18:59 2012 +0100 Moved to dh_python2 diff --git a/debian/changelog b/debian/changelog index 7dbe8c0..7ea1833 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,12 @@ +libkml (1.3.0~r863-4) unstable; urgency=low + + * Added liburiparser-dev to libkml-dev. + * Moved to dh_python2 instead of python-central. + * Policy bumped to 3.9.3, no changes required. + * Debhelper level set to 9. + + -- Francesco Paolo Lovergine Wed, 14 Mar 2012 13:15:52 +0100 + libkml (1.3.0~r863-3) unstable; urgency=low * Added swig patch to remove a wrong swig version test. diff --git a/debian/compat b/debian/compat index 45a4fb7..ec63514 100644 --- a/debian/compat +++ b/debian/compat @@ -1 +1 @@ -8 +9 diff --git a/debian/control b/debian/control index 265de85..f2c4430 100644 --- a/debian/control +++ b/debian/control @@ -3,11 +3,11 @@ Section: science Priority: extra Maintainer: Debian GIS Project Uploaders: Francesco Paolo Lovergine -Build-Depends: cdbs, debhelper (>= 8), autotools-dev, libexpat1-dev, zlib1g-dev, default-jdk, - python-dev, python-all-dev, liburiparser-dev (>= 0.7.1), chrpath, - libcurl4-openssl-dev, swig, python-central -XS-Python-Version: >= 2.5 -Standards-Version: 3.9.2 +Build-Depends: cdbs (>= 0.4.90~), debhelper (>= 9), autotools-dev, libexpat1-dev, zlib1g-dev, default-jdk, + python-dev (>= 2.6.6-3~), python-all-dev (>= 2.6.6-3~), liburiparser-dev (>= 0.7.1), chrpath, + libcurl4-openssl-dev, swig +X-Python-Version: >= 2.5 +Standards-Version: 3.9.3 Homepage: http://code.google.com/p/libkml/ Vcs-Git: git://git.debian.org/git/pkg-grass/libkml.git Vcs-Browser: http://git.debian.org/?p=pkg-grass/libkml.git @@ -28,7 +28,7 @@ Description: A library to manipulate KML 2.2 OGC standard files Package: libkml-dev Architecture: any Section: libdevel -Depends: libkml0 (= ${binary:Version}), ${shlibs:Depends}, ${misc:Depends} +Depends: libkml0 (= ${binary:Version}), liburiparser-dev (>= 0.7.1), ${shlibs:Depends}, ${misc:Depends} Description: A library to manipulate KML 2.2 OGC standard files - development files This is a library for use with applications that want to parse, generate and operate on KML, a geo-data XML variant. It is an diff --git a/debian/rules b/debian/rules index 6393b29..5335b57 100755 --- a/debian/rules +++ b/debian/rules @@ -1,6 +1,5 @@ #!/usr/bin/make -f -DEB_PYTHON_SYSTEM = pycentral PY_VERSIONS = $(shell pyversions --requested debian/control) JAVA_HOME = /usr/lib/jvm/default-java @@ -47,7 +46,7 @@ binary-install/python-kml:: install/python-kml do \ chrpath --delete $(CURDIR)/debian/python-kml/usr/lib/$$version/*-packages/*.so ; \ done - dh_pycentral -ppython-kml + dh_python2 -ppython-kml binary-install/libkml-dev:: # removes autotools stuff -- 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