[DebianGIS-dev] r2774 - in packages/geographiclib/trunk: . debian debian/patches

frankie at alioth.debian.org frankie at alioth.debian.org
Thu Mar 11 12:29:10 UTC 2010


Author: frankie
Date: 2010-03-11 12:29:09 +0000 (Thu, 11 Mar 2010)
New Revision: 2774

Added:
   packages/geographiclib/trunk/debian/
   packages/geographiclib/trunk/debian/README.Debian
   packages/geographiclib/trunk/debian/README.source
   packages/geographiclib/trunk/debian/changelog
   packages/geographiclib/trunk/debian/compat
   packages/geographiclib/trunk/debian/control
   packages/geographiclib/trunk/debian/copyright
   packages/geographiclib/trunk/debian/docs
   packages/geographiclib/trunk/debian/geographiclib-datasets-download
   packages/geographiclib/trunk/debian/geographiclib-tools.doc-base
   packages/geographiclib/trunk/debian/geographiclib-tools.install
   packages/geographiclib/trunk/debian/libgeographiclib-dev.install
   packages/geographiclib/trunk/debian/libgeographiclib1.install
   packages/geographiclib/trunk/debian/patches/
   packages/geographiclib/trunk/debian/patches/datadir
   packages/geographiclib/trunk/debian/patches/destdir
   packages/geographiclib/trunk/debian/patches/series
   packages/geographiclib/trunk/debian/rules
   packages/geographiclib/trunk/debian/watch
Log:
[svn-inject] Applying Debian modifications to trunk


Property changes on: packages/geographiclib/trunk/debian
___________________________________________________________________
Added: mergeWithUpstream
   + 1

Added: packages/geographiclib/trunk/debian/README.Debian
===================================================================
--- packages/geographiclib/trunk/debian/README.Debian	                        (rev 0)
+++ packages/geographiclib/trunk/debian/README.Debian	2010-03-11 12:29:09 UTC (rev 2774)
@@ -0,0 +1,20 @@
+geographiclib for Debian
+------------------------
+
+This package does not install required files for computing geoid height approximations.
+You have to download them explicitly by using the provided 
+/usr/bin/geographiclib-datasets-download script. Possible datasets at different 
+resolutions are:
+
+    * EGM84, 30' grid
+    * EGM84, 15' grid
+    * EGM96, 15' grid
+    * EGM96, 5' grid
+    * EGM2008, 5' grid
+    * EGM2008, 2.5' grid
+    * EGM2008, 1' grid
+
+The default grid model is EGM96 at 5', so you should at least run once 
+geographiclib-datasets-download to get it.
+
+ -- Francesco Paolo Lovergine <frankie at debian.org>  Wed, 10 Mar 2010 15:36:44 +0100

Added: packages/geographiclib/trunk/debian/README.source
===================================================================
--- packages/geographiclib/trunk/debian/README.source	                        (rev 0)
+++ packages/geographiclib/trunk/debian/README.source	2010-03-11 12:29:09 UTC (rev 2774)
@@ -0,0 +1,12 @@
+geographiclib for Debian
+------------------------
+
+This package uses quilt to manage all modifications to the upstream
+source.  Changes are stored in the source package as diffs in
+debian/patches and applied during the build.  Please see:
+
+	 /usr/share/doc/quilt/README.source
+
+for more information on how to apply the patches, modify patches, or
+remove a patch.
+

