diff options
| author | Markus Lehtonen <markus.lehtonen@linux.intel.com> | 2015-12-08 23:32:57 +0200 |
|---|---|---|
| committer | Markus Lehtonen <markus.lehtonen@linux.intel.com> | 2015-12-09 09:00:16 +0200 |
| commit | 282fd6308ae79efc15645e491864b171f82e2213 (patch) | |
| tree | bba38d768fa82dd7b79ca05d4af9a1510d4b12ae | |
| parent | aead4ebd40c0ce23421c4924562a0d20ad7a82b3 (diff) | |
Drop signatures and diffstat from test repo patch files
Just a cosmetic change to reduce the "noise" in the patch files.
Signed-off-by: Markus Lehtonen <markus.lehtonen@linux.intel.com>
39 files changed, 351 insertions, 635 deletions
diff --git a/gbp-test-native.data/Add-changelog-file.patch b/gbp-test-native.data/Add-changelog-file.patch index 944c9fd..b9f96aa 100644 --- a/gbp-test-native.data/Add-changelog-file.patch +++ b/gbp-test-native.data/Add-changelog-file.patch @@ -5,10 +5,6 @@ Subject: [PATCH] Add changelog file Add an "OBS-style" separate changelog file. Signed-off-by: Markus Lehtonen <markus.lehtonen@linux.intel.com> ---- - packaging/gbp-test-native.changes | 3 +++ - 1 file changed, 3 insertions(+) - create mode 100644 packaging/gbp-test-native.changes diff --git a/packaging/gbp-test-native.changes b/packaging/gbp-test-native.changes new file mode 100644 @@ -19,6 +15,3 @@ index 0000000..e9886a4 +* Tue Feb 25 2014 Markus Lehtonen <markus.lehtonen@linux.intel.com> 1.0-1 +- Initial packaging + --- -2.1.4 - diff --git a/gbp-test-native.data/Add-dummy-Makefile.patch b/gbp-test-native.data/Add-dummy-Makefile.patch index db6020e..9d7f2b1 100644 --- a/gbp-test-native.data/Add-dummy-Makefile.patch +++ b/gbp-test-native.data/Add-dummy-Makefile.patch @@ -3,10 +3,6 @@ Date: Wed, 7 Nov 2012 09:13:25 +0200 Subject: [PATCH] Add dummy Makefile Signed-off-by: Markus Lehtonen <markus.lehtonen@linux.intel.com> ---- - Makefile | 2 ++ - 1 file changed, 2 insertions(+) - create mode 100644 Makefile diff --git a/Makefile b/Makefile new file mode 100644 @@ -16,6 +12,3 @@ index 0000000..ecbc49e @@ -0,0 +1,2 @@ +all: + @echo "Ready!" --- -2.1.4 - diff --git a/gbp-test-native.data/Add-dummy-files.patch b/gbp-test-native.data/Add-dummy-files.patch index 5669449..2d2b3a8 100644 --- a/gbp-test-native.data/Add-dummy-files.patch +++ b/gbp-test-native.data/Add-dummy-files.patch @@ -3,12 +3,6 @@ Date: Wed, 7 Nov 2012 09:13:14 +0200 Subject: [PATCH] Add dummy files Signed-off-by: Markus Lehtonen <markus.lehtonen@linux.intel.com> ---- - README | 1 + - dummy.sh | 3 +++ - 2 files changed, 4 insertions(+) - create mode 100644 README - create mode 100755 dummy.sh diff --git a/README b/README new file mode 100644 @@ -26,6 +20,3 @@ index 0000000..8c33db6 +#!/bin/sh + +echo "Hello world" --- -2.1.4 - diff --git a/gbp-test-native.data/Add-gbp.conf.patch b/gbp-test-native.data/Add-gbp.conf.patch index ec429b0..5ec6d61 100644 --- a/gbp-test-native.data/Add-gbp.conf.patch +++ b/gbp-test-native.data/Add-gbp.conf.patch @@ -3,10 +3,6 @@ Date: Thu, 8 Nov 2012 19:49:51 +0200 Subject: [PATCH] Add gbp.conf Signed-off-by: Markus Lehtonen <markus.lehtonen@linux.intel.com> ---- - .gbp.conf | 5 +++++ - 1 file changed, 5 insertions(+) - create mode 100644 .gbp.conf diff --git a/.gbp.conf b/.gbp.conf new file mode 100644 @@ -19,6 +15,3 @@ index 0000000..13aa70c +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/Add-packaging-files.patch b/gbp-test-native.data/Add-packaging-files.patch index 21d70cb..6a0596a 100644 --- a/gbp-test-native.data/Add-packaging-files.patch +++ b/gbp-test-native.data/Add-packaging-files.patch @@ -3,10 +3,6 @@ Date: Thu, 8 Nov 2012 14:33:51 +0200 Subject: [PATCH] Add packaging files Signed-off-by: Markus Lehtonen <markus.lehtonen@linux.intel.com> ---- - packaging/gbp-test-native.spec | 34 ++++++++++++++++++++++++++++++++++ - 1 file changed, 34 insertions(+) - create mode 100644 packaging/gbp-test-native.spec diff --git a/packaging/gbp-test-native.spec b/packaging/gbp-test-native.spec new file mode 100644 @@ -48,6 +44,3 @@ index 0000000..38b07e4 +%defattr(-,root,root,-) +%dir %{_datadir}/%{name} +%{_datadir}/%{name} --- -2.1.4 - diff --git a/gbp-test-native.data/manifest.json b/gbp-test-native.data/manifest.json index 0a0fc9f..994677b 100644 --- a/gbp-test-native.data/manifest.json +++ b/gbp-test-native.data/manifest.json @@ -1,81 +1,81 @@ { + "HEAD": "ref: refs/heads/master\n", "commits": { - "3da491d0deb6f39fec98b3ca2e946126052e5134": { - "committer": "Markus Lehtonen <markus.lehtonen@linux.intel.com> 1352272394 +0200", - "sha1": "3da491d0deb6f39fec98b3ca2e946126052e5134", - "patchfile": "Add-dummy-files.patch", - "author": "Markus Lehtonen <markus.lehtonen@linux.intel.com> 1352272394 +0200", - "tree": "ad6c786edb64f4bf1be4c38db1bf4dde485fd5c6", + "0579e0753b78476ad822c54b6ea07e2e80c0cdd2": { + "author": "Markus Lehtonen <markus.lehtonen@linux.intel.com> 1352272349 +0200", + "committer": "Markus Lehtonen <markus.lehtonen@linux.intel.com> 1352272349 +0200", + "message": "Repository initialization\n\nSigned-off-by: Markus Lehtonen <markus.lehtonen@linux.intel.com>", + "patchfile": "Repository-initialization.patch", + "sha1": "0579e0753b78476ad822c54b6ea07e2e80c0cdd2", + "tree": "4b825dc642cb6eb9a060e54bf8d69288fbee4904" + }, + "2602690dc1870e491488bc59241d4735100aebd5": { + "author": "Markus Lehtonen <markus.lehtonen@linux.intel.com> 1352378031 +0200", + "committer": "Markus Lehtonen <markus.lehtonen@linux.intel.com> 1448556394 +0200", + "message": "Add packaging files\n\nSigned-off-by: Markus Lehtonen <markus.lehtonen@linux.intel.com>", "parents": [ - "0579e0753b78476ad822c54b6ea07e2e80c0cdd2" + "3d679b81b4c7847ac217515b2878d1e4680d50d7" ], - "message": "Add dummy files\n\nSigned-off-by: Markus Lehtonen <markus.lehtonen@linux.intel.com>" + "patchfile": "Add-packaging-files.patch", + "sha1": "2602690dc1870e491488bc59241d4735100aebd5", + "tree": "8bfe92bfb18c69580d94b50b5f1afa99f7391819" }, "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", + "committer": "Markus Lehtonen <markus.lehtonen@linux.intel.com> 1448556393 +0200", + "message": "Add gbp.conf\n\nSigned-off-by: Markus Lehtonen <markus.lehtonen@linux.intel.com>", "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", - "patchfile": "Repository-initialization.patch", - "author": "Markus Lehtonen <markus.lehtonen@linux.intel.com> 1352272349 +0200", - "tree": "4b825dc642cb6eb9a060e54bf8d69288fbee4904", - "message": "Repository initialization\n\nSigned-off-by: Markus Lehtonen <markus.lehtonen@linux.intel.com>" + "patchfile": "Add-gbp.conf.patch", + "sha1": "3d679b81b4c7847ac217515b2878d1e4680d50d7", + "tree": "cc4847f78e3c9e0937668dd7473c428c7fe79a3d" }, - "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": "8bfe92bfb18c69580d94b50b5f1afa99f7391819", + "3da491d0deb6f39fec98b3ca2e946126052e5134": { + "author": "Markus Lehtonen <markus.lehtonen@linux.intel.com> 1352272394 +0200", + "committer": "Markus Lehtonen <markus.lehtonen@linux.intel.com> 1352272394 +0200", + "message": "Add dummy files\n\nSigned-off-by: Markus Lehtonen <markus.lehtonen@linux.intel.com>", "parents": [ - "3d679b81b4c7847ac217515b2878d1e4680d50d7" + "0579e0753b78476ad822c54b6ea07e2e80c0cdd2" ], - "message": "Add packaging files\n\nSigned-off-by: Markus Lehtonen <markus.lehtonen@linux.intel.com>" + "patchfile": "Add-dummy-files.patch", + "sha1": "3da491d0deb6f39fec98b3ca2e946126052e5134", + "tree": "ad6c786edb64f4bf1be4c38db1bf4dde485fd5c6" }, "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", + "committer": "Markus Lehtonen <markus.lehtonen@linux.intel.com> 1448556394 +0200", + "message": "Add changelog file\n\nAdd an \"OBS-style\" separate changelog file.\n\nSigned-off-by: Markus Lehtonen <markus.lehtonen@linux.intel.com>", "parents": [ "2602690dc1870e491488bc59241d4735100aebd5" ], - "message": "Add changelog file\n\nAdd an \"OBS-style\" separate changelog file.\n\nSigned-off-by: Markus Lehtonen <markus.lehtonen@linux.intel.com>" + "patchfile": "Add-changelog-file.patch", + "sha1": "66d8d14f6112eb144f4dbd877b07d64a33a14e33", + "tree": "937e32d31f1b11231476693eae588d27404cee75" }, "cb5596d72659212d947f0cb882d758edb70a69b8": { - "committer": "Markus Lehtonen <markus.lehtonen@linux.intel.com> 1352272405 +0200", - "sha1": "cb5596d72659212d947f0cb882d758edb70a69b8", - "patchfile": "Add-dummy-Makefile.patch", "author": "Markus Lehtonen <markus.lehtonen@linux.intel.com> 1352272405 +0200", - "tree": "4d95f43faa3efb7b914f2c384853f0776649d567", + "committer": "Markus Lehtonen <markus.lehtonen@linux.intel.com> 1352272405 +0200", + "message": "Add dummy Makefile\n\nSigned-off-by: Markus Lehtonen <markus.lehtonen@linux.intel.com>", "parents": [ "3da491d0deb6f39fec98b3ca2e946126052e5134" ], - "message": "Add dummy Makefile\n\nSigned-off-by: Markus Lehtonen <markus.lehtonen@linux.intel.com>" + "patchfile": "Add-dummy-Makefile.patch", + "sha1": "cb5596d72659212d947f0cb882d758edb70a69b8", + "tree": "4d95f43faa3efb7b914f2c384853f0776649d567" } }, "refs": { "refs/heads/master": "66d8d14f6112eb144f4dbd877b07d64a33a14e33", "refs/tags/release/1.0-1": "03fa45b9f680c75a7195c60d2893797f4fc49f47" }, - "HEAD": "ref: refs/heads/master\n", "tags": { "03fa45b9f680c75a7195c60d2893797f4fc49f47": { - "tagger": "Markus Lehtonen <markus.lehtonen@linux.intel.com> 1448556424 +0200", "message": "Test-Distro release 1.0-1", + "object": "2602690dc1870e491488bc59241d4735100aebd5", "tag": "release/1.0-1", - "type": "commit", - "object": "2602690dc1870e491488bc59241d4735100aebd5" + "tagger": "Markus Lehtonen <markus.lehtonen@linux.intel.com> 1448556424 +0200", + "type": "commit" } } }
\ 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 ec429b0..5ec6d61 100644 --- a/gbp-test-native2.data/Add-gbp.conf.patch +++ b/gbp-test-native2.data/Add-gbp.conf.patch @@ -3,10 +3,6 @@ Date: Thu, 8 Nov 2012 19:49:51 +0200 Subject: [PATCH] Add gbp.conf Signed-off-by: Markus Lehtonen <markus.lehtonen@linux.intel.com> ---- - .gbp.conf | 5 +++++ - 1 file changed, 5 insertions(+) - create mode 100644 .gbp.conf diff --git a/.gbp.conf b/.gbp.conf new file mode 100644 @@ -19,6 +15,3 @@ index 0000000..13aa70c +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/Add-packaging-files.patch b/gbp-test-native2.data/Add-packaging-files.patch index 0e7a77a..26d39ec 100644 --- a/gbp-test-native2.data/Add-packaging-files.patch +++ b/gbp-test-native2.data/Add-packaging-files.patch @@ -3,12 +3,6 @@ Date: Thu, 8 Nov 2012 14:33:51 +0200 Subject: [PATCH] Add packaging files Signed-off-by: Markus Lehtonen <markus.lehtonen@linux.intel.com> ---- - foo.txt | 3 +++ - gbp-test-native2.spec | 35 +++++++++++++++++++++++++++++++++++ - 2 files changed, 38 insertions(+) - create mode 100644 foo.txt - create mode 100644 gbp-test-native2.spec diff --git a/foo.txt b/foo.txt new file mode 100644 @@ -60,6 +54,3 @@ index 0000000..34fd33d +%defattr(-,root,root,-) +%dir %{_datadir}/%{name} +%{_datadir}/%{name} --- -2.1.4 - diff --git a/gbp-test-native2.data/manifest.json b/gbp-test-native2.data/manifest.json index 73f5bdd..526b195 100644 --- a/gbp-test-native2.data/manifest.json +++ b/gbp-test-native2.data/manifest.json @@ -1,48 +1,48 @@ { + "HEAD": "ref: refs/heads/master\n", "commits": { + "0579e0753b78476ad822c54b6ea07e2e80c0cdd2": { + "author": "Markus Lehtonen <markus.lehtonen@linux.intel.com> 1352272349 +0200", + "committer": "Markus Lehtonen <markus.lehtonen@linux.intel.com> 1352272349 +0200", + "message": "Repository initialization\n\nSigned-off-by: Markus Lehtonen <markus.lehtonen@linux.intel.com>", + "patchfile": "Repository-initialization.patch", + "sha1": "0579e0753b78476ad822c54b6ea07e2e80c0cdd2", + "tree": "4b825dc642cb6eb9a060e54bf8d69288fbee4904" + }, "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": "c39480f420ac998a5654d2f636993c12f0d3625c", + "committer": "Markus Lehtonen <markus.lehtonen@linux.intel.com> 1448556624 +0200", + "message": "Add packaging files\n\nSigned-off-by: Markus Lehtonen <markus.lehtonen@linux.intel.com>", "parents": [ "8c635fc95942701989b9e777f57a16b36c7689a2" ], - "message": "Add packaging files\n\nSigned-off-by: Markus Lehtonen <markus.lehtonen@linux.intel.com>" + "patchfile": "Add-packaging-files.patch", + "sha1": "8a0c3b923beea5ccfb2c29db2f56a5f924fa02eb", + "tree": "c39480f420ac998a5654d2f636993c12f0d3625c" }, "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": "cc8ea141c352ebe5357ff49f53efb7bdf03fee22", + "committer": "Markus Lehtonen <markus.lehtonen@linux.intel.com> 1448556624 +0200", + "message": "Add gbp.conf\n\nSigned-off-by: Markus Lehtonen <markus.lehtonen@linux.intel.com>", "parents": [ "0579e0753b78476ad822c54b6ea07e2e80c0cdd2" ], - "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", - "patchfile": "Repository-initialization.patch", - "author": "Markus Lehtonen <markus.lehtonen@linux.intel.com> 1352272349 +0200", - "tree": "4b825dc642cb6eb9a060e54bf8d69288fbee4904", - "message": "Repository initialization\n\nSigned-off-by: Markus Lehtonen <markus.lehtonen@linux.intel.com>" + "patchfile": "Add-gbp.conf.patch", + "sha1": "8c635fc95942701989b9e777f57a16b36c7689a2", + "tree": "cc8ea141c352ebe5357ff49f53efb7bdf03fee22" } }, "refs": { - "refs/tags/release/2.0-0": "6b7594bd635ce9e841c9fa0bf8872ae811e4d3f9", - "refs/heads/master": "8a0c3b923beea5ccfb2c29db2f56a5f924fa02eb" + "refs/heads/master": "8a0c3b923beea5ccfb2c29db2f56a5f924fa02eb", + "refs/tags/release/2.0-0": "6b7594bd635ce9e841c9fa0bf8872ae811e4d3f9" }, - "HEAD": "ref: refs/heads/master\n", "tags": { "6b7594bd635ce9e841c9fa0bf8872ae811e4d3f9": { - "tagger": "Markus Lehtonen <markus.lehtonen@linux.intel.com> 1448556639 +0200", "message": "Test-Distro release 2.0-0", + "object": "8a0c3b923beea5ccfb2c29db2f56a5f924fa02eb", "tag": "release/2.0-0", - "type": "commit", - "object": "8a0c3b923beea5ccfb2c29db2f56a5f924fa02eb" + "tagger": "Markus Lehtonen <markus.lehtonen@linux.intel.com> 1448556639 +0200", + "type": "commit" } } }
\ No newline at end of file diff --git a/gbp-test.data/Add-.gitignore.patch b/gbp-test.data/Add-.gitignore.patch index 5433c8a..f0259d2 100644 --- a/gbp-test.data/Add-.gitignore.patch +++ b/gbp-test.data/Add-.gitignore.patch @@ -5,10 +5,6 @@ Subject: [PATCH] Add .gitignore Ignore '*.tmp' and '*.swp'. Signed-off-by: Markus Lehtonen <markus.lehtonen@linux.intel.com> ---- - .gitignore | 2 ++ - 1 file changed, 2 insertions(+) - create mode 100644 .gitignore diff --git a/.gitignore b/.gitignore new file mode 100644 @@ -18,6 +14,3 @@ index 0000000..c9b0245 @@ -0,0 +1,2 @@ +*.tmp +*.swp --- -2.1.4 - diff --git a/gbp-test.data/Add-changelog.patch b/gbp-test.data/Add-changelog.patch index 1ffe462..59d342d 100644 --- a/gbp-test.data/Add-changelog.patch +++ b/gbp-test.data/Add-changelog.patch @@ -3,9 +3,6 @@ Date: Tue, 25 Feb 2014 11:02:26 +0200 Subject: [PATCH] Add changelog Signed-off-by: Markus Lehtonen <markus.lehtonen@linux.intel.com> ---- - gbp-test.spec | 7 +++++++ - 1 file changed, 7 insertions(+) diff --git a/gbp-test.spec b/gbp-test.spec index 0a8fecc..9f0e198 100644 @@ -22,6 +19,3 @@ index 0a8fecc..9f0e198 100644 +* Tue Feb 25 2014 Markus Lehtonen <markus.lehtonen@linux.intel.com> 1.1-2 +- Version 1.1 + --- -2.1.4 - diff --git a/gbp-test.data/Add-compressed-patches.patch b/gbp-test.data/Add-compressed-patches.patch index a72cc7b..67060dc 100644 --- a/gbp-test.data/Add-compressed-patches.patch +++ b/gbp-test.data/Add-compressed-patches.patch @@ -5,13 +5,6 @@ Subject: [PATCH] Add compressed patches New release. Adds patches compressed with gzip and bzip2. Signed-off-by: Markus Lehtonen <markus.lehtonen@linux.intel.com> ---- - gbp-test.spec | 6 +++++- - my-bzip2.patch.bz2 | Bin 0 -> 137 bytes - my-gz.patch.gz | Bin 0 -> 166 bytes - 3 files changed, 5 insertions(+), 1 deletion(-) - create mode 100644 my-bzip2.patch.bz2 - create mode 100644 my-gz.patch.gz diff --git a/gbp-test.spec b/gbp-test.spec index 0898d72..0a8fecc 100644 @@ -69,6 +62,3 @@ UBWFsw>Dq;O0eO1I8K?jN069iY*Z=?k literal 0 HcmV?d00001 --- -2.1.4 - diff --git a/gbp-test.data/Add-dummy-Makefile.patch b/gbp-test.data/Add-dummy-Makefile.patch index db6020e..9d7f2b1 100644 --- a/gbp-test.data/Add-dummy-Makefile.patch +++ b/gbp-test.data/Add-dummy-Makefile.patch @@ -3,10 +3,6 @@ Date: Wed, 7 Nov 2012 09:13:25 +0200 Subject: [PATCH] Add dummy Makefile Signed-off-by: Markus Lehtonen <markus.lehtonen@linux.intel.com> ---- - Makefile | 2 ++ - 1 file changed, 2 insertions(+) - create mode 100644 Makefile diff --git a/Makefile b/Makefile new file mode 100644 @@ -16,6 +12,3 @@ index 0000000..ecbc49e @@ -0,0 +1,2 @@ +all: + @echo "Ready!" --- -2.1.4 - diff --git a/gbp-test.data/Add-dummy-files.patch b/gbp-test.data/Add-dummy-files.patch index 5669449..2d2b3a8 100644 --- a/gbp-test.data/Add-dummy-files.patch +++ b/gbp-test.data/Add-dummy-files.patch @@ -3,12 +3,6 @@ Date: Wed, 7 Nov 2012 09:13:14 +0200 Subject: [PATCH] Add dummy files Signed-off-by: Markus Lehtonen <markus.lehtonen@linux.intel.com> ---- - README | 1 + - dummy.sh | 3 +++ - 2 files changed, 4 insertions(+) - create mode 100644 README - create mode 100755 dummy.sh diff --git a/README b/README new file mode 100644 @@ -26,6 +20,3 @@ index 0000000..8c33db6 +#!/bin/sh + +echo "Hello world" --- -2.1.4 - diff --git a/gbp-test.data/Add-gbp.conf.patch b/gbp-test.data/Add-gbp.conf.patch index 256be73..280371b 100644 --- a/gbp-test.data/Add-gbp.conf.patch +++ b/gbp-test.data/Add-gbp.conf.patch @@ -3,10 +3,6 @@ Date: Thu, 8 Nov 2012 19:20:17 +0200 Subject: [PATCH] Add gbp.conf Signed-off-by: Markus Lehtonen <markus.lehtonen@linux.intel.com> ---- - .gbp.conf | 7 +++++++ - 1 file changed, 7 insertions(+) - create mode 100644 .gbp.conf diff --git a/.gbp.conf b/.gbp.conf new file mode 100644 @@ -21,6 +17,3 @@ index 0000000..598b658 +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/Add-initial-packaging-files.patch b/gbp-test.data/Add-initial-packaging-files.patch index 964ce9d..566fdc4 100644 --- a/gbp-test.data/Add-initial-packaging-files.patch +++ b/gbp-test.data/Add-initial-packaging-files.patch @@ -3,20 +3,6 @@ Date: Thu, 8 Nov 2012 19:12:21 +0200 Subject: [PATCH] Add initial packaging files Signed-off-by: Markus Lehtonen <markus.lehtonen@linux.intel.com> ---- - bar.tar.gz | Bin 0 -> 177 bytes - foo.txt | 3 +++ - gbp-test.spec | 42 ++++++++++++++++++++++++++++++++++++++++++ - my.patch | 9 +++++++++ - my2.patch | 7 +++++++ - my3.patch | 7 +++++++ - 6 files changed, 68 insertions(+) - create mode 100644 bar.tar.gz - create mode 100644 foo.txt - create mode 100644 gbp-test.spec - create mode 100644 my.patch - create mode 100644 my2.patch - create mode 100644 my3.patch diff --git a/bar.tar.gz b/bar.tar.gz new file mode 100644 @@ -129,6 +115,3 @@ index 0000000..9fee859 +@@ -1 +1 @@ +-Just for testing git-buildpackage. ++Just for testing GBP. --- -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 b9e482f..c7134bf 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 @@ -5,10 +5,6 @@ Subject: [PATCH] Auto-import file(s) from branch 'srcdata/gbp-test/master': Gbp: Ignore Gbp-Rpm: Ignore ---- - .gbp.conf | 7 +++++++ - 1 file changed, 7 insertions(+) - create mode 100644 .gbp.conf diff --git a/.gbp.conf b/.gbp.conf new file mode 100644 @@ -23,6 +19,3 @@ index 0000000..598b658 +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 60dddb6..6b8bc9f 100644 --- a/gbp-test.data/Create-a-forked-version.patch +++ b/gbp-test.data/Create-a-forked-version.patch @@ -3,12 +3,6 @@ Date: Thu, 8 Nov 2012 19:37:36 +0200 Subject: [PATCH] Create a forked version. Signed-off-by: Markus Lehtonen <markus.lehtonen@linux.intel.com> ---- - .gbp.conf | 4 ++-- - gbp-test.spec | 2 +- - my3.patch | 7 ------- - 3 files changed, 3 insertions(+), 10 deletions(-) - delete mode 100644 my3.patch diff --git a/.gbp.conf b/.gbp.conf index 598b658..1f3671f 100644 @@ -54,6 +48,3 @@ index 9fee859..0000000 -@@ -1 +1 @@ --Just for testing git-buildpackage. -+Just for testing GBP. --- -2.1.4 - diff --git a/gbp-test.data/Modify-README.patch b/gbp-test.data/Modify-README.patch index 6f92152..bde0d5e 100644 --- a/gbp-test.data/Modify-README.patch +++ b/gbp-test.data/Modify-README.patch @@ -3,9 +3,6 @@ Date: Wed, 7 Nov 2012 09:15:41 +0200 Subject: [PATCH] Modify README Signed-off-by: Markus Lehtonen <markus.lehtonen@linux.intel.com> ---- - README | 2 ++ - 1 file changed, 2 insertions(+) diff --git a/README b/README index a1311cb..17b5e09 100644 @@ -15,6 +12,3 @@ index a1311cb..17b5e09 100644 Just for testing git-buildpackage. + +Version 1.1 --- -2.1.4 - 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 02d17cf..d238dae 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 @@ -3,9 +3,6 @@ Date: Tue, 27 Aug 2013 16:57:44 +0300 Subject: [PATCH] Update gbp.conf to rename the generated source package Signed-off-by: Markus Lehtonen <markus.lehtonen@linux.intel.com> ---- - .gbp.conf | 1 + - 1 file changed, 1 insertion(+) diff --git a/.gbp.conf b/.gbp.conf index 1f3671f..d2302db 100644 @@ -16,6 +13,3 @@ index 1f3671f..d2302db 100644 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/Version-bump-to-1.1.patch b/gbp-test.data/Version-bump-to-1.1.patch index 5cf6d7c..4a81d7e 100644 --- a/gbp-test.data/Version-bump-to-1.1.patch +++ b/gbp-test.data/Version-bump-to-1.1.patch @@ -3,9 +3,6 @@ Date: Thu, 8 Nov 2012 19:37:36 +0200 Subject: [PATCH] Version bump to 1.1 Signed-off-by: Markus Lehtonen <markus.lehtonen@linux.intel.com> ---- - gbp-test.spec | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gbp-test.spec b/gbp-test.spec index c46a734..0898d72 100644 @@ -19,6 +16,3 @@ index c46a734..0898d72 100644 Release: 1 Group: Development/Libraries License: GPLv2 --- -2.1.4 - diff --git a/gbp-test.data/manifest.json b/gbp-test.data/manifest.json index 960d27a..fc62eea 100644 --- a/gbp-test.data/manifest.json +++ b/gbp-test.data/manifest.json @@ -1,262 +1,262 @@ { + "HEAD": "ref: refs/heads/master\n", "commits": { - "42239c7f237b51a02b701dbd077f161c3a8036cb": { - "committer": "Markus Lehtonen <markus.lehtonen@linux.intel.com> 1405419535 +0300", - "sha1": "42239c7f237b51a02b701dbd077f161c3a8036cb", - "patchfile": "pristine-tar-data-for-gbp-test-1.0.tar.bz2.patch", - "author": "Markus Lehtonen <markus.lehtonen@linux.intel.com> 1405419535 +0300", - "tree": "f158ca5c2372e2386efc41d55da67117de6457c1", - "message": "pristine-tar data for gbp-test-1.0.tar.bz2" + "0579e0753b78476ad822c54b6ea07e2e80c0cdd2": { + "author": "Markus Lehtonen <markus.lehtonen@linux.intel.com> 1352272349 +0200", + "committer": "Markus Lehtonen <markus.lehtonen@linux.intel.com> 1352272349 +0200", + "message": "Repository initialization\n\nSigned-off-by: Markus Lehtonen <markus.lehtonen@linux.intel.com>", + "patchfile": "Repository-initialization.patch", + "sha1": "0579e0753b78476ad822c54b6ea07e2e80c0cdd2", + "tree": "4b825dc642cb6eb9a060e54bf8d69288fbee4904" }, - "4140ac36c9511620734b1692d175ff8bb7435b79": { + "0bbf100d2386abe5e13a3fdcaf4878285fe3d752": { + "author": "Markus Lehtonen <markus.lehtonen@linux.intel.com> 1405585647 +0300", "committer": "Markus Lehtonen <markus.lehtonen@linux.intel.com> 1448553313 +0200", - "sha1": "4140ac36c9511620734b1692d175ff8bb7435b79", - "patchfile": "my-bzip2.patch", + "message": "Auto-import file(s) from branch 'srcdata/gbp-test/master':\n .gbp.conf\n\nGbp: Ignore\nGbp-Rpm: Ignore", + "parents": [ + "6450890aa002b0868537ee50cc1aea177fdcc941" + ], + "patchfile": "Auto-import-file-s-from-branch-srcdata-gbp-test-master.patch", + "sha1": "0bbf100d2386abe5e13a3fdcaf4878285fe3d752", + "tree": "3affc5c03684dd084deda7d117278924cfae691d" + }, + "26073221b1b357f076e18446ff18904538757e40": { "author": "Markus Lehtonen <markus.lehtonen@linux.intel.com> 1405585647 +0300", - "tree": "ea3ca259d5a73df217bbcc0b5e099faa3ba1dbbd", + "committer": "Markus Lehtonen <markus.lehtonen@linux.intel.com> 1448553313 +0200", + "message": "my-gz", "parents": [ - "26073221b1b357f076e18446ff18904538757e40" + "0bbf100d2386abe5e13a3fdcaf4878285fe3d752" ], - "message": "my-bzip2" + "patchfile": "my-gz.patch", + "sha1": "26073221b1b357f076e18446ff18904538757e40", + "tree": "e1d995715363081b0816b3d9c2cbd15cf58d6ee9" }, - "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", + "2daf4a20c32d63966f55ffff05643388b58b7a4d": { + "author": "Markus Lehtonen <markus.lehtonen@linux.intel.com> 1405585647 +0300", + "committer": "Markus Lehtonen <markus.lehtonen@linux.intel.com> 1448553314 +0200", + "message": "my2", "parents": [ - "808906d7e5d1fa4ad6f79c863b56d12593e4e6ce" + "4140ac36c9511620734b1692d175ff8bb7435b79" ], - "message": "Add .gitignore\n\nIgnore '*.tmp' and '*.swp'.\n\nSigned-off-by: Markus Lehtonen <markus.lehtonen@linux.intel.com>" + "patchfile": "my2.patch", + "sha1": "2daf4a20c32d63966f55ffff05643388b58b7a4d", + "tree": "cc443e8fdcc30fc4d818336d52a6031341111448" }, "3da491d0deb6f39fec98b3ca2e946126052e5134": { - "committer": "Markus Lehtonen <markus.lehtonen@linux.intel.com> 1352272394 +0200", - "sha1": "3da491d0deb6f39fec98b3ca2e946126052e5134", - "patchfile": "Add-dummy-files.patch", "author": "Markus Lehtonen <markus.lehtonen@linux.intel.com> 1352272394 +0200", - "tree": "ad6c786edb64f4bf1be4c38db1bf4dde485fd5c6", + "committer": "Markus Lehtonen <markus.lehtonen@linux.intel.com> 1352272394 +0200", + "message": "Add dummy files\n\nSigned-off-by: Markus Lehtonen <markus.lehtonen@linux.intel.com>", "parents": [ "0579e0753b78476ad822c54b6ea07e2e80c0cdd2" ], - "message": "Add dummy files\n\nSigned-off-by: Markus Lehtonen <markus.lehtonen@linux.intel.com>" + "patchfile": "Add-dummy-files.patch", + "sha1": "3da491d0deb6f39fec98b3ca2e946126052e5134", + "tree": "ad6c786edb64f4bf1be4c38db1bf4dde485fd5c6" }, - "0579e0753b78476ad822c54b6ea07e2e80c0cdd2": { - "committer": "Markus Lehtonen <markus.lehtonen@linux.intel.com> 1352272349 +0200", - "sha1": "0579e0753b78476ad822c54b6ea07e2e80c0cdd2", - "patchfile": "Repository-initialization.patch", - "author": "Markus Lehtonen <markus.lehtonen@linux.intel.com> 1352272349 +0200", - "tree": "4b825dc642cb6eb9a060e54bf8d69288fbee4904", - "message": "Repository initialization\n\nSigned-off-by: Markus Lehtonen <markus.lehtonen@linux.intel.com>" + "4140ac36c9511620734b1692d175ff8bb7435b79": { + "author": "Markus Lehtonen <markus.lehtonen@linux.intel.com> 1405585647 +0300", + "committer": "Markus Lehtonen <markus.lehtonen@linux.intel.com> 1448553313 +0200", + "message": "my-bzip2", + "parents": [ + "26073221b1b357f076e18446ff18904538757e40" + ], + "patchfile": "my-bzip2.patch", + "sha1": "4140ac36c9511620734b1692d175ff8bb7435b79", + "tree": "ea3ca259d5a73df217bbcc0b5e099faa3ba1dbbd" + }, + "42239c7f237b51a02b701dbd077f161c3a8036cb": { + "author": "Markus Lehtonen <markus.lehtonen@linux.intel.com> 1405419535 +0300", + "committer": "Markus Lehtonen <markus.lehtonen@linux.intel.com> 1405419535 +0300", + "message": "pristine-tar data for gbp-test-1.0.tar.bz2", + "patchfile": "pristine-tar-data-for-gbp-test-1.0.tar.bz2.patch", + "sha1": "42239c7f237b51a02b701dbd077f161c3a8036cb", + "tree": "f158ca5c2372e2386efc41d55da67117de6457c1" }, "6450890aa002b0868537ee50cc1aea177fdcc941": { - "committer": "Markus Lehtonen <markus.lehtonen@linux.intel.com> 1352272541 +0200", - "sha1": "6450890aa002b0868537ee50cc1aea177fdcc941", - "patchfile": "Modify-README.patch", "author": "Markus Lehtonen <markus.lehtonen@linux.intel.com> 1352272541 +0200", - "tree": "faacd47155bcaf94dbfbcb85d807512291b54dc5", + "committer": "Markus Lehtonen <markus.lehtonen@linux.intel.com> 1352272541 +0200", + "message": "Modify README\n\nSigned-off-by: Markus Lehtonen <markus.lehtonen@linux.intel.com>", "parents": [ "cb5596d72659212d947f0cb882d758edb70a69b8" ], - "message": "Modify README\n\nSigned-off-by: Markus Lehtonen <markus.lehtonen@linux.intel.com>" + "patchfile": "Modify-README.patch", + "sha1": "6450890aa002b0868537ee50cc1aea177fdcc941", + "tree": "faacd47155bcaf94dbfbcb85d807512291b54dc5" + }, + "760f5514aad64a31e26d08792984faaea59b740d": { + "author": "Markus Lehtonen <markus.lehtonen@linux.intel.com> 1352396256 +0200", + "committer": "Markus Lehtonen <markus.lehtonen@linux.intel.com> 1448549248 +0200", + "message": "Create a forked version.\n\nSigned-off-by: Markus Lehtonen <markus.lehtonen@linux.intel.com>", + "parents": [ + "f6c85dd3acf7811fd8a12aa304c3fd7a583bcdb1" + ], + "patchfile": "Create-a-forked-version.patch", + "sha1": "760f5514aad64a31e26d08792984faaea59b740d", + "tree": "05c80eaa14bc071479b9510a7eaadf9ab5ff9650" }, "7ce872128f5d0f4970102bdd2fdfc85b77244c7a": { + "author": "Markus Lehtonen <markus.lehtonen@linux.intel.com> 1352394455 +0200", "committer": "Markus Lehtonen <markus.lehtonen@linux.intel.com> 1352394455 +0200", - "sha1": "7ce872128f5d0f4970102bdd2fdfc85b77244c7a", + "message": "Initial commit\n\nSigned-off-by: Markus Lehtonen <markus.lehtonen@linux.intel.com>", "patchfile": "Initial-commit.patch", - "author": "Markus Lehtonen <markus.lehtonen@linux.intel.com> 1352394455 +0200", - "tree": "4b825dc642cb6eb9a060e54bf8d69288fbee4904", - "message": "Initial commit\n\nSigned-off-by: Markus Lehtonen <markus.lehtonen@linux.intel.com>" + "sha1": "7ce872128f5d0f4970102bdd2fdfc85b77244c7a", + "tree": "4b825dc642cb6eb9a060e54bf8d69288fbee4904" }, - "f6c85dd3acf7811fd8a12aa304c3fd7a583bcdb1": { + "808906d7e5d1fa4ad6f79c863b56d12593e4e6ce": { + "author": "Markus Lehtonen <markus.lehtonen@linux.intel.com> 1393318946 +0200", "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", + "message": "Add changelog\n\nSigned-off-by: Markus Lehtonen <markus.lehtonen@linux.intel.com>", "parents": [ - "834a39e0889dfe9779336730bc68b7e8ef2cf793" + "b3cd99dae46fcec1ad7e4b2adf41b1ec6cfa590f" ], - "message": "Add initial packaging files\n\nSigned-off-by: Markus Lehtonen <markus.lehtonen@linux.intel.com>" + "patchfile": "Add-changelog.patch", + "sha1": "808906d7e5d1fa4ad6f79c863b56d12593e4e6ce", + "tree": "2aa6fb238d5fa3f5a73078ac77e8fa8bbdefc9a3" }, - "ee75150c3e9f3dacc1000d7ebc34a833e23b0356": { - "committer": "Markus Lehtonen <markus.lehtonen@linux.intel.com> 1405419544 +0300", - "sha1": "ee75150c3e9f3dacc1000d7ebc34a833e23b0356", - "patchfile": "pristine-tar-data-for-gbp-test-1.1.tar.bz2.patch", - "author": "Markus Lehtonen <markus.lehtonen@linux.intel.com> 1405419544 +0300", - "tree": "2435a8996297f840489f8dfbda5d19d3ed49a669", + "834a39e0889dfe9779336730bc68b7e8ef2cf793": { + "author": "Markus Lehtonen <markus.lehtonen@linux.intel.com> 1352395217 +0200", + "committer": "Markus Lehtonen <markus.lehtonen@linux.intel.com> 1448549153 +0200", + "message": "Add gbp.conf\n\nSigned-off-by: Markus Lehtonen <markus.lehtonen@linux.intel.com>", "parents": [ - "42239c7f237b51a02b701dbd077f161c3a8036cb" + "7ce872128f5d0f4970102bdd2fdfc85b77244c7a" ], - "message": "pristine-tar data for gbp-test-1.1.tar.bz2" + "patchfile": "Add-gbp.conf.patch", + "sha1": "834a39e0889dfe9779336730bc68b7e8ef2cf793", + "tree": "dac3c42871a1dc32b65adac4eef1722e0a6831fb" }, - "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", + "925e9580ae2a76331dff7c09a27080c695d88cc3": { + "author": "Markus Lehtonen <markus.lehtonen@linux.intel.com> 1404294590 +0300", + "committer": "Markus Lehtonen <markus.lehtonen@linux.intel.com> 1448549157 +0200", + "message": "Add .gitignore\n\nIgnore '*.tmp' and '*.swp'.\n\nSigned-off-by: Markus Lehtonen <markus.lehtonen@linux.intel.com>", "parents": [ - "6450890aa002b0868537ee50cc1aea177fdcc941" + "808906d7e5d1fa4ad6f79c863b56d12593e4e6ce" ], - "message": "Auto-import file(s) from branch 'srcdata/gbp-test/master':\n .gbp.conf\n\nGbp: Ignore\nGbp-Rpm: Ignore" + "patchfile": "Add-.gitignore.patch", + "sha1": "925e9580ae2a76331dff7c09a27080c695d88cc3", + "tree": "19149d2bb381d1d4e7d52d9e3c96df18d69b3eab" }, "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": [ - "f234683df1682cc81a631856b2bf284340234975" - ], - "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>" - }, - "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", + "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>", "parents": [ - "b3cd99dae46fcec1ad7e4b2adf41b1ec6cfa590f" + "f234683df1682cc81a631856b2bf284340234975" ], - "message": "Add changelog\n\nSigned-off-by: Markus Lehtonen <markus.lehtonen@linux.intel.com>" + "patchfile": "Add-compressed-patches.patch", + "sha1": "b3cd99dae46fcec1ad7e4b2adf41b1ec6cfa590f", + "tree": "fc16065ed8b66d42d060670d611ecf6bad1746b9" }, - "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": "cc443e8fdcc30fc4d818336d52a6031341111448", + "cb5596d72659212d947f0cb882d758edb70a69b8": { + "author": "Markus Lehtonen <markus.lehtonen@linux.intel.com> 1352272405 +0200", + "committer": "Markus Lehtonen <markus.lehtonen@linux.intel.com> 1352272405 +0200", + "message": "Add dummy Makefile\n\nSigned-off-by: Markus Lehtonen <markus.lehtonen@linux.intel.com>", "parents": [ - "4140ac36c9511620734b1692d175ff8bb7435b79" + "3da491d0deb6f39fec98b3ca2e946126052e5134" ], - "message": "my2" + "patchfile": "Add-dummy-Makefile.patch", + "sha1": "cb5596d72659212d947f0cb882d758edb70a69b8", + "tree": "4d95f43faa3efb7b914f2c384853f0776649d567" }, "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", + "committer": "Markus Lehtonen <markus.lehtonen@linux.intel.com> 1448549264 +0200", + "message": "Update gbp.conf to rename the generated source package\n\nSigned-off-by: Markus Lehtonen <markus.lehtonen@linux.intel.com>", "parents": [ "760f5514aad64a31e26d08792984faaea59b740d" ], - "message": "Update gbp.conf to rename the generated source package\n\nSigned-off-by: Markus Lehtonen <markus.lehtonen@linux.intel.com>" + "patchfile": "Update-gbp.conf-to-rename-the-generated-source-package.patch", + "sha1": "cbf747086e12cc390cdae71ce297b0e1a55a420a", + "tree": "22658ce6155376fc6348769bc1756725acca705b" }, - "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", + "ee75150c3e9f3dacc1000d7ebc34a833e23b0356": { + "author": "Markus Lehtonen <markus.lehtonen@linux.intel.com> 1405419544 +0300", + "committer": "Markus Lehtonen <markus.lehtonen@linux.intel.com> 1405419544 +0300", + "message": "pristine-tar data for gbp-test-1.1.tar.bz2", "parents": [ - "f6c85dd3acf7811fd8a12aa304c3fd7a583bcdb1" + "42239c7f237b51a02b701dbd077f161c3a8036cb" ], - "message": "Create a forked version.\n\nSigned-off-by: Markus Lehtonen <markus.lehtonen@linux.intel.com>" + "patchfile": "pristine-tar-data-for-gbp-test-1.1.tar.bz2.patch", + "sha1": "ee75150c3e9f3dacc1000d7ebc34a833e23b0356", + "tree": "2435a8996297f840489f8dfbda5d19d3ed49a669" }, "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", + "committer": "Markus Lehtonen <markus.lehtonen@linux.intel.com> 1448549157 +0200", + "message": "Version bump to 1.1\n\nSigned-off-by: Markus Lehtonen <markus.lehtonen@linux.intel.com>", "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", - "sha1": "cb5596d72659212d947f0cb882d758edb70a69b8", - "patchfile": "Add-dummy-Makefile.patch", - "author": "Markus Lehtonen <markus.lehtonen@linux.intel.com> 1352272405 +0200", - "tree": "4d95f43faa3efb7b914f2c384853f0776649d567", - "parents": [ - "3da491d0deb6f39fec98b3ca2e946126052e5134" - ], - "message": "Add dummy Makefile\n\nSigned-off-by: Markus Lehtonen <markus.lehtonen@linux.intel.com>" + "patchfile": "Version-bump-to-1.1.patch", + "sha1": "f234683df1682cc81a631856b2bf284340234975", + "tree": "78054d45c9bb174e41b27a7eaa3c1b096a60fe5c" }, - "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": "dac3c42871a1dc32b65adac4eef1722e0a6831fb", + "f6c85dd3acf7811fd8a12aa304c3fd7a583bcdb1": { + "author": "Markus Lehtonen <markus.lehtonen@linux.intel.com> 1352394741 +0200", + "committer": "Markus Lehtonen <markus.lehtonen@linux.intel.com> 1448549157 +0200", + "message": "Add initial packaging files\n\nSigned-off-by: Markus Lehtonen <markus.lehtonen@linux.intel.com>", "parents": [ - "7ce872128f5d0f4970102bdd2fdfc85b77244c7a" + "834a39e0889dfe9779336730bc68b7e8ef2cf793" ], - "message": "Add gbp.conf\n\nSigned-off-by: Markus Lehtonen <markus.lehtonen@linux.intel.com>" + "patchfile": "Add-initial-packaging-files.patch", + "sha1": "f6c85dd3acf7811fd8a12aa304c3fd7a583bcdb1", + "tree": "4b34035c4e1b14c570946fab454901499eb8b717" } }, "refs": { - "refs/heads/pristine-tar": "ee75150c3e9f3dacc1000d7ebc34a833e23b0356", + "refs/heads/fork": "cbf747086e12cc390cdae71ce297b0e1a55a420a", + "refs/heads/master": "925e9580ae2a76331dff7c09a27080c695d88cc3", "refs/heads/pq/master": "2daf4a20c32d63966f55ffff05643388b58b7a4d", + "refs/heads/pristine-tar": "ee75150c3e9f3dacc1000d7ebc34a833e23b0356", + "refs/heads/upstream": "6450890aa002b0868537ee50cc1aea177fdcc941", "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/release/1.1-2": "2d24c99cca2a563ca0e498ffc972d54049345f66", "refs/tags/upstream/1.0": "3788dc189de65222f9740c48af30e2d4c8175726", - "refs/tags/upstream/1.1": "d55cd55506641d7dd6f968bba37451a599f26017", - "refs/heads/upstream": "6450890aa002b0868537ee50cc1aea177fdcc941", - "refs/heads/master": "925e9580ae2a76331dff7c09a27080c695d88cc3" + "refs/tags/upstream/1.1": "d55cd55506641d7dd6f968bba37451a599f26017" }, - "HEAD": "ref: refs/heads/master\n", "tags": { - "d55cd55506641d7dd6f968bba37451a599f26017": { - "tagger": "Markus Lehtonen <markus.lehtonen@linux.intel.com> 1377529755 +0300", - "message": "Version 1.1", - "tag": "upstream/1.1", - "type": "commit", - "object": "6450890aa002b0868537ee50cc1aea177fdcc941" - }, - "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": "f6c85dd3acf7811fd8a12aa304c3fd7a583bcdb1" + "2d24c99cca2a563ca0e498ffc972d54049345f66": { + "message": "Test-Distro release 1.1-2", + "object": "b3cd99dae46fcec1ad7e4b2adf41b1ec6cfa590f", + "tag": "release/1.1-2", + "tagger": "Markus Lehtonen <markus.lehtonen@linux.intel.com> 1448549368 +0200", + "type": "commit" }, "3788dc189de65222f9740c48af30e2d4c8175726": { - "tagger": "Markus Lehtonen <markus.lehtonen@linux.intel.com> 1377529152 +0300", "message": "Version 1.0", + "object": "cb5596d72659212d947f0cb882d758edb70a69b8", "tag": "upstream/1.0", - "type": "commit", - "object": "cb5596d72659212d947f0cb882d758edb70a69b8" - }, - "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" + "tagger": "Markus Lehtonen <markus.lehtonen@linux.intel.com> 1377529152 +0300", + "type": "commit" }, "a64150c6e2feb9efa5c9cf150107a3b06a1657e7": { - "tagger": "Markus Lehtonen <markus.lehtonen@linux.intel.com> 1448549366 +0200", "message": "Test-Distro release 1.1-1", + "object": "f234683df1682cc81a631856b2bf284340234975", "tag": "release/1.1-1", - "type": "commit", - "object": "f234683df1682cc81a631856b2bf284340234975" + "tagger": "Markus Lehtonen <markus.lehtonen@linux.intel.com> 1448549366 +0200", + "type": "commit" + }, + "b96b77fa4c4016f788aa5a36fa53241305ba86b2": { + "message": "Test-Distro release 1.0-1", + "object": "f6c85dd3acf7811fd8a12aa304c3fd7a583bcdb1", + "tag": "release/1.0-1", + "tagger": "Markus Lehtonen <markus.lehtonen@linux.intel.com> 1448549318 +0200", + "type": "commit" + }, + "d55cd55506641d7dd6f968bba37451a599f26017": { + "message": "Version 1.1", + "object": "6450890aa002b0868537ee50cc1aea177fdcc941", + "tag": "upstream/1.1", + "tagger": "Markus Lehtonen <markus.lehtonen@linux.intel.com> 1377529755 +0300", + "type": "commit" }, "e7d565fd0795315ef64c28aedabcfc4c0d7c579a": { - "tagger": "Markus Lehtonen <markus.lehtonen@linux.intel.com> 1448549401 +0200", "message": "Test-Distro release 1.0-1", + "object": "cbf747086e12cc390cdae71ce297b0e1a55a420a", "tag": "fork/release/1.0-1", - "type": "commit", - "object": "cbf747086e12cc390cdae71ce297b0e1a55a420a" + "tagger": "Markus Lehtonen <markus.lehtonen@linux.intel.com> 1448549401 +0200", + "type": "commit" } } }
\ No newline at end of file diff --git a/gbp-test.data/my-bzip2.patch b/gbp-test.data/my-bzip2.patch index b1940e4..b5588c7 100644 --- a/gbp-test.data/my-bzip2.patch +++ b/gbp-test.data/my-bzip2.patch @@ -2,10 +2,6 @@ From: Markus Lehtonen <markus.lehtonen@linux.intel.com> Date: Thu, 17 Jul 2014 11:27:27 +0300 Subject: [PATCH] my-bzip2 ---- - NEWS | 1 + - 1 file changed, 1 insertion(+) - create mode 100644 NEWS diff --git a/NEWS b/NEWS new file mode 100644 @@ -14,6 +10,3 @@ index 0000000..e2620b0 +++ b/NEWS @@ -0,0 +1 @@ +No news. --- -2.1.4 - diff --git a/gbp-test.data/my-gz.patch b/gbp-test.data/my-gz.patch index 01699a3..a86beab 100644 --- a/gbp-test.data/my-gz.patch +++ b/gbp-test.data/my-gz.patch @@ -2,10 +2,6 @@ From: Markus Lehtonen <markus.lehtonen@linux.intel.com> Date: Thu, 17 Jul 2014 11:27:27 +0300 Subject: [PATCH] my-gz ---- - AUTHORS | 1 + - 1 file changed, 1 insertion(+) - create mode 100644 AUTHORS diff --git a/AUTHORS b/AUTHORS new file mode 100644 @@ -14,6 +10,3 @@ index 0000000..9c3f518 +++ b/AUTHORS @@ -0,0 +1 @@ +Markus Lehtonen <markus.lehtonen@linux.intel.com> --- -2.1.4 - diff --git a/gbp-test.data/my2.patch b/gbp-test.data/my2.patch index f852a6c..b0fedb8 100644 --- a/gbp-test.data/my2.patch +++ b/gbp-test.data/my2.patch @@ -2,10 +2,6 @@ From: Markus Lehtonen <markus.lehtonen@linux.intel.com> Date: Thu, 17 Jul 2014 11:27:27 +0300 Subject: [PATCH] my2 ---- - mydir/myfile.txt | 1 + - 1 file changed, 1 insertion(+) - create mode 100644 mydir/myfile.txt diff --git a/mydir/myfile.txt b/mydir/myfile.txt new file mode 100644 @@ -14,6 +10,3 @@ index 0000000..2cdad29 +++ b/mydir/myfile.txt @@ -0,0 +1 @@ +Dummy --- -2.1.4 - diff --git a/gbp-test.data/pristine-tar-data-for-gbp-test-1.0.tar.bz2.patch b/gbp-test.data/pristine-tar-data-for-gbp-test-1.0.tar.bz2.patch index 0de5157..f30b81b 100644 --- a/gbp-test.data/pristine-tar-data-for-gbp-test-1.0.tar.bz2.patch +++ b/gbp-test.data/pristine-tar-data-for-gbp-test-1.0.tar.bz2.patch @@ -2,12 +2,6 @@ From: Markus Lehtonen <markus.lehtonen@linux.intel.com> Date: Tue, 15 Jul 2014 13:18:55 +0300 Subject: [PATCH] pristine-tar data for gbp-test-1.0.tar.bz2 ---- - gbp-test-1.0.tar.bz2.delta | Bin 0 -> 1234 bytes - gbp-test-1.0.tar.bz2.id | 1 + - 2 files changed, 1 insertion(+) - create mode 100644 gbp-test-1.0.tar.bz2.delta - create mode 100644 gbp-test-1.0.tar.bz2.id diff --git a/gbp-test-1.0.tar.bz2.delta b/gbp-test-1.0.tar.bz2.delta new file mode 100644 @@ -49,6 +43,3 @@ index 0000000..0221a07 +++ b/gbp-test-1.0.tar.bz2.id @@ -0,0 +1 @@ +4d95f43faa3efb7b914f2c384853f0776649d567 --- -2.1.4 - diff --git a/gbp-test.data/pristine-tar-data-for-gbp-test-1.1.tar.bz2.patch b/gbp-test.data/pristine-tar-data-for-gbp-test-1.1.tar.bz2.patch index 161e116..eae6868 100644 --- a/gbp-test.data/pristine-tar-data-for-gbp-test-1.1.tar.bz2.patch +++ b/gbp-test.data/pristine-tar-data-for-gbp-test-1.1.tar.bz2.patch @@ -2,12 +2,6 @@ From: Markus Lehtonen <markus.lehtonen@linux.intel.com> Date: Tue, 15 Jul 2014 13:19:04 +0300 Subject: [PATCH] pristine-tar data for gbp-test-1.1.tar.bz2 ---- - gbp-test-1.1.tar.bz2.delta | Bin 0 -> 1236 bytes - gbp-test-1.1.tar.bz2.id | 1 + - 2 files changed, 1 insertion(+) - create mode 100644 gbp-test-1.1.tar.bz2.delta - create mode 100644 gbp-test-1.1.tar.bz2.id diff --git a/gbp-test-1.1.tar.bz2.delta b/gbp-test-1.1.tar.bz2.delta new file mode 100644 @@ -49,6 +43,3 @@ index 0000000..ea1b4e4 +++ b/gbp-test-1.1.tar.bz2.id @@ -0,0 +1 @@ +faacd47155bcaf94dbfbcb85d807512291b54dc5 --- -2.1.4 - diff --git a/gbp-test2.data/Add-dummy-Makefile.patch b/gbp-test2.data/Add-dummy-Makefile.patch index 1f9a75b..19f3da4 100644 --- a/gbp-test2.data/Add-dummy-Makefile.patch +++ b/gbp-test2.data/Add-dummy-Makefile.patch @@ -3,10 +3,6 @@ Date: Wed, 7 Nov 2012 09:13:25 +0200 Subject: [PATCH] Add dummy Makefile Signed-off-by: Markus Lehtonen <markus.lehtonen@linux.intel.com> ---- - Makefile | 2 ++ - 1 file changed, 2 insertions(+) - create mode 100644 Makefile diff --git a/Makefile b/Makefile new file mode 100644 @@ -16,6 +12,3 @@ index 0000000..de5341d @@ -0,0 +1,2 @@ +all: + @echo "Ready (2.0)!" --- -2.1.4 - diff --git a/gbp-test2.data/Add-dummy-files.patch b/gbp-test2.data/Add-dummy-files.patch index 0b8cd82..fdebc88 100644 --- a/gbp-test2.data/Add-dummy-files.patch +++ b/gbp-test2.data/Add-dummy-files.patch @@ -3,12 +3,6 @@ Date: Wed, 7 Nov 2012 09:13:14 +0200 Subject: [PATCH] Add dummy files Signed-off-by: Markus Lehtonen <markus.lehtonen@linux.intel.com> ---- - README | 2 ++ - dummy.sh | 3 +++ - 2 files changed, 5 insertions(+) - create mode 100644 README - create mode 100755 dummy.sh diff --git a/README b/README new file mode 100644 @@ -27,6 +21,3 @@ index 0000000..7eeb298 +#!/bin/sh + +echo "Hello world 2.0" --- -2.1.4 - diff --git a/gbp-test2.data/Add-gbp.conf.patch b/gbp-test2.data/Add-gbp.conf.patch index 6dde169..c6c4923 100644 --- a/gbp-test2.data/Add-gbp.conf.patch +++ b/gbp-test2.data/Add-gbp.conf.patch @@ -3,10 +3,6 @@ Date: Tue, 13 Nov 2012 13:37:10 +0200 Subject: [PATCH] Add gbp.conf Signed-off-by: Markus Lehtonen <markus.lehtonen@linux.intel.com> ---- - .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 @@ -24,6 +20,3 @@ index 0000000..3d5f92d +packaging-dir = packaging +patch-ignore-path = ^(packaging/.*|\.gbp.conf) + --- -2.1.4 - diff --git a/gbp-test2.data/Add-packaging-files.patch b/gbp-test2.data/Add-packaging-files.patch index 3b77369..5d13ffe 100644 --- a/gbp-test2.data/Add-packaging-files.patch +++ b/gbp-test2.data/Add-packaging-files.patch @@ -3,20 +3,6 @@ Date: Tue, 13 Nov 2012 13:35:52 +0200 Subject: [PATCH] Add packaging files Signed-off-by: Markus Lehtonen <markus.lehtonen@linux.intel.com> ---- - packaging/bar.tar.gz | Bin 0 -> 177 bytes - packaging/foo.txt | 3 +++ - packaging/gbp-test2.spec | 48 +++++++++++++++++++++++++++++++++++++++++++++++ - packaging/my.patch | 9 +++++++++ - packaging/my2.patch | 7 +++++++ - packaging/my3.patch | 7 +++++++ - 6 files changed, 74 insertions(+) - create mode 100644 packaging/bar.tar.gz - create mode 100644 packaging/foo.txt - create mode 100644 packaging/gbp-test2.spec - create mode 100644 packaging/my.patch - create mode 100644 packaging/my2.patch - create mode 100644 packaging/my3.patch diff --git a/packaging/bar.tar.gz b/packaging/bar.tar.gz new file mode 100644 @@ -135,6 +121,3 @@ index 0000000..9fee859 +@@ -1 +1 @@ +-Just for testing git-buildpackage. ++Just for testing GBP. --- -2.1.4 - diff --git a/gbp-test2.data/My-addition.patch b/gbp-test2.data/My-addition.patch index c18d7b2..7e52b9f 100644 --- a/gbp-test2.data/My-addition.patch +++ b/gbp-test2.data/My-addition.patch @@ -5,10 +5,6 @@ Subject: [PATCH] My addition Import my2.patch to the git tree. Signed-off-by: Markus Lehtonen <markus.lehtonen@linux.intel.com> ---- - mydir/myfile.txt | 1 + - 1 file changed, 1 insertion(+) - create mode 100644 mydir/myfile.txt diff --git a/mydir/myfile.txt b/mydir/myfile.txt new file mode 100644 @@ -17,6 +13,3 @@ index 0000000..2cdad29 +++ b/mydir/myfile.txt @@ -0,0 +1 @@ +Dummy --- -2.1.4 - diff --git a/gbp-test2.data/Remove-imported-patches.patch b/gbp-test2.data/Remove-imported-patches.patch index e41295c..020a8a1 100644 --- a/gbp-test2.data/Remove-imported-patches.patch +++ b/gbp-test2.data/Remove-imported-patches.patch @@ -5,14 +5,6 @@ Subject: [PATCH] Remove imported patches And enable automatic patch-generation. Signed-off-by: Markus Lehtonen <markus.lehtonen@linux.intel.com> ---- - .gbp.conf | 1 + - packaging/gbp-test2.spec | 5 +---- - packaging/my2.patch | 16 ---------------- - packaging/my3.patch | 7 ------- - 4 files changed, 2 insertions(+), 27 deletions(-) - delete mode 100644 packaging/my2.patch - delete mode 100644 packaging/my3.patch diff --git a/.gbp.conf b/.gbp.conf index 6c8e847..52a1267 100644 @@ -91,6 +83,3 @@ index 9fee859..0000000 -@@ -1 +1 @@ --Just for testing git-buildpackage. -+Just for testing GBP. --- -2.1.4 - diff --git a/gbp-test2.data/Update-.gbp.conf.patch b/gbp-test2.data/Update-.gbp.conf.patch index f91b7f0..704c65e 100644 --- a/gbp-test2.data/Update-.gbp.conf.patch +++ b/gbp-test2.data/Update-.gbp.conf.patch @@ -3,9 +3,6 @@ Date: Thu, 12 Dec 2013 12:15:13 +0200 Subject: [PATCH] Update .gbp.conf Signed-off-by: Markus Lehtonen <markus.lehtonen@linux.intel.com> ---- - .gbp.conf | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.gbp.conf b/.gbp.conf index 6c8e847..e76aa24 100644 @@ -21,6 +18,3 @@ index 6c8e847..e76aa24 100644 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/manifest.json b/gbp-test2.data/manifest.json index 9567a3e..7ec60cc 100644 --- a/gbp-test2.data/manifest.json +++ b/gbp-test2.data/manifest.json @@ -1,163 +1,163 @@ { + "HEAD": "ref: refs/heads/master\n", "commits": { - "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": [ - "189b0a152a6f1405e021c2988755ce2f5d89c998" - ], - "message": "My addition\n\nImport my2.patch to the git tree.\n\nSigned-off-by: Markus Lehtonen <markus.lehtonen@linux.intel.com>" - }, "0579e0753b78476ad822c54b6ea07e2e80c0cdd2": { + "author": "Markus Lehtonen <markus.lehtonen@linux.intel.com> 1352272349 +0200", "committer": "Markus Lehtonen <markus.lehtonen@linux.intel.com> 1352272349 +0200", - "sha1": "0579e0753b78476ad822c54b6ea07e2e80c0cdd2", + "message": "Repository initialization\n\nSigned-off-by: Markus Lehtonen <markus.lehtonen@linux.intel.com>", "patchfile": "Repository-initialization.patch", - "author": "Markus Lehtonen <markus.lehtonen@linux.intel.com> 1352272349 +0200", - "tree": "4b825dc642cb6eb9a060e54bf8d69288fbee4904", - "message": "Repository initialization\n\nSigned-off-by: Markus Lehtonen <markus.lehtonen@linux.intel.com>" + "sha1": "0579e0753b78476ad822c54b6ea07e2e80c0cdd2", + "tree": "4b825dc642cb6eb9a060e54bf8d69288fbee4904" }, - "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", + "189b0a152a6f1405e021c2988755ce2f5d89c998": { + "author": "Markus Lehtonen <markus.lehtonen@linux.intel.com> 1358253459 +0200", + "committer": "Markus Lehtonen <markus.lehtonen@linux.intel.com> 1448551036 +0200", + "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>", "parents": [ - "189b0a152a6f1405e021c2988755ce2f5d89c998" + "db72a4efae2b72b56f7723df844d7a506e549ce1" + ], + "patchfile": "packaging-change-my2.patch-to-git-email-format.patch", + "sha1": "189b0a152a6f1405e021c2988755ce2f5d89c998", + "tree": "8bec5b20caa318012584b1e90942949704248a13" + }, + "2a17b0d682aa73f10a6e242e0f60408b61812047": { + "author": "Markus Lehtonen <markus.lehtonen@linux.intel.com> 1352807855 +0200", + "committer": "Markus Lehtonen <markus.lehtonen@linux.intel.com> 1448551076 +0200", + "message": "Remove imported patches\n\nAnd enable automatic patch-generation.\n\nSigned-off-by: Markus Lehtonen <markus.lehtonen@linux.intel.com>", + "parents": [ + "9ff4f5f6853622a95489d2d575c63eceedc203f8" ], - "message": "Update .gbp.conf\n\nSigned-off-by: Markus Lehtonen <markus.lehtonen@linux.intel.com>" + "patchfile": "Remove-imported-patches.patch", + "sha1": "2a17b0d682aa73f10a6e242e0f60408b61812047", + "tree": "771f74c3339e47cf7ad767bd39a27eec4aba4df0" }, "6dccee0ab7689e5ae446d39535138ea39a88e70c": { - "committer": "Markus Lehtonen <markus.lehtonen@linux.intel.com> 1352806279 +0200", - "sha1": "6dccee0ab7689e5ae446d39535138ea39a88e70c", - "patchfile": "Add-dummy-Makefile.patch", "author": "Markus Lehtonen <markus.lehtonen@linux.intel.com> 1352272405 +0200", - "tree": "afdd4586454b4648d29a606ebf6be9c52708332f", + "committer": "Markus Lehtonen <markus.lehtonen@linux.intel.com> 1352806279 +0200", + "message": "Add dummy Makefile\n\nSigned-off-by: Markus Lehtonen <markus.lehtonen@linux.intel.com>", "parents": [ "dc4481d39005968f1f2673d760af69b411eccc33" ], - "message": "Add dummy Makefile\n\nSigned-off-by: Markus Lehtonen <markus.lehtonen@linux.intel.com>" + "patchfile": "Add-dummy-Makefile.patch", + "sha1": "6dccee0ab7689e5ae446d39535138ea39a88e70c", + "tree": "afdd4586454b4648d29a606ebf6be9c52708332f" }, - "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": [ - "80d0f75635f6ac35f080736236836aac1e596845" - ], - "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>" + "75e1ee1d3c0b920491cb9fc827be6de8cd9f0d9f": { + "author": "Markus Lehtonen <markus.lehtonen@linux.intel.com> 1405419767 +0300", + "committer": "Markus Lehtonen <markus.lehtonen@linux.intel.com> 1405419767 +0300", + "message": "pristine-tar data for gbp-test2-2.0.tar.gz", + "patchfile": "pristine-tar-data-for-gbp-test2-2.0.tar.gz.patch", + "sha1": "75e1ee1d3c0b920491cb9fc827be6de8cd9f0d9f", + "tree": "aa56ec00b2a895dc32612e9717b525725c40e4a9" }, - "dc4481d39005968f1f2673d760af69b411eccc33": { - "committer": "Markus Lehtonen <markus.lehtonen@linux.intel.com> 1352806277 +0200", - "sha1": "dc4481d39005968f1f2673d760af69b411eccc33", - "patchfile": "Add-dummy-files.patch", - "author": "Markus Lehtonen <markus.lehtonen@linux.intel.com> 1352272394 +0200", - "tree": "af52702a859e84653bfab0a1e0f9253177772f28", + "80d0f75635f6ac35f080736236836aac1e596845": { + "author": "Markus Lehtonen <markus.lehtonen@linux.intel.com> 1357733987 +0200", + "committer": "Markus Lehtonen <markus.lehtonen@linux.intel.com> 1448551035 +0200", + "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>", "parents": [ - "0579e0753b78476ad822c54b6ea07e2e80c0cdd2" + "fb1bf5f16bfa1a4e3ffd29fcc0820bd60fbd1a35" ], - "message": "Add dummy files\n\nSigned-off-by: Markus Lehtonen <markus.lehtonen@linux.intel.com>" + "patchfile": "packaging-add-alternative-spec-file-and-change-patch-p.patch", + "sha1": "80d0f75635f6ac35f080736236836aac1e596845", + "tree": "41d5ec4dfb4b4be0d0552d50f34f5045d4512a46" }, - "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", + "9ff4f5f6853622a95489d2d575c63eceedc203f8": { + "author": "Markus Lehtonen <markus.lehtonen@linux.intel.com> 1352807746 +0200", + "committer": "Markus Lehtonen <markus.lehtonen@linux.intel.com> 1448551036 +0200", + "message": "My addition\n\nImport my2.patch to the git tree.\n\nSigned-off-by: Markus Lehtonen <markus.lehtonen@linux.intel.com>", "parents": [ - "b7b009c4f87828ad51e26c5c62b91b7c5f83cfff" + "189b0a152a6f1405e021c2988755ce2f5d89c998" ], - "message": "Add packaging files\n\nSigned-off-by: Markus Lehtonen <markus.lehtonen@linux.intel.com>" + "patchfile": "My-addition.patch", + "sha1": "9ff4f5f6853622a95489d2d575c63eceedc203f8", + "tree": "472db0daae817c14f1cb74608e1d234758301da0" }, - "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": "771f74c3339e47cf7ad767bd39a27eec4aba4df0", + "a93779ad111470b1619f2ceb7a31dd10d6ad6a4f": { + "author": "Markus Lehtonen <markus.lehtonen@linux.intel.com> 1386843313 +0200", + "committer": "Markus Lehtonen <markus.lehtonen@linux.intel.com> 1448551387 +0200", + "message": "Update .gbp.conf\n\nSigned-off-by: Markus Lehtonen <markus.lehtonen@linux.intel.com>", "parents": [ - "9ff4f5f6853622a95489d2d575c63eceedc203f8" + "189b0a152a6f1405e021c2988755ce2f5d89c998" ], - "message": "Remove imported patches\n\nAnd enable automatic patch-generation.\n\nSigned-off-by: Markus Lehtonen <markus.lehtonen@linux.intel.com>" + "patchfile": "Update-.gbp.conf.patch", + "sha1": "a93779ad111470b1619f2ceb7a31dd10d6ad6a4f", + "tree": "e92ab121d622ee866dffd560ce2dcd561223719b" }, - "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", + "b7b009c4f87828ad51e26c5c62b91b7c5f83cfff": { + "author": "Markus Lehtonen <markus.lehtonen@linux.intel.com> 1352806630 +0200", + "committer": "Markus Lehtonen <markus.lehtonen@linux.intel.com> 1448551002 +0200", + "message": "Add gbp.conf\n\nSigned-off-by: Markus Lehtonen <markus.lehtonen@linux.intel.com>", "parents": [ - "fb1bf5f16bfa1a4e3ffd29fcc0820bd60fbd1a35" + "6dccee0ab7689e5ae446d39535138ea39a88e70c" ], - "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>" + "patchfile": "Add-gbp.conf.patch", + "sha1": "b7b009c4f87828ad51e26c5c62b91b7c5f83cfff", + "tree": "7a64093756c1668d9d2888473baf9fd4d44ba11b" }, - "189b0a152a6f1405e021c2988755ce2f5d89c998": { + "db72a4efae2b72b56f7723df844d7a506e549ce1": { + "author": "Markus Lehtonen <markus.lehtonen@linux.intel.com> 1357897260 +0200", "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", + "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>", "parents": [ - "db72a4efae2b72b56f7723df844d7a506e549ce1" + "80d0f75635f6ac35f080736236836aac1e596845" ], - "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>" + "patchfile": "packaging-reflect-the-corrected-patch-number-handling.patch", + "sha1": "db72a4efae2b72b56f7723df844d7a506e549ce1", + "tree": "cc668ba4e00ae7308e6a9f1b2225a820e50f618f" }, - "75e1ee1d3c0b920491cb9fc827be6de8cd9f0d9f": { - "committer": "Markus Lehtonen <markus.lehtonen@linux.intel.com> 1405419767 +0300", - "sha1": "75e1ee1d3c0b920491cb9fc827be6de8cd9f0d9f", - "patchfile": "pristine-tar-data-for-gbp-test2-2.0.tar.gz.patch", - "author": "Markus Lehtonen <markus.lehtonen@linux.intel.com> 1405419767 +0300", - "tree": "aa56ec00b2a895dc32612e9717b525725c40e4a9", - "message": "pristine-tar data for gbp-test2-2.0.tar.gz" + "dc4481d39005968f1f2673d760af69b411eccc33": { + "author": "Markus Lehtonen <markus.lehtonen@linux.intel.com> 1352272394 +0200", + "committer": "Markus Lehtonen <markus.lehtonen@linux.intel.com> 1352806277 +0200", + "message": "Add dummy files\n\nSigned-off-by: Markus Lehtonen <markus.lehtonen@linux.intel.com>", + "parents": [ + "0579e0753b78476ad822c54b6ea07e2e80c0cdd2" + ], + "patchfile": "Add-dummy-files.patch", + "sha1": "dc4481d39005968f1f2673d760af69b411eccc33", + "tree": "af52702a859e84653bfab0a1e0f9253177772f28" }, - "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", + "fb1bf5f16bfa1a4e3ffd29fcc0820bd60fbd1a35": { + "author": "Markus Lehtonen <markus.lehtonen@linux.intel.com> 1352806552 +0200", + "committer": "Markus Lehtonen <markus.lehtonen@linux.intel.com> 1448551003 +0200", + "message": "Add packaging files\n\nSigned-off-by: Markus Lehtonen <markus.lehtonen@linux.intel.com>", "parents": [ - "6dccee0ab7689e5ae446d39535138ea39a88e70c" + "b7b009c4f87828ad51e26c5c62b91b7c5f83cfff" ], - "message": "Add gbp.conf\n\nSigned-off-by: Markus Lehtonen <markus.lehtonen@linux.intel.com>" + "patchfile": "Add-packaging-files.patch", + "sha1": "fb1bf5f16bfa1a4e3ffd29fcc0820bd60fbd1a35", + "tree": "321aba18b5f072ecab528e2b004cdd4396b8c780" } }, "refs": { - "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": "2a17b0d682aa73f10a6e242e0f60408b61812047", "refs/heads/master-orphan": "a93779ad111470b1619f2ceb7a31dd10d6ad6a4f", + "refs/heads/pristine-tar": "75e1ee1d3c0b920491cb9fc827be6de8cd9f0d9f", "refs/heads/upstream": "6dccee0ab7689e5ae446d39535138ea39a88e70c", - "refs/heads/master": "2a17b0d682aa73f10a6e242e0f60408b61812047" + "refs/tags/release/1%2.0-0": "3ee597fee679b6138467ac62e4f857ef5b59b240", + "refs/tags/release/1%2.0-1": "d586d2c9384b2536bc1db0a6940578533ff9d122", + "refs/tags/upstream/2.0": "c5da8dd1e15c6845f9f7e176a1c5208b5157da14" }, - "HEAD": "ref: refs/heads/master\n", "tags": { - "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": "2a17b0d682aa73f10a6e242e0f60408b61812047" - }, "3ee597fee679b6138467ac62e4f857ef5b59b240": { - "tagger": "Markus Lehtonen <markus.lehtonen@linux.intel.com> 1448551734 +0200", "message": "Test-Distro release 1:2.0-0", + "object": "189b0a152a6f1405e021c2988755ce2f5d89c998", "tag": "release/1%2.0-0", - "type": "commit", - "object": "189b0a152a6f1405e021c2988755ce2f5d89c998" + "tagger": "Markus Lehtonen <markus.lehtonen@linux.intel.com> 1448551734 +0200", + "type": "commit" }, "c5da8dd1e15c6845f9f7e176a1c5208b5157da14": { - "tagger": "Markus Lehtonen <markus.lehtonen@linux.intel.com> 1377529719 +0300", "message": "Version 2.0", + "object": "6dccee0ab7689e5ae446d39535138ea39a88e70c", "tag": "upstream/2.0", - "type": "commit", - "object": "6dccee0ab7689e5ae446d39535138ea39a88e70c" + "tagger": "Markus Lehtonen <markus.lehtonen@linux.intel.com> 1377529719 +0300", + "type": "commit" + }, + "d586d2c9384b2536bc1db0a6940578533ff9d122": { + "message": "Test-Distro release 1:2.0-1", + "object": "2a17b0d682aa73f10a6e242e0f60408b61812047", + "tag": "release/1%2.0-1", + "tagger": "Markus Lehtonen <markus.lehtonen@linux.intel.com> 1448551738 +0200", + "type": "commit" } } }
\ 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 d900df2..1295be9 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 @@ -8,12 +8,6 @@ Change one patch filename to be full url for testing import-srpm patch import functionality. Signed-off-by: Markus Lehtonen <markus.lehtonen@linux.intel.com> ---- - .gbp.conf | 1 + - packaging/gbp-test2-alt.spec | 48 ++++++++++++++++++++++++++++++++++++++++++++ - packaging/gbp-test2.spec | 3 ++- - 3 files changed, 51 insertions(+), 1 deletion(-) - create mode 100644 packaging/gbp-test2-alt.spec diff --git a/.gbp.conf b/.gbp.conf index 3d5f92d..6c8e847 100644 @@ -95,6 +89,3 @@ index 61aae33..eec5d26 100644 Patch20: my3.patch Packager: Markus Lehtonen <markus.lehtonen@linux.intel.com> --- -2.1.4 - diff --git a/gbp-test2.data/packaging-change-my2.patch-to-git-email-format.patch b/gbp-test2.data/packaging-change-my2.patch-to-git-email-format.patch index 8bab862..9aa20cc 100644 --- a/gbp-test2.data/packaging-change-my2.patch-to-git-email-format.patch +++ b/gbp-test2.data/packaging-change-my2.patch-to-git-email-format.patch @@ -6,9 +6,6 @@ Change my2.patch from plain diff to git email format to test author and date parsing of gbp. Signed-off-by: Markus Lehtonen <markus.lehtonen@linux.intel.com> ---- - packaging/my2.patch | 9 +++++++++ - 1 file changed, 9 insertions(+) diff --git a/packaging/my2.patch b/packaging/my2.patch index ad5ca2d..5554d9c 100644 @@ -27,6 +24,3 @@ index ad5ca2d..5554d9c 100644 diff --git a/mydir/myfile.txt b/mydir/myfile.txt new file mode 100644 index 0000000..2cdad29 --- -2.1.4 - diff --git a/gbp-test2.data/packaging-reflect-the-corrected-patch-number-handling.patch b/gbp-test2.data/packaging-reflect-the-corrected-patch-number-handling.patch index 51639d9..a0a2264 100644 --- a/gbp-test2.data/packaging-reflect-the-corrected-patch-number-handling.patch +++ b/gbp-test2.data/packaging-reflect-the-corrected-patch-number-handling.patch @@ -6,10 +6,6 @@ Fix spec files as GBP now treats 'Patch:' as patch number -1, instead of 0. Signed-off-by: Markus Lehtonen <markus.lehtonen@linux.intel.com> ---- - packaging/gbp-test2-alt.spec | 2 +- - packaging/gbp-test2.spec | 2 +- - 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/packaging/gbp-test2-alt.spec b/packaging/gbp-test2-alt.spec index 155ea43..be5d8bc 100644 @@ -37,6 +33,3 @@ index eec5d26..5b41aae 100644 Patch: my.patch Patch10: http://example.com/patches/my2.patch Patch20: my3.patch --- -2.1.4 - diff --git a/gbp-test2.data/pristine-tar-data-for-gbp-test2-2.0.tar.gz.patch b/gbp-test2.data/pristine-tar-data-for-gbp-test2-2.0.tar.gz.patch index fa6dc96..5709e95 100644 --- a/gbp-test2.data/pristine-tar-data-for-gbp-test2-2.0.tar.gz.patch +++ b/gbp-test2.data/pristine-tar-data-for-gbp-test2-2.0.tar.gz.patch @@ -2,12 +2,6 @@ From: Markus Lehtonen <markus.lehtonen@linux.intel.com> Date: Tue, 15 Jul 2014 13:22:47 +0300 Subject: [PATCH] pristine-tar data for gbp-test2-2.0.tar.gz ---- - gbp-test2-2.0.tar.gz.delta | Bin 0 -> 1302 bytes - gbp-test2-2.0.tar.gz.id | 1 + - 2 files changed, 1 insertion(+) - create mode 100644 gbp-test2-2.0.tar.gz.delta - create mode 100644 gbp-test2-2.0.tar.gz.id diff --git a/gbp-test2-2.0.tar.gz.delta b/gbp-test2-2.0.tar.gz.delta new file mode 100644 @@ -51,6 +45,3 @@ index 0000000..340feea +++ b/gbp-test2-2.0.tar.gz.id @@ -0,0 +1 @@ +afdd4586454b4648d29a606ebf6be9c52708332f --- -2.1.4 - |