diff -Nru tigervnc-1.7.0+dfsg/debian/changelog tigervnc-1.7.0+dfsg/debian/changelog --- tigervnc-1.7.0+dfsg/debian/changelog 2017-01-28 20:08:53.000000000 +0000 +++ tigervnc-1.7.0+dfsg/debian/changelog 2017-01-30 13:04:13.000000000 +0000 @@ -1,3 +1,10 @@ +tigervnc (1.7.0+dfsg-4) unstable; urgency=medium + + * Make sure libtool do not complain about missing symbol. + Closes: #851842. + + -- Ola Lundqvist Mon, 30 Jan 2017 13:04:13 +0000 + tigervnc (1.7.0+dfsg-3) unstable; urgency=high [ Salvatore Bonaccorso ] diff -Nru tigervnc-1.7.0+dfsg/debian/rules tigervnc-1.7.0+dfsg/debian/rules --- tigervnc-1.7.0+dfsg/debian/rules 2017-01-28 20:05:18.000000000 +0000 +++ tigervnc-1.7.0+dfsg/debian/rules 2017-01-30 13:04:13.000000000 +0000 @@ -16,6 +16,7 @@ # However in this case we do not have this file from upstream so we use a # debian specific copy instead. VNC_PATCH = $(CURDIR)/debian/xserver119.patch +VNC_LIBTOOL_PATCH = $(CURDIR)/contrib/packages/deb/ubuntu-xenial/debian/xorg-source-patches/debian_libtool.patch include /usr/share/cdbs/1/rules/debhelper.mk include /usr/share/cdbs/1/class/cmake.mk @@ -97,7 +98,7 @@ apply-patches-unify-xorg-and-vnc-tree: reverse-patches-dance: reverse-patches-remove-xorg-from-vnc-tree -reverse-patches-remove-xorg-from-vnc-tree: reverse-patches-vnc-unpatch-xorg +reverse-patches-remove-xorg-from-vnc-tree: reverse-patches-vnc-unpatch-xorg reverse-patches-vnc-unpatch-xorg-libtool reverse-patches-vnc-unpatch-xorg: reverse-patches-deautoreconf reverse-patches-deautoreconf: reverse-patches @@ -135,6 +136,22 @@ rm -f .apply-patches-vnc-patch-xorg.stamp; \ fi +.PHONY: apply-patches-vnc-patch-xorg-libtool reverse-patches-vnc-unpatch-xorg-libtool + +apply-patches-vnc-patch-xorg-libtool: $(DEB_SRCDIR)/unix/xserver/.apply-patches-vnc-patch-xorg-libtool.stamp + +$(DEB_SRCDIR)/unix/xserver/.apply-patches-vnc-patch-xorg-libtool.stamp: $(VNC_LIBTOOL_PATCH) + cd $(DEB_SRCDIR)/unix/xserver && { \ + patch --no-backup-if-mismatch -p1 < $(VNC_LIBTOOL_PATCH) && \ + touch .apply-patches-vnc-patch-xorg-libtool.stamp; \ + } + +reverse-patches-vnc-unpatch-xorg-libtool: $(VNC_LIBTOOL_PATCH) + cd $(DEB_SRCDIR)/unix/xserver && if test -f .apply-patches-vnc-patch-xorg-libtool.stamp; then \ + patch --no-backup-if-mismatch -R -p1 < $(VNC_LIBTOOL_PATCH); \ + rm -f .apply-patches-vnc-patch-xorg-libtool.stamp; \ + fi + .PHONY: apply-patches-unify-xorg-and-vnc-tree reverse-patches-remove-xorg-from-vnc-tree apply-patches-unify-xorg-and-vnc-tree: $(DEB_SRCDIR)/unix/xserver/.apply-patches-unify-xorg-and-vnc-tree.stamp @@ -190,7 +207,7 @@ # Next step is run configure script. It is very difficult use correct parameters. # You should use same parameters as used in your distribution X server and add # --disable-xvfb --disable-xnest --disable-xorg -$(DEB_BUILDDIR)/unix/xserver/configure.stamp: +$(DEB_BUILDDIR)/unix/xserver/configure.stamp: apply-patches-vnc-patch-xorg-libtool mkdir -p $(DEB_BUILDDIR)/unix/xserver cd $(DEB_BUILDDIR)/unix/xserver && \ $(DEB_CONFIGURE_SCRIPT_ENV) $(CURDIR)/$(DEB_SRCDIR)/unix/xserver/configure \