From f79aea1c02ce01ee41027fe459221c9df24cfd87 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?ChangZhuo=20Chen=20=28=E9=99=B3=E6=98=8C=E5=80=AC=29?= Date: Thu, 19 Nov 2015 22:46:39 +0800 Subject: [PATCH] Update Vcs-* fields --- debian/control | 4 ++-- debian/gbp.conf | 4 ---- 2 files changed, 2 insertions(+), 6 deletions(-) diff --git a/debian/control b/debian/control index 153ea40..53a2ba0 100644 --- a/debian/control +++ b/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 diff --git a/debian/gbp.conf b/debian/gbp.conf index 7a9f00a..ead668a 100644 --- a/debian/gbp.conf +++ b/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