From 63c471d71a6c4c22f3b8236471e09c5e4ce82eb3 Mon Sep 17 00:00:00 2001 From: Jakob Haufe Date: Sun, 27 Mar 2016 00:22:22 +0100 Subject: [PATCH] Drop cdbs --- debian/control | 2 +- debian/patches/qt-subdir-patch | 17 +++++++++++++++++ debian/patches/series | 1 + debian/rules | 7 ++----- 4 files changed, 21 insertions(+), 6 deletions(-) create mode 100644 debian/patches/qt-subdir-patch diff --git a/debian/control b/debian/control index 34feee1..e286fc3 100644 --- a/debian/control +++ b/debian/control @@ -2,7 +2,7 @@ Source: fstl Section: graphics Priority: optional Maintainer: Jakob Haufe -Build-Depends: debhelper (>=9), cdbs, qtbase5-dev, qtchooser, libqt5opengl5-dev +Build-Depends: debhelper (>=9), qtbase5-dev, qtchooser, libqt5opengl5-dev Standards-Version: 3.9.7 Homepage: http://www.mattkeeter.com/projects/fstl/ Vcs-Git: https://git.sur5r.net/fstl diff --git a/debian/patches/qt-subdir-patch b/debian/patches/qt-subdir-patch new file mode 100644 index 0000000..102aa12 --- /dev/null +++ b/debian/patches/qt-subdir-patch @@ -0,0 +1,17 @@ +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 43bfce6..a0d8371 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -1 +1,2 @@ fix-qt-project +qt-subdir-patch diff --git a/debian/rules b/debian/rules index 26f0b93..3ab9380 100755 --- a/debian/rules +++ b/debian/rules @@ -5,9 +5,6 @@ export DEB_BUILD_MAINT_OPTIONS = hardening=+all export DEB_LDFLAGS_MAINT_APPEND = -Wl,--as-needed -export DEB_QMAKE_ARGS=qt/fstl.pro - -include /usr/share/dpkg/buildflags.mk -include /usr/share/cdbs/1/rules/debhelper.mk -include /usr/share/cdbs/1/class/qmake.mk +%: + dh "$@" -- 2.39.2