Update Vcs-* fields

debian/control

@@ -22,8 +22,8 @@ Build-Depends: debhelper (>= 9),
                qttools5-dev,
                qttools5-dev-tools
 Standards-Version: 3.9.6
-Vcs-Browser: http://anonscm.debian.org/cgit/pkg-lxqt/lxqt-powermanagement.git
-Vcs-Git: git://anonscm.debian.org/pkg-lxqt/lxqt-powermanagement.git
+Vcs-Browser: http://anonscm.debian.org/cgit/pkg-lxqt/lxqt-powermanagement.git/?h=debian/sid
+Vcs-Git: git://anonscm.debian.org/pkg-lxqt/lxqt-powermanagement.git -b debian/sid
 Homepage: https://github.com/lxde/lxqt-powermanagement
 
 Package: lxqt-powermanagement

debian/gbp.conf

@@ -2,7 +2,3 @@
 debian-branch = debian/sid
 upstream-branch = upstream/latest
 pristine-tar = True
-
-[import-orig]
-# Use git cherrypick -n upstream instead.
-merge = False