debian packaging update (revert GEOS C++ dependency)

qgis · Oct 12, 2015 · e193c7c · e193c7c
1 parent 43c046b
commit e193c7c
Show file tree

Hide file tree

Showing 3 changed files with 1 addition and 4 deletions.
diff --git a/debian/control b/debian/control
@@ -13,7 +13,6 @@ Build-Depends:
  libfcgi-dev,
  libgdal1-dev | libgdal-dev,
  libgeos-dev (>= 3.0.0),
- libgeos++-dev,
  libgsl0-dev,
  libpq-dev,
  libproj-dev,

diff --git a/debian/control.in b/debian/control.in
@@ -17,7 +17,6 @@ Build-Depends:
 #saucy# libgdal-dev (>= 1.9.0),
 #wheezy# libgdal1-dev,
  libgeos-dev (>= 3.0.0),
- libgeos++-dev,
  libgsl0-dev,
  libpq-dev,
  libproj-dev,

diff --git a/debian/rules b/debian/rules
@@ -98,8 +98,7 @@ ifneq (,$(findstring $(DISTRIBUTION),"sid stretch"))
 endif
 
 ifneq (,$(findstring $(DISTRIBUTION),"sid"))
-	CMAKE_OPTS += -DGEOS_LIBRARY=/usr/lib/$(DEB_BUILD_MULTIARCH)/libgeos_c.so \
-		      -DGEOS_CPP_LIBRARY=/usr/lib/$(DEB_BUILD_MULTIARCH)/libgeos.so
+	CMAKE_OPTS += -DGEOS_LIBRARY=/usr/lib/$(DEB_BUILD_MULTIARCH)/libgeos_c.so
 endif
 
 ifneq (,$(findstring $(DISTRIBUTION),"jessie stretch trusty utopic vivid wily sid"))