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 --- gbp-test2.data/Add-gbp.conf.patch | 19 ++++++++++--------- 1 file changed, 10 insertions(+), 9 deletions(-) (limited to 'gbp-test2.data/Add-gbp.conf.patch') diff --git a/gbp-test2.data/Add-gbp.conf.patch b/gbp-test2.data/Add-gbp.conf.patch index 4e05b98..6dde169 100644 --- a/gbp-test2.data/Add-gbp.conf.patch +++ b/gbp-test2.data/Add-gbp.conf.patch @@ -4,24 +4,25 @@ Subject: [PATCH] Add gbp.conf Signed-off-by: Markus Lehtonen --- - .gbp.conf | 9 +++++++++ - 1 file changed, 9 insertions(+) + .gbp.conf | 10 ++++++++++ + 1 file changed, 10 insertions(+) create mode 100644 .gbp.conf diff --git a/.gbp.conf b/.gbp.conf new file mode 100644 -index 0000000..601d792 +index 0000000..3d5f92d --- /dev/null +++ b/.gbp.conf -@@ -0,0 +1,9 @@ +@@ -0,0 +1,10 @@ +[DEFAULT] +vendor = Test-Distro -+packaging-branch = srcdata/gbp-test2/master -+packaging-tag = srcdata/gbp-test2/release/%(version)s -+upstream-branch = srcdata/gbp-test2/upstream -+upstream-tag = srcdata/gbp-test2/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 +packaging-dir = packaging -+patch-export-ignore-path = ^(packaging/.*|\.gbp.conf) ++patch-ignore-path = ^(packaging/.*|\.gbp.conf) + -- 2.1.4 -- cgit v1.2.3