Merge pull request #408 in ZP/z-push from...

Merge pull request #408 in ZP/z-push from bugfix/ZP-1059-add-mbstring-dependency-to-packages to develop

* commit 'df1d7e19':
  ZP-1059 Detect Ubuntu 16.04 and add php-mbstring as dependency.

build/deb/debian.control

@@ -8,7 +8,7 @@ Homepage: http://z-push.org
 
 Package: z-push-common
 Architecture: all
-Depends: ${misc:Depends}, php5 (>= 5.4) | php (>= 5.4) , php5-cli | php-cli, php-soap
+Depends: ${misc:Depends}, php5 (>= 5.4) | php (>= 5.4) , php5-cli | php-cli, php-soap, ${dist:Depends}
 Conflicts: d-push, z-push
 Replaces: d-push, z-push
 Description: open source implementation of the ActiveSync protocol

build/deb/debian.rules

@@ -4,6 +4,12 @@ export DH_VERBOSE=1
 
 #include /usr/share/quilt/quilt.make
 
+# Since only Ubuntu 16.04 requires php-mbstring we detect that here
+ifeq ($(shell dpkg-vendor --derives-from Ubuntu && echo yes),yes)
+		ifeq ($(shell grep -q Xenial /etc/os-release && echo yes),yes)
+				SUBSTVARS = -Vdist:Depends="php-mbstring"
+		endif
+endif
 
 
 DEB_VERSION := $(shell dpkg-parsechangelog | egrep '^Version:' | cut -f 2 -d ' ')
@@ -11,6 +17,9 @@ DEB_VERSION := $(shell dpkg-parsechangelog | egrep '^Version:' | cut -f 2 -d ' '
 %:
 	dh  $@
 
+override_dh_gencontrol:
+	dh_gencontrol -- $(SUBSTVARS)
+
 override_dh_install:
 	mv src/* .
 	sed -s "s/ZPUSHVERSION/${DEB_VERSION}/" build/version.php.in > version.php