[SCM] proj branch, master, updated. upstream/4.8.0-11-g9569749
The following commit has been merged in the master branch:
commit 9569749d95bb810eb5b9a3c7d92f904e1d31c6cd
Author: Francesco Paolo Lovergine fran...@debian.org
Date: Mon Nov 25 15:26:32 2013 +0100
Restored original config.* stuff from upstream branch.
diff --git a/config.guess b/config.guess
index 11a9347..0f0fe71 100755
--- a/config.guess
+++ b/config.guess
@@ -4,11 +4,7 @@
# 2000, 2001, 2002, 2003, 2004, 2005, 2006 Free Software Foundation,
# Inc.
- HEAD
-timestamp='2007-07-22'
-===
timestamp='2007-03-06'
- sid
# This file is free software; you can redistribute it and/or modify it
# under the terms of the GNU General Public License as published by
@@ -334,11 +330,7 @@ case
${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION} in
sun4*:SunOS:5.*:* | tadpole*:SunOS:5.*:*)
echo sparc-sun-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
exit ;;
- HEAD
-i86pc:SunOS:5.*:* | i86xen:SunOS:5.*:*)
-===
i86pc:SunOS:5.*:*)
- sid
echo i386-pc-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
exit ;;
sun4*:SunOS:6*:*)
@@ -801,11 +793,7 @@ EOF
exit ;;
*:Interix*:[3456]*)
case ${UNAME_MACHINE} in
- HEAD
- x86)
-===
x86)
- sid
echo i586-pc-interix${UNAME_RELEASE}
exit ;;
EM64T | authenticamd)
diff --git a/config.sub b/config.sub
index e01d92f..5defff6 100755
--- a/config.sub
+++ b/config.sub
@@ -4,11 +4,7 @@
# 2000, 2001, 2002, 2003, 2004, 2005, 2006 Free Software Foundation,
# Inc.
- HEAD
-timestamp='2007-06-28'
-===
timestamp='2007-01-18'
- sid
# This file is (in principle) common to ALL GNU software.
# The presence of a machine in this file suggests that SOME GNU software
@@ -479,13 +475,8 @@ case $basic_machine in
basic_machine=craynv-cray
os=-unicosmp
;;
- HEAD
- cr16)
- basic_machine=cr16-unknown
-===
cr16c)
basic_machine=cr16c-unknown
- sid
os=-elf
;;
crds | unos)
@@ -692,13 +683,6 @@ case $basic_machine in
basic_machine=i386-pc
os=-mingw32
;;
- HEAD
- mingw32ce)
- basic_machine=arm-unknown
- os=-mingw32ce
- ;;
-===
- sid
miniframe)
basic_machine=m68000-convergent
;;
--
Proj.4
___
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] proj branch, master, updated. upstream/4.8.0-11-g9569749
The following commit has been merged in the master branch:
commit a58129fcec5d42ae1cae2bb2bda9a72d37ae8bef
Merge: e3d50a9bb6a95640b64ae7792bcb251452f63ae9
d38fa69827927e353528a7f3a584132d88c8a4ec
Author: Francesco Paolo Lovergine fran...@debian.org
Date: Mon Nov 25 15:25:13 2013 +0100
Merge branch 'sid'
Conflicts:
config.guess
config.sub
debian/changelog
debian/control
debian/proj-bin.install
debian/rules
diff --combined config.guess
index 278f9e9,0f0fe71..11a9347
--- a/config.guess
+++ b/config.guess
@@@ -4,7 -4,7 +4,11 @@@
# 2000, 2001, 2002, 2003, 2004, 2005, 2006 Free Software Foundation,
# Inc.
++ HEAD
+timestamp='2007-07-22'
++===
+ timestamp='2007-03-06'
++ sid
# This file is free software; you can redistribute it and/or modify it
# under the terms of the GNU General Public License as published by
@@@ -330,7 -330,7 +334,11 @@@ case ${UNAME_MACHINE}:${UNAME_SYSTEM}:
sun4*:SunOS:5.*:* | tadpole*:SunOS:5.*:*)
echo sparc-sun-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
exit ;;
++ HEAD
+i86pc:SunOS:5.*:* | i86xen:SunOS:5.*:*)
++===
+ i86pc:SunOS:5.*:*)
++ sid
echo i386-pc-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
exit ;;
sun4*:SunOS:6*:*)
@@@ -793,7 -793,7 +801,11 @@@ EO
exit ;;
*:Interix*:[3456]*)
case ${UNAME_MACHINE} in
++ HEAD
+ x86)
++===
+ x86)
++ sid
echo i586-pc-interix${UNAME_RELEASE}
exit ;;
EM64T | authenticamd)
diff --combined config.sub
index 1761d8b,5defff6..e01d92f
--- a/config.sub
+++ b/config.sub
@@@ -4,7 -4,7 +4,11 @@@
# 2000, 2001, 2002, 2003, 2004, 2005, 2006 Free Software Foundation,
# Inc.
++ HEAD
+timestamp='2007-06-28'
++===
+ timestamp='2007-01-18'
++ sid
# This file is (in principle) common to ALL GNU software.
# The presence of a machine in this file suggests that SOME GNU software
@@@ -475,8 -475,8 +479,13 @@@ case $basic_machine i
basic_machine=craynv-cray
os=-unicosmp
;;
++ HEAD
+ cr16)
+ basic_machine=cr16-unknown
++===
+ cr16c)
+ basic_machine=cr16c-unknown
++ sid
os=-elf
;;
crds | unos)
@@@ -683,10 -683,6 +692,13 @@@
basic_machine=i386-pc
os=-mingw32
;;
++ HEAD
+ mingw32ce)
+ basic_machine=arm-unknown
+ os=-mingw32ce
+ ;;
++===
++ sid
miniframe)
basic_machine=m68000-convergent
;;
diff --combined debian/control
index 00968c0,66b9875..4e7d14b
--- a/debian/control
+++ b/debian/control
@@@ -2,36 -2,18 +2,18 @@@ Source: pro
Section: science
Priority: optional
Maintainer: Debian GIS Project pkg-grass-devel@lists.alioth.debian.org
- Uploaders: Peter S Galbraith p...@debian.org, Francesco Paolo Lovergine
fran...@debian.org
- Build-Depends: debhelper (= 7), sharutils, dpatch
- Standards-Version: 3.8.3
+ Uploaders: Francesco Paolo Lovergine fran...@debian.org
+ Build-Depends: debhelper (= 9), sharutils
+ Standards-Version: 3.9.3
Homepage: http://trac.osgeo.org/proj/
- Vcs-Browser: http://svn.debian.org/wsvn/pkg-grass/packages/proj/
- Vcs-Svn: svn://svn.debian.org/pkg-grass/packages/proj/
-
- Package: proj
- Architecture: all
- Depends: libproj0 (= 4.6.1-4), proj-bin (= 4.6.1-4), libproj-dev (=
4.6.1-4), ${misc:Depends}
- Description: Cartographic projection filter and library (transitional package)
- Proj and invproj perform respective forward and inverse transformation
- of cartographic data to or from Cartesian data with a wide range of
- selectable projection functions (over 100 projections).
- .
- Geod and invgeod perform geodesic (Great Circle) computations for
- determining latitude, longitude and back azimuth of a terminus point given
- a initial point latitude, longitude, azimuth and distance (direct) or the
- forward and back azimuths and distance between an initial and terminus
- point latitudes and longitudes (inverse).
- .
- This is a transitional meta-package. You can safely remove it after
upgrading.
+ Vcs-Browser: http://git.debian.org/?p=pkg-grass/proj.git
+ Vcs-Git: git://git.debian.org/pkg-grass/proj.git
Package: proj-data
Architecture: any
Section: libs
- Conflicts: proj (= 4.6.1-3)
- Replaces: proj (= 4.6.1-3)
Depends: ${misc:Depends}
- Description: Cartographic projection filter and library (transitional package)
+ Description: Cartographic projection filter and library (datum package)
Proj and invproj perform respective forward and inverse transformation
of cartographic data to or from Cartesian data with a wide range of
selectable projection functions (over 100 projections).
@@@ -50,8 -32,6 +32,6 @@@ Architecture: an
Section: libs
Depends: proj-data, ${shlibs:Depends},
[SCM] proj branch, master, updated. upstream/4.8.0-11-g9569749
The following commit has been merged in the master branch:
commit d38fa69827927e353528a7f3a584132d88c8a4ec
Author: Francesco Paolo Lovergine fran...@debian.org
Date: Mon Nov 25 15:20:28 2013 +0100
Removed staling 4.7 files and merged with current 4.8.0-1 changes.
diff --git a/debian/changelog b/debian/changelog
index df65322..dc53b50 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,19 @@
+proj (4.8.0-1) unstable; urgency=low
+
+ [ Jerome Villeneuve Larouche ]
+ * New upstream release
+ * Modified libproj-dev.install to remove nad_list.h and projects.h
+ * Modified proj-bin.install to remove nad2nad
+ * Modified proj-bin.manpages to remove nad2nad man
+ * Added symbols for libproj0
+
+ [ Francesco Paolo Lovergine ]
+ * Properly merged with current git master and sid version 4.7.0-2.
+ * Removed proj transitional package and obsolete conflicts/replaces against
+series 4.6 and older.
+
+ -- Francesco Paolo Lovergine fran...@debian.org Mon, 25 Nov 2013 15:11:25
+0100
+
proj (4.7.0-2) unstable; urgency=medium
* Moved to source format 3.0 with quilt support.
diff --git a/debian/control b/debian/control
index 5f91fc8..66b9875 100644
--- a/debian/control
+++ b/debian/control
@@ -1,6 +1,6 @@
Source: proj
Section: science
-Priority: extra
+Priority: optional
Maintainer: Debian GIS Project pkg-grass-devel@lists.alioth.debian.org
Uploaders: Francesco Paolo Lovergine fran...@debian.org
Build-Depends: debhelper (= 9), sharutils
@@ -68,7 +68,6 @@ Package: proj-bin
Architecture: any
Section: science
Depends: ${shlibs:Depends}, ${misc:Depends}
-Suggests: proj-ps-doc
Description: Cartographic projection library (tools)
Proj and invproj perform respective forward and inverse transformation
of cartographic data to or from Cartesian data with a wide range of
diff --git a/debian/libproj-dev.install b/debian/libproj-dev.install
index bb14820..d8625b2 100644
--- a/debian/libproj-dev.install
+++ b/debian/libproj-dev.install
@@ -2,6 +2,4 @@ usr/lib/libproj.a
usr/lib/libproj.la
usr/lib/libproj.so
usr/include/org_proj4_Projections.h
-usr/include/nad_list.h
usr/include/proj_api.h
-usr/include/projects.h
diff --git a/debian/proj-bin.install b/debian/proj-bin.install
index ff4e82f..c69b4b2 100644
--- a/debian/proj-bin.install
+++ b/debian/proj-bin.install
@@ -2,6 +2,5 @@ usr/bin/geod
usr/bin/proj
usr/bin/cs2cs
usr/bin/nad2bin
-usr/bin/nad2nad
usr/bin/invgeod
usr/bin/invproj
diff --git a/debian/proj-bin.manpages b/debian/proj-bin.manpages
index 8115b82..810d7cd 100644
--- a/debian/proj-bin.manpages
+++ b/debian/proj-bin.manpages
@@ -1,5 +1,4 @@
debian/tmp/usr/share/man/man1/cs2cs.1
debian/tmp/usr/share/man/man1/geod.1
debian/tmp/usr/share/man/man1/proj.1
-debian/tmp/usr/share/man/man1/nad2nad.1
debian/nad2bin.1
diff --git a/debian/rules b/debian/rules
index 19df8b4..37dbc1f 100755
--- a/debian/rules
+++ b/debian/rules
@@ -88,7 +88,7 @@ binary-arch: install
dh_strip -a
dh_compress -a
dh_fixperms -a
- dh_makeshlibs -a
+ dh_makeshlibs -a -- -c0
dh_shlibdeps -a
dh_installdeb -a
dh_gencontrol -a
diff --git a/src/nad2nad.c b/src/nad2nad.c
deleted file mode 100644
index e59877d..000
--- a/src/nad2nad.c
+++ /dev/null
@@ -1,310 +0,0 @@
-/* North American Datum Transfer Program */
-#include stdio.h
-#include stdlib.h
-#include ctype.h
-#include string.h
-#define PJ_LIST_H nad_list.h
-#include projects.h
-#include emess.h
-
-#define MAX_LINE 1000
-#define MAX_PARGS 100
-#define PJ_INVERS(P) (P-inv ? 1 : 0)
- static int
-echoin = 0,/* echo input data to output line */
-tag = '#'; /* beginning of line tag character */
- static char
-*oform = (char *)0,/* output format for x-y or decimal degrees */
-*oterr = *\t*, /* output line for unprojectable input */
-*inargs = 0,
-*outargs = 0,
-*czone = 0,
-*usage =
-%s\nusage: %s [ -eEfihortwW [args] ] [ files ]\n;
- struct CTABLE
-*ctab = 0,
-*htab = 0;
-static struct TAG_LIST {
- char *tag;
- short sw;
-} ops_list[] = {
- utm=, 0,
- spcs=, 1,
- feet, 2,
- 27, 3,
- 83, 4,
- hp, 5,
- bin, 6,
- rev, 7,
- 0, 0,
-};
-static struct IO_CON {
- short rev; /* reverse lon/lat or x/y */
- short bin; /* io binary */
- short ll; /* io lat-lon */
- short t83; /* data in 83 datum */
- short zone; /* 100 utm zone, ==0 geog, else state plane zone */
- short nprojc; /* number of entries in projc */
- char *hp; /* high precision name */
- char *projc[10];/* params for pj_init */
- PJ *cnv;
-} input = {
- 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0,
-}, output = {
- 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0,
-};
- static void
-set_zone(int in, struct IO_CON *io) {
- char tmp[20];
-
- if (io-hp) {
-
