This is an automated email from the git hooks/post-receive script. sebastic pushed a commit to branch master in repository geographiclib.
commit a4b6b45aa719f740feae00cb215660da8f689346 Author: Bas Couwenberg <[email protected]> Date: Fri Dec 4 14:52:06 2015 +0100 Also build geographiclib for Python 3. --- debian/changelog | 7 +++ debian/control | 15 +++++++ debian/patches/disable-python-build.patch | 72 +++++++++++++++++++++++++++++++ debian/patches/series | 1 + debian/python-geographiclib.install | 1 - debian/rules | 23 +++++++++- 6 files changed, 116 insertions(+), 3 deletions(-) diff --git a/debian/changelog b/debian/changelog index f90190c..b4fc8fd 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,10 @@ +geographiclib (1.45-2) UNRELEASED; urgency=medium + + * Also build geographiclib for Python 3. + (closes: #805964) + + -- Bas Couwenberg <[email protected]> Fri, 04 Dec 2015 14:51:27 +0100 + geographiclib (1.45-1) unstable; urgency=medium * Move from experimental to unstable. diff --git a/debian/control b/debian/control index 4f0edab..b6dd167 100644 --- a/debian/control +++ b/debian/control @@ -12,6 +12,8 @@ Build-Depends: autoconf-archive, doxygen, python-all (>= 2.6.6-3~), python-setuptools, + python3-all, + python3-setuptools, pkg-kde-tools Standards-Version: 3.9.6 Vcs-Browser: http://anonscm.debian.org/cgit/pkg-grass/geographiclib.git @@ -115,6 +117,19 @@ Description: Python implementation of GeographicLib . This package contains the Python implementation of GeographicLib. +Package: python3-geographiclib +Architecture: any +Section: python +Depends: ${misc:Depends}, + ${python3:Depends} +Description: Python 3 implementation of GeographicLib + GeographicLib is a small set of C++ classes for converting between + geographic, UTM, UPS, MGRS, geocentric, and local cartesian coordinates, + for geoid calculations, and for computing geodesic. It is a suitable + replacement for the core functionality provided by NGA Geotrans. + . + This package contains the Python 3 implementation of GeographicLib. + Package: node-geographiclib Architecture: all Section: web diff --git a/debian/patches/disable-python-build.patch b/debian/patches/disable-python-build.patch new file mode 100644 index 0000000..2640198 --- /dev/null +++ b/debian/patches/disable-python-build.patch @@ -0,0 +1,72 @@ +Description: Disable python support as part of the larger build. + The python support is now built separately with pybuild, + adding support for all Python 2 and Python 3 versions. +Author: Bas Couwenberg <[email protected]> +Bug-Debian: https://bugs.debian.org/805964 +Forwarded: not-needed + +--- a/Makefile.am ++++ b/Makefile.am +@@ -7,7 +7,7 @@ AUTOMAKE_OPTIONS = foreign + + ACLOCAL_AMFLAGS = -I m4 + +-SUBDIRS = src man tools doc js include matlab python cmake examples ++SUBDIRS = src man tools doc js include matlab cmake examples + + EXTRA_DIST = AUTHORS 00README.txt LICENSE.txt NEWS INSTALL README.md pom.xml \ + Makefile.mk CMakeLists.txt windows maxima doc legacy java js dotnet +@@ -47,4 +47,4 @@ install-doc: + man: + $(MAKE) -C man man + +-.PHONY: doc install-doc man install-matlab install-python ++.PHONY: doc install-doc man install-matlab +--- a/Makefile.mk ++++ b/Makefile.mk +@@ -1,7 +1,7 @@ + MAKEFILE := $(lastword $(MAKEFILE_LIST)) + MAKE := $(MAKE) -f $(MAKEFILE) + SUBDIRS = src man tools doc js +-ALLDIRS = include $(SUBDIRS) maxima matlab python cmake ++ALLDIRS = include $(SUBDIRS) maxima matlab cmake + + all: src man tools js + +@@ -10,9 +10,8 @@ $(SUBDIRS): + + tools: src + install: install-headers install-lib install-tools install-man install-cmake \ +- install-doc install-js install-matlab install-python +-clean: clean-src clean-tools clean-doc clean-js clean-man clean-matlab \ +- clean-python ++ install-doc install-js install-matlab ++clean: clean-src clean-tools clean-doc clean-js clean-man clean-matlab + + install-headers: + $(MAKE) -C include install +@@ -30,8 +29,6 @@ install-man: man + $(MAKE) -C man install + install-matlab: matlab + $(MAKE) -C matlab install +-install-python: python +- $(MAKE) -C python install + clean-src: + $(MAKE) -C src clean + clean-tools: +@@ -44,13 +41,10 @@ clean-man: + $(MAKE) -C man clean + clean-matlab: matlab + $(MAKE) -C matlab clean +-clean-python: python +- $(MAKE) -C python clean + + VERSION:=$(shell grep '\bVERSION=' configure | cut -f2 -d\' | head -1) + + .PHONY: all $(SUBDIRS) install clean \ + install-headers install-lib install-tools install-man install-cmake \ +- install-doc install-js install-matlab install-python \ +- clean-src clean-tools clean-doc clean-js clean-man clean-matlab \ +- clean-python ++ install-doc install-js install-matlab \ ++ clean-src clean-tools clean-doc clean-js clean-man clean-matlab diff --git a/debian/patches/series b/debian/patches/series index eba8c4b..2b70e9d 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -1,3 +1,4 @@ css.patch privacy.patch manpage_lintian.patch +disable-python-build.patch diff --git a/debian/python-geographiclib.install b/debian/python-geographiclib.install deleted file mode 100644 index b006d35..0000000 --- a/debian/python-geographiclib.install +++ /dev/null @@ -1 +0,0 @@ -usr/lib/*/python/site-packages/geographiclib usr/share/pyshared diff --git a/debian/rules b/debian/rules index e65a288..34b3af9 100755 --- a/debian/rules +++ b/debian/rules @@ -1,14 +1,33 @@ #!/usr/bin/make -f export PYBUILD_NAME=geographiclib -export PYBUILD_SYSTEM=pybuild UPSTREAM_VERSION=$(shell dpkg-parsechangelog | sed -ne 's/^Version: \(.*\)-.*/\1/p' | sed -e 's/\+.*//; s/^[0-9]://') DBG_PACKAGE=$(shell grep "^Package: libgeographic[0-9]*-dbg$$" debian/control | awk '{print $$2}') %: - dh $@ --with autoreconf,python2,pkgkde_symbolshelper + dh $@ --with autoreconf,python2,python3,pkgkde_symbolshelper + +override_dh_auto_clean: + dh_auto_clean + dh_auto_clean --buildsystem=pybuild --sourcedirectory=python + +override_dh_auto_configure: + dh_auto_configure + dh_auto_configure --buildsystem=pybuild --sourcedirectory=python + +override_dh_auto_build: + dh_auto_build + dh_auto_build --buildsystem=pybuild --sourcedirectory=python + +override_dh_auto_test: + dh_auto_test + dh_auto_test --buildsystem=pybuild --sourcedirectory=python + +override_dh_auto_install: + dh_auto_install + dh_auto_install --buildsystem=pybuild --sourcedirectory=python override_dh_install: # Remove duplicate license information -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-grass/geographiclib.git _______________________________________________ Pkg-grass-devel mailing list [email protected] http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-grass-devel