Added: packages/geographiclib/trunk/debian/changelog
===================================================================
--- packages/geographiclib/trunk/debian/changelog	                        (rev 0)
+++ packages/geographiclib/trunk/debian/changelog	2010-03-11 12:29:09 UTC (rev 2774)
@@ -0,0 +1,8 @@
+geographiclib (1.1-1) unstable; urgency=low
+
+  * Initial release, with format 3.0 of archive.
+    (closes: #571788)
+  * A couple of problems fixed by quilt patches. Should go upstream.
+  * Introduced a support script to download geoid grids from SF.
+
+ -- Francesco Paolo Lovergine <frankie at debian.org>  Wed, 10 Mar 2010 15:36:44 +0100

Added: packages/geographiclib/trunk/debian/compat
===================================================================
--- packages/geographiclib/trunk/debian/compat	                        (rev 0)
+++ packages/geographiclib/trunk/debian/compat	2010-03-11 12:29:09 UTC (rev 2774)
@@ -0,0 +1 @@
+7

Added: packages/geographiclib/trunk/debian/control
===================================================================
--- packages/geographiclib/trunk/debian/control	                        (rev 0)
+++ packages/geographiclib/trunk/debian/control	2010-03-11 12:29:09 UTC (rev 2774)
@@ -0,0 +1,49 @@
+Source: geographiclib
+Section: science
+Priority: optional
+Maintainer: Francesco Paolo Lovergine <frankie at debian.org>
+Build-Depends: cdbs, debhelper (>= 7), autotools-dev, quilt
+Standards-Version: 3.8.4
+Homepage: http://geographiclib.sf.net/
+Vcs-Svn: svn://svn.debian.org/pkg-grass/geographiclib/trunk
+Vcs-Browser: http://svn.debian.org/wsvn/pkg-grass/packages/geographiclib/trunk/
+
+Package: geographiclib-tools
+Architecture: any
+Depends: ${shlibs:Depends}, ${misc:Depends}
+Suggests: proj-bin
+Recommends: bzip2
+Description: A C++ library to manage some geodesic transformations and problems -- tools
+ 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 some core tools based on the GeographicLib library.
+
+Package: libgeographiclib1
+Architecture: any
+Section: libs
+Depends: ${shlibs:Depends}, ${misc:Depends}
+Suggests: geographiclib-tools
+Description: A C++ library to manage some geodesic transformations and problems -- library
+ 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 GeographicLib shared library used at run-time 
+ by applications.
+
+Package: libgeographiclib-dev
+Architecture: any
+Section: libdevel
+Depends: ${shlibs:Depends}, ${misc:Depends}
+Description: A C++ library to manage some geodesic transformations and problems -- development files
+ 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 files used to develop applications that use the
+ GeographicLib library.

Added: packages/geographiclib/trunk/debian/copyright
===================================================================
--- packages/geographiclib/trunk/debian/copyright	                        (rev 0)
+++ packages/geographiclib/trunk/debian/copyright	2010-03-11 12:29:09 UTC (rev 2774)
@@ -0,0 +1,46 @@
+This work was packaged for Debian by:
+
+    Francesco Paolo Lovergine <frankie at debian.org> on Wed, 10 Mar 2010 15:36:44 +0100
+
+It was downloaded from:
+
+    http://geographiclib.sf.net/
+
+Upstream Author:
+
+    Charles Karney <charles at karney.com> 
+    Francesco P. Lovergine <frankie at debian.org>
+
+Copyright:
+
+    Copyright (C) 2009-2010 Charles Karney
+    Copyright (C) 2009 Francesco P. Lovergine
+
+License:
+
+    This package is free software; you can redistribute it and/or
+    modify it under the terms of the GNU Lesser General Public
+    License as published by the Free Software Foundation; either
+    version 3 of the License, or (at your option) any later version.
+
+    This package is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+    Lesser General Public License for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with this program. If not, see <http://www.gnu.org/licenses/>.
+
+On Debian systems, the complete text of the GNU Lesser General
+Public License can be found in "/usr/share/common-licenses/LGPL-3".
+
+The Debian packaging is:
+
+    Copyright (C) 2010 Francesco Paolo Lovergine <frankie at debian.org>
+
+and is licensed under the GPL version 3,
+see "/usr/share/common-licenses/GPL-3".
+
+
+The EGM grids data are computed using the Maxima scripts provided with
+the sources, and are distributed with the same license.

Added: packages/geographiclib/trunk/debian/docs
===================================================================
--- packages/geographiclib/trunk/debian/docs	                        (rev 0)
+++ packages/geographiclib/trunk/debian/docs	2010-03-11 12:29:09 UTC (rev 2774)
@@ -0,0 +1,2 @@
+00README.txt
+NEWS

Added: packages/geographiclib/trunk/debian/geographiclib-datasets-download
===================================================================
--- packages/geographiclib/trunk/debian/geographiclib-datasets-download	                        (rev 0)
+++ packages/geographiclib/trunk/debian/geographiclib-datasets-download	2010-03-11 12:29:09 UTC (rev 2774)
@@ -0,0 +1,135 @@
+#!/bin/bash
+#
+# Copyright (C) 2010 Francesco P. Lovergine <frankie at debian.org>
+# 
+# This script shamely predates my previous GMT coast lines download script.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License version 3, 
+# as published by the Free Software Foundation.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
+#
+
+usage() { 
+	cat <<EOF
+usage: $0 [egm84_30|egm84_15|egm96_15|egm96_5|egm2k8_5|egm2k8_2.5|egm2k8_1|all] 
+
+This program can be used to download the earth Geoid models used by 
+GeographicLib and the GeoidEval tool to compute the EGM geoid heights by 
+interpolation at different grid size. Note that by default the EGM96 
+Geoid is used with a 5' grid, but you can use any of the following 
+models and resolutions, with different resolts in approximation errors:
+
+                                  bilinear error    cubic error
+   name         geoid    grid     max     rms       max     rms
+   egm84-30     EGM84    30'      1.546m  70mm      0.274m  14mm
+   egm84-15     EGM84    15'      0.413m  18mm      0.020m   1mm
+   egm96-15     EGM96    15'      1.152m  40mm      0.169m   7mm
+   egm96-5      EGM96     5'      0.140m   5mm      0.003m   1mm
+   egm2008-5    EGM2008   5'      0.478m  12mm      0.294m   5mm
+   egm2008-2_5  EGM2008   2.5'    0.135m   3mm      0.031m   1mm
+   egm2008-1    EGM2008   1'      0.025m   1mm      0.003m   1mm
+
+EOF
+}
+
+set -e
+
+if [ $(id -u) -ne 0 ]; then
+	echo "Run this script as root"
+	exit 1
+fi
+
+if [ $(which bunzip2|wc -l) -eq 0 ]; then
+    echo "Please install bzip2 before using this script"
+    exit 6
+fi
+
+# List of currently available data grids
+ALL="egm96-5 egm96-15 egm84-30 egm84-15 egm2008-5 egm2008-2_5 egm2008-1"
+
+# Default is downloading EGM96 geoid with 5' grid
+if [ $# -eq 0 ]; then
+	FILE=egm96-5
+else
+	case "$1" in
+		egm84_30)
+			FILE=egm84-30
+			;;
+		egm84_15)
+			FILE=egm84-15
+			;;
+		egm96_15)
+			FILE=egm96-15
+			;;
+		egm96_5)
+			FILE=egm96-5
+			;;
+		egm2k8_5)
+			FILE=egm2008-5
+			;;
+		egm2k8_2.5)
+			FILE=egm2008-2_5
+			;;
+		egm2k8_1)
+			FILE=egm2008-1
+			;;
+		all)
+			FILE=all
+			;;
+		help|-h|--help)
+			usage
+			exit 5
+			;;
+		*)
+			echo "Unknown argument '$1'" && usage
+			exit 4
+			;;
+	esac
+fi
+
+SHARE_DIR=/usr/share/geographiclib
+if [ ! -d $SHARE_DIR ]; then
+	echo "Geographiclib target directory $SHARE_DIR not found"
+	exit 2
+fi
+TMPDIR=`mktemp -t -d geographiclib-geoid.XXXXXXXX` || exit 3
+
+get_file() {
+    URL="http://downloads.sourceforge.net/project/geographiclib/geoids-distrib/$1.tar.bz2?use_mirror=autoselect"
+    ARCHIVE=$TMPDIR/$1.tar.bz2
+    if [ -x /usr/bin/wget ]; then
+        GET_IT="wget --progress=bar -O$ARCHIVE $URL"
+    else if [ -x /usr/bin/curl ]; then
+                GET_IT="curl --progress-bar -o$ARCHIVE $URL"
+         fi
+    fi
+    echo $GET_IT && $GET_IT && tar xojvf $ARCHIVE -C $SHARE_DIR
+}
+
+if [ "$FILE" != "all" ]; then
+    get_file $FILE
+else
+    for f in $ALL 
+    do
+        get_file $f
+    done
+fi
+
+rm -rf $TMPDIR
+
+cat <<EOF
+
+Geoid grid(s) downloaded and installed under $SHARE_DIR/geoids.
+
+EOF
+
+exit 0

Added: packages/geographiclib/trunk/debian/geographiclib-tools.doc-base
===================================================================
--- packages/geographiclib/trunk/debian/geographiclib-tools.doc-base	                        (rev 0)
+++ packages/geographiclib/trunk/debian/geographiclib-tools.doc-base	2010-03-11 12:29:09 UTC (rev 2774)
@@ -0,0 +1,11 @@
+Document: geographiclib
+Title: Debian geographiclib Manual
+Author: Charles Karney
+Abstract: This manual describes what geographiclib is
+ and how it can be used to solve some basic geomapping
+ problems.
+Section: science
+
+Format: HTML
+Index: /usr/share/doc/geographiclib/html/index.html
+Files: /usr/share/doc/geographiclib/html/*.html

Added: packages/geographiclib/trunk/debian/geographiclib-tools.install
===================================================================
--- packages/geographiclib/trunk/debian/geographiclib-tools.install	                        (rev 0)
+++ packages/geographiclib/trunk/debian/geographiclib-tools.install	2010-03-11 12:29:09 UTC (rev 2774)
@@ -0,0 +1,7 @@
+usr/bin/CartConvert
+usr/bin/GeoConvert
+usr/bin/Geod
+usr/bin/GeoidEval
+usr/bin/CartConvert
+usr/share/doc/geographiclib/html
+debian/geographiclib-datasets-download usr/sbin/

Added: packages/geographiclib/trunk/debian/libgeographiclib-dev.install
===================================================================
--- packages/geographiclib/trunk/debian/libgeographiclib-dev.install	                        (rev 0)
+++ packages/geographiclib/trunk/debian/libgeographiclib-dev.install	2010-03-11 12:29:09 UTC (rev 2774)
@@ -0,0 +1,3 @@
+usr/lib/libGeographic.a
+usr/lib/libGeographic.so
+usr/include/*

Added: packages/geographiclib/trunk/debian/libgeographiclib1.install
===================================================================
--- packages/geographiclib/trunk/debian/libgeographiclib1.install	                        (rev 0)
+++ packages/geographiclib/trunk/debian/libgeographiclib1.install	2010-03-11 12:29:09 UTC (rev 2774)
@@ -0,0 +1,2 @@
+usr/lib/libGeographic.so.1
+usr/lib/libGeographic.so.1.*

Added: packages/geographiclib/trunk/debian/patches/datadir
===================================================================
--- packages/geographiclib/trunk/debian/patches/datadir	                        (rev 0)
+++ packages/geographiclib/trunk/debian/patches/datadir	2010-03-11 12:29:09 UTC (rev 2774)
@@ -0,0 +1,26 @@
+Index: geographiclib-1.1/include/Makefile.in
+===================================================================
+--- geographiclib-1.1.orig/include/Makefile.in	2010-03-11 12:59:12.000000000 +0100
++++ geographiclib-1.1/include/Makefile.in	2010-03-11 12:59:19.000000000 +0100
+@@ -195,7 +195,7 @@
+ 				GeographicLib/TransverseMercator.hpp \
+ 				GeographicLib/UTMUPS.hpp
+ 
+-geoid_dir = $(datadir)/GeographicLib/geoids
++geoid_dir = $(datadir)/geoids
+ EXTRA_DIST = Makefile.mk
+ all: all-am
+ 
+Index: geographiclib-1.1/src/Makefile.in
+===================================================================
+--- geographiclib-1.1.orig/src/Makefile.in	2010-03-11 13:06:51.000000000 +0100
++++ geographiclib-1.1/src/Makefile.in	2010-03-11 13:07:06.000000000 +0100
+@@ -243,7 +243,7 @@
+ 		../include/GeographicLib/TransverseMercator.hpp \
+ 		../include/GeographicLib/UTMUPS.hpp
+ 
+-geoids_dir = $(datadir)/GeographicLib/geoids
++geoids_dir = $(datadir)/geoids
+ EXTRA_DIST = Makefile.mk
+ all: all-am
+ 

Added: packages/geographiclib/trunk/debian/patches/destdir
===================================================================
--- packages/geographiclib/trunk/debian/patches/destdir	                        (rev 0)
+++ packages/geographiclib/trunk/debian/patches/destdir	2010-03-11 12:29:09 UTC (rev 2774)
@@ -0,0 +1,15 @@
+Index: geographiclib-1.1/doc/Makefile.in
+===================================================================
+--- geographiclib-1.1.orig/doc/Makefile.in	2010-03-10 16:47:02.000000000 +0100
++++ geographiclib-1.1/doc/Makefile.in	2010-03-10 16:47:21.000000000 +0100
+@@ -391,8 +391,8 @@
+ 	rm -rf html
+ 
+ install-doc: doc
+-	$(INSTALL) -d $(docdir)/html
+-	$(INSTALL) -m 644 html/* $(docdir)/html
++	$(INSTALL) -d $(DESTDIR)$(docdir)/html
++	$(INSTALL) -m 644 html/* $(DESTDIR)$(docdir)/html
+ # Tell versions [3.59,3.63) of GNU make to not export all variables.
+ # Otherwise a system limit (for SysV at least) may be exceeded.
+ .NOEXPORT:

Added: packages/geographiclib/trunk/debian/patches/series
===================================================================
--- packages/geographiclib/trunk/debian/patches/series	                        (rev 0)
+++ packages/geographiclib/trunk/debian/patches/series	2010-03-11 12:29:09 UTC (rev 2774)
@@ -0,0 +1,2 @@
+datadir
+destdir

Added: packages/geographiclib/trunk/debian/rules
===================================================================
--- packages/geographiclib/trunk/debian/rules	                        (rev 0)
+++ packages/geographiclib/trunk/debian/rules	2010-03-11 12:29:09 UTC (rev 2774)
@@ -0,0 +1,7 @@
+#!/usr/bin/make -f
+
+include /usr/share/cdbs/1/rules/debhelper.mk
+include /usr/share/cdbs/1/class/autotools.mk
+include /usr/share/cdbs/1/rules/patchsys-quilt.mk
+
+DEB_CONFIGURE_EXTRA_FLAGS=--datadir=/usr/share/geographiclib --prefix=/usr


Property changes on: packages/geographiclib/trunk/debian/rules
___________________________________________________________________
Added: svn:executable
   + *

Added: packages/geographiclib/trunk/debian/watch
===================================================================
--- packages/geographiclib/trunk/debian/watch	                        (rev 0)
+++ packages/geographiclib/trunk/debian/watch	2010-03-11 12:29:09 UTC (rev 2774)
@@ -0,0 +1,8 @@
+# Example watch control file for uscan
+# See uscan(1) for format
+
+# Compulsory line, this is a version 3 file
+version=3
+
+# Uncomment to find new files on sourceforge, for devscripts >= 2.9
+http://sf.net/geographiclib/geographiclib-(.*)\.tar\.gz




More information about the Pkg-grass-devel mailing list