From 09a446db2ffb101b1eac23c4f343b30682f55b9e Mon Sep 17 00:00:00 2001 From: Markus Lehtonen Date: Thu, 26 Nov 2015 16:58:05 +0200 Subject: Simpler branch and tag naming in test repos Removes the cumbersome srcdata/... prefixes from the branch and tag names. Also, renames pristine_tar branches to pristine-tar as this re-naming hack is not needed, anymore. Signed-off-by: Markus Lehtonen --- ...o-import-file-s-from-branch-srcdata-gbp-test-master.patch | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'gbp-test.data/Auto-import-file-s-from-branch-srcdata-gbp-test-master.patch') diff --git a/gbp-test.data/Auto-import-file-s-from-branch-srcdata-gbp-test-master.patch b/gbp-test.data/Auto-import-file-s-from-branch-srcdata-gbp-test-master.patch index 08692da..b9e482f 100644 --- a/gbp-test.data/Auto-import-file-s-from-branch-srcdata-gbp-test-master.patch +++ b/gbp-test.data/Auto-import-file-s-from-branch-srcdata-gbp-test-master.patch @@ -12,17 +12,17 @@ Gbp-Rpm: Ignore diff --git a/.gbp.conf b/.gbp.conf new file mode 100644 -index 0000000..985a6c3 +index 0000000..598b658 --- /dev/null +++ b/.gbp.conf @@ -0,0 +1,7 @@ +[DEFAULT] +vendor = Test-Distro -+packaging-branch = srcdata/gbp-test/master -+packaging-tag = srcdata/gbp-test/release/%(version)s -+upstream-branch = srcdata/gbp-test/upstream -+upstream-tag = srcdata/gbp-test/upstream/%(upstreamversion)s -+ ++packaging-branch = master ++packaging-tag = release/%(version)s ++upstream-branch = upstream ++upstream-tag = upstream/%(upstreamversion)s ++packaging-tag-msg = %(vendor)s release %(version)s -- 2.1.4 -- cgit v1.2.3