From a3586044cf9a10d496fdde9a52ea4a79c36d6954 Mon Sep 17 00:00:00 2001 From: Alf Gaida Date: Sun, 24 Jul 2016 14:25:04 +0200 Subject: [PATCH] some cosmetic changes, nothing functional --- debian/.gitignore | 1 + debian/control | 4 ++-- debian/gbp.conf | 4 ++++ debian/rules | 2 +- 4 files changed, 8 insertions(+), 3 deletions(-) diff --git a/debian/.gitignore b/debian/.gitignore index 469769b..66df0ee 100644 --- a/debian/.gitignore +++ b/debian/.gitignore @@ -1,6 +1,7 @@ /*.debhelper /*.log /*.substvars +/debhelper-build-stamp /files /lxqt-qtplugin/ diff --git a/debian/control b/debian/control index c6925c5..ea3f580 100644 --- a/debian/control +++ b/debian/control @@ -19,7 +19,7 @@ Build-Depends: debhelper (>= 9), pkg-config, qtbase5-private-dev, qttools5-dev, - qttools5-dev-tools, + qttools5-dev-tools Standards-Version: 3.9.8 Vcs-Browser: https://anonscm.debian.org/git/pkg-lxqt/lxqt-qtplugin.git/?h=debian/experimental Vcs-Git: https://anonscm.debian.org/git/pkg-lxqt/lxqt-qtplugin.git -b debian/experimental @@ -33,4 +33,4 @@ Description: LXQt system integration plugin for Qt With this plugin, all Qt-based programs can adopt settings of LXQt, such as the icon theme. . - This package provides the lxqt qtplugin interface. + This package provides the LXQt qtplugin interface. diff --git a/debian/gbp.conf b/debian/gbp.conf index b7a5f8f..ffe50a8 100644 --- a/debian/gbp.conf +++ b/debian/gbp.conf @@ -2,3 +2,7 @@ debian-branch = debian/experimental upstream-branch = upstream/latest pristine-tar = True + +[import-orig] +# Use git cherrypick -n upstream instead. +merge = False diff --git a/debian/rules b/debian/rules index 5858ca7..fba35aa 100755 --- a/debian/rules +++ b/debian/rules @@ -10,7 +10,7 @@ export DEB_BUILD_MAINT_OPTIONS = hardening=+all --parallel override_dh_auto_configure: - dh_auto_configure -- \ + dh_auto_configure --\ -DPULL_TRANSLATIONS=OFF\ -DUPDATE_TRANSLATIONS=OFF\ -DCMAKE_BUILD_TYPE=RelWithDebInfo