This is an automated email from the git hooks/post-receive script. frankie pushed a commit to branch master in repository geographiclib.
commit 67af38f68dc7655dc7d9fc819ec0922cabca1628 Author: Francesco Paolo Lovergine <fran...@debian.org> Date: Wed Mar 12 13:29:57 2014 +0100 New upstream release 1.34. --- debian/changelog | 11 +++++++++++ debian/compat | 2 +- debian/control | 12 ++++++------ debian/geographiclib-tools.install | 18 +++++++++++++----- debian/libgeographiclib-dev.install | 5 +++-- debian/libgeographiclib10.install | 2 ++ debian/libgeographiclib9.install | 2 -- debian/patches/datadir | 32 ++++++++++++++++---------------- debian/python-geographiclib.install | 2 +- debian/rules | 17 ++++++++--------- 10 files changed, 61 insertions(+), 42 deletions(-) diff --git a/debian/changelog b/debian/changelog index 36e3b44..92aae64 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,14 @@ +geographiclib (1.34-1) unstable; urgency=low + + * New upstram release. It now includes new programs to download data. + * Policy bumped to 3.9.5. + * Vcs-* fields moved to canonical form to make lintian happy. + * Now using modern debhelper instead of cdbs. + * Debhelper level set to 9. + * Patchset refreshed. + + -- Francesco Paolo Lovergine <fran...@debian.org> Wed, 12 Mar 2014 10:03:54 +0100 + geographiclib (1.21-1) unstable; urgency=low * New upstream release. 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 5df932f..4c23960 100644 --- a/debian/control +++ b/debian/control @@ -3,11 +3,11 @@ Section: science Priority: optional Maintainer: Debian GIS Project <pkg-grass-devel@lists.alioth.debian.org> Uploaders: Francesco Paolo Lovergine <fran...@debian.org> -Build-Depends: cdbs, debhelper (>= 8), autotools-dev, doxygen, python-all -Standards-Version: 3.9.3 +Build-Depends: debhelper (>= 9), autotools-dev, doxygen, python-all +Standards-Version: 3.9.5 Homepage: http://geographiclib.sf.net/ -Vcs-Browser: http://git.debian.org/?p=pkg-grass/geographiclib.git -Vcs-Git: git://git.debian.org/git/pkg-grass/geographiclib.git +Vcs-Browser: http://anonscm.debian.org/gitweb/?p=pkg-grass/geographiclib.git +Vcs-Git: git://anonscm.debian.org/pkg-grass/geographiclib.git Package: geographiclib-tools Architecture: any @@ -22,7 +22,7 @@ Description: A C++ library to solve some geodesic problems -- tools . This package contains some core tools based on the GeographicLib library. -Package: libgeographiclib9 +Package: libgeographiclib10 Architecture: any Section: libs Depends: ${shlibs:Depends}, ${misc:Depends} @@ -39,7 +39,7 @@ Description: A C++ library to solve some geodesic problems -- library Package: libgeographiclib-dev Architecture: any Section: libdevel -Depends: libgeographiclib9 (= ${binary:Version}), ${shlibs:Depends}, ${misc:Depends} +Depends: libgeographiclib10 (= ${binary:Version}), ${shlibs:Depends}, ${misc:Depends} Description: A C++ library to solve some geodesic problems -- development files GeographicLib is a small set of C++ classes for converting between geographic, UTM, UPS, MGRS, geocentric, and local cartesian coordinates, diff --git a/debian/geographiclib-tools.install b/debian/geographiclib-tools.install index f7c948d..39e1755 100644 --- a/debian/geographiclib-tools.install +++ b/debian/geographiclib-tools.install @@ -1,8 +1,16 @@ +usr/share/doc/geographiclib/html +usr/share/doc/geographiclib/scripts +usr/share/man/man1 usr/bin/CartConvert +usr/bin/ConicProj usr/bin/GeoConvert -usr/bin/Geod +usr/bin/GeodesicProj +usr/bin/GeodSolve usr/bin/GeoidEval -usr/bin/CartConvert -usr/share/doc/geographiclib/html -usr/share/man/man1 -debian/geographiclib-datasets-download usr/sbin/ +usr/bin/Gravity +usr/bin/MagneticField +usr/bin/Planimeter +usr/bin/TransverseMercatorProj +usr/sbin/geographiclib-get-geoids +usr/sbin/geographiclib-get-gravity +usr/sbin/geographiclib-get-magnetic diff --git a/debian/libgeographiclib-dev.install b/debian/libgeographiclib-dev.install index 3f4673a..20142ae 100644 --- a/debian/libgeographiclib-dev.install +++ b/debian/libgeographiclib-dev.install @@ -1,3 +1,4 @@ -usr/lib/libGeographic.a -usr/lib/libGeographic.so +usr/lib/*/libGeographic.a +usr/lib/*/libGeographic.so usr/include/* +usr/share/geographiclib/cmake/GeographicLib/FindGeographicLib.cmake usr/share/cmake/geographiclib/. diff --git a/debian/libgeographiclib10.install b/debian/libgeographiclib10.install new file mode 100644 index 0000000..aab5ee2 --- /dev/null +++ b/debian/libgeographiclib10.install @@ -0,0 +1,2 @@ +usr/lib/*/libGeographic.so.10 +usr/lib/*/libGeographic.so.10.* diff --git a/debian/libgeographiclib9.install b/debian/libgeographiclib9.install deleted file mode 100644 index 282e2cf..0000000 --- a/debian/libgeographiclib9.install +++ /dev/null @@ -1,2 +0,0 @@ -usr/lib/libGeographic.so.9 -usr/lib/libGeographic.so.9.* diff --git a/debian/patches/datadir b/debian/patches/datadir index 96c6e65..3397156 100644 --- a/debian/patches/datadir +++ b/debian/patches/datadir @@ -1,21 +1,8 @@ -Index: geographiclib/include/Makefile.in -=================================================================== ---- geographiclib.orig/include/Makefile.in 2012-03-09 19:49:48.000000000 +0100 -+++ geographiclib/include/Makefile.in 2012-03-09 20:00:37.000000000 +0100 -@@ -246,7 +246,7 @@ - GeographicLib/Utility.hpp \ - GeographicLib/Config.h - --geoids_dir = $(datadir)/GeographicLib/geoids -+geoids_dir = $(datadir)/geoids - EXTRA_DIST = Makefile.mk GeographicLib/CMakeLists.txt GeographicLib/Config.h.in - all: all-am - Index: geographiclib/src/Makefile.in =================================================================== ---- geographiclib.orig/src/Makefile.in 2012-03-09 19:49:49.000000000 +0100 -+++ geographiclib/src/Makefile.in 2012-03-09 19:59:13.000000000 +0100 -@@ -312,7 +312,7 @@ +--- geographiclib.orig/src/Makefile.in 2014-03-12 12:21:05.000000000 +0100 ++++ geographiclib/src/Makefile.in 2014-03-12 12:21:05.000000000 +0100 +@@ -358,7 +358,7 @@ ../include/GeographicLib/Utility.hpp \ ../include/GeographicLib/Config.h @@ -24,3 +11,16 @@ Index: geographiclib/src/Makefile.in EXTRA_DIST = Makefile.mk CMakeLists.txt Geographic.pro all: all-am +Index: geographiclib/include/Makefile.in +=================================================================== +--- geographiclib.orig/include/Makefile.in 2014-03-12 12:16:00.000000000 +0100 ++++ geographiclib/include/Makefile.in 2014-03-12 12:21:29.000000000 +0100 +@@ -283,7 +283,7 @@ + GeographicLib/Utility.hpp \ + GeographicLib/Config.h + +-geographiclib_data = $(datadir)/GeographicLib ++geographiclib_data = $(datadir) + EXTRA_DIST = Makefile.mk GeographicLib/CMakeLists.txt GeographicLib/Config.h.in + all: all-am + diff --git a/debian/python-geographiclib.install b/debian/python-geographiclib.install index 4c87169..b006d35 100644 --- a/debian/python-geographiclib.install +++ b/debian/python-geographiclib.install @@ -1 +1 @@ -usr/lib/python/site-packages/geographiclib usr/share/pyshared +usr/lib/*/python/site-packages/geographiclib usr/share/pyshared diff --git a/debian/rules b/debian/rules index bd58331..0f324be 100755 --- a/debian/rules +++ b/debian/rules @@ -1,14 +1,13 @@ #!/usr/bin/make -f -include /usr/share/cdbs/1/rules/debhelper.mk -include /usr/share/cdbs/1/class/autotools.mk +%: + dh $@ --buildsystem autoconf \ + --sourcedirectory=$(CURDIR) --with python2 -DEB_PYTHON_DISTUTILS_SRCDIR = python -DEB_PYTHON2_MODULE_PACKAGES = python-geographiclib -DEB_PYTHON_SETUP_CMD = setup.py +override_dh_auto_configure: + dh_auto_configure -- --datadir=/usr/share/geographiclib --prefix=/usr -include /usr/share/cdbs/1/class/python-vars.mk -include /usr/share/cdbs/1/class/python-distutils.mk - -DEB_CONFIGURE_EXTRA_FLAGS=--datadir=/usr/share/geographiclib --prefix=/usr +override_dh_auto_install: + make -C python DESTDIR=$(CURDIR)/debian/tmp install + dh_auto_install -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-grass/geographiclib.git _______________________________________________ Pkg-grass-devel mailing list Pkg-grass-devel@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-grass-devel