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 --- .../packaging-add-alternative-spec-file-and-change-patch-p.patch | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'gbp-test2.data/packaging-add-alternative-spec-file-and-change-patch-p.patch') diff --git a/gbp-test2.data/packaging-add-alternative-spec-file-and-change-patch-p.patch b/gbp-test2.data/packaging-add-alternative-spec-file-and-change-patch-p.patch index f148df5..d900df2 100644 --- a/gbp-test2.data/packaging-add-alternative-spec-file-and-change-patch-p.patch +++ b/gbp-test2.data/packaging-add-alternative-spec-file-and-change-patch-p.patch @@ -16,13 +16,13 @@ Signed-off-by: Markus Lehtonen create mode 100644 packaging/gbp-test2-alt.spec diff --git a/.gbp.conf b/.gbp.conf -index 601d792..885f9bb 100644 +index 3d5f92d..6c8e847 100644 --- a/.gbp.conf +++ b/.gbp.conf -@@ -6,4 +6,5 @@ upstream-branch = srcdata/gbp-test2/upstream - upstream-tag = srcdata/gbp-test2/upstream/%(upstreamversion)s +@@ -7,4 +7,5 @@ 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) +spec-file = packaging/gbp-test2.spec diff --git a/packaging/gbp-test2-alt.spec b/packaging/gbp-test2-alt.spec -- cgit v1.2.3