debian/README.Debian

@@ -260,7 +260,7 @@ set of configuration files installed to /etc/asterisk:
 
 If you do need any of those protocols, copy the sample file from
 /usr/share/asterisk/conf/samples/FILE.conf.sample to
-/etc/asterisk/FILE.conf and resart asterisk (or the specific module).
+/etc/asterisk/FILE.conf and restart asterisk (or the specific module).
 
 
 Missing Documentation

debian/asterisk.lintian-overrides

 asterisk: package-contains-empty-directory
 # astcanary is not supposed to be invoked manually
 asterisk: binary-without-manpage usr/sbin/astcanary
+# private copy of pjproject
+asterisk: package-name-doesnt-match-sonames libasteriskpj2
+asterisk: non-dev-pkg-with-shlib-symlink usr/lib/libasteriskpj.so.2 usr/lib/libasteriskpj.so

debian/changelog

+asterisk (1:16.1.0~dfsg-3) experimental; urgency=medium
+
+  * Adjust MySQL build-dep for current mariadb-10.3 breakage
+  * d/p/autoreconf-pjproject: also update config.guess and config.sub,
+    that should REALLY fix the FTBFS now
+  * Restore previous pjproject md5sum on dh_clean, allows package to be
+    built twice
+  * README.Debian: Fix a typo found by lintian
+  * Add lintian override for bundled libasteriskpj
+
+ -- Bernhard Schmidt <berni@debian.org>  Sat, 22 Dec 2018 23:51:06 +0100
+
 asterisk (1:16.1.0~dfsg-2) experimental; urgency=medium
 
   * Add patch to rerun autoconf in third_party/pjproject, hopefully fixes

debian/control

@@ -15,7 +15,10 @@ Build-Depends:
  binutils-dev,
  dahdi-source,
  debhelper (>= 10),
- default-libmysqlclient-dev,
+# MariaDB woes in unstable, see #917075
+# default-libmysqlclient-dev,
+ libmariadb-dev-compat,
+# end MariaDB woes
  freetds-dev,
  libasound2-dev,
  libavcodec-dev,

debian/patches/autoreconf-pjproject

+Description: Update autoconf files for pjproject
+ config.guess and config.sub for pjproject are six years old, this
+ makes the build FTBFS on newer architectures like ppc64el.
+ .
+ Unfortunately the sources are only unpacked during the toplevel
+ ./configure run, so we cannot solve this with dh_autoreconf
+Author: Bernhard Schmidt <berni@debian.org>
+Last-Update: 2018-12-21
 --- a/third-party/pjproject/Makefile
 +++ b/third-party/pjproject/Makefile
-@@ -100,6 +100,7 @@
+@@ -100,6 +100,11 @@
  	@mv pjproject-$(PJPROJECT_VERSION) source
  	$(ECHO_PREFIX) Applying patches "$(realpath patches)" "$(realpath .)/source"
  	$(CMD_PREFIX) ../apply_patches $(QUIET_CONFIGURE) "$(realpath patches)" "$(realpath .)/source"
++	# Debian patch: Update autoconf files to support newer architectures
 +	cd source && autoconf aconfigure.ac >aconfigure
++	cp /usr/share/misc/config.guess source/config.guess
++	cp /usr/share/misc/config.sub source/config.sub
++	# End Debian patch
  	-@touch source/.unpacked
  
  source/version.mak: source/.unpacked

debian/rules

@@ -78,6 +78,7 @@ override_dh_auto_configure:
 	# upstream build will find it, update checksums because we repacked
 	# it
 	cp -a debian/pjproject_2.8~dfsg.orig.tar.bz2 /tmp/pjproject-2.8.tar.bz2
+	cp third-party/pjproject/pjproject-2.8.tar.bz2.md5 third-party/pjproject/pjproject-2.8.tar.bz2.md5.debian_sav
 	md5sum /tmp/pjproject-2.8.tar.bz2 | sed 's:/tmp/::' > third-party/pjproject/pjproject-2.8.tar.bz2.md5
 	$(FETCH_ENV) ./configure			\
 		CFLAGS="-fgnu89-inline $(CFLAGS) $(CPPFLAGS)" LDFLAGS="$(LDFLAGS) -Wl,--as-needed" \
@@ -122,6 +123,9 @@ override_dh_clean:
 
 	[ ! -f .version.debian_sav ] || mv .version.debian_sav .version
 	if [ -f configure.debian_sav ]; then mv configure.debian_sav configure; fi
+	if [ -f third-party/pjproject/pjproject-2.8.tar.bz2.md5.debian_sav ]; then \
+	  mv third-party/pjproject/pjproject-2.8.tar.bz2.md5.debian_sav third-party/pjproject/pjproject-2.8.tar.bz2.md5; \
+	fi
 
 	dh_clean