Lisandro Damián Nicanor Pérez Meyer writes: > Control: tag -1 patch > > On Friday 22 January 2016 17:20:28 Jean-Francois Dockes wrote: > [snip] > > Hi, > > > > As far as I know, Recoll builds fine with qt5-webkit > 5.2. Just get rid of > > the QMAKE=qmake-qt4 line in the rules. > > Indeed, this is true. Thanks Jean-Francois! > > I'm attaching a patch to get this done. > > I have seen that the latest upload was a NMU agreed with you, please take a > look at the patch and tell me if you want me to upload it. > > Thanks in advance!
Hi, Last week's upload was validated by Kartik Mistry, who is the Debian package maintainer. I'm the upstream and I see nothing wrong with the patch, but Kartik should probably be in the loop if he is around. Cheers, jf > -- > No pienses que estoy loco, es sólo una manera de actuar > De mí - Charly García > > Lisandro Damián Nicanor Pérez Meyer > http://perezmeyer.com.ar/ > http://perezmeyer.blogspot.com/ > > ---------------------------------------------------------------------- > diff --git a/debian/changelog b/debian/changelog > index 1958191..4537a22 100644 > --- a/debian/changelog > +++ b/debian/changelog > @@ -1,3 +1,10 @@ > +recoll (1.21.0-1.2) UNRELEASED; urgency=medium > + > + * Non-maintainer upload. > + * Switch to Qt 5 (Closes: #784523). > + > + -- Lisandro Damián Nicanor Pérez Meyer <lisan...@debian.org> Fri, 22 Jan > 2016 13:29:02 -0300 > + > recoll (1.21.0-1.1) unstable; urgency=medium > > * Non-maintainer upload (agreed by maintainer). (Closes: #809478) > diff --git a/debian/control b/debian/control > index 368f55a..973c6c8 100644 > --- a/debian/control > +++ b/debian/control > @@ -7,8 +7,8 @@ Build-Depends: autotools-dev, > debhelper (>= 7), > dh-python, > dpkg-dev (>= 1.16.1~), > - libqt4-dev, > - libqtwebkit-dev, > + qtbase5-dev, > + libqt5webkit5-dev, > libx11-dev, > libxapian-dev (>= 1.2.0), > libz-dev, > diff --git a/debian/rules b/debian/rules > index 82590ae..2389a87 100755 > --- a/debian/rules > +++ b/debian/rules > @@ -17,8 +17,8 @@ LDFLAGS:=$(shell dpkg-buildflags --get LDFLAGS) > > build3vers := $(shell py3versions -sv) > > -#build qt4 UI only > -export QMAKE=qmake-qt4 > +#build qt5 UI > +export QT_SELECT := qt5 > > ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS))) > CFLAGS += -O0 > xapplication/pgp-signature [Click mouse-2 to save to a file]
