aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--gbp-test-native.data/Add-gbp.conf.patch8
-rw-r--r--gbp-test-native.data/manifest.json62
-rw-r--r--gbp-test-native2.data/Add-gbp.conf.patch8
-rw-r--r--gbp-test-native2.data/manifest.json32
-rw-r--r--gbp-test.data/Add-gbp.conf.patch12
-rw-r--r--gbp-test.data/Auto-import-file-s-from-branch-srcdata-gbp-test-master.patch12
-rw-r--r--gbp-test.data/Create-a-forked-version.patch22
-rw-r--r--gbp-test.data/Update-gbp.conf-to-rename-the-generated-source-package.patch10
-rw-r--r--gbp-test.data/manifest.json266
-rw-r--r--gbp-test2.data/Add-gbp.conf.patch19
-rw-r--r--gbp-test2.data/Remove-imported-patches.patch10
-rw-r--r--gbp-test2.data/Update-.gbp.conf.patch16
-rw-r--r--gbp-test2.data/gbp.conf-adapt-to-new-patch-export-option-names-2.patch24
-rw-r--r--gbp-test2.data/gbp.conf-adapt-to-new-patch-export-option-names.patch24
-rw-r--r--gbp-test2.data/manifest.json200
-rw-r--r--gbp-test2.data/packaging-add-alternative-spec-file-and-change-patch-p.patch8
16 files changed, 332 insertions, 401 deletions
diff --git a/gbp-test-native.data/Add-gbp.conf.patch b/gbp-test-native.data/Add-gbp.conf.patch
index 153de41..ec429b0 100644
--- a/gbp-test-native.data/Add-gbp.conf.patch
+++ b/gbp-test-native.data/Add-gbp.conf.patch
@@ -10,15 +10,15 @@ Signed-off-by: Markus Lehtonen <markus.lehtonen@linux.intel.com>
diff --git a/.gbp.conf b/.gbp.conf
new file mode 100644
-index 0000000..195c85e
+index 0000000..13aa70c
--- /dev/null
+++ b/.gbp.conf
@@ -0,0 +1,5 @@
+[DEFAULT]
+vendor = Test-Distro
-+packaging-branch = srcdata/gbp-test-native/master
-+packaging-tag = srcdata/gbp-test-native/release/%(version)s
-+
++packaging-branch = master
++packaging-tag = release/%(version)s
++packaging-tag-msg = %(vendor)s release %(version)s
--
2.1.4
diff --git a/gbp-test-native.data/manifest.json b/gbp-test-native.data/manifest.json
index 90eac26..0a0fc9f 100644
--- a/gbp-test-native.data/manifest.json
+++ b/gbp-test-native.data/manifest.json
@@ -11,6 +11,17 @@
],
"message": "Add dummy files\n\nSigned-off-by: Markus Lehtonen <markus.lehtonen@linux.intel.com>"
},
+ "3d679b81b4c7847ac217515b2878d1e4680d50d7": {
+ "committer": "Markus Lehtonen <markus.lehtonen@linux.intel.com> 1448556393 +0200",
+ "sha1": "3d679b81b4c7847ac217515b2878d1e4680d50d7",
+ "patchfile": "Add-gbp.conf.patch",
+ "author": "Markus Lehtonen <markus.lehtonen@linux.intel.com> 1352396991 +0200",
+ "tree": "cc4847f78e3c9e0937668dd7473c428c7fe79a3d",
+ "parents": [
+ "cb5596d72659212d947f0cb882d758edb70a69b8"
+ ],
+ "message": "Add gbp.conf\n\nSigned-off-by: Markus Lehtonen <markus.lehtonen@linux.intel.com>"
+ },
"0579e0753b78476ad822c54b6ea07e2e80c0cdd2": {
"committer": "Markus Lehtonen <markus.lehtonen@linux.intel.com> 1352272349 +0200",
"sha1": "0579e0753b78476ad822c54b6ea07e2e80c0cdd2",
@@ -19,27 +30,27 @@
"tree": "4b825dc642cb6eb9a060e54bf8d69288fbee4904",
"message": "Repository initialization\n\nSigned-off-by: Markus Lehtonen <markus.lehtonen@linux.intel.com>"
},
- "ffb0a12339c529124da144944a2efc9ae273d7a4": {
- "committer": "Markus Lehtonen <markus.lehtonen@linux.intel.com> 1377528350 +0300",
- "sha1": "ffb0a12339c529124da144944a2efc9ae273d7a4",
+ "2602690dc1870e491488bc59241d4735100aebd5": {
+ "committer": "Markus Lehtonen <markus.lehtonen@linux.intel.com> 1448556394 +0200",
+ "sha1": "2602690dc1870e491488bc59241d4735100aebd5",
"patchfile": "Add-packaging-files.patch",
"author": "Markus Lehtonen <markus.lehtonen@linux.intel.com> 1352378031 +0200",
- "tree": "62bd5b260e1e670b4f8638a0e18a841affe7866e",
+ "tree": "8bfe92bfb18c69580d94b50b5f1afa99f7391819",
"parents": [
- "a092cdf5aede44974ded09ee55c73c372260df9a"
+ "3d679b81b4c7847ac217515b2878d1e4680d50d7"
],
"message": "Add packaging files\n\nSigned-off-by: Markus Lehtonen <markus.lehtonen@linux.intel.com>"
},
- "a092cdf5aede44974ded09ee55c73c372260df9a": {
- "committer": "Markus Lehtonen <markus.lehtonen@linux.intel.com> 1377528350 +0300",
- "sha1": "a092cdf5aede44974ded09ee55c73c372260df9a",
- "patchfile": "Add-gbp.conf.patch",
- "author": "Markus Lehtonen <markus.lehtonen@linux.intel.com> 1352396991 +0200",
- "tree": "52d543935e41ab3217ae70cfda4b043281228144",
+ "66d8d14f6112eb144f4dbd877b07d64a33a14e33": {
+ "committer": "Markus Lehtonen <markus.lehtonen@linux.intel.com> 1448556394 +0200",
+ "sha1": "66d8d14f6112eb144f4dbd877b07d64a33a14e33",
+ "patchfile": "Add-changelog-file.patch",
+ "author": "Markus Lehtonen <markus.lehtonen@linux.intel.com> 1393318645 +0200",
+ "tree": "937e32d31f1b11231476693eae588d27404cee75",
"parents": [
- "cb5596d72659212d947f0cb882d758edb70a69b8"
+ "2602690dc1870e491488bc59241d4735100aebd5"
],
- "message": "Add gbp.conf\n\nSigned-off-by: Markus Lehtonen <markus.lehtonen@linux.intel.com>"
+ "message": "Add changelog file\n\nAdd an \"OBS-style\" separate changelog file.\n\nSigned-off-by: Markus Lehtonen <markus.lehtonen@linux.intel.com>"
},
"cb5596d72659212d947f0cb882d758edb70a69b8": {
"committer": "Markus Lehtonen <markus.lehtonen@linux.intel.com> 1352272405 +0200",
@@ -51,31 +62,20 @@
"3da491d0deb6f39fec98b3ca2e946126052e5134"
],
"message": "Add dummy Makefile\n\nSigned-off-by: Markus Lehtonen <markus.lehtonen@linux.intel.com>"
- },
- "1b89d1d93044b12e4adc102f7c30feaabc41ba58": {
- "committer": "Markus Lehtonen <markus.lehtonen@linux.intel.com> 1393318659 +0200",
- "sha1": "1b89d1d93044b12e4adc102f7c30feaabc41ba58",
- "patchfile": "Add-changelog-file.patch",
- "author": "Markus Lehtonen <markus.lehtonen@linux.intel.com> 1393318645 +0200",
- "tree": "95f48d603b67918bb10c2545bc3b492af66e1512",
- "parents": [
- "ffb0a12339c529124da144944a2efc9ae273d7a4"
- ],
- "message": "Add changelog file\n\nAdd an \"OBS-style\" separate changelog file.\n\nSigned-off-by: Markus Lehtonen <markus.lehtonen@linux.intel.com>"
}
},
"refs": {
- "refs/heads/srcdata/gbp-test-native/master": "1b89d1d93044b12e4adc102f7c30feaabc41ba58",
- "refs/tags/srcdata/gbp-test-native/release/1.0-1": "f99a5ea3325134f88d0508ad6731b86620260134"
+ "refs/heads/master": "66d8d14f6112eb144f4dbd877b07d64a33a14e33",
+ "refs/tags/release/1.0-1": "03fa45b9f680c75a7195c60d2893797f4fc49f47"
},
- "HEAD": "ref: refs/heads/srcdata/gbp-test-native/master\n",
+ "HEAD": "ref: refs/heads/master\n",
"tags": {
- "f99a5ea3325134f88d0508ad6731b86620260134": {
- "tagger": "Markus Lehtonen <markus.lehtonen@linux.intel.com> 1377528358 +0300",
+ "03fa45b9f680c75a7195c60d2893797f4fc49f47": {
+ "tagger": "Markus Lehtonen <markus.lehtonen@linux.intel.com> 1448556424 +0200",
"message": "Test-Distro release 1.0-1",
- "tag": "srcdata/gbp-test-native/release/1.0-1",
+ "tag": "release/1.0-1",
"type": "commit",
- "object": "ffb0a12339c529124da144944a2efc9ae273d7a4"
+ "object": "2602690dc1870e491488bc59241d4735100aebd5"
}
}
} \ No newline at end of file
diff --git a/gbp-test-native2.data/Add-gbp.conf.patch b/gbp-test-native2.data/Add-gbp.conf.patch
index 89180e3..ec429b0 100644
--- a/gbp-test-native2.data/Add-gbp.conf.patch
+++ b/gbp-test-native2.data/Add-gbp.conf.patch
@@ -10,15 +10,15 @@ Signed-off-by: Markus Lehtonen <markus.lehtonen@linux.intel.com>
diff --git a/.gbp.conf b/.gbp.conf
new file mode 100644
-index 0000000..f6e0645
+index 0000000..13aa70c
--- /dev/null
+++ b/.gbp.conf
@@ -0,0 +1,5 @@
+[DEFAULT]
+vendor = Test-Distro
-+packaging-branch = srcdata/gbp-test-native2/master
-+packaging-tag = srcdata/gbp-test-native2/release/%(version)s
-+
++packaging-branch = master
++packaging-tag = release/%(version)s
++packaging-tag-msg = %(vendor)s release %(version)s
--
2.1.4
diff --git a/gbp-test-native2.data/manifest.json b/gbp-test-native2.data/manifest.json
index e8fb58e..73f5bdd 100644
--- a/gbp-test-native2.data/manifest.json
+++ b/gbp-test-native2.data/manifest.json
@@ -1,22 +1,22 @@
{
"commits": {
- "3da6930adaaef1cf7c67c97244d72a4aaef13f00": {
- "committer": "Markus Lehtonen <markus.lehtonen@linux.intel.com> 1377528551 +0300",
- "sha1": "3da6930adaaef1cf7c67c97244d72a4aaef13f00",
+ "8a0c3b923beea5ccfb2c29db2f56a5f924fa02eb": {
+ "committer": "Markus Lehtonen <markus.lehtonen@linux.intel.com> 1448556624 +0200",
+ "sha1": "8a0c3b923beea5ccfb2c29db2f56a5f924fa02eb",
"patchfile": "Add-packaging-files.patch",
"author": "Markus Lehtonen <markus.lehtonen@linux.intel.com> 1352378031 +0200",
- "tree": "e5f3bbd020b2beae3bfde712e51b8a65f1748b26",
+ "tree": "c39480f420ac998a5654d2f636993c12f0d3625c",
"parents": [
- "489308b880d5f722b7d9b9b2e65c3e856f60c641"
+ "8c635fc95942701989b9e777f57a16b36c7689a2"
],
"message": "Add packaging files\n\nSigned-off-by: Markus Lehtonen <markus.lehtonen@linux.intel.com>"
},
- "489308b880d5f722b7d9b9b2e65c3e856f60c641": {
- "committer": "Markus Lehtonen <markus.lehtonen@linux.intel.com> 1377528551 +0300",
- "sha1": "489308b880d5f722b7d9b9b2e65c3e856f60c641",
+ "8c635fc95942701989b9e777f57a16b36c7689a2": {
+ "committer": "Markus Lehtonen <markus.lehtonen@linux.intel.com> 1448556624 +0200",
+ "sha1": "8c635fc95942701989b9e777f57a16b36c7689a2",
"patchfile": "Add-gbp.conf.patch",
"author": "Markus Lehtonen <markus.lehtonen@linux.intel.com> 1352396991 +0200",
- "tree": "cbd0f889baa0d487d34f2318efb418bbfdbbf682",
+ "tree": "cc8ea141c352ebe5357ff49f53efb7bdf03fee22",
"parents": [
"0579e0753b78476ad822c54b6ea07e2e80c0cdd2"
],
@@ -32,17 +32,17 @@
}
},
"refs": {
- "refs/tags/srcdata/gbp-test-native2/release/2.0-0": "d65c4acb5a586d19a433358b3e3ec94211edbff2",
- "refs/heads/srcdata/gbp-test-native2/master": "3da6930adaaef1cf7c67c97244d72a4aaef13f00"
+ "refs/tags/release/2.0-0": "6b7594bd635ce9e841c9fa0bf8872ae811e4d3f9",
+ "refs/heads/master": "8a0c3b923beea5ccfb2c29db2f56a5f924fa02eb"
},
- "HEAD": "ref: refs/heads/srcdata/gbp-test-native2/master\n",
+ "HEAD": "ref: refs/heads/master\n",
"tags": {
- "d65c4acb5a586d19a433358b3e3ec94211edbff2": {
- "tagger": "Markus Lehtonen <markus.lehtonen@linux.intel.com> 1377528598 +0300",
+ "6b7594bd635ce9e841c9fa0bf8872ae811e4d3f9": {
+ "tagger": "Markus Lehtonen <markus.lehtonen@linux.intel.com> 1448556639 +0200",
"message": "Test-Distro release 2.0-0",
- "tag": "srcdata/gbp-test-native2/release/2.0-0",
+ "tag": "release/2.0-0",
"type": "commit",
- "object": "3da6930adaaef1cf7c67c97244d72a4aaef13f00"
+ "object": "8a0c3b923beea5ccfb2c29db2f56a5f924fa02eb"
}
}
} \ No newline at end of file
diff --git a/gbp-test.data/Add-gbp.conf.patch b/gbp-test.data/Add-gbp.conf.patch
index c36ccbe..256be73 100644
--- a/gbp-test.data/Add-gbp.conf.patch
+++ b/gbp-test.data/Add-gbp.conf.patch
@@ -10,17 +10,17 @@ Signed-off-by: Markus Lehtonen <markus.lehtonen@linux.intel.com>
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
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
diff --git a/gbp-test.data/Create-a-forked-version.patch b/gbp-test.data/Create-a-forked-version.patch
index 50ca009..60dddb6 100644
--- a/gbp-test.data/Create-a-forked-version.patch
+++ b/gbp-test.data/Create-a-forked-version.patch
@@ -4,26 +4,26 @@ Subject: [PATCH] Create a forked version.
Signed-off-by: Markus Lehtonen <markus.lehtonen@linux.intel.com>
---
- .gbp.conf | 5 ++---
+ .gbp.conf | 4 ++--
gbp-test.spec | 2 +-
my3.patch | 7 -------
- 3 files changed, 3 insertions(+), 11 deletions(-)
+ 3 files changed, 3 insertions(+), 10 deletions(-)
delete mode 100644 my3.patch
diff --git a/.gbp.conf b/.gbp.conf
-index 985a6c3..3ec3795 100644
+index 598b658..1f3671f 100644
--- a/.gbp.conf
+++ b/.gbp.conf
-@@ -1,7 +1,6 @@
+@@ -1,7 +1,7 @@
[DEFAULT]
vendor = Test-Distro
--packaging-branch = srcdata/gbp-test/master
--packaging-tag = srcdata/gbp-test/release/%(version)s
-+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
--
+-packaging-branch = master
+-packaging-tag = release/%(version)s
++packaging-branch = fork
++packaging-tag = fork/release/%(version)s
+ upstream-branch = upstream
+ upstream-tag = upstream/%(upstreamversion)s
+ packaging-tag-msg = %(vendor)s release %(version)s
diff --git a/gbp-test.spec b/gbp-test.spec
index c46a734..4759934 100644
--- a/gbp-test.spec
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 <markus.lehtonen@linux.intel.com>
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
diff --git a/gbp-test.data/manifest.json b/gbp-test.data/manifest.json
index 63ac55e..960d27a 100644
--- a/gbp-test.data/manifest.json
+++ b/gbp-test.data/manifest.json
@@ -1,16 +1,5 @@
{
"commits": {
- "2e1136967e0ad1ae5405222834f3dbc79f400a12": {
- "committer": "Markus Lehtonen <markus.lehtonen@linux.intel.com> 1377529226 +0300",
- "sha1": "2e1136967e0ad1ae5405222834f3dbc79f400a12",
- "patchfile": "Add-initial-packaging-files.patch",
- "author": "Markus Lehtonen <markus.lehtonen@linux.intel.com> 1352394741 +0200",
- "tree": "44c5de3fd7c98365d77c759e8446e32a639c02cd",
- "parents": [
- "f0344fb18718d14eb8e2153998a3ed1478749139"
- ],
- "message": "Add initial packaging files\n\nSigned-off-by: Markus Lehtonen <markus.lehtonen@linux.intel.com>"
- },
"42239c7f237b51a02b701dbd077f161c3a8036cb": {
"committer": "Markus Lehtonen <markus.lehtonen@linux.intel.com> 1405419535 +0300",
"sha1": "42239c7f237b51a02b701dbd077f161c3a8036cb",
@@ -19,27 +8,27 @@
"tree": "f158ca5c2372e2386efc41d55da67117de6457c1",
"message": "pristine-tar data for gbp-test-1.0.tar.bz2"
},
- "e15a409079398445a9a0f84ab4160b434c07b9ee": {
- "committer": "Markus Lehtonen <markus.lehtonen@linux.intel.com> 1377611864 +0300",
- "sha1": "e15a409079398445a9a0f84ab4160b434c07b9ee",
- "patchfile": "Update-gbp.conf-to-rename-the-generated-source-package.patch",
- "author": "Markus Lehtonen <markus.lehtonen@linux.intel.com> 1377611864 +0300",
- "tree": "2aa746a455e7efe0829dd950005a204cd229f567",
+ "4140ac36c9511620734b1692d175ff8bb7435b79": {
+ "committer": "Markus Lehtonen <markus.lehtonen@linux.intel.com> 1448553313 +0200",
+ "sha1": "4140ac36c9511620734b1692d175ff8bb7435b79",
+ "patchfile": "my-bzip2.patch",
+ "author": "Markus Lehtonen <markus.lehtonen@linux.intel.com> 1405585647 +0300",
+ "tree": "ea3ca259d5a73df217bbcc0b5e099faa3ba1dbbd",
"parents": [
- "20f9f1cbc4da74f39f0746f64b944024d3594712"
+ "26073221b1b357f076e18446ff18904538757e40"
],
- "message": "Update gbp.conf to rename the generated source package\n\nSigned-off-by: Markus Lehtonen <markus.lehtonen@linux.intel.com>"
+ "message": "my-bzip2"
},
- "cbbe5a0a5308ca74ddb306ed781d26fc3a918afd": {
- "committer": "Markus Lehtonen <markus.lehtonen@linux.intel.com> 1393318946 +0200",
- "sha1": "cbbe5a0a5308ca74ddb306ed781d26fc3a918afd",
- "patchfile": "Add-changelog.patch",
- "author": "Markus Lehtonen <markus.lehtonen@linux.intel.com> 1393318946 +0200",
- "tree": "0eed49fc02d40e8b0f0d341416c451065e8b2348",
+ "925e9580ae2a76331dff7c09a27080c695d88cc3": {
+ "committer": "Markus Lehtonen <markus.lehtonen@linux.intel.com> 1448549157 +0200",
+ "sha1": "925e9580ae2a76331dff7c09a27080c695d88cc3",
+ "patchfile": "Add-.gitignore.patch",
+ "author": "Markus Lehtonen <markus.lehtonen@linux.intel.com> 1404294590 +0300",
+ "tree": "19149d2bb381d1d4e7d52d9e3c96df18d69b3eab",
"parents": [
- "a70b69e5210f34b238627a9969b5cce48f600e77"
+ "808906d7e5d1fa4ad6f79c863b56d12593e4e6ce"
],
- "message": "Add changelog\n\nSigned-off-by: Markus Lehtonen <markus.lehtonen@linux.intel.com>"
+ "message": "Add .gitignore\n\nIgnore '*.tmp' and '*.swp'.\n\nSigned-off-by: Markus Lehtonen <markus.lehtonen@linux.intel.com>"
},
"3da491d0deb6f39fec98b3ca2e946126052e5134": {
"committer": "Markus Lehtonen <markus.lehtonen@linux.intel.com> 1352272394 +0200",
@@ -79,16 +68,16 @@
"tree": "4b825dc642cb6eb9a060e54bf8d69288fbee4904",
"message": "Initial commit\n\nSigned-off-by: Markus Lehtonen <markus.lehtonen@linux.intel.com>"
},
- "a70b69e5210f34b238627a9969b5cce48f600e77": {
- "committer": "Markus Lehtonen <markus.lehtonen@linux.intel.com> 1377529226 +0300",
- "sha1": "a70b69e5210f34b238627a9969b5cce48f600e77",
- "patchfile": "Add-compressed-patches.patch",
- "author": "Markus Lehtonen <markus.lehtonen@linux.intel.com> 1369033598 +0300",
- "tree": "84b63b18c86260020ec356b42e05563310e093b3",
+ "f6c85dd3acf7811fd8a12aa304c3fd7a583bcdb1": {
+ "committer": "Markus Lehtonen <markus.lehtonen@linux.intel.com> 1448549157 +0200",
+ "sha1": "f6c85dd3acf7811fd8a12aa304c3fd7a583bcdb1",
+ "patchfile": "Add-initial-packaging-files.patch",
+ "author": "Markus Lehtonen <markus.lehtonen@linux.intel.com> 1352394741 +0200",
+ "tree": "4b34035c4e1b14c570946fab454901499eb8b717",
"parents": [
- "c8a87a3eb63666545f1c62f1866d2a86afecfd57"
+ "834a39e0889dfe9779336730bc68b7e8ef2cf793"
],
- "message": "Add compressed patches\n\nNew release. Adds patches compressed with gzip and bzip2.\n\nSigned-off-by: Markus Lehtonen <markus.lehtonen@linux.intel.com>"
+ "message": "Add initial packaging files\n\nSigned-off-by: Markus Lehtonen <markus.lehtonen@linux.intel.com>"
},
"ee75150c3e9f3dacc1000d7ebc34a833e23b0356": {
"committer": "Markus Lehtonen <markus.lehtonen@linux.intel.com> 1405419544 +0300",
@@ -101,71 +90,93 @@
],
"message": "pristine-tar data for gbp-test-1.1.tar.bz2"
},
- "20f9f1cbc4da74f39f0746f64b944024d3594712": {
- "committer": "Markus Lehtonen <markus.lehtonen@linux.intel.com> 1377531474 +0300",
- "sha1": "20f9f1cbc4da74f39f0746f64b944024d3594712",
- "patchfile": "Create-a-forked-version.patch",
- "author": "Markus Lehtonen <markus.lehtonen@linux.intel.com> 1352396256 +0200",
- "tree": "0c74a51d6fdcdb6fdfd787a6e41b0365dc013493",
+ "0bbf100d2386abe5e13a3fdcaf4878285fe3d752": {
+ "committer": "Markus Lehtonen <markus.lehtonen@linux.intel.com> 1448553313 +0200",
+ "sha1": "0bbf100d2386abe5e13a3fdcaf4878285fe3d752",
+ "patchfile": "Auto-import-file-s-from-branch-srcdata-gbp-test-master.patch",
+ "author": "Markus Lehtonen <markus.lehtonen@linux.intel.com> 1405585647 +0300",
+ "tree": "3affc5c03684dd084deda7d117278924cfae691d",
"parents": [
- "2e1136967e0ad1ae5405222834f3dbc79f400a12"
+ "6450890aa002b0868537ee50cc1aea177fdcc941"
],
- "message": "Create a forked version.\n\nSigned-off-by: Markus Lehtonen <markus.lehtonen@linux.intel.com>"
+ "message": "Auto-import file(s) from branch 'srcdata/gbp-test/master':\n .gbp.conf\n\nGbp: Ignore\nGbp-Rpm: Ignore"
},
- "c8a87a3eb63666545f1c62f1866d2a86afecfd57": {
- "committer": "Markus Lehtonen <markus.lehtonen@linux.intel.com> 1377529226 +0300",
- "sha1": "c8a87a3eb63666545f1c62f1866d2a86afecfd57",
- "patchfile": "Version-bump-to-1.1.patch",
- "author": "Markus Lehtonen <markus.lehtonen@linux.intel.com> 1352396256 +0200",
- "tree": "b9e814912804c262893b4c3b16adb34ab9fe5b78",
+ "b3cd99dae46fcec1ad7e4b2adf41b1ec6cfa590f": {
+ "committer": "Markus Lehtonen <markus.lehtonen@linux.intel.com> 1448549157 +0200",
+ "sha1": "b3cd99dae46fcec1ad7e4b2adf41b1ec6cfa590f",
+ "patchfile": "Add-compressed-patches.patch",
+ "author": "Markus Lehtonen <markus.lehtonen@linux.intel.com> 1369033598 +0300",
+ "tree": "fc16065ed8b66d42d060670d611ecf6bad1746b9",
"parents": [
- "2e1136967e0ad1ae5405222834f3dbc79f400a12"
+ "f234683df1682cc81a631856b2bf284340234975"
],
- "message": "Version bump to 1.1\n\nSigned-off-by: Markus Lehtonen <markus.lehtonen@linux.intel.com>"
+ "message": "Add compressed patches\n\nNew release. Adds patches compressed with gzip and bzip2.\n\nSigned-off-by: Markus Lehtonen <markus.lehtonen@linux.intel.com>"
},
- "d6e0b73d43baf78d5c99cfc2533b500940ed7021": {
- "committer": "Markus Lehtonen <markus.lehtonen@linux.intel.com> 1405585647 +0300",
- "sha1": "d6e0b73d43baf78d5c99cfc2533b500940ed7021",
- "patchfile": "my-gz.patch",
- "author": "Markus Lehtonen <markus.lehtonen@linux.intel.com> 1405585647 +0300",
- "tree": "447ca5872d24b1e18bd1fe4dcf2c6cfec8685935",
+ "808906d7e5d1fa4ad6f79c863b56d12593e4e6ce": {
+ "committer": "Markus Lehtonen <markus.lehtonen@linux.intel.com> 1448549157 +0200",
+ "sha1": "808906d7e5d1fa4ad6f79c863b56d12593e4e6ce",
+ "patchfile": "Add-changelog.patch",
+ "author": "Markus Lehtonen <markus.lehtonen@linux.intel.com> 1393318946 +0200",
+ "tree": "2aa6fb238d5fa3f5a73078ac77e8fa8bbdefc9a3",
"parents": [
- "65f2a23e9b1144308d02fc8b16be7a027a9def70"
+ "b3cd99dae46fcec1ad7e4b2adf41b1ec6cfa590f"
],
- "message": "my-gz\n"
+ "message": "Add changelog\n\nSigned-off-by: Markus Lehtonen <markus.lehtonen@linux.intel.com>"
},
- "972ecde7c94eb00f4d310aa0e3e8f72ed215f591": {
- "committer": "Markus Lehtonen <markus.lehtonen@linux.intel.com> 1405585647 +0300",
- "sha1": "972ecde7c94eb00f4d310aa0e3e8f72ed215f591",
+ "2daf4a20c32d63966f55ffff05643388b58b7a4d": {
+ "committer": "Markus Lehtonen <markus.lehtonen@linux.intel.com> 1448553314 +0200",
+ "sha1": "2daf4a20c32d63966f55ffff05643388b58b7a4d",
"patchfile": "my2.patch",
"author": "Markus Lehtonen <markus.lehtonen@linux.intel.com> 1405585647 +0300",
- "tree": "2360793736e9a389b6d3897102fa3a2204b7c09e",
+ "tree": "cc443e8fdcc30fc4d818336d52a6031341111448",
"parents": [
- "87bf4bbebdbd30eda6bf2deeee7ae196a6bc6e2d"
+ "4140ac36c9511620734b1692d175ff8bb7435b79"
],
- "message": "my2\n"
+ "message": "my2"
},
- "65f2a23e9b1144308d02fc8b16be7a027a9def70": {
- "committer": "Markus Lehtonen <markus.lehtonen@linux.intel.com> 1405585647 +0300",
- "sha1": "65f2a23e9b1144308d02fc8b16be7a027a9def70",
- "patchfile": "Auto-import-file-s-from-branch-srcdata-gbp-test-master.patch",
- "author": "Markus Lehtonen <markus.lehtonen@linux.intel.com> 1405585647 +0300",
- "tree": "ae0c0c423a6e17a8dab4c9648511d95fd57cb19c",
+ "cbf747086e12cc390cdae71ce297b0e1a55a420a": {
+ "committer": "Markus Lehtonen <markus.lehtonen@linux.intel.com> 1448549264 +0200",
+ "sha1": "cbf747086e12cc390cdae71ce297b0e1a55a420a",
+ "patchfile": "Update-gbp.conf-to-rename-the-generated-source-package.patch",
+ "author": "Markus Lehtonen <markus.lehtonen@linux.intel.com> 1377611864 +0300",
+ "tree": "22658ce6155376fc6348769bc1756725acca705b",
"parents": [
- "6450890aa002b0868537ee50cc1aea177fdcc941"
+ "760f5514aad64a31e26d08792984faaea59b740d"
],
- "message": "Auto-import file(s) from branch 'srcdata/gbp-test/master':\n .gbp.conf\n\nGbp: Ignore\nGbp-Rpm: Ignore"
+ "message": "Update gbp.conf to rename the generated source package\n\nSigned-off-by: Markus Lehtonen <markus.lehtonen@linux.intel.com>"
},
- "b82fd1a61db4221263b2c110f60c6d07cb0203df": {
- "committer": "Markus Lehtonen <markus.lehtonen@linux.intel.com> 1404294645 +0300",
- "sha1": "b82fd1a61db4221263b2c110f60c6d07cb0203df",
- "patchfile": "Add-.gitignore.patch",
- "author": "Markus Lehtonen <markus.lehtonen@linux.intel.com> 1404294590 +0300",
- "tree": "d7ca61ee438e374fb2fdc0554a0b05d07f58b802",
+ "760f5514aad64a31e26d08792984faaea59b740d": {
+ "committer": "Markus Lehtonen <markus.lehtonen@linux.intel.com> 1448549248 +0200",
+ "sha1": "760f5514aad64a31e26d08792984faaea59b740d",
+ "patchfile": "Create-a-forked-version.patch",
+ "author": "Markus Lehtonen <markus.lehtonen@linux.intel.com> 1352396256 +0200",
+ "tree": "05c80eaa14bc071479b9510a7eaadf9ab5ff9650",
"parents": [
- "cbbe5a0a5308ca74ddb306ed781d26fc3a918afd"
+ "f6c85dd3acf7811fd8a12aa304c3fd7a583bcdb1"
],
- "message": "Add .gitignore\n\nIgnore '*.tmp' and '*.swp'.\n\nSigned-off-by: Markus Lehtonen <markus.lehtonen@linux.intel.com>"
+ "message": "Create a forked version.\n\nSigned-off-by: Markus Lehtonen <markus.lehtonen@linux.intel.com>"
+ },
+ "f234683df1682cc81a631856b2bf284340234975": {
+ "committer": "Markus Lehtonen <markus.lehtonen@linux.intel.com> 1448549157 +0200",
+ "sha1": "f234683df1682cc81a631856b2bf284340234975",
+ "patchfile": "Version-bump-to-1.1.patch",
+ "author": "Markus Lehtonen <markus.lehtonen@linux.intel.com> 1352396256 +0200",
+ "tree": "78054d45c9bb174e41b27a7eaa3c1b096a60fe5c",
+ "parents": [
+ "f6c85dd3acf7811fd8a12aa304c3fd7a583bcdb1"
+ ],
+ "message": "Version bump to 1.1\n\nSigned-off-by: Markus Lehtonen <markus.lehtonen@linux.intel.com>"
+ },
+ "26073221b1b357f076e18446ff18904538757e40": {
+ "committer": "Markus Lehtonen <markus.lehtonen@linux.intel.com> 1448553313 +0200",
+ "sha1": "26073221b1b357f076e18446ff18904538757e40",
+ "patchfile": "my-gz.patch",
+ "author": "Markus Lehtonen <markus.lehtonen@linux.intel.com> 1405585647 +0300",
+ "tree": "e1d995715363081b0816b3d9c2cbd15cf58d6ee9",
+ "parents": [
+ "0bbf100d2386abe5e13a3fdcaf4878285fe3d752"
+ ],
+ "message": "my-gz"
},
"cb5596d72659212d947f0cb882d758edb70a69b8": {
"committer": "Markus Lehtonen <markus.lehtonen@linux.intel.com> 1352272405 +0200",
@@ -178,85 +189,74 @@
],
"message": "Add dummy Makefile\n\nSigned-off-by: Markus Lehtonen <markus.lehtonen@linux.intel.com>"
},
- "f0344fb18718d14eb8e2153998a3ed1478749139": {
- "committer": "Markus Lehtonen <markus.lehtonen@linux.intel.com> 1377529226 +0300",
- "sha1": "f0344fb18718d14eb8e2153998a3ed1478749139",
+ "834a39e0889dfe9779336730bc68b7e8ef2cf793": {
+ "committer": "Markus Lehtonen <markus.lehtonen@linux.intel.com> 1448549153 +0200",
+ "sha1": "834a39e0889dfe9779336730bc68b7e8ef2cf793",
"patchfile": "Add-gbp.conf.patch",
"author": "Markus Lehtonen <markus.lehtonen@linux.intel.com> 1352395217 +0200",
- "tree": "ae777930c777718138ef0ca6585e04f338436409",
+ "tree": "dac3c42871a1dc32b65adac4eef1722e0a6831fb",
"parents": [
"7ce872128f5d0f4970102bdd2fdfc85b77244c7a"
],
"message": "Add gbp.conf\n\nSigned-off-by: Markus Lehtonen <markus.lehtonen@linux.intel.com>"
- },
- "87bf4bbebdbd30eda6bf2deeee7ae196a6bc6e2d": {
- "committer": "Markus Lehtonen <markus.lehtonen@linux.intel.com> 1405585647 +0300",
- "sha1": "87bf4bbebdbd30eda6bf2deeee7ae196a6bc6e2d",
- "patchfile": "my-bzip2.patch",
- "author": "Markus Lehtonen <markus.lehtonen@linux.intel.com> 1405585647 +0300",
- "tree": "ba7a682b8c0a486a6911730291a055242994dd82",
- "parents": [
- "d6e0b73d43baf78d5c99cfc2533b500940ed7021"
- ],
- "message": "my-bzip2\n"
}
},
"refs": {
- "refs/heads/srcdata/gbp-test/fork": "e15a409079398445a9a0f84ab4160b434c07b9ee",
- "refs/heads/srcdata/gbp-test/pristine_tar": "ee75150c3e9f3dacc1000d7ebc34a833e23b0356",
- "refs/tags/srcdata/gbp-test/upstream/1.1": "8e2500d226793bb16afab3dde917f4023581e2e9",
- "refs/tags/srcdata/gbp-test/fork/release/1.0-1": "72371bde2ac20cbb720459e23fc4f17320924ce1",
- "refs/tags/srcdata/gbp-test/release/1.1-1": "41e836cb72c8e28ae26c20070b8122e5671c2dc2",
- "refs/tags/srcdata/gbp-test/release/1.1-2": "158a4b27046916810df412f8b0d1190fffdbe02b",
- "refs/tags/srcdata/gbp-test/release/1.0-1": "53493622bc522302b0bbc5540e1c535377a52c77",
- "refs/heads/srcdata/gbp-test/upstream": "6450890aa002b0868537ee50cc1aea177fdcc941",
- "refs/tags/srcdata/gbp-test/upstream/1.0": "876baa15c6a0f93cb1c785b756a1a75c2ff18c48",
- "refs/heads/srcdata/gbp-test/master": "b82fd1a61db4221263b2c110f60c6d07cb0203df",
- "refs/heads/srcdata/gbp-test/pq/master": "972ecde7c94eb00f4d310aa0e3e8f72ed215f591"
+ "refs/heads/pristine-tar": "ee75150c3e9f3dacc1000d7ebc34a833e23b0356",
+ "refs/heads/pq/master": "2daf4a20c32d63966f55ffff05643388b58b7a4d",
+ "refs/tags/fork/release/1.0-1": "e7d565fd0795315ef64c28aedabcfc4c0d7c579a",
+ "refs/heads/fork": "cbf747086e12cc390cdae71ce297b0e1a55a420a",
+ "refs/tags/release/1.0-1": "b96b77fa4c4016f788aa5a36fa53241305ba86b2",
+ "refs/tags/release/1.1-2": "2d24c99cca2a563ca0e498ffc972d54049345f66",
+ "refs/tags/release/1.1-1": "a64150c6e2feb9efa5c9cf150107a3b06a1657e7",
+ "refs/tags/upstream/1.0": "3788dc189de65222f9740c48af30e2d4c8175726",
+ "refs/tags/upstream/1.1": "d55cd55506641d7dd6f968bba37451a599f26017",
+ "refs/heads/upstream": "6450890aa002b0868537ee50cc1aea177fdcc941",
+ "refs/heads/master": "925e9580ae2a76331dff7c09a27080c695d88cc3"
},
- "HEAD": "ref: refs/heads/srcdata/gbp-test/master\n",
+ "HEAD": "ref: refs/heads/master\n",
"tags": {
- "41e836cb72c8e28ae26c20070b8122e5671c2dc2": {
- "tagger": "Markus Lehtonen <markus.lehtonen@linux.intel.com> 1377529325 +0300",
- "message": "Test-Distro release 1.1-1",
- "tag": "srcdata/gbp-test/release/1.1-1",
- "type": "commit",
- "object": "c8a87a3eb63666545f1c62f1866d2a86afecfd57"
- },
- "8e2500d226793bb16afab3dde917f4023581e2e9": {
+ "d55cd55506641d7dd6f968bba37451a599f26017": {
"tagger": "Markus Lehtonen <markus.lehtonen@linux.intel.com> 1377529755 +0300",
"message": "Version 1.1",
- "tag": "srcdata/gbp-test/upstream/1.1",
+ "tag": "upstream/1.1",
"type": "commit",
"object": "6450890aa002b0868537ee50cc1aea177fdcc941"
},
- "158a4b27046916810df412f8b0d1190fffdbe02b": {
- "tagger": "Markus Lehtonen <markus.lehtonen@linux.intel.com> 1377529316 +0300",
- "message": "Test-Distro release 1.1-2",
- "tag": "srcdata/gbp-test/release/1.1-2",
+ "b96b77fa4c4016f788aa5a36fa53241305ba86b2": {
+ "tagger": "Markus Lehtonen <markus.lehtonen@linux.intel.com> 1448549318 +0200",
+ "message": "Test-Distro release 1.0-1",
+ "tag": "release/1.0-1",
"type": "commit",
- "object": "a70b69e5210f34b238627a9969b5cce48f600e77"
+ "object": "f6c85dd3acf7811fd8a12aa304c3fd7a583bcdb1"
},
- "876baa15c6a0f93cb1c785b756a1a75c2ff18c48": {
+ "3788dc189de65222f9740c48af30e2d4c8175726": {
"tagger": "Markus Lehtonen <markus.lehtonen@linux.intel.com> 1377529152 +0300",
"message": "Version 1.0",
- "tag": "srcdata/gbp-test/upstream/1.0",
+ "tag": "upstream/1.0",
"type": "commit",
"object": "cb5596d72659212d947f0cb882d758edb70a69b8"
},
- "72371bde2ac20cbb720459e23fc4f17320924ce1": {
- "tagger": "Markus Lehtonen <markus.lehtonen@linux.intel.com> 1377611964 +0300",
- "message": "Test-Distro release 1.0-1",
- "tag": "srcdata/gbp-test/fork/release/1.0-1",
+ "2d24c99cca2a563ca0e498ffc972d54049345f66": {
+ "tagger": "Markus Lehtonen <markus.lehtonen@linux.intel.com> 1448549368 +0200",
+ "message": "Test-Distro release 1.1-2",
+ "tag": "release/1.1-2",
+ "type": "commit",
+ "object": "b3cd99dae46fcec1ad7e4b2adf41b1ec6cfa590f"
+ },
+ "a64150c6e2feb9efa5c9cf150107a3b06a1657e7": {
+ "tagger": "Markus Lehtonen <markus.lehtonen@linux.intel.com> 1448549366 +0200",
+ "message": "Test-Distro release 1.1-1",
+ "tag": "release/1.1-1",
"type": "commit",
- "object": "e15a409079398445a9a0f84ab4160b434c07b9ee"
+ "object": "f234683df1682cc81a631856b2bf284340234975"
},
- "53493622bc522302b0bbc5540e1c535377a52c77": {
- "tagger": "Markus Lehtonen <markus.lehtonen@linux.intel.com> 1377529327 +0300",
+ "e7d565fd0795315ef64c28aedabcfc4c0d7c579a": {
+ "tagger": "Markus Lehtonen <markus.lehtonen@linux.intel.com> 1448549401 +0200",
"message": "Test-Distro release 1.0-1",
- "tag": "srcdata/gbp-test/release/1.0-1",
+ "tag": "fork/release/1.0-1",
"type": "commit",
- "object": "2e1136967e0ad1ae5405222834f3dbc79f400a12"
+ "object": "cbf747086e12cc390cdae71ce297b0e1a55a420a"
}
}
} \ No newline at end of file
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 <markus.lehtonen@linux.intel.com>
---
- .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
diff --git a/gbp-test2.data/Remove-imported-patches.patch b/gbp-test2.data/Remove-imported-patches.patch
index cd91ca0..e41295c 100644
--- a/gbp-test2.data/Remove-imported-patches.patch
+++ b/gbp-test2.data/Remove-imported-patches.patch
@@ -15,15 +15,15 @@ Signed-off-by: Markus Lehtonen <markus.lehtonen@linux.intel.com>
delete mode 100644 packaging/my3.patch
diff --git a/.gbp.conf b/.gbp.conf
-index 885f9bb..4af2c49 100644
+index 6c8e847..52a1267 100644
--- a/.gbp.conf
+++ b/.gbp.conf
-@@ -5,6 +5,7 @@ packaging-tag = srcdata/gbp-test2/release/%(version)s
- upstream-branch = srcdata/gbp-test2/upstream
- upstream-tag = srcdata/gbp-test2/upstream/%(upstreamversion)s
+@@ -6,6 +6,7 @@ upstream-branch = upstream
+ upstream-tag = upstream/%(upstreamversion)s
+ packaging-tag-msg = %(vendor)s release %(version)s
packaging-dir = packaging
+patch-export = True
- 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.spec b/packaging/gbp-test2.spec
diff --git a/gbp-test2.data/Update-.gbp.conf.patch b/gbp-test2.data/Update-.gbp.conf.patch
index 08bf437..f91b7f0 100644
--- a/gbp-test2.data/Update-.gbp.conf.patch
+++ b/gbp-test2.data/Update-.gbp.conf.patch
@@ -8,19 +8,19 @@ Signed-off-by: Markus Lehtonen <markus.lehtonen@linux.intel.com>
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/.gbp.conf b/.gbp.conf
-index 885f9bb..c611421 100644
+index 6c8e847..e76aa24 100644
--- a/.gbp.conf
+++ b/.gbp.conf
@@ -1,7 +1,7 @@
[DEFAULT]
vendor = Test-Distro
--packaging-branch = srcdata/gbp-test2/master
--packaging-tag = srcdata/gbp-test2/release/%(version)s
-+packaging-branch = srcdata/gbp-test2/master-orphan
-+packaging-tag = srcdata/gbp-test2/release-orphan/%(version)s
- upstream-branch = srcdata/gbp-test2/upstream
- upstream-tag = srcdata/gbp-test2/upstream/%(upstreamversion)s
- packaging-dir = packaging
+-packaging-branch = master
+-packaging-tag = release/%(version)s
++packaging-branch = master-orphan
++packaging-tag = release-orphan/%(version)s
+ upstream-branch = upstream
+ upstream-tag = upstream/%(upstreamversion)s
+ packaging-tag-msg = %(vendor)s release %(version)s
--
2.1.4
diff --git a/gbp-test2.data/gbp.conf-adapt-to-new-patch-export-option-names-2.patch b/gbp-test2.data/gbp.conf-adapt-to-new-patch-export-option-names-2.patch
deleted file mode 100644
index b84ec63..0000000
--- a/gbp-test2.data/gbp.conf-adapt-to-new-patch-export-option-names-2.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-From: Markus Lehtonen <markus.lehtonen@linux.intel.com>
-Date: Thu, 26 Feb 2015 11:12:42 +0200
-Subject: [PATCH] gbp.conf: adapt to new patch-export option names
-
-Signed-off-by: Markus Lehtonen <markus.lehtonen@linux.intel.com>
----
- .gbp.conf | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/.gbp.conf b/.gbp.conf
-index 4af2c49..b31adf7 100644
---- a/.gbp.conf
-+++ b/.gbp.conf
-@@ -6,6 +6,6 @@ upstream-branch = srcdata/gbp-test2/upstream
- upstream-tag = srcdata/gbp-test2/upstream/%(upstreamversion)s
- packaging-dir = packaging
- patch-export = True
--patch-export-ignore-path = ^(packaging/.*|\.gbp.conf)
-+patch-ignore-path = ^(packaging/.*|\.gbp.conf)
- spec-file = packaging/gbp-test2.spec
-
---
-2.1.4
-
diff --git a/gbp-test2.data/gbp.conf-adapt-to-new-patch-export-option-names.patch b/gbp-test2.data/gbp.conf-adapt-to-new-patch-export-option-names.patch
deleted file mode 100644
index c8210d1..0000000
--- a/gbp-test2.data/gbp.conf-adapt-to-new-patch-export-option-names.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-From: Markus Lehtonen <markus.lehtonen@linux.intel.com>
-Date: Thu, 26 Feb 2015 11:10:16 +0200
-Subject: [PATCH] gbp.conf: adapt to new patch-export option names
-
-Signed-off-by: Markus Lehtonen <markus.lehtonen@linux.intel.com>
----
- .gbp.conf | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/.gbp.conf b/.gbp.conf
-index c611421..eb3aaae 100644
---- a/.gbp.conf
-+++ b/.gbp.conf
-@@ -5,6 +5,6 @@ packaging-tag = srcdata/gbp-test2/release-orphan/%(version)s
- upstream-branch = srcdata/gbp-test2/upstream
- upstream-tag = srcdata/gbp-test2/upstream/%(upstreamversion)s
- packaging-dir = packaging
--patch-export-ignore-path = ^(packaging/.*|\.gbp.conf)
-+patch-ignore-path = ^(packaging/.*|\.gbp.conf)
- spec-file = packaging/gbp-test2.spec
-
---
-2.1.4
-
diff --git a/gbp-test2.data/manifest.json b/gbp-test2.data/manifest.json
index 561fcdd..9567a3e 100644
--- a/gbp-test2.data/manifest.json
+++ b/gbp-test2.data/manifest.json
@@ -1,15 +1,15 @@
{
"commits": {
- "9d9a1e4efc5c1a9ba48c7de7bb2f3158a29e40d8": {
- "committer": "Markus Lehtonen <markus.lehtonen@linux.intel.com> 1424941962 +0200",
- "sha1": "9d9a1e4efc5c1a9ba48c7de7bb2f3158a29e40d8",
- "patchfile": "gbp.conf-adapt-to-new-patch-export-option-names-2.patch",
- "author": "Markus Lehtonen <markus.lehtonen@linux.intel.com> 1424941962 +0200",
- "tree": "d599726243f1b49586c4b6004779aa79d39c42a4",
+ "9ff4f5f6853622a95489d2d575c63eceedc203f8": {
+ "committer": "Markus Lehtonen <markus.lehtonen@linux.intel.com> 1448551036 +0200",
+ "sha1": "9ff4f5f6853622a95489d2d575c63eceedc203f8",
+ "patchfile": "My-addition.patch",
+ "author": "Markus Lehtonen <markus.lehtonen@linux.intel.com> 1352807746 +0200",
+ "tree": "472db0daae817c14f1cb74608e1d234758301da0",
"parents": [
- "cd2763432f4ad93b29c6f22aee7f623552156a81"
+ "189b0a152a6f1405e021c2988755ce2f5d89c998"
],
- "message": "gbp.conf: adapt to new patch-export option names\n\nSigned-off-by: Markus Lehtonen <markus.lehtonen@linux.intel.com>"
+ "message": "My addition\n\nImport my2.patch to the git tree.\n\nSigned-off-by: Markus Lehtonen <markus.lehtonen@linux.intel.com>"
},
"0579e0753b78476ad822c54b6ea07e2e80c0cdd2": {
"committer": "Markus Lehtonen <markus.lehtonen@linux.intel.com> 1352272349 +0200",
@@ -19,38 +19,16 @@
"tree": "4b825dc642cb6eb9a060e54bf8d69288fbee4904",
"message": "Repository initialization\n\nSigned-off-by: Markus Lehtonen <markus.lehtonen@linux.intel.com>"
},
- "6dd11793b037a9f78473253b85832ab70226e2bc": {
- "committer": "Markus Lehtonen <markus.lehtonen@linux.intel.com> 1377529985 +0300",
- "sha1": "6dd11793b037a9f78473253b85832ab70226e2bc",
- "patchfile": "Add-gbp.conf.patch",
- "author": "Markus Lehtonen <markus.lehtonen@linux.intel.com> 1352806630 +0200",
- "tree": "aecee30e09c6cb14eea17c622ae65e9a43c6b159",
- "parents": [
- "6dccee0ab7689e5ae446d39535138ea39a88e70c"
- ],
- "message": "Add gbp.conf\n\nSigned-off-by: Markus Lehtonen <markus.lehtonen@linux.intel.com>"
- },
- "4515c6e8041903b3aea45d4e424c90f88492fc66": {
- "committer": "Markus Lehtonen <markus.lehtonen@linux.intel.com> 1377529986 +0300",
- "sha1": "4515c6e8041903b3aea45d4e424c90f88492fc66",
- "patchfile": "My-addition.patch",
- "author": "Markus Lehtonen <markus.lehtonen@linux.intel.com> 1352807746 +0200",
- "tree": "2478f4ee0e07ac1e900bcd9d23f2bb791cd6ede2",
- "parents": [
- "3445afd5e168f6a58046b473ff9380999599a374"
- ],
- "message": "My addition\n\nImport my2.patch to the git tree.\n\nSigned-off-by: Markus Lehtonen <markus.lehtonen@linux.intel.com>"
- },
- "846aee30702fff8519dcb8bdd591ac1a227859a2": {
- "committer": "Markus Lehtonen <markus.lehtonen@linux.intel.com> 1377529985 +0300",
- "sha1": "846aee30702fff8519dcb8bdd591ac1a227859a2",
- "patchfile": "packaging-add-alternative-spec-file-and-change-patch-p.patch",
- "author": "Markus Lehtonen <markus.lehtonen@linux.intel.com> 1357733987 +0200",
- "tree": "7e4badd5dad4652ad5bb60f772f4296f276b9729",
+ "a93779ad111470b1619f2ceb7a31dd10d6ad6a4f": {
+ "committer": "Markus Lehtonen <markus.lehtonen@linux.intel.com> 1448551387 +0200",
+ "sha1": "a93779ad111470b1619f2ceb7a31dd10d6ad6a4f",
+ "patchfile": "Update-.gbp.conf.patch",
+ "author": "Markus Lehtonen <markus.lehtonen@linux.intel.com> 1386843313 +0200",
+ "tree": "e92ab121d622ee866dffd560ce2dcd561223719b",
"parents": [
- "489dbece0462a2818e31b02b3e50d73e003e7a5d"
+ "189b0a152a6f1405e021c2988755ce2f5d89c998"
],
- "message": "packaging: add alternative spec file and change patch path\n\nAdd a second spec file for testing import-srpm spec guessing.\n\nChange one patch filename to be full url for testing import-srpm patch\nimport functionality.\n\nSigned-off-by: Markus Lehtonen <markus.lehtonen@linux.intel.com>"
+ "message": "Update .gbp.conf\n\nSigned-off-by: Markus Lehtonen <markus.lehtonen@linux.intel.com>"
},
"6dccee0ab7689e5ae446d39535138ea39a88e70c": {
"committer": "Markus Lehtonen <markus.lehtonen@linux.intel.com> 1352806279 +0200",
@@ -63,38 +41,16 @@
],
"message": "Add dummy Makefile\n\nSigned-off-by: Markus Lehtonen <markus.lehtonen@linux.intel.com>"
},
- "97d5c7e811c7b4160142606d1553172ca4567f21": {
- "committer": "Markus Lehtonen <markus.lehtonen@linux.intel.com> 1424941816 +0200",
- "sha1": "97d5c7e811c7b4160142606d1553172ca4567f21",
- "patchfile": "gbp.conf-adapt-to-new-patch-export-option-names.patch",
- "author": "Markus Lehtonen <markus.lehtonen@linux.intel.com> 1424941816 +0200",
- "tree": "89a8decc2f72f146acc10f4cce68af19dd732b40",
- "parents": [
- "33c84e86148c3707d2880f439529074296f03d29"
- ],
- "message": "gbp.conf: adapt to new patch-export option names\n\nSigned-off-by: Markus Lehtonen <markus.lehtonen@linux.intel.com>"
- },
- "3445afd5e168f6a58046b473ff9380999599a374": {
- "committer": "Markus Lehtonen <markus.lehtonen@linux.intel.com> 1377529985 +0300",
- "sha1": "3445afd5e168f6a58046b473ff9380999599a374",
- "patchfile": "packaging-change-my2.patch-to-git-email-format.patch",
- "author": "Markus Lehtonen <markus.lehtonen@linux.intel.com> 1358253459 +0200",
- "tree": "d5c31f1edb05290f70ca4434158aa0dbcac0ddb5",
- "parents": [
- "d10f8183822d1a9214d2ec1b98538c1a636d9fb4"
- ],
- "message": "packaging: change my2.patch to git email format\n\nChange my2.patch from plain diff to git email format to test author and\ndate parsing of gbp.\n\nSigned-off-by: Markus Lehtonen <markus.lehtonen@linux.intel.com>"
- },
- "489dbece0462a2818e31b02b3e50d73e003e7a5d": {
- "committer": "Markus Lehtonen <markus.lehtonen@linux.intel.com> 1377529985 +0300",
- "sha1": "489dbece0462a2818e31b02b3e50d73e003e7a5d",
- "patchfile": "Add-packaging-files.patch",
- "author": "Markus Lehtonen <markus.lehtonen@linux.intel.com> 1352806552 +0200",
- "tree": "dc290850829f4818a45a9e968c6159ee28f62074",
+ "db72a4efae2b72b56f7723df844d7a506e549ce1": {
+ "committer": "Markus Lehtonen <markus.lehtonen@linux.intel.com> 1448551036 +0200",
+ "sha1": "db72a4efae2b72b56f7723df844d7a506e549ce1",
+ "patchfile": "packaging-reflect-the-corrected-patch-number-handling.patch",
+ "author": "Markus Lehtonen <markus.lehtonen@linux.intel.com> 1357897260 +0200",
+ "tree": "cc668ba4e00ae7308e6a9f1b2225a820e50f618f",
"parents": [
- "6dd11793b037a9f78473253b85832ab70226e2bc"
+ "80d0f75635f6ac35f080736236836aac1e596845"
],
- "message": "Add packaging files\n\nSigned-off-by: Markus Lehtonen <markus.lehtonen@linux.intel.com>"
+ "message": "packaging: reflect the corrected patch number handling\n\nFix spec files as GBP now treats 'Patch:' as patch number -1, instead of\n0.\n\nSigned-off-by: Markus Lehtonen <markus.lehtonen@linux.intel.com>"
},
"dc4481d39005968f1f2673d760af69b411eccc33": {
"committer": "Markus Lehtonen <markus.lehtonen@linux.intel.com> 1352806277 +0200",
@@ -107,38 +63,49 @@
],
"message": "Add dummy files\n\nSigned-off-by: Markus Lehtonen <markus.lehtonen@linux.intel.com>"
},
- "cd2763432f4ad93b29c6f22aee7f623552156a81": {
- "committer": "Markus Lehtonen <markus.lehtonen@linux.intel.com> 1377610598 +0300",
- "sha1": "cd2763432f4ad93b29c6f22aee7f623552156a81",
+ "fb1bf5f16bfa1a4e3ffd29fcc0820bd60fbd1a35": {
+ "committer": "Markus Lehtonen <markus.lehtonen@linux.intel.com> 1448551003 +0200",
+ "sha1": "fb1bf5f16bfa1a4e3ffd29fcc0820bd60fbd1a35",
+ "patchfile": "Add-packaging-files.patch",
+ "author": "Markus Lehtonen <markus.lehtonen@linux.intel.com> 1352806552 +0200",
+ "tree": "321aba18b5f072ecab528e2b004cdd4396b8c780",
+ "parents": [
+ "b7b009c4f87828ad51e26c5c62b91b7c5f83cfff"
+ ],
+ "message": "Add packaging files\n\nSigned-off-by: Markus Lehtonen <markus.lehtonen@linux.intel.com>"
+ },
+ "2a17b0d682aa73f10a6e242e0f60408b61812047": {
+ "committer": "Markus Lehtonen <markus.lehtonen@linux.intel.com> 1448551076 +0200",
+ "sha1": "2a17b0d682aa73f10a6e242e0f60408b61812047",
"patchfile": "Remove-imported-patches.patch",
"author": "Markus Lehtonen <markus.lehtonen@linux.intel.com> 1352807855 +0200",
- "tree": "3ec74b66ae400b34d5dd615f5bfe462b71adcf7f",
+ "tree": "771f74c3339e47cf7ad767bd39a27eec4aba4df0",
"parents": [
- "4515c6e8041903b3aea45d4e424c90f88492fc66"
+ "9ff4f5f6853622a95489d2d575c63eceedc203f8"
],
"message": "Remove imported patches\n\nAnd enable automatic patch-generation.\n\nSigned-off-by: Markus Lehtonen <markus.lehtonen@linux.intel.com>"
},
- "33c84e86148c3707d2880f439529074296f03d29": {
- "committer": "Markus Lehtonen <markus.lehtonen@linux.intel.com> 1386843313 +0200",
- "sha1": "33c84e86148c3707d2880f439529074296f03d29",
- "patchfile": "Update-.gbp.conf.patch",
- "author": "Markus Lehtonen <markus.lehtonen@linux.intel.com> 1386843313 +0200",
- "tree": "058029fd4202f33aa018e0622fef64b9a12aceae",
+ "80d0f75635f6ac35f080736236836aac1e596845": {
+ "committer": "Markus Lehtonen <markus.lehtonen@linux.intel.com> 1448551035 +0200",
+ "sha1": "80d0f75635f6ac35f080736236836aac1e596845",
+ "patchfile": "packaging-add-alternative-spec-file-and-change-patch-p.patch",
+ "author": "Markus Lehtonen <markus.lehtonen@linux.intel.com> 1357733987 +0200",
+ "tree": "41d5ec4dfb4b4be0d0552d50f34f5045d4512a46",
"parents": [
- "3445afd5e168f6a58046b473ff9380999599a374"
+ "fb1bf5f16bfa1a4e3ffd29fcc0820bd60fbd1a35"
],
- "message": "Update .gbp.conf\n\nSigned-off-by: Markus Lehtonen <markus.lehtonen@linux.intel.com>"
+ "message": "packaging: add alternative spec file and change patch path\n\nAdd a second spec file for testing import-srpm spec guessing.\n\nChange one patch filename to be full url for testing import-srpm patch\nimport functionality.\n\nSigned-off-by: Markus Lehtonen <markus.lehtonen@linux.intel.com>"
},
- "d10f8183822d1a9214d2ec1b98538c1a636d9fb4": {
- "committer": "Markus Lehtonen <markus.lehtonen@linux.intel.com> 1377529985 +0300",
- "sha1": "d10f8183822d1a9214d2ec1b98538c1a636d9fb4",
- "patchfile": "packaging-reflect-the-corrected-patch-number-handling.patch",
- "author": "Markus Lehtonen <markus.lehtonen@linux.intel.com> 1357897260 +0200",
- "tree": "0506db7aae8d2404ded39db7c1f1a6bea9c81b21",
+ "189b0a152a6f1405e021c2988755ce2f5d89c998": {
+ "committer": "Markus Lehtonen <markus.lehtonen@linux.intel.com> 1448551036 +0200",
+ "sha1": "189b0a152a6f1405e021c2988755ce2f5d89c998",
+ "patchfile": "packaging-change-my2.patch-to-git-email-format.patch",
+ "author": "Markus Lehtonen <markus.lehtonen@linux.intel.com> 1358253459 +0200",
+ "tree": "8bec5b20caa318012584b1e90942949704248a13",
"parents": [
- "846aee30702fff8519dcb8bdd591ac1a227859a2"
+ "db72a4efae2b72b56f7723df844d7a506e549ce1"
],
- "message": "packaging: reflect the corrected patch number handling\n\nFix spec files as GBP now treats 'Patch:' as patch number -1, instead of\n0.\n\nSigned-off-by: Markus Lehtonen <markus.lehtonen@linux.intel.com>"
+ "message": "packaging: change my2.patch to git email format\n\nChange my2.patch from plain diff to git email format to test author and\ndate parsing of gbp.\n\nSigned-off-by: Markus Lehtonen <markus.lehtonen@linux.intel.com>"
},
"75e1ee1d3c0b920491cb9fc827be6de8cd9f0d9f": {
"committer": "Markus Lehtonen <markus.lehtonen@linux.intel.com> 1405419767 +0300",
@@ -147,39 +114,50 @@
"author": "Markus Lehtonen <markus.lehtonen@linux.intel.com> 1405419767 +0300",
"tree": "aa56ec00b2a895dc32612e9717b525725c40e4a9",
"message": "pristine-tar data for gbp-test2-2.0.tar.gz"
+ },
+ "b7b009c4f87828ad51e26c5c62b91b7c5f83cfff": {
+ "committer": "Markus Lehtonen <markus.lehtonen@linux.intel.com> 1448551002 +0200",
+ "sha1": "b7b009c4f87828ad51e26c5c62b91b7c5f83cfff",
+ "patchfile": "Add-gbp.conf.patch",
+ "author": "Markus Lehtonen <markus.lehtonen@linux.intel.com> 1352806630 +0200",
+ "tree": "7a64093756c1668d9d2888473baf9fd4d44ba11b",
+ "parents": [
+ "6dccee0ab7689e5ae446d39535138ea39a88e70c"
+ ],
+ "message": "Add gbp.conf\n\nSigned-off-by: Markus Lehtonen <markus.lehtonen@linux.intel.com>"
}
},
"refs": {
- "refs/tags/srcdata/gbp-test2/release/1%2.0-1": "c2ab8de23c48dfd24d8ab165279a595d0021cf41",
- "refs/tags/srcdata/gbp-test2/release/1%2.0-0": "63a0cbe0ad67d592f838465e595df4688e3f84a5",
- "refs/heads/srcdata/gbp-test2/pristine_tar": "75e1ee1d3c0b920491cb9fc827be6de8cd9f0d9f",
- "refs/tags/srcdata/gbp-test2/upstream/2.0": "3006655226cb9f1508a0e5eb1562c5d051170648",
- "refs/heads/srcdata/gbp-test2/master": "9d9a1e4efc5c1a9ba48c7de7bb2f3158a29e40d8",
- "refs/heads/srcdata/gbp-test2/upstream": "6dccee0ab7689e5ae446d39535138ea39a88e70c",
- "refs/heads/srcdata/gbp-test2/master-orphan": "97d5c7e811c7b4160142606d1553172ca4567f21"
+ "refs/heads/pristine-tar": "75e1ee1d3c0b920491cb9fc827be6de8cd9f0d9f",
+ "refs/tags/release/1%2.0-1": "d586d2c9384b2536bc1db0a6940578533ff9d122",
+ "refs/tags/release/1%2.0-0": "3ee597fee679b6138467ac62e4f857ef5b59b240",
+ "refs/tags/upstream/2.0": "c5da8dd1e15c6845f9f7e176a1c5208b5157da14",
+ "refs/heads/master-orphan": "a93779ad111470b1619f2ceb7a31dd10d6ad6a4f",
+ "refs/heads/upstream": "6dccee0ab7689e5ae446d39535138ea39a88e70c",
+ "refs/heads/master": "2a17b0d682aa73f10a6e242e0f60408b61812047"
},
- "HEAD": "ref: refs/heads/srcdata/gbp-test2/master\n",
+ "HEAD": "ref: refs/heads/master\n",
"tags": {
- "3006655226cb9f1508a0e5eb1562c5d051170648": {
- "tagger": "Markus Lehtonen <markus.lehtonen@linux.intel.com> 1377529719 +0300",
- "message": "Version 2.0",
- "tag": "srcdata/gbp-test2/upstream/2.0",
+ "d586d2c9384b2536bc1db0a6940578533ff9d122": {
+ "tagger": "Markus Lehtonen <markus.lehtonen@linux.intel.com> 1448551738 +0200",
+ "message": "Test-Distro release 1:2.0-1",
+ "tag": "release/1%2.0-1",
"type": "commit",
- "object": "6dccee0ab7689e5ae446d39535138ea39a88e70c"
+ "object": "2a17b0d682aa73f10a6e242e0f60408b61812047"
},
- "63a0cbe0ad67d592f838465e595df4688e3f84a5": {
- "tagger": "Markus Lehtonen <markus.lehtonen@linux.intel.com> 1377530035 +0300",
+ "3ee597fee679b6138467ac62e4f857ef5b59b240": {
+ "tagger": "Markus Lehtonen <markus.lehtonen@linux.intel.com> 1448551734 +0200",
"message": "Test-Distro release 1:2.0-0",
- "tag": "srcdata/gbp-test2/release/1%2.0-0",
+ "tag": "release/1%2.0-0",
"type": "commit",
- "object": "3445afd5e168f6a58046b473ff9380999599a374"
+ "object": "189b0a152a6f1405e021c2988755ce2f5d89c998"
},
- "c2ab8de23c48dfd24d8ab165279a595d0021cf41": {
- "tagger": "Markus Lehtonen <markus.lehtonen@linux.intel.com> 1377610676 +0300",
- "message": "Test-Distro release 1:2.0-1",
- "tag": "srcdata/gbp-test2/release/1%2.0-1",
+ "c5da8dd1e15c6845f9f7e176a1c5208b5157da14": {
+ "tagger": "Markus Lehtonen <markus.lehtonen@linux.intel.com> 1377529719 +0300",
+ "message": "Version 2.0",
+ "tag": "upstream/2.0",
"type": "commit",
- "object": "cd2763432f4ad93b29c6f22aee7f623552156a81"
+ "object": "6dccee0ab7689e5ae446d39535138ea39a88e70c"
}
}
} \ No newline at end of file
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 <markus.lehtonen@linux.intel.com>
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