Drop qt-subdir-patch

This patch was introduced by 63c471d71a6c4c22f3b8236471e09c5e4ce82eb3 to
get rid of cdbs. It turns it it's not needed as there's an option to dh
which solves the same problem.

diff --git a/debian/patches/qt-subdir-patch b/debian/patches/qt-subdir-patch
deleted file mode 100644 (file)
index 102aa12..0000000
--- a/debian/patches/qt-subdir-patch
+++ /dev/null
@@ -1,17 +0,0 @@
-Description: qt subdir workaround
- Upstream ships its qmake project file in a subdirectory which makes it
- impossible for debhelper to detect it automatically.
- .
- This patch adds two small additional project files to solve this problem.
-Author: Jakob Haufe <sur5r@sur5r.net>
-
---- /dev/null
-+++ fstl-0.9.2/qt/qt.pro
-@@ -0,0 +1 @@
-+include(fstl.pro)
---- /dev/null
-+++ fstl-0.9.2/top.pro
-@@ -0,0 +1,3 @@
-+TEMPLATE=subdirs
-+SUBDIRS+=qt
-+

diff --git a/debian/patches/series b/debian/patches/series
index a0d8371ca69d63f53e7d0fa8f084901c3f9d1405..43bfce68ccc0e2a57a8263f7352fbfb7121b890a 100644 (file)
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1 @@
 fix-qt-project
-qt-subdir-patch

diff --git a/debian/rules b/debian/rules
index 3ab93807e9ae71d355c6b986e25869638f5bd743..f270df40f17a80f1cc3a02a566fc1d5ee63d565b 100755 (executable)
--- a/debian/rules
+++ b/debian/rules
@@ -6,5 +6,5 @@ export DEB_BUILD_MAINT_OPTIONS = hardening=+all
 export DEB_LDFLAGS_MAINT_APPEND = -Wl,--as-needed
 
 %:
-       dh "$@"
+       dh "$@" --sourcedirectory=qt