debian packaging: re-enable server

jef-n · jef-n · commit 4b868389099c · 2016-10-01T13:58:25.000+02:00
diff --git a/debian/control.in b/debian/control.in
@@ -185,17 +185,17 @@ Description: QGIS custom widgets for Qt Designer
  .
  This package contains a library to use specific QGIS widgets in Qt Designer.
 
-#server#Package: libqgis-server{QGIS_ABI}
-#server#Architecture: any
-#server#Depends:
-#server# ${shlibs:Depends},
-#server# ${misc:Depends}
-#server#Description: QGIS - shared server library
-#server# QGIS is a Geographic Information System (GIS) which manages, analyzes and
-#server# display databases of geographic information.
-#server# .
-#server# This package contains the shared server library.
-#server#
+Package: libqgis-server{QGIS_ABI}
+Architecture: any
+Depends:
+ ${shlibs:Depends},
+ ${misc:Depends}
+Description: QGIS - shared server library
+ QGIS is a Geographic Information System (GIS) which manages, analyzes and
+ display databases of geographic information.
+ .
+ This package contains the shared server library.
+
 Package: libqgis-dev
 Architecture: any
 Section: libdevel
@@ -405,21 +405,21 @@ Description: collection of data providers to QGIS - architecture-independent fil
  .
  This package contains architecture-independent files for the QGIS providers.
 
-#server#Package: qgis-server
-#server#Architecture: any
-#server#Depends:
-#server# qgis-providers (= ${binary:Version}),
-#server# ${shlibs:Depends},
-#server# ${misc:Depends}
-#server#Conflicts: qgis-mapserver
-#server#Provides: qgis-mapserver
-#server#Replaces: qgis-mapserver
-#server#Description: QGIS server providing various OGC services
-#server# QGIS is a Geographic Information System (GIS) which manages, analyzes and
-#server# display databases of geographic information.
-#server# .
-#server# This package contains the QGIS server.
-#server#
+Package: qgis-server
+Architecture: any
+Depends:
+ qgis-providers (= ${binary:Version}),
+ ${shlibs:Depends},
+ ${misc:Depends}
+Conflicts: qgis-mapserver
+Provides: qgis-mapserver
+Replaces: qgis-mapserver
+Description: QGIS server providing various OGC services
+ QGIS is a Geographic Information System (GIS) which manages, analyzes and
+ display databases of geographic information.
+ .
+ This package contains the QGIS server.
+
 Package: qgis-api-doc
 Architecture: all
 Section: doc
diff --git a/debian/python-qgis.install.in b/debian/python-qgis.install.in
@@ -7,4 +7,4 @@ usr/lib/python*/*-packages/qgis/networkanalysis/*
 usr/lib/python*/*-packages/qgis/PyQt/*
 usr/lib/python*/*-packages/qgis/testing/*
 usr/lib/python*/*-packages/pyspatialite/*
-#server#usr/lib/python*/*-packages/qgis/server/*
+usr/lib/python*/*-packages/qgis/server/*
diff --git a/debian/rules b/debian/rules
@@ -34,11 +34,6 @@ ifneq (,$(findstring -oracle,$(DISTRIBUTION)))
 	WITH_ORACLE=1
 endif
 
-ifneq (,$(findstring -server,$(DISTRIBUTION)))
-	DISTRIBUTION := $(subst -oracle,,$(DISTRIBUTION))
-	WITH_SERVER=1
-endif
-
 QT_PLUGINS_DIR = usr/lib/$(DEB_BUILD_MULTIARCH)/qt5/plugins
 
 ifneq ($(DISTRIBUTION),$(findstring $(DISTRIBUTION),"stretch xenial"))
@@ -83,8 +78,8 @@ CMAKE_OPTS := \
 	-DWITH_INTERNAL_NOSE2=FALSE \
         -DWITH_INTERNAL_SIX=FALSE \
 	-DWITH_GLOBE=FALSE \
-	-DWITH_SERVER=FALSE \
-	-DWITH_SERVER_PLUGINS=FALSE \
+	-DWITH_SERVER=TRUE \
+	-DWITH_SERVER_PLUGINS=TRUE \
 	-DWITH_QWTPOLAR=FALSE \
 	-DWITH_QSPATIALITE=TRUE \
 	-DWITH_PYSPATIALITE=TRUE \
@@ -113,12 +108,6 @@ ifneq (,$(filter parallel=%,$(DEB_BUILD_OPTIONS)))
 endif
 
 
-ifeq (,$(findstring $(DISTRIBUTION),"stretch sid xenial"))
-	CMAKE_OPTS += -DWITH_INTERNAL_FUTURE=TRUE
-else
-	CMAKE_OPTS += -DWITH_INTERNAL_FUTURE=FALSE
-endif
-
 ifneq (,$(WITH_GLOBE))
 	CMAKE_OPTS += -DWITH_GLOBE=TRUE
 endif
@@ -207,10 +196,6 @@ ifneq (,$(WITH_ORACLE))
 	CONTROL_EXPRESSIONS += oracle
 endif
 
-ifneq (,$(WITH_SERVER))
-	CONTROL_EXPRESSIONS += server
-endif
-
 define gentemplate
 $(2): $(1)
 	sed -r \
