This is an automated email from the git hooks/post-receive script. sebastic pushed a commit to branch experimental in repository gdal-grass.
commit 4a9741eca537c5264b457e0f2253a703b0819dd4 Author: Bas Couwenberg <[email protected]> Date: Thu Dec 14 20:56:13 2017 +0100 Revert changes for GRASS 7.4 to build with GRASS 7.2. --- debian/changelog | 1 + debian/control | 4 ++-- debian/patches/rpath | 4 ++-- 3 files changed, 5 insertions(+), 4 deletions(-) diff --git a/debian/changelog b/debian/changelog index 7576f5c..705cf47 100644 --- a/debian/changelog +++ b/debian/changelog @@ -2,6 +2,7 @@ libgdal-grass (2.2.2-2~exp3) UNRELEASED; urgency=medium * Drop libproj-dev from build dependencies, not directly required and already pulled in via libgdal-dev. + * Revert changes for GRASS 7.4 to build with GRASS 7.2. -- Bas Couwenberg <[email protected]> Fri, 17 Nov 2017 20:26:09 +0100 diff --git a/debian/control b/debian/control index 398c3ad..c463352 100644 --- a/debian/control +++ b/debian/control @@ -7,8 +7,8 @@ Priority: optional Build-Depends: debhelper (>= 9), dh-autoreconf, d-shlibs, - grass (>= 7.4.0~), - grass-dev (>= 7.4.0~), + grass (>= 7.2.2), + grass-dev (>= 7.2.2), libgdal-dev (>= 2.2.2), libpq-dev, pkg-config diff --git a/debian/patches/rpath b/debian/patches/rpath index 7ed29b1..2b7b059 100644 --- a/debian/patches/rpath +++ b/debian/patches/rpath @@ -9,11 +9,11 @@ Forwarded: not-needed $(GLIBNAME): grass57dataset.o - $(LD_SHARED) $(LDFLAGS) grass57dataset.o $(LIBS) -o $(GLIBNAME) -+ $(LD_SHARED) $(LDFLAGS) grass57dataset.o $(LIBS) -o $(GLIBNAME) -Wl,-rpath,/usr/lib/grass74/lib ++ $(LD_SHARED) $(LDFLAGS) grass57dataset.o $(LIBS) -o $(GLIBNAME) -Wl,-rpath,/usr/lib/grass72/lib $(OLIBNAME): ogrgrassdriver.o ogrgrassdatasource.o ogrgrasslayer.o - $(LD_SHARED) $(LDFLAGS) ogrgrassdriver.o ogrgrassdatasource.o ogrgrasslayer.o $(LIBS) -o $(OLIBNAME) -+ $(LD_SHARED) $(LDFLAGS) ogrgrassdriver.o ogrgrassdatasource.o ogrgrasslayer.o $(LIBS) -o $(OLIBNAME) -Wl,-rpath,/usr/lib/grass74/lib ++ $(LD_SHARED) $(LDFLAGS) ogrgrassdriver.o ogrgrassdatasource.o ogrgrasslayer.o $(LIBS) -o $(OLIBNAME) -Wl,-rpath,/usr/lib/grass72/lib %.o: %.cpp $(CXX) $(CXXFLAGS) $(CPPFLAGS) $(CFLAGS) -c -o $@ $< -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-grass/gdal-grass.git _______________________________________________ Pkg-grass-devel mailing list [email protected] http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-grass-devel
