[proj] 17/18: 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.
Bas Couwenberg
sebastic at xs4all.nl
Sun Oct 5 19:37:32 UTC 2014
This is an automated email from the git hooks/post-receive script.
sebastic-guest pushed a commit to branch experimental
in repository proj.
commit aca32124e91bf1a8b5ede48b6bb94f02aec6f073
Author: Bas Couwenberg <sebastic at xs4all.nl>
Date: Sun Oct 5 16:45:27 2014 +0200
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.
---
debian/changelog | 3 +++
debian/control | 2 +-
debian/patches/nad2bin-data.patch | 43 +++++++++++++++++++++++++++++----------
debian/proj-data.install | 13 ------------
debian/rules | 22 +-------------------
5 files changed, 37 insertions(+), 46 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index 36e749a..5646e99 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -12,6 +12,9 @@ proj (4.9.0~rc2-1) UNRELEASED; urgency=medium
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.
-- Bas Couwenberg <sebastic at xs4all.nl> Fri, 03 Oct 2014 17:29:03 +0200
diff --git a/debian/control b/debian/control
index 0b34ad9..1c4969b 100644
--- a/debian/control
+++ b/debian/control
@@ -17,7 +17,7 @@ Vcs-Git: git://anonscm.debian.org/pkg-grass/proj.git
Homepage: http://trac.osgeo.org/proj/
Package: proj-data
-Architecture: any
+Architecture: all
Section: libs
Depends: ${misc:Depends}
Description: Cartographic projection filter and library (datum package)
diff --git a/debian/patches/nad2bin-data.patch b/debian/patches/nad2bin-data.patch
index d8ef443..5381efb 100644
--- a/debian/patches/nad2bin-data.patch
+++ b/debian/patches/nad2bin-data.patch
@@ -1,19 +1,40 @@
-Description: Install the data files produced by nad2bin to /usr/lib/proj.
- The simple binary format produced by nad2bin is not endianess-aware,
- making the resulting data files architecture specific.
+Description: Don't assume the .lla files from proj-datumgrid are present.
+ The .lla files need to be extracted from proj-datumgrid-1.5, but aren't
+ included in proj-datumgrid-1.6RC1 anymore.
+ .
+ Before proj-datagrids 1.6RC1 the simple binary format produced by nad2bin
+ was not endianess-aware, making the resulting data files architecture
+ specific and needing to be installed under /usr/lib/proj.
+ .
Author: Bas Couwenberg <sebastic at xs4all.nl>
Bug-Debian: https://bugs.debian.org/747862
--- a/nad/Makefile.am
+++ b/nad/Makefile.am
-@@ -32,9 +32,9 @@ process-nad2bin:
- fi
+@@ -33,7 +33,8 @@ process-nad2bin:
install-data-local: process-nad2bin
-- $(mkinstalldirs) $(DESTDIR)$(pkgdatadir)
-+ $(mkinstalldirs) $(DESTDIR)$(pkgdatadir) $(DESTDIR)$(pkglibdir)
- @for x in *.lla ; do \
-- DEST=$(DESTDIR)$(pkgdatadir)/`basename $$x .lla`; \
-+ DEST=$(DESTDIR)$(pkglibdir)/`basename $$x .lla`; \
+ $(mkinstalldirs) $(DESTDIR)$(pkgdatadir)
+- @for x in *.lla ; do \
++ @if [ -f null.lla -a ! -f null ] || [ -f conus.lla -a ! -f conus ] ; then \
++ for x in *.lla ; do \
+ DEST=$(DESTDIR)$(pkgdatadir)/`basename $$x .lla`; \
echo "../src/nad2bin$(EXEEXT) $$DEST < $$x"; \
../src/nad2bin$(EXEEXT) $$DEST < $$x ; \
- if [ $$? -ne 0 ] ; then \
+@@ -41,11 +42,14 @@ install-data-local: process-nad2bin
+ echo "nad2bin$(EXEEXT) failed to install $$DEST"; \
+ exit 1; \
+ fi; \
+- done
+- @if [ ! -f conus.lla ] ; then \
++ done; \
++ else \
+ echo "nad2nad NADCON source files not present"; \
+ fi
+- @for gridfile in *.gsb ntv1_can.dat dummy ; do \
++ @for gridfile in *.gsb ntv1_can.dat dummy \
++ alaska conus hawaii null \
++ prvi stgeorge stlrnc stpaul \
++ FL MD TN WI WO; do \
+ if test "$$gridfile" != "dummy" -a -f "$$gridfile" ; then \
+ echo $(INSTALL_DATA) $$gridfile $(DESTDIR)$(pkgdatadir)/$$gridfile; \
+ $(INSTALL_DATA) $$gridfile $(DESTDIR)$(pkgdatadir)/$$gridfile; \
diff --git a/debian/proj-data.install b/debian/proj-data.install
index 09bd5b4..a33b3a1 100644
--- a/debian/proj-data.install
+++ b/debian/proj-data.install
@@ -1,14 +1 @@
usr/share/proj/*
-usr/lib/*/proj/alaska
-usr/lib/*/proj/conus
-usr/lib/*/proj/FL
-usr/lib/*/proj/hawaii
-usr/lib/*/proj/MD
-usr/lib/*/proj/null
-usr/lib/*/proj/prvi
-usr/lib/*/proj/stgeorge
-usr/lib/*/proj/stlrnc
-usr/lib/*/proj/stpaul
-usr/lib/*/proj/TN
-usr/lib/*/proj/WI
-usr/lib/*/proj/WO
diff --git a/debian/rules b/debian/rules
index 4f81278..07f04d7 100755
--- a/debian/rules
+++ b/debian/rules
@@ -74,11 +74,7 @@ override_dh_autoreconf_clean:
done
override_dh_clean:
- dh_clean nad/FL nad/MD nad/TN nad/WI nad/WO \
- nad/alaska nad/conus nad/hawaii \
- nad/null nad/prvi \
- nad/stgeorge nad/stlrnc nad/stpaul \
- src/org_proj4_PJ.h src/org_proj4_PJ_Type.h
+ dh_clean src/org_proj4_PJ.h src/org_proj4_PJ_Type.h
override_dh_auto_install:
dh_auto_install
@@ -102,22 +98,6 @@ override_dh_auto_install:
# Remove useless autogenreated doxygen files
rm -f $(CURDIR)/jniwrap/docs/html/*.md5
-override_dh_link:
- dh_link
- dh_link usr/lib/$(DEB_HOST_MULTIARCH)/proj/alaska usr/share/proj/alaska \
- usr/lib/$(DEB_HOST_MULTIARCH)/proj/conus usr/share/proj/conus \
- usr/lib/$(DEB_HOST_MULTIARCH)/proj/FL usr/share/proj/FL \
- usr/lib/$(DEB_HOST_MULTIARCH)/proj/hawaii usr/share/proj/hawaii \
- usr/lib/$(DEB_HOST_MULTIARCH)/proj/MD usr/share/proj/MD \
- usr/lib/$(DEB_HOST_MULTIARCH)/proj/null usr/share/proj/null \
- usr/lib/$(DEB_HOST_MULTIARCH)/proj/prvi usr/share/proj/prvi \
- usr/lib/$(DEB_HOST_MULTIARCH)/proj/stgeorge usr/share/proj/stgeorge \
- usr/lib/$(DEB_HOST_MULTIARCH)/proj/stlrnc usr/share/proj/stlrnc \
- usr/lib/$(DEB_HOST_MULTIARCH)/proj/stpaul usr/share/proj/stpaul \
- usr/lib/$(DEB_HOST_MULTIARCH)/proj/TN usr/share/proj/TN \
- usr/lib/$(DEB_HOST_MULTIARCH)/proj/WI usr/share/proj/WI \
- usr/lib/$(DEB_HOST_MULTIARCH)/proj/WO usr/share/proj/WO
-
override_dh_install:
dh_install --list-missing
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-grass/proj.git
More information about the Pkg-grass-devel
mailing list