[Pkg-lyx-devel] [lyx] 06/06: Enable Qt5 support

[Nick Andrik]

This is an automated email from the git hooks/post-receive script.

andrikos-guest pushed a commit to branch master
in repository lyx.

commit 5f7ede10afbedd8bec25712337ec86b78eb5674d
Author: Nick Andrik <nick.andrik at gmail.com>
Date:   Sat Jul 2 17:16:40 2016 +0200

    Enable Qt5 support
---
 debian/changelog | 1 +
 debian/control   | 7 ++++---
 debian/rules     | 4 +++-
 3 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 375bba1..efaa75f 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,6 +2,7 @@ lyx (2.2.2-1) UNRELEASED; urgency=medium
 
   [ Nick Andrik ]
   * New upstream release
+  * Enable Qt5 support
 
   [ Sven Hoexter ]
   * Remove "etoolbox" from the list of suggested packages and update the package
diff --git a/debian/control b/debian/control
index 4c3734c..59449cc 100644
--- a/debian/control
+++ b/debian/control
@@ -9,8 +9,9 @@ Vcs-Browser: https://anonscm.debian.org/gitweb/?p=pkg-lyx/lyx.git
 Homepage: http://www.lyx.org/
 Build-Depends: python, debhelper (>= 9), dh-python, bc,
  libz-dev, libx11-dev, libenchant-dev, libmythes-dev,
- autotools-dev, libqt4-dev, libboost-dev, libmagic-dev,
- libboost-filesystem-dev, libboost-signals-dev,
+ autotools-dev, libmagic-dev,
+ qtbase5-dev (>= 5.6.0), libqt5svg5-dev,
+ libboost-dev, libboost-filesystem-dev, libboost-signals-dev,
  libboost-iostreams-dev, libboost-regex-dev, libboost-test-dev,
  pkg-config, tex-common
 
@@ -18,7 +19,7 @@ Package: lyx
 Architecture: any
 Replaces: lyx-common (<< 2.1.2-3)
 Breaks: lyx-common (<< 2.1.2-3)
-Depends: ${shlibs:Depends}, ${misc:Depends}, lyx-common (= ${source:Version}), xdg-utils, libqt4-svg
+Depends: ${shlibs:Depends}, ${misc:Depends}, lyx-common (= ${source:Version}), xdg-utils
 Recommends: texlive-latex-recommended, texlive-latex-extra, texlive-science, texlive-generic-recommended, texlive-generic-extra, texlive-fonts-recommended, preview-latex-style, dvipng, imagemagick, psutils, ghostscript, poppler-utils, fonts-lyx, evince-gtk | pdf-viewer, elyxer | tex4ht | hevea | tth | latex2html
 Suggests: rcs, latex-xcolor, groff, libtiff-tools, gnuhtml2latex, wv, chktex, noweb, sgmltools-lite, linuxdoc-tools, writer2latex, latex2rtf, librsvg2-bin | inkscape, texlive-xetex, lyx-dbg (= ${binary:Version})
 Description: document processor
diff --git a/debian/rules b/debian/rules
index bb2cb9c..dc8f6d6 100755
--- a/debian/rules
+++ b/debian/rules
@@ -2,6 +2,8 @@
 
 export DEB_BUILD_MAINT_OPTIONS = hardening=+all
 export DEB_LDFLAGS_MAINT_PREPEND := -Wl,-z,defs -Wl,--as-needed
+export DEB_CXXFLAGS_MAINT_APPEND := -fPIC
+export QT_SELECT=qt5
 
 %:
 	dh $@ --with autotools_dev,python2,tex --builddirectory
@@ -12,12 +14,12 @@ override_dh_auto_configure:
 		--disable-rpath \
 		--enable-warnings \
 		--enable-nls \
+		--enable-qt5 \
 		--with-gnu-ld \
 		--without-aspell \
 		--without-hunspell \
 		--with-enchant \
 		--with-x \
-		--without-included-gettext \
 		--without-included-boost \
 		--without-included-mythes \
 

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-lyx/lyx.git