From 9eead1ea1c56c1adfb3984bbd20678e61a5d98bd Mon Sep 17 00:00:00 2001 From: Jakob Haufe Date: Sun, 27 Mar 2016 16:20:51 +0200 Subject: [PATCH] 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. --- debian/patches/qt-subdir-patch | 17 ----------------- debian/patches/series | 1 - debian/rules | 2 +- 3 files changed, 1 insertion(+), 19 deletions(-) delete mode 100644 debian/patches/qt-subdir-patch diff --git a/debian/patches/qt-subdir-patch b/debian/patches/qt-subdir-patch deleted file mode 100644 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 - ---- /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 a0d8371..43bfce6 100644 --- 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 3ab9380..f270df4 100755 --- 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 -- 2.39.2