Hi David,
I have NMUd comparepdf to switch it from Qt4 to Qt5, plus some other small
fix-ups on the package as per the previous set of patches. The debdiff is
attached and I have pushed these changes to git.
regards
Stuart
--
Stuart Prescott http://www.nanonanonano.net/ stu...@nanonanonano.net
Debian Developer http://www.debian.org/ stu...@debian.org
GPG fingerprint 90E2 D2C1 AD14 6A1B 7EBB 891D BBC1 7EBB 1396 F2F7
diff -Nru comparepdf-1.0.1/debian/changelog comparepdf-1.0.1/debian/changelog
--- comparepdf-1.0.1/debian/changelog 2012-02-25 00:16:35.000000000 +1100
+++ comparepdf-1.0.1/debian/changelog 2018-01-18 22:47:16.000000000 +1100
@@ -1,3 +1,15 @@
+comparepdf (1.0.1-1.1) unstable; urgency=medium
+
+ * Non-maintainer upload.
+ * Update package to Qt5 (Closes: #874846).
+ * Bump to debhelper compat 11.
+ * Update Standards-Version to 4.1.1 (no changes required).
+ * Fix copyright format declaration.
+ * Update Vcs headers to standard https values.
+ * Pass build flags through to compiler to harden build.
+
+ -- Stuart Prescott <stu...@debian.org> Thu, 18 Jan 2018 22:47:16 +1100
+
comparepdf (1.0.1-1) unstable; urgency=low
* Initial release (Closes: #640776)
diff -Nru comparepdf-1.0.1/debian/compat comparepdf-1.0.1/debian/compat
--- comparepdf-1.0.1/debian/compat 2012-02-25 00:16:35.000000000 +1100
+++ comparepdf-1.0.1/debian/compat 2018-01-18 22:47:16.000000000 +1100
@@ -1 +1 @@
-8
+11
diff -Nru comparepdf-1.0.1/debian/control comparepdf-1.0.1/debian/control
--- comparepdf-1.0.1/debian/control 2012-02-25 00:16:35.000000000 +1100
+++ comparepdf-1.0.1/debian/control 2018-01-18 22:47:16.000000000 +1100
@@ -3,14 +3,14 @@
Priority: optional
Maintainer: David Paleino <da...@debian.org>
Build-Depends:
- debhelper (>= 8~)
- , qt4-qmake
+ debhelper (>= 11~)
+ , qt5-qmake
, libpoppler-cpp-dev
- , libpoppler-qt4-dev
-Standards-Version: 3.9.3
+ , libpoppler-qt5-dev
+Standards-Version: 4.1.1
Homepage: http://www.qtrac.eu/comparepdf.html
-Vcs-Git: git://git.debian.org/collab-maint/comparepdf.git
-Vcs-Browser: http://git.debian.org/?p=collab-maint/comparepdf.git
+Vcs-Git: https://anonscm.debian.org/git/collab-maint/comparepdf.git
+Vcs-Browser: https://anonscm.debian.org/git/collab-maint/comparepdf.git
Package: comparepdf
Architecture: any
diff -Nru comparepdf-1.0.1/debian/copyright comparepdf-1.0.1/debian/copyright
--- comparepdf-1.0.1/debian/copyright 2012-02-25 00:16:35.000000000 +1100
+++ comparepdf-1.0.1/debian/copyright 2018-01-18 22:47:16.000000000 +1100
@@ -1,4 +1,5 @@
-Format: http://dep.debian.net/deps/dep5
+Format: https://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
+Upstream-name: comparepdf
Files: *
Copyright: © 2011-2012, Qtrac Ltd.
diff -Nru comparepdf-1.0.1/debian/patches/buildflags.patch comparepdf-1.0.1/debian/patches/buildflags.patch
--- comparepdf-1.0.1/debian/patches/buildflags.patch 1970-01-01 10:00:00.000000000 +1000
+++ comparepdf-1.0.1/debian/patches/buildflags.patch 2018-01-18 22:47:16.000000000 +1100
@@ -0,0 +1,11 @@
+Description: make qmake pass compiler flags
+Author: Stuart Prescott <stu...@debian.org>
+--- a/comparepdf.pro
++++ b/comparepdf.pro
+@@ -16,3 +16,6 @@
+ INCLUDEPATH += /usr/local/include/poppler/qt5
+ }
+ }
++QMAKE_CFLAGS += $$(CPPFLAGS) $$(CFLAGS)
++QMAKE_CXXFLAGS += $$(CPPFLAGS) $$(CXXFLAGS)
++QMAKE_LFLAGS += $$(LDFLAGS)
diff -Nru comparepdf-1.0.1/debian/patches/comparepdf-qt5.patch comparepdf-1.0.1/debian/patches/comparepdf-qt5.patch
--- comparepdf-1.0.1/debian/patches/comparepdf-qt5.patch 1970-01-01 10:00:00.000000000 +1000
+++ comparepdf-1.0.1/debian/patches/comparepdf-qt5.patch 2018-01-18 22:47:16.000000000 +1100
@@ -0,0 +1,64 @@
+Description: Port code from Qt4 to Qt5
+Author: Stuart Prescott <stu...@debian.org>
+diff --git a/comparepdf.pro b/comparepdf.pro
+index cc7e465..bb79d2c 100644
+--- a/comparepdf.pro
++++ b/comparepdf.pro
+@@ -1,18 +1,18 @@
+ SOURCES += main.cpp
+ HEADERS += option_parser.hpp
+ SOURCES += option_parser.cpp
+-LIBS += -lpoppler-qt4
++LIBS += -lpoppler-qt5
+ exists($(HOME)/opt/poppler018/) {
+ message(Using locally built Poppler library)
+ INCLUDEPATH += $(HOME)/opt/poppler018/include/poppler/cpp
+- INCLUDEPATH += $(HOME)/opt/poppler018/include/poppler/qt4
++ INCLUDEPATH += $(HOME)/opt/poppler018/include/poppler/qt5
+ LIBS += -Wl,-rpath -Wl,$(HOME)/opt/poppler018/lib -Wl,-L$(HOME)/opt/poppler018/lib
+ } else {
+- exists(/usr/include/poppler/qt4) {
++ exists(/usr/include/poppler/qt5) {
+ INCLUDEPATH += /usr/include/poppler/cpp
+- INCLUDEPATH += /usr/include/poppler/qt4
++ INCLUDEPATH += /usr/include/poppler/qt5
+ } else {
+ INCLUDEPATH += /usr/local/include/poppler/cpp
+- INCLUDEPATH += /usr/local/include/poppler/qt4
++ INCLUDEPATH += /usr/local/include/poppler/qt5
+ }
+ }
+diff --git a/main.cpp b/main.cpp
+index a55a03f..17d60b5 100644
+--- a/main.cpp
++++ b/main.cpp
+@@ -16,9 +16,8 @@
+ #else
+ #include <tr1/memory>
+ #endif
+-#include <poppler-version.h>
+-#include <poppler-qt4.h>
+-#include <QApplication>
++#include <poppler-qt5.h>
++#include <QCoreApplication>
+ #include <QImage>
+ #include <QTextStream>
+ #include "option_parser.hpp"
+@@ -49,7 +48,7 @@ const QString Version("1.0.1");
+
+ int main(int argc, char *argv[])
+ {
+- QApplication app(argc, argv);
++ QCoreApplication app(argc, argv);
+ AQP::OptionParser parser(app.arguments(),
+ QObject::tr("usage: {program} [options] <pdf1> <pdf2>\n"
+ "\nA program to compare two PDF files.\n"),
+@@ -83,7 +82,7 @@ int main(int argc, char *argv[])
+ QTextStream out(stdout);
+ if (versionOpt->boolean()) {
+ out << QObject::tr("comparepdf ") << Version << "\n"
+- << QObject::tr("poppler ") << POPPLER_VERSION << "\n";
++ << QObject::tr("poppler") << "\n";
+ return 0;
+ }
+ QStringList files = parser.remainder();
diff -Nru comparepdf-1.0.1/debian/patches/series comparepdf-1.0.1/debian/patches/series
--- comparepdf-1.0.1/debian/patches/series 2012-02-25 00:16:35.000000000 +1100
+++ comparepdf-1.0.1/debian/patches/series 2018-01-18 22:47:16.000000000 +1100
@@ -1 +1,3 @@
00-fix_manpage.patch
+comparepdf-qt5.patch
+buildflags.patch
diff -Nru comparepdf-1.0.1/debian/rules comparepdf-1.0.1/debian/rules
--- comparepdf-1.0.1/debian/rules 2012-02-25 00:16:35.000000000 +1100
+++ comparepdf-1.0.1/debian/rules 2018-01-18 22:47:16.000000000 +1100
@@ -4,5 +4,8 @@
# Uncomment this to turn on verbose mode.
#export DH_VERBOSE=1
+export DEB_BUILD_MAINT_OPTIONS = hardening=+all
+export QT_SELECT=5
+
%:
dh $@
