some cosmetic changes, nothing functional

debian/.gitignore

@@ -1,6 +1,7 @@
 /*.debhelper
 /*.log
 /*.substvars
+/debhelper-build-stamp
 /files
 
 /lxqt-qtplugin/

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.

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

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