diff options
Diffstat (limited to 'gbp-test2.data')
-rw-r--r-- | gbp-test2.data/Add-dummy-Makefile.patch | 7 | ||||
-rw-r--r-- | gbp-test2.data/Add-dummy-files.patch | 9 | ||||
-rw-r--r-- | gbp-test2.data/Add-gbp.conf.patch | 7 | ||||
-rw-r--r-- | gbp-test2.data/Add-packaging-files.patch | 17 | ||||
-rw-r--r-- | gbp-test2.data/My-addition.patch | 7 | ||||
-rw-r--r-- | gbp-test2.data/Remove-imported-patches.patch | 11 | ||||
-rw-r--r-- | gbp-test2.data/Update-.gbp.conf.patch | 6 | ||||
-rw-r--r-- | gbp-test2.data/manifest.json | 222 | ||||
-rw-r--r-- | gbp-test2.data/packaging-add-alternative-spec-file-and-change-patch-p.patch | 9 | ||||
-rw-r--r-- | gbp-test2.data/packaging-change-my2.patch-to-git-email-format.patch | 6 | ||||
-rw-r--r-- | gbp-test2.data/packaging-reflect-the-corrected-patch-number-handling.patch | 7 | ||||
-rw-r--r-- | gbp-test2.data/pristine-tar-data-for-gbp-test2-2.0.tar.gz.patch | 9 |
12 files changed, 111 insertions, 206 deletions
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 - |