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 --- ...pdate-gbp.conf-to-rename-the-generated-source-package.patch | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'gbp-test.data/Update-gbp.conf-to-rename-the-generated-source-package.patch') diff --git a/gbp-test.data/Update-gbp.conf-to-rename-the-generated-source-package.patch b/gbp-test.data/Update-gbp.conf-to-rename-the-generated-source-package.patch index 00b9311..02d17cf 100644 --- a/gbp-test.data/Update-gbp.conf-to-rename-the-generated-source-package.patch +++ b/gbp-test.data/Update-gbp.conf-to-rename-the-generated-source-package.patch @@ -8,13 +8,13 @@ Signed-off-by: Markus Lehtonen 1 file changed, 1 insertion(+) diff --git a/.gbp.conf b/.gbp.conf -index 3ec3795..30e8489 100644 +index 1f3671f..d2302db 100644 --- a/.gbp.conf +++ b/.gbp.conf -@@ -4,3 +4,4 @@ packaging-branch = srcdata/gbp-test/fork - packaging-tag = srcdata/gbp-test/fork/release/%(version)s - upstream-branch = srcdata/gbp-test/upstream - upstream-tag = srcdata/gbp-test/upstream/%(upstreamversion)s +@@ -5,3 +5,4 @@ packaging-tag = fork/release/%(version)s + upstream-branch = upstream + upstream-tag = upstream/%(upstreamversion)s + packaging-tag-msg = %(vendor)s release %(version)s +postbuild = for _r in $GBP_BUILD_DIR/SRPMS/*rpm; do _b=`basename $_r`; _n=`echo $_b | sed s"/src.rpm/other.src.rpm/"`; mv $_r `dirname $_r`/$_n; done -- 2.1.4 -- cgit v1.2.3