[med-svn] [Git][med-team/ugene][master] 2 commits: Fix build issue by adding missing headers

[Andreas Tille]

Andreas Tille pushed to branch master at Debian Med / ugene


Commits:
6ac9bd7a by Andreas Tille at 2019-01-31T12:52:25Z
Fix build issue by adding missing headers

- - - - -
09eda307 by Andreas Tille at 2019-01-31T12:54:12Z
Skip dh_dwz

- - - - -


5 changed files:

- debian/changelog
- debian/control
- + debian/patches/add_missing_header.patch
- debian/patches/series
- debian/rules


Changes:

=====================================
debian/changelog
=====================================
@@ -7,8 +7,8 @@ ugene (1.31.1+dfsg-1) UNRELEASED; urgency=medium
 
   [ Andreas Tille ]
   * New upstream version
+    Closes: #868885, #887305
   * Standards-Version: 4.3.0
-  * Upstream switched to cmake
   * Cleanup d/watch
   * More Files-Excluded
   * debhelper 12
@@ -17,6 +17,7 @@ ugene (1.31.1+dfsg-1) UNRELEASED; urgency=medium
  -- Andreas Tille <tille at debian.org>  Sun, 03 Dec 2017 19:10:03 +0100
 
 ugene (1.25.0+dfsg-1) unstable; urgency=medium
+
   * New upstream version
     Closes: #846557
   * debhelper 10


=====================================
debian/control
=====================================
@@ -19,8 +19,7 @@ Build-Depends: qtbase5-dev,
                debhelper (>= 12~),
                libxtst-dev,
                libsqlite3-dev,
-               libprocps-dev,
-               cmake
+               libprocps-dev
 Build-Conflicts: libqt4-dev,
                  qt4-qmake
 Standards-Version: 4.3.0


=====================================
debian/patches/add_missing_header.patch
=====================================
@@ -0,0 +1,24 @@
+Author:  Andreas Tille <tille at debian.org>
+Last-Update: Sun, 03 Dec 2017 19:10:03 +0100
+Description: Fix build issue by adding missing headers
+
+--- a/src/plugins/external_tool_support/src/trimmomatic/steps/SlidingWindowStep.cpp
++++ b/src/plugins/external_tool_support/src/trimmomatic/steps/SlidingWindowStep.cpp
+@@ -20,6 +20,7 @@
+  */
+ 
+ #include <U2Core/U2SafePoints.h>
++#include <QIntValidator>
+ 
+ #include "trimmomatic/util/LineEditHighlighter.h"
+ #include "SlidingWindowStep.h"
+--- a/src/plugins/external_tool_support/src/trimmomatic/util/LengthSettingsWidget.cpp
++++ b/src/plugins/external_tool_support/src/trimmomatic/util/LengthSettingsWidget.cpp
+@@ -20,6 +20,7 @@
+  */
+ 
+ #include <U2Core/U2SafePoints.h>
++#include <QIntValidator>
+ 
+ #include "LengthSettingsWidget.h"
+ #include "LineEditHighlighter.h"


=====================================
debian/patches/series
=====================================
@@ -1,3 +1,4 @@
 use_debian_sqlite.patch
 hardening.patch
 debian_packaged_libs.patch
+add_missing_header.patch


=====================================
debian/rules
=====================================
@@ -19,7 +19,7 @@ export DEB_BUILD_MAINT_OPTIONS = hardening=+all
 #	dh_strip --dbg-package=ugene-dbg
 
 %:
-	dh $@
+	dh $@ --buildsystem=qmake
 
 override_dh_auto_configure:
 	# exclude non-free plugins
@@ -49,3 +49,9 @@ override_dh_fixperms-indep:
 
 override_dh_shlibdeps:
 	dh_shlibdeps -l$(CURDIR)/debian/$(pkg)/usr/lib/$(pkg)/
+
+override_dh_dwz:
+	echo "Do not run dh_dwz since it just results in:"
+	echo "    dwz: debian/ugene/usr/lib/ugene/libU2View.so.1.0.0: Couldn't find DIE referenced by DW_OP_GNU_parameter_ref"
+	echo "    dwz: debian/ugene/usr/lib/ugene/plugins/libexternal_tool_support.so.1.0.0: Couldn't find DIE referenced by DW_OP_GNU_parameter_ref"
+	echo "    dh_dwz: dwz -q -mdebian/ugene/usr/lib/debug/.dwz/x86_64-linux-gnu/ugene.debug -M/usr/lib/debug/.dwz/x86_64-linux-gnu/ugene.debug ..."



View it on GitLab: https://salsa.debian.org/med-team/ugene/compare/3f868ce36dfc0f67461765453cd04526e218a956...09eda3078d548fa757152e5fdac3725105f3c4e6

-- 
View it on GitLab: https://salsa.debian.org/med-team/ugene/compare/3f868ce36dfc0f67461765453cd04526e218a956...09eda3078d548fa757152e5fdac3725105f3c4e6
You're receiving this email because of your account on salsa.debian.org.
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://alioth-lists.debian.net/pipermail/debian-med-commit/attachments/20190131/172f0eb3/attachment-0001.html>