This is an automated email from the git hooks/post-receive script.
johanvdw-guest pushed a commit to branch ubuntu/trusty
in repository proj.
commit 4ba2b96058f7052b8ee29222ccab9e2526fc10e3
Merge: 01d926b 296b8ac
Author: Johan Van de Wauw <johan.vandew...@gmail.com>
Date: Fri Sep 18 20:21:55 2015 +0200
Merge remote-tracking branch 'origin/master' into ubuntu/precise
Conflicts:
config.guess
config.sub
debian/changelog
AUTHORS | 4 +
CMakeLists.txt | 111 +
ChangeLog | 386 +-
Makefile.am | 4 +-
Makefile.in | 416 +-
NEWS | 156 +-
aclocal.m4 | 9194 +-
cmake/CMakeLists.txt | 29 +
cmake/Makefile.am | 14 +
{jniwrap/org/proj4 => cmake}/Makefile.in | 143 +-
cmake/Proj4Config.cmake | 41 +
cmake/Proj4InstallPath.cmake | 67 +
cmake/Proj4Mac.cmake | 24 +
cmake/Proj4SystemInfo.cmake | 83 +
cmake/Proj4Test.cmake | 32 +
cmake/Proj4Utilities.cmake | 456 +
cmake/Proj4Version.cmake | 47 +
cmake/policies.cmake | 5 +
src/proj_config.h.in => cmake/proj_config.cmake.in | 48 +-
cmake/project-config-version.cmake.in | 48 +
cmake/project-config.cmake.in | 31 +
compile | 347 +
config.guess | 759 +-
config.sub | 397 +-
configure | 1962 +-
configure.in | 21 +-
debian/README.source | 2 +-
debian/TODO | 10 -
debian/changelog | 206 +-
debian/compat | 2 +-
debian/control | 84 +-
debian/copyright | 189 +-
debian/datumgrids-ch.list | 3 +
debian/datumgrids-ch.shar | 340463 +++++++++++++++++-
debian/datumgrids.list | 28 +-
debian/datumgrids.shar | 81298 +++--
debian/gbp.conf | 16 +
debian/libproj-dev.install | 11 +-
debian/libproj-dev.manpages | 1 +
debian/libproj-java.doc-base | 8 +
debian/libproj-java.docs | 1 +
debian/libproj-java.install | 1 +
debian/libproj-java.links | 1 +
debian/libproj0.install | 1 -
debian/libproj0.symbols | 406 -
debian/libproj9.install | 1 +
debian/libproj9.symbols | 456 +
debian/patches/00list | 1 -
debian/proj-bin.install | 2 -
debian/proj-bin.links | 3 +-
debian/proj-data.install | 28 +-
debian/rules | 157 +-
debian/upstream/metadata | 7 +
debian/watch | 9 +-
install-sh | 673 +-
jniwrap/Makefile.in | 296 +-
jniwrap/doxygen.cfg | 2 +-
jniwrap/org/Makefile.in | 295 +-
jniwrap/org/proj4/LatLong.java | 74 -
jniwrap/org/proj4/Makefile.am | 6 +-
jniwrap/org/proj4/Makefile.in | 126 +-
jniwrap/org/proj4/Others.java | 73 -
jniwrap/org/proj4/PJ.java | 2 -
jniwrap/org/proj4/PJException.java | 2 -
jniwrap/org/proj4/Proj4.java | 189 -
jniwrap/org/proj4/Proj4Factory.java | 77 -
jniwrap/org/proj4/ProjectionData.java | 78 -
jniwrap/org/proj4/Projections.java | 318 -
jniwrap/org/proj4/package-info.java | 2 -
ltmain.sh | 123 +-
m4/ax_cflags_warn_all.m4 | 120 +
aclocal.m4 => m4/libtool.m4 | 1971 +-
m4/ltoptions.m4 | 384 +
m4/ltsugar.m4 | 123 +
m4/ltversion.m4 | 23 +
m4/lt~obsolete.m4 | 98 +
makefile.vc | 1 -
man/CMakeLists.txt | 6 +
man/Makefile.am | 2 +
man/Makefile.in | 296 +-
man/man1/Makefile.in | 163 +-
man/man1/cs2cs.1 | 18 +-
man/man1/geod.1 | 74 +-
man/man1/proj.1 | 11 +-
man/man3/Makefile.am | 2 +-
man/man3/Makefile.in | 165 +-
man/man3/geodesic.3 | 97 +
man/man3/pj_init.3 | 2 +-
mkinstalldirs | 2 -
nad/CMakeLists.txt | 57 +
nad/Makefile.am | 62 +-
nad/Makefile.in | 201 +-
nad/epsg | 3088 +-
nad/makefile.vc | 2 -
nad/ntv2_out.dist | 12 +-
nad/test27 | 5 +-
nad/test83 | 5 +-
nad/testIGNF | 3 +-
nad/testdatumfile | 3 +-
nad/testflaky | 74 +
nad/testntv2 | 7 +-
nad/testvarious | 388 +-
nad/tf_out.dist | 13 +
nad/tv_out.dist | 209 +-
src/CMakeLists.txt | 45 +
src/Makefile.am | 30 +-
src/Makefile.in | 388 +-
src/PJ_aea.c | 4 -
src/PJ_aeqd.c | 74 +-
src/PJ_airy.c | 4 -
src/PJ_aitoff.c | 92 +-
src/PJ_august.c | 1 +
src/PJ_boggs.c | 1 +
src/PJ_calcofi.c | 138 +
src/PJ_cc.c | 1 +
src/PJ_cea.c | 11 +-
src/PJ_collg.c | 1 +
src/PJ_crast.c | 2 +
src/PJ_denoy.c | 1 +
src/PJ_eck1.c | 2 +
src/PJ_eck2.c | 1 +
src/PJ_eck4.c | 1 +
src/PJ_eck5.c | 2 +
src/PJ_fahey.c | 2 +
src/PJ_gall.c | 2 +
src/PJ_geos.c | 4 +-
src/PJ_gins8.c | 1 +
src/PJ_hatano.c | 1 +
src/PJ_healpix.c | 983 +-
src/PJ_isea.c | 33 +-
src/PJ_krovak.c | 16 +-
src/PJ_larr.c | 1 +
src/PJ_lask.c | 1 +
src/PJ_lcca.c | 4 +-
src/PJ_mbt_fps.c | 1 +
src/PJ_mbtfpp.c | 1 +
src/PJ_mbtfpq.c | 1 +
src/PJ_mill.c | 2 +
src/PJ_moll.c | 8 +-
src/PJ_natearth.c | 2 +
src/PJ_nell.c | 1 +
src/PJ_nell_h.c | 2 +
src/PJ_nocol.c | 2 +
src/PJ_nzmg.c | 4 -
src/PJ_ob_tran.c | 1 +
src/PJ_omerc.c | 17 +-
src/PJ_putp2.c | 1 +
src/PJ_putp3.c | 2 +-
src/PJ_qsc.c | 381 +
src/PJ_robin.c | 98 +-
src/PJ_stere.c | 2 -
src/PJ_sterea.c | 2 -
src/PJ_urm5.c | 2 +-
src/PJ_vandg4.c | 1 +
src/PJ_wag7.c | 1 +
src/bin_cs2cs.cmake | 14 +
src/bin_geod.cmake | 16 +
src/bin_nad2bin.cmake | 17 +
src/bin_proj.cmake | 19 +
src/cs2cs.c | 47 +-
src/dmstor.c | 2 +-
src/gen_cheb.c | 4 +-
src/geocent.c | 3 -
src/geod.c | 4 +-
src/geod_for.c | 103 -
src/geod_interface.c | 39 +
src/{geodesic.h => geod_interface.h} | 30 +-
src/geod_inv.c | 56 -
src/geod_set.c | 24 +-
src/geodesic.c | 1919 +
src/geodesic.h | 824 +-
src/jniproj.c | 207 +-
src/lib_proj.cmake | 330 +
src/makefile.vc | 30 +-
src/mk_cheby.c | 316 +-
src/multistresstest.c | 227 +-
src/nad2bin.c | 4 +-
src/nad_init.c | 30 +-
src/org_proj4_PJ.h | 135 +
src/pj_apply_gridshift.c | 23 +-
src/pj_apply_vgridshift.c | 17 +-
src/pj_ctx.c | 29 +-
src/pj_datum_set.c | 22 +-
src/pj_datums.c | 69 +-
src/pj_ell_set.c | 51 +-
src/pj_ellps.c | 87 +-
src/pj_fileapi.c | 199 +
src/pj_gauss.c | 3 +-
src/pj_gc_reader.c | 207 +
src/pj_geocent.c | 6 +-
src/pj_gridcatalog.c | 281 +
src/pj_gridinfo.c | 292 +-
src/pj_gridlist.c | 4 +-
src/pj_init.c | 261 +-
src/pj_initcache.c | 4 -
src/pj_latlong.c | 2 -
src/pj_list.c | 2 +-
src/pj_list.h | 2 +
src/pj_log.c | 6 +-
src/pj_mutex.c | 62 +-
src/pj_open_lib.c | 14 +-
src/pj_param.c | 18 +-
src/pj_pr_list.c | 3 +-
src/pj_release.c | 2 +-
src/pj_strerrno.c | 2 +-
src/pj_strtod.c | 184 +
src/pj_transform.c | 8 +-
src/pj_units.c | 44 +-
src/pj_utils.c | 13 +-
src/proj.def | 128 +-
src/proj_api.h | 34 +-
src/proj_config.h.in | 19 +
src/proj_etmerc.c | 367 +-
src/proj_mdist.c | 2 -
src/proj_rouss.c | 2 -
src/projects.h | 112 +-
src/test228.c | 76 +
217 files changed, 402636 insertions(+), 55043 deletions(-)
diff --cc debian/changelog
index a1e05bf,316810a..8f2026c
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,9 -1,156 +1,162 @@@
- proj (4.8.0-3~precise2) precise; urgency=medium
++proj (4.9.2-1~ubuntugis~precise) precise; urgency=medium
+
- * Launchpad build for Precise
- * Removed projects.h from libproj-dev.install
++ * Backport to precise
+
- -- Jerome Villeneuve Larouche <jlarou...@mapgears.com> Thu, 29 Nov 2012
22:04:34 +0000
++ -- Johan Van de Wauw <johan.vandew...@gmail.com> Fri, 18 Sep 2015 20:11:23
+0200
++
+ proj (4.9.2-1) unstable; urgency=medium
+
+ * New upstream release.
+ * Don't use RC version for symbols.
+ * Move from experimental to unstable.
+
+ -- Bas Couwenberg <sebas...@debian.org> Mon, 14 Sep 2015 08:26:15 +0200
+
+ proj (4.9.2~rc3-1~exp1) experimental; urgency=medium
+
+ * New upstream release candidate.
+ * Drop SONAME patch, fixed upstream.
+
+ -- Bas Couwenberg <sebas...@debian.org> Fri, 11 Sep 2015 01:41:44 +0200
+
+ proj (4.9.2~rc2+1-1~exp1) experimental; urgency=medium
+
+ * Import proj-4.9.2RC2.tar.gz again (changed after first published).
+ * Add patch to revert the SONAME back to libproj.so.9.
+
+ -- Bas Couwenberg <sebas...@debian.org> Fri, 11 Sep 2015 00:30:33 +0200
+
+ proj (4.9.2~rc2-1~exp1) experimental; urgency=medium
+
+ * New upstream release candidate.
+ * Update symbols for 4.9.2 RC1.
+ * Don't ignore symbols changes for libproj.
+
+ -- Bas Couwenberg <sebas...@debian.org> Thu, 10 Sep 2015 16:53:12 +0200
+
+ proj (4.9.2~rc1-1~exp1) experimental; urgency=medium
+
+ * New upstream release candidate.
+ * Update copyright for new & changed files.
+ * Drop patches, fixed upstream.
+
+ -- Bas Couwenberg <sebas...@debian.org> Tue, 08 Sep 2015 19:27:36 +0200
+
+ proj (4.9.1-3) unstable; urgency=medium
+
+ * Add patches to install proj_def.dat again.
+ * Update Vcs-Browser URL to use HTTPS.
+
+ -- Bas Couwenberg <sebas...@debian.org> Sun, 06 Sep 2015 19:46:01 +0200
+
+ proj (4.9.1-2) unstable; urgency=medium
+
+ * Update upstream metadata for move to GitHub.
+ * Update copyright file, changes:
+ - Group copyright holders by license
+ - Drop .0 from GPL license shortname
+ - Update my email to use @debian.org address
+
+ -- Bas Couwenberg <sebas...@debian.org> Wed, 19 Aug 2015 15:49:24 +0200
+
+ proj (4.9.1-1) unstable; urgency=medium
+
+ * Move from experimental to unstable.
+ * Use jquery.js from libjs-jquery instead of doxygen copy.
+
+ -- Bas Couwenberg <sebas...@debian.org> Sun, 03 May 2015 21:15:10 +0200
+
+ proj (4.9.1-1~exp1) experimental; urgency=medium
+
+ * New upstream release.
+ * Ignore test failures instead of failing the build.
+ * Drop patches applied upstream.
+ * Update package names for SONAME bump (0 -> 9).
+ * Update symbols for PROJ 4.9.0/4.9.1.
+ * Add substitution variable ${misc:Pre-Depends} for libproj.
+
+ -- Bas Couwenberg <sebas...@debian.org> Tue, 10 Mar 2015 20:57:14 +0100
+
+ proj (4.9.1~rc1-1~exp1) experimental; urgency=medium
+
+ * New upstream release candidate.
+ * Set experimental branch in Vcs-Git and gbp.conf.
+ * Add upstream metadata.
+ * Update Vcs-Browser URL to use cgit instead of gitweb.
+ * Update my email to use @debian.org address.
+ * Refresh patches.
+ * Update copyright years in copyright file.
+
+ -- Bas Couwenberg <sebas...@debian.org> Sat, 21 Feb 2015 00:12:35 +0100
+
+ proj (4.9.0~rc2-1~exp1) experimental; urgency=medium
+
+ * New upstream release.
+ * Refresh patches.
+ * Update copyright file.
+ * Use minimal dh rules.
+ * Update install files for Multi-Arch paths.
+ * Bump Standards-Version to 3.9.6, no changes.
+ * Remove useless autogenerated doxygen files.
+ * Update datumgrids.shar with proj-datumgrid-1.6RC1, it now includes
+ "CTable2" format grid shift files that aren't system dependent,
+ but requires PROJ 4.8.0 or newer.
+ * Update datumgrids-ch.shar to also include the latest Swiss CHENyx06
+ dataset, adding CHENYX06a.{asc,gsb} and chenyx06etrs.gsb.
+ * Update nad2bin-data.patch to fix the build when the .lla files from
+ proj-datumgrid-1.5 are not present, and install system independent
+ files from proj-datumgrid-1.6 if they are present.
+ * Add patch to use the higher precision towgs84 values as specified by
+ Kadaster for EPSG 28991 & 28992.
+
+ -- Bas Couwenberg <sebas...@xs4all.nl> Sun, 05 Oct 2014 21:45:15 +0200
+
+ proj (4.8.0-5) unstable; urgency=medium
+
+ * Add patch to install nad2bin produced data files in /usr/lib/proj.
+ (closes: 747862)
+ * Symlink moved data files from /usr/lib/proj to /usr/share/proj.
+ * Remove debian/TODO, nad2bin data files moved to /usr/lib/proj.
+
+ -- Bas Couwenberg <sebas...@xs4all.nl> Tue, 20 May 2014 20:05:43 +0200
+
+ proj (4.8.0-4) unstable; urgency=medium
+
+ * proj-data is arch any because of architecture specific datumgrids.
+
+ -- Bas Couwenberg <sebas...@xs4all.nl> Sat, 10 May 2014 11:30:06 +0200
+
+ proj (4.8.0-3) unstable; urgency=medium
+
+ [ Bas Couwenberg ]
+ * Update watch file, handle common problems.
+ * Don't install geodesic.h.
+ * Move from experimental to unstable.
+
+ [ Andreas Tille ]
+ * proj-data is arch all
+
+ -- Bas Couwenberg <sebas...@xs4all.nl> Fri, 09 May 2014 20:46:34 +0200
+
+ proj (4.8.0-3~exp1) experimental; urgency=low
+
+ * Add myself to Uploaders.
+ * Also install geodesic.h.
+ * Restructure control file with cme, changes: canonical Vcs-* URLs.
+ * Add gbp.conf to use pristine-tar by default.
+ * Use dh-autoreconf for retooling.
+ (closes: #703006)
+ * Bump debhelper compatibility to 9.
+ * Use hardening build flags.
+ * Strip debian revision from symbols version.
+ * Empty dependency_libs in .la files.
+ * Add patches to fix man pages issues.
+ * Also build the Java Native Interface bindings.
+ (closes: #293803)
+ * Update copyright file using copyright-format 1.0.
+ * Bump Standards-Version to 3.9.5, changes: Vcs-* fields, symbols,
copyright.
+
+ -- Bas Couwenberg <sebas...@xs4all.nl> Sat, 12 Apr 2014 21:02:49 +0200
proj (4.8.0-2) unstable; urgency=low
--
Alioth's /usr/local/bin/git-commit-notice on
/srv/git.debian.org/git/pkg-grass/proj.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
