This is an automated email from the git hooks/post-receive script. sebastic-guest pushed a commit to branch experimental in repository proj.
commit a21f27cc38b5880b7fa19e5c0206d18abd03100a Author: Bas Couwenberg <[email protected]> Date: Fri Oct 3 19:36:01 2014 +0200 Update install files for Multi-Arch paths. --- debian/changelog | 1 + debian/libproj-dev.install | 6 +++--- debian/libproj0.install | 2 +- debian/proj-data.install | 26 +++++++++++++------------- debian/proj-data.links | 13 ------------- debian/rules | 18 ++++++++++++++++++ 6 files changed, 36 insertions(+), 30 deletions(-) diff --git a/debian/changelog b/debian/changelog index 1d7ec26..70b2ce3 100644 --- a/debian/changelog +++ b/debian/changelog @@ -4,6 +4,7 @@ proj (4.9.0~rc2-1) UNRELEASED; urgency=medium * Refresh patches. * Update copyright file. * Use minimal dh rules. + * Update install files for Multi-Arch paths. -- Bas Couwenberg <[email protected]> Fri, 03 Oct 2014 17:29:03 +0200 diff --git a/debian/libproj-dev.install b/debian/libproj-dev.install index 5e55278..9defbd9 100644 --- a/debian/libproj-dev.install +++ b/debian/libproj-dev.install @@ -1,6 +1,6 @@ -usr/lib/libproj.a -usr/lib/libproj.la -usr/lib/libproj.so +usr/lib/*/libproj.a +usr/lib/*/libproj.la +usr/lib/*/libproj.so usr/include/org_proj4_Projections.h usr/include/org_proj4_PJ.h usr/include/org_proj4_PJ_Type.h diff --git a/debian/libproj0.install b/debian/libproj0.install index e1f92cf..a5cec06 100644 --- a/debian/libproj0.install +++ b/debian/libproj0.install @@ -1 +1 @@ -usr/lib/libproj.so.0* +usr/lib/*/libproj.so.0* diff --git a/debian/proj-data.install b/debian/proj-data.install index ca8f05d..c3afae3 100644 --- a/debian/proj-data.install +++ b/debian/proj-data.install @@ -12,16 +12,16 @@ usr/share/proj/esri.extra usr/share/proj/nad.lst usr/share/proj/ntv1_can.dat usr/share/proj/ntf_r93.gsb -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 +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/proj-data.links b/debian/proj-data.links deleted file mode 100644 index 49d8e10..0000000 --- a/debian/proj-data.links +++ /dev/null @@ -1,13 +0,0 @@ -usr/lib/proj/alaska usr/share/proj/alaska -usr/lib/proj/conus usr/share/proj/conus -usr/lib/proj/FL usr/share/proj/FL -usr/lib/proj/hawaii usr/share/proj/hawaii -usr/lib/proj/MD usr/share/proj/MD -usr/lib/proj/null usr/share/proj/null -usr/lib/proj/prvi usr/share/proj/prvi -usr/lib/proj/stgeorge usr/share/proj/stgeorge -usr/lib/proj/stlrnc usr/share/proj/stlrnc -usr/lib/proj/stpaul usr/share/proj/stpaul -usr/lib/proj/TN usr/share/proj/TN -usr/lib/proj/WI usr/share/proj/WI -usr/lib/proj/WO usr/share/proj/WO diff --git a/debian/rules b/debian/rules index 5528833..0e14132 100755 --- a/debian/rules +++ b/debian/rules @@ -9,6 +9,8 @@ # This has to be exported to make some magic below work. export DH_OPTIONS +DEB_HOST_MULTIARCH?=$(shell dpkg-architecture -qDEB_HOST_MULTIARCH) + PROJ_VERSION=$(shell dpkg-parsechangelog | sed -ne 's/^Version: \(.*\)-.*/\1/p') JAVA_HOME = /usr/lib/jvm/default-java @@ -97,6 +99,22 @@ override_dh_auto_install: # Empty dependency_libs in .la files sed -i "/dependency_libs/ s/'.*'/''/" `find . -name '*.la'` +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 _______________________________________________ Pkg-grass-devel mailing list [email protected] http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-grass-devel
