This is an automated email from the git hooks/post-receive script. sebastic pushed a commit to branch experimental in repository proj.
commit 85e44c548b0983b32b68b35951e18205849e4dd4 Author: Bas Couwenberg <sebas...@xs4all.nl> Date: Fri Feb 20 23:04:12 2015 +0100 Refresh patches. --- debian/changelog | 1 + debian/patches/nad2bin-data.patch | 26 +++++++++++++------------- 2 files changed, 14 insertions(+), 13 deletions(-) diff --git a/debian/changelog b/debian/changelog index 0a845e7..80e505c 100644 --- a/debian/changelog +++ b/debian/changelog @@ -5,6 +5,7 @@ proj (4.9.1~rc1-1) UNRELEASED; urgency=medium * Add upstream metadata. * Update Vcs-Browser URL to use cgit instead of gitweb. * Update my email to use @debian.org address. + * Refresh patches. -- Bas Couwenberg <sebas...@debian.org> Fri, 20 Feb 2015 23:00:27 +0100 diff --git a/debian/patches/nad2bin-data.patch b/debian/patches/nad2bin-data.patch index 78dfe23..390a125 100644 --- a/debian/patches/nad2bin-data.patch +++ b/debian/patches/nad2bin-data.patch @@ -11,31 +11,31 @@ Bug-Debian: https://bugs.debian.org/747862 Forwarded: http://trac.osgeo.org/proj/ticket/249 --- a/nad/Makefile.am +++ b/nad/Makefile.am -@@ -33,7 +33,8 @@ process-nad2bin: +@@ -34,7 +34,8 @@ process-nad2bin: install-data-local: process-nad2bin $(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 \ +- @for x in $(NADPATH)/*.lla ; do \ ++ @if [ -f $(NADPATH)/null.lla -a ! -f $(NADPATH)/null ] || [ -f $(NADPATH)/conus.lla -a ! -f $(NADPATH)/conus ] ; then \ ++ for x in $(NADPATH)/*.lla ; do \ DEST=$(DESTDIR)$(pkgdatadir)/`basename $$x .lla`; \ echo "../src/nad2bin$(EXEEXT) $$DEST < $$x"; \ ../src/nad2bin$(EXEEXT) $$DEST < $$x ; \ -@@ -41,11 +42,14 @@ install-data-local: process-nad2bin +@@ -42,11 +43,14 @@ install-data-local: process-nad2bin echo "nad2bin$(EXEEXT) failed to install $$DEST"; \ exit 1; \ fi; \ - done -- @if [ ! -f conus.lla ] ; then \ +- @if [ ! -f $(NADPATH)/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 \ +- @for gridfile in $(NADPATH)/*.gsb $(NADPATH)/ntv1_can.dat dummy ; do \ ++ @for gridfile in $(NADPATH)/*.gsb $(NADPATH)/ntv1_can.dat dummy \ ++ $(NADPATH)/alaska $(NADPATH)/conus $(NADPATH)/hawaii $(NADPATH)/null \ ++ $(NADPATH)/prvi $(NADPATH)/stgeorge $(NADPATH)/stlrnc $(NADPATH)/stpaul \ ++ $(NADPATH)/FL $(NADPATH)/MD $(NADPATH)/TN $(NADPATH)/WI $(NADPATH)/WO; do \ if test "$$gridfile" != "dummy" -a -f "$$gridfile" ; then \ - echo $(INSTALL_DATA) $$gridfile $(DESTDIR)$(pkgdatadir)/$$gridfile; \ - $(INSTALL_DATA) $$gridfile $(DESTDIR)$(pkgdatadir)/$$gridfile; \ + echo $(INSTALL_DATA) $$gridfile $(DESTDIR)$(pkgdatadir)/`basename $$gridfile`; \ + $(INSTALL_DATA) $$gridfile $(DESTDIR)$(pkgdatadir)/`basename $$gridfile`; \ -- 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