aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--gbp-test-native.data/Add-changelog-file.patch24
-rw-r--r--gbp-test-native.data/Add-dummy-Makefile.patch21
-rw-r--r--gbp-test-native.data/Add-dummy-files.patch31
-rw-r--r--gbp-test-native.data/Add-gbp.conf.patch24
-rw-r--r--gbp-test-native.data/Add-packaging-files.patch53
-rw-r--r--gbp-test-native.data/Repository-initialization.patch0
-rw-r--r--gbp-test-native.data/manifest.json81
-rw-r--r--gbp-test-native2.data/Add-gbp.conf.patch24
-rw-r--r--gbp-test-native2.data/Add-packaging-files.patch65
-rw-r--r--gbp-test-native2.data/Repository-initialization.patch0
-rw-r--r--gbp-test-native2.data/manifest.json48
-rw-r--r--gbp-test.data/Add-.gitignore.patch23
-rw-r--r--gbp-test.data/Add-changelog.patch27
-rw-r--r--gbp-test.data/Add-compressed-patches.patch74
-rw-r--r--gbp-test.data/Add-dummy-Makefile.patch21
-rw-r--r--gbp-test.data/Add-dummy-files.patch31
-rw-r--r--gbp-test.data/Add-gbp.conf.patch26
-rw-r--r--gbp-test.data/Add-initial-packaging-files.patch134
-rw-r--r--gbp-test.data/Auto-import-file-s-from-branch-srcdata-gbp-test-master.patch28
-rw-r--r--gbp-test.data/Create-a-forked-version.patch59
-rw-r--r--gbp-test.data/Initial-commit.patch0
-rw-r--r--gbp-test.data/Modify-README.patch20
-rw-r--r--gbp-test.data/Repository-initialization.patch0
-rw-r--r--gbp-test.data/Update-gbp.conf-to-rename-the-generated-source-package.patch21
-rw-r--r--gbp-test.data/Version-bump-to-1.1.patch24
-rw-r--r--gbp-test.data/manifest.json262
-rw-r--r--gbp-test.data/my-bzip2.patch19
-rw-r--r--gbp-test.data/my-gz.patch19
-rw-r--r--gbp-test.data/my2.patch19
-rw-r--r--gbp-test.data/pristine-tar-data-for-gbp-test-1.0.tar.bz2.patch54
-rw-r--r--gbp-test.data/pristine-tar-data-for-gbp-test-1.1.tar.bz2.patch54
-rw-r--r--gbp-test2.data/Add-dummy-Makefile.patch21
-rw-r--r--gbp-test2.data/Add-dummy-files.patch32
-rw-r--r--gbp-test2.data/Add-gbp.conf.patch28
-rw-r--r--gbp-test2.data/Add-packaging-files.patch140
-rw-r--r--gbp-test2.data/My-addition.patch22
-rw-r--r--gbp-test2.data/Remove-imported-patches.patch96
-rw-r--r--gbp-test2.data/Repository-initialization.patch0
-rw-r--r--gbp-test2.data/Update-.gbp.conf.patch26
-rw-r--r--gbp-test2.data/gbp.conf-adapt-to-new-patch-export-option-names-2.patch24
-rw-r--r--gbp-test2.data/gbp.conf-adapt-to-new-patch-export-option-names.patch24
-rw-r--r--gbp-test2.data/manifest.json185
-rw-r--r--gbp-test2.data/packaging-add-alternative-spec-file-and-change-patch-p.patch100
-rw-r--r--gbp-test2.data/packaging-change-my2.patch-to-git-email-format.patch32
-rw-r--r--gbp-test2.data/packaging-reflect-the-corrected-patch-number-handling.patch42
-rw-r--r--gbp-test2.data/pristine-tar-data-for-gbp-test2-2.0.tar.gz.patch56
46 files changed, 2114 insertions, 0 deletions
diff --git a/gbp-test-native.data/Add-changelog-file.patch b/gbp-test-native.data/Add-changelog-file.patch
new file mode 100644
index 0000000..944c9fd
--- /dev/null
+++ b/gbp-test-native.data/Add-changelog-file.patch
@@ -0,0 +1,24 @@
+From: Markus Lehtonen <markus.lehtonen@linux.intel.com>
+Date: Tue, 25 Feb 2014 10:57:25 +0200
+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
+index 0000000..e9886a4
+--- /dev/null
++++ b/packaging/gbp-test-native.changes
+@@ -0,0 +1,3 @@
++* 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
new file mode 100644
index 0000000..db6020e
--- /dev/null
+++ b/gbp-test-native.data/Add-dummy-Makefile.patch
@@ -0,0 +1,21 @@
+From: Markus Lehtonen <markus.lehtonen@linux.intel.com>
+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
+index 0000000..ecbc49e
+--- /dev/null
++++ b/Makefile
+@@ -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
new file mode 100644
index 0000000..5669449
--- /dev/null
+++ b/gbp-test-native.data/Add-dummy-files.patch
@@ -0,0 +1,31 @@
+From: Markus Lehtonen <markus.lehtonen@linux.intel.com>
+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
+index 0000000..a1311cb
+--- /dev/null
++++ b/README
+@@ -0,0 +1 @@
++Just for testing git-buildpackage.
+diff --git a/dummy.sh b/dummy.sh
+new file mode 100755
+index 0000000..8c33db6
+--- /dev/null
++++ b/dummy.sh
+@@ -0,0 +1,3 @@
++#!/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
new file mode 100644
index 0000000..153de41
--- /dev/null
+++ b/gbp-test-native.data/Add-gbp.conf.patch
@@ -0,0 +1,24 @@
+From: Markus Lehtonen <markus.lehtonen@linux.intel.com>
+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
+index 0000000..195c85e
+--- /dev/null
++++ b/.gbp.conf
+@@ -0,0 +1,5 @@
++[DEFAULT]
++vendor = Test-Distro
++packaging-branch = srcdata/gbp-test-native/master
++packaging-tag = srcdata/gbp-test-native/release/%(version)s
++
+--
+2.1.4
+
diff --git a/gbp-test-native.data/Add-packaging-files.patch b/gbp-test-native.data/Add-packaging-files.patch
new file mode 100644
index 0000000..21d70cb
--- /dev/null
+++ b/gbp-test-native.data/Add-packaging-files.patch
@@ -0,0 +1,53 @@
+From: Markus Lehtonen <markus.lehtonen@linux.intel.com>
+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
+index 0000000..38b07e4
+--- /dev/null
++++ b/packaging/gbp-test-native.spec
+@@ -0,0 +1,34 @@
++Name: gbp-test-native
++Summary: Test package for git-buildpackage
++Version: 1.0
++Release: 1
++Group: Development/Libraries
++License: GPLv2
++Source1: %{name}-%{version}.zip
++BuildRequires: unzip
++
++%description
++Package for testing the RPM functionality of git-buildpackage.
++Mimics a "native" package
++
++
++%prep
++unzip %{SOURCE1}
++%setup -T -D
++
++
++%build
++make
++
++
++%install
++rm -rf %{buildroot}
++mkdir -p %{buildroot}/%{_datadir}/%{name}
++cp -R * %{buildroot}/%{_datadir}/%{name}
++
++
++
++%files
++%defattr(-,root,root,-)
++%dir %{_datadir}/%{name}
++%{_datadir}/%{name}
+--
+2.1.4
+
diff --git a/gbp-test-native.data/Repository-initialization.patch b/gbp-test-native.data/Repository-initialization.patch
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/gbp-test-native.data/Repository-initialization.patch
diff --git a/gbp-test-native.data/manifest.json b/gbp-test-native.data/manifest.json
new file mode 100644
index 0000000..90eac26
--- /dev/null
+++ b/gbp-test-native.data/manifest.json
@@ -0,0 +1,81 @@
+{
+ "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",
+ "parents": [
+ "0579e0753b78476ad822c54b6ea07e2e80c0cdd2"
+ ],
+ "message": "Add dummy files\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>"
+ },
+ "ffb0a12339c529124da144944a2efc9ae273d7a4": {
+ "committer": "Markus Lehtonen <markus.lehtonen@linux.intel.com> 1377528350 +0300",
+ "sha1": "ffb0a12339c529124da144944a2efc9ae273d7a4",
+ "patchfile": "Add-packaging-files.patch",
+ "author": "Markus Lehtonen <markus.lehtonen@linux.intel.com> 1352378031 +0200",
+ "tree": "62bd5b260e1e670b4f8638a0e18a841affe7866e",
+ "parents": [
+ "a092cdf5aede44974ded09ee55c73c372260df9a"
+ ],
+ "message": "Add packaging files\n\nSigned-off-by: Markus Lehtonen <markus.lehtonen@linux.intel.com>"
+ },
+ "a092cdf5aede44974ded09ee55c73c372260df9a": {
+ "committer": "Markus Lehtonen <markus.lehtonen@linux.intel.com> 1377528350 +0300",
+ "sha1": "a092cdf5aede44974ded09ee55c73c372260df9a",
+ "patchfile": "Add-gbp.conf.patch",
+ "author": "Markus Lehtonen <markus.lehtonen@linux.intel.com> 1352396991 +0200",
+ "tree": "52d543935e41ab3217ae70cfda4b043281228144",
+ "parents": [
+ "cb5596d72659212d947f0cb882d758edb70a69b8"
+ ],
+ "message": "Add gbp.conf\n\nSigned-off-by: Markus Lehtonen <markus.lehtonen@linux.intel.com>"
+ },
+ "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>"
+ },
+ "1b89d1d93044b12e4adc102f7c30feaabc41ba58": {
+ "committer": "Markus Lehtonen <markus.lehtonen@linux.intel.com> 1393318659 +0200",
+ "sha1": "1b89d1d93044b12e4adc102f7c30feaabc41ba58",
+ "patchfile": "Add-changelog-file.patch",
+ "author": "Markus Lehtonen <markus.lehtonen@linux.intel.com> 1393318645 +0200",
+ "tree": "95f48d603b67918bb10c2545bc3b492af66e1512",
+ "parents": [
+ "ffb0a12339c529124da144944a2efc9ae273d7a4"
+ ],
+ "message": "Add changelog file\n\nAdd an \"OBS-style\" separate changelog file.\n\nSigned-off-by: Markus Lehtonen <markus.lehtonen@linux.intel.com>"
+ }
+ },
+ "refs": {
+ "refs/heads/srcdata/gbp-test-native/master": "1b89d1d93044b12e4adc102f7c30feaabc41ba58",
+ "refs/tags/srcdata/gbp-test-native/release/1.0-1": "f99a5ea3325134f88d0508ad6731b86620260134"
+ },
+ "HEAD": "ref: refs/heads/srcdata/gbp-test-native/master\n",
+ "tags": {
+ "f99a5ea3325134f88d0508ad6731b86620260134": {
+ "tagger": "Markus Lehtonen <markus.lehtonen@linux.intel.com> 1377528358 +0300",
+ "message": "Test-Distro release 1.0-1",
+ "tag": "srcdata/gbp-test-native/release/1.0-1",
+ "type": "commit",
+ "object": "ffb0a12339c529124da144944a2efc9ae273d7a4"
+ }
+ }
+} \ 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
new file mode 100644
index 0000000..89180e3
--- /dev/null
+++ b/gbp-test-native2.data/Add-gbp.conf.patch
@@ -0,0 +1,24 @@
+From: Markus Lehtonen <markus.lehtonen@linux.intel.com>
+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
+index 0000000..f6e0645
+--- /dev/null
++++ b/.gbp.conf
+@@ -0,0 +1,5 @@
++[DEFAULT]
++vendor = Test-Distro
++packaging-branch = srcdata/gbp-test-native2/master
++packaging-tag = srcdata/gbp-test-native2/release/%(version)s
++
+--
+2.1.4
+
diff --git a/gbp-test-native2.data/Add-packaging-files.patch b/gbp-test-native2.data/Add-packaging-files.patch
new file mode 100644
index 0000000..0e7a77a
--- /dev/null
+++ b/gbp-test-native2.data/Add-packaging-files.patch
@@ -0,0 +1,65 @@
+From: Markus Lehtonen <markus.lehtonen@linux.intel.com>
+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
+index 0000000..25ed442
+--- /dev/null
++++ b/foo.txt
+@@ -0,0 +1,3 @@
++FOO:
++
++file for testing rpm support of git-buildpackage.
+diff --git a/gbp-test-native2.spec b/gbp-test-native2.spec
+new file mode 100644
+index 0000000..34fd33d
+--- /dev/null
++++ b/gbp-test-native2.spec
+@@ -0,0 +1,35 @@
++Name: gbp-test-native2
++Summary: Test package for git-buildpackage
++Version: 2.0
++Release: 0
++Group: Development/Libraries
++License: GPLv2
++Source: foo.txt
++BuildRequires: unzip
++
++%description
++Package for testing the RPM functionality of git-buildpackage.
++Mimics a "native" package that doesn't have any source tarball.
++
++
++%prep
++# Just create build dir
++%setup -T -c
++cp %{SOURCE0} .
++
++
++%build
++# Nothing to do
++
++
++%install
++rm -rf %{buildroot}
++mkdir -p %{buildroot}/%{_datadir}/%{name}
++cp -R * %{buildroot}/%{_datadir}/%{name}
++
++
++
++%files
++%defattr(-,root,root,-)
++%dir %{_datadir}/%{name}
++%{_datadir}/%{name}
+--
+2.1.4
+
diff --git a/gbp-test-native2.data/Repository-initialization.patch b/gbp-test-native2.data/Repository-initialization.patch
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/gbp-test-native2.data/Repository-initialization.patch
diff --git a/gbp-test-native2.data/manifest.json b/gbp-test-native2.data/manifest.json
new file mode 100644
index 0000000..e8fb58e
--- /dev/null
+++ b/gbp-test-native2.data/manifest.json
@@ -0,0 +1,48 @@
+{
+ "commits": {
+ "3da6930adaaef1cf7c67c97244d72a4aaef13f00": {
+ "committer": "Markus Lehtonen <markus.lehtonen@linux.intel.com> 1377528551 +0300",
+ "sha1": "3da6930adaaef1cf7c67c97244d72a4aaef13f00",
+ "patchfile": "Add-packaging-files.patch",
+ "author": "Markus Lehtonen <markus.lehtonen@linux.intel.com> 1352378031 +0200",
+ "tree": "e5f3bbd020b2beae3bfde712e51b8a65f1748b26",
+ "parents": [
+ "489308b880d5f722b7d9b9b2e65c3e856f60c641"
+ ],
+ "message": "Add packaging files\n\nSigned-off-by: Markus Lehtonen <markus.lehtonen@linux.intel.com>"
+ },
+ "489308b880d5f722b7d9b9b2e65c3e856f60c641": {
+ "committer": "Markus Lehtonen <markus.lehtonen@linux.intel.com> 1377528551 +0300",
+ "sha1": "489308b880d5f722b7d9b9b2e65c3e856f60c641",
+ "patchfile": "Add-gbp.conf.patch",
+ "author": "Markus Lehtonen <markus.lehtonen@linux.intel.com> 1352396991 +0200",
+ "tree": "cbd0f889baa0d487d34f2318efb418bbfdbbf682",
+ "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>"
+ }
+ },
+ "refs": {
+ "refs/tags/srcdata/gbp-test-native2/release/2.0-0": "d65c4acb5a586d19a433358b3e3ec94211edbff2",
+ "refs/heads/srcdata/gbp-test-native2/master": "3da6930adaaef1cf7c67c97244d72a4aaef13f00"
+ },
+ "HEAD": "ref: refs/heads/srcdata/gbp-test-native2/master\n",
+ "tags": {
+ "d65c4acb5a586d19a433358b3e3ec94211edbff2": {
+ "tagger": "Markus Lehtonen <markus.lehtonen@linux.intel.com> 1377528598 +0300",
+ "message": "Test-Distro release 2.0-0",
+ "tag": "srcdata/gbp-test-native2/release/2.0-0",
+ "type": "commit",
+ "object": "3da6930adaaef1cf7c67c97244d72a4aaef13f00"
+ }
+ }
+} \ No newline at end of file
diff --git a/gbp-test.data/Add-.gitignore.patch b/gbp-test.data/Add-.gitignore.patch
new file mode 100644
index 0000000..5433c8a
--- /dev/null
+++ b/gbp-test.data/Add-.gitignore.patch
@@ -0,0 +1,23 @@
+From: Markus Lehtonen <markus.lehtonen@linux.intel.com>
+Date: Wed, 2 Jul 2014 12:49:50 +0300
+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
+index 0000000..c9b0245
+--- /dev/null
++++ b/.gitignore
+@@ -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
new file mode 100644
index 0000000..1ffe462
--- /dev/null
+++ b/gbp-test.data/Add-changelog.patch
@@ -0,0 +1,27 @@
+From: Markus Lehtonen <markus.lehtonen@linux.intel.com>
+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
+--- a/gbp-test.spec
++++ b/gbp-test.spec
+@@ -44,3 +44,10 @@ install %{SOURCE0} %{buildroot}/%{_datadir}/%{name}
+ %defattr(-,root,root,-)
+ %dir %{_datadir}/%{name}
+ %{_datadir}/%{name}
++
++
++
++%changelog
++* 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
new file mode 100644
index 0000000..a72cc7b
--- /dev/null
+++ b/gbp-test.data/Add-compressed-patches.patch
@@ -0,0 +1,74 @@
+From: Markus Lehtonen <markus.lehtonen@linux.intel.com>
+Date: Mon, 20 May 2013 10:06:38 +0300
+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
+--- a/gbp-test.spec
++++ b/gbp-test.spec
+@@ -1,7 +1,7 @@
+ Name: gbp-test
+ Summary: Test package for git-buildpackage
+ Version: 1.1
+-Release: 1
++Release: 2
+ Group: Development/Libraries
+ License: GPLv2
+ Source: %{name}-%{version}.tar.bz2
+@@ -9,6 +9,8 @@ Source1: foo.txt
+ Source20: bar.tar.gz
+ # Gbp-Ignore-Patches: 0
+ Patch0: my.patch
++Patch1: my-gz.patch.gz
++Patch2: my-bzip2.patch.bz2
+ Patch10: my2.patch
+ Patch20: my3.patch
+
+@@ -21,6 +23,8 @@ Package for testing the RPM functionality of git-buildpackage.
+ %setup -n %{name} -a 20
+
+ %patch0
++%patch1 -p1
++%patch2 -p1
+ %patch10 -p1
+
+
+diff --git a/my-bzip2.patch.bz2 b/my-bzip2.patch.bz2
+new file mode 100644
+index 0000000000000000000000000000000000000000..cd2bc996dbd27dd6ac3008ed346353d6d82f7cda
+GIT binary patch
+literal 137
+zcmV;40CxXET4*^jL0KkKSx_w20{{Ri-+%}ZKo9i*LIDVXH>Z!lAOLC_qtJ$$WZHny
+zp`+9*Q`Gd-^hSU(4LwZ@xPcw;C2q_TQKl_MQDP@s+zCLv$mS<vHG4HdhFie6#zNDJ
+r4=#g{e8OO0kw09kAtqF`e#A*fS@H`>#+0%01MznxQ-uiy0?lABiw!uO
+
+literal 0
+HcmV?d00001
+
+diff --git a/my-gz.patch.gz b/my-gz.patch.gz
+new file mode 100644
+index 0000000000000000000000000000000000000000..6bd6015f4cbcdd4c88b090e895289ef71d0af0fc
+GIT binary patch
+literal 166
+zcmV;X09pSZiwFo*%b8IC18sRNXL>GhVRU0?08Na`3c@fH1^4-ivyVv=tfEjP?p!E>
+zj}NHLjRw<O&{X^Rf)8+3!z{+f5TMjKX4J*<cvx+Bdz^kIn4SnR5!%iZtTEHF6p=j*
+zFdwv@H{&p|Goh41;ptIupOTPL{(YQ-G9v?N;hd10`gZN_SkonUOpL012c5pbrO5rD
+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
new file mode 100644
index 0000000..db6020e
--- /dev/null
+++ b/gbp-test.data/Add-dummy-Makefile.patch
@@ -0,0 +1,21 @@
+From: Markus Lehtonen <markus.lehtonen@linux.intel.com>
+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
+index 0000000..ecbc49e
+--- /dev/null
++++ b/Makefile
+@@ -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
new file mode 100644
index 0000000..5669449
--- /dev/null
+++ b/gbp-test.data/Add-dummy-files.patch
@@ -0,0 +1,31 @@
+From: Markus Lehtonen <markus.lehtonen@linux.intel.com>
+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
+index 0000000..a1311cb
+--- /dev/null
++++ b/README
+@@ -0,0 +1 @@
++Just for testing git-buildpackage.
+diff --git a/dummy.sh b/dummy.sh
+new file mode 100755
+index 0000000..8c33db6
+--- /dev/null
++++ b/dummy.sh
+@@ -0,0 +1,3 @@
++#!/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
new file mode 100644
index 0000000..c36ccbe
--- /dev/null
+++ b/gbp-test.data/Add-gbp.conf.patch
@@ -0,0 +1,26 @@
+From: Markus Lehtonen <markus.lehtonen@linux.intel.com>
+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
+index 0000000..985a6c3
+--- /dev/null
++++ b/.gbp.conf
+@@ -0,0 +1,7 @@
++[DEFAULT]
++vendor = Test-Distro
++packaging-branch = srcdata/gbp-test/master
++packaging-tag = srcdata/gbp-test/release/%(version)s
++upstream-branch = srcdata/gbp-test/upstream
++upstream-tag = srcdata/gbp-test/upstream/%(upstreamversion)s
++
+--
+2.1.4
+
diff --git a/gbp-test.data/Add-initial-packaging-files.patch b/gbp-test.data/Add-initial-packaging-files.patch
new file mode 100644
index 0000000..964ce9d
--- /dev/null
+++ b/gbp-test.data/Add-initial-packaging-files.patch
@@ -0,0 +1,134 @@
+From: Markus Lehtonen <markus.lehtonen@linux.intel.com>
+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
+index 0000000000000000000000000000000000000000..f5dae8035202d6206a72803f35b756e8fbcb1d6c
+GIT binary patch
+literal 177
+zcmb2|=3oe$-XFlg{Pvt9Uz34I%foe+M|U?Y3Ej|XZQEqNf@_H&tG8#*a`B^EtqUIh
+zSJl^_d?txcZ^=iwt5d!t%uQXNpR?}%&7R7Xtw!E+*RF}oOukZJw%zN?lGS#<^mZvM
+z($l+B_5a5uZ71{N3o74k`|Uev%09g%IZa0vb^nX<%+SB|HTQOlhOg$-{%+^@uY+Ir
+arH6}VetLbE0U3OFKX1)<rOyl+3=9C`8d6&T
+
+literal 0
+HcmV?d00001
+
+diff --git a/foo.txt b/foo.txt
+new file mode 100644
+index 0000000..25ed442
+--- /dev/null
++++ b/foo.txt
+@@ -0,0 +1,3 @@
++FOO:
++
++file for testing rpm support of git-buildpackage.
+diff --git a/gbp-test.spec b/gbp-test.spec
+new file mode 100644
+index 0000000..c46a734
+--- /dev/null
++++ b/gbp-test.spec
+@@ -0,0 +1,42 @@
++Name: gbp-test
++Summary: Test package for git-buildpackage
++Version: 1.0
++Release: 1
++Group: Development/Libraries
++License: GPLv2
++Source: %{name}-%{version}.tar.bz2
++Source1: foo.txt
++Source20: bar.tar.gz
++# Gbp-Ignore-Patches: 0
++Patch0: my.patch
++Patch10: my2.patch
++Patch20: my3.patch
++
++
++%description
++Package for testing the RPM functionality of git-buildpackage.
++
++
++%prep
++%setup -n %{name} -a 20
++
++%patch0
++%patch10 -p1
++
++
++%build
++make
++
++
++%install
++rm -rf %{buildroot}
++mkdir -p %{buildroot}/%{_datadir}/%{name}
++cp -R * %{buildroot}/%{_datadir}/%{name}
++install %{SOURCE0} %{buildroot}/%{_datadir}/%{name}
++
++
++
++%files
++%defattr(-,root,root,-)
++%dir %{_datadir}/%{name}
++%{_datadir}/%{name}
+diff --git a/my.patch b/my.patch
+new file mode 100644
+index 0000000..50870df
+--- /dev/null
++++ b/my.patch
+@@ -0,0 +1,9 @@
++diff --git a/dummy.sh b/dummy.sh
++index 8c33db6..6f04268 100755
++--- dummy.sh
+++++ dummy.sh
++@@ -1,3 +1,3 @@
++ #!/bin/sh
++
++-echo "Hello world"
+++echo "Hello GBP"
+diff --git a/my2.patch b/my2.patch
+new file mode 100644
+index 0000000..ad5ca2d
+--- /dev/null
++++ b/my2.patch
+@@ -0,0 +1,7 @@
++diff --git a/mydir/myfile.txt b/mydir/myfile.txt
++new file mode 100644
++index 0000000..2cdad29
++--- /dev/null
+++++ b/mydir/myfile.txt
++@@ -0,0 +1 @@
+++Dummy
+diff --git a/my3.patch b/my3.patch
+new file mode 100644
+index 0000000..9fee859
+--- /dev/null
++++ b/my3.patch
+@@ -0,0 +1,7 @@
++diff --git a/README b/README
++index a1311cb..a59f1b9 100644
++--- a/README
+++++ b/README
++@@ -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
new file mode 100644
index 0000000..08692da
--- /dev/null
+++ b/gbp-test.data/Auto-import-file-s-from-branch-srcdata-gbp-test-master.patch
@@ -0,0 +1,28 @@
+From: Markus Lehtonen <markus.lehtonen@linux.intel.com>
+Date: Thu, 17 Jul 2014 11:27:27 +0300
+Subject: [PATCH] Auto-import file(s) from branch 'srcdata/gbp-test/master':
+ .gbp.conf
+
+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
+index 0000000..985a6c3
+--- /dev/null
++++ b/.gbp.conf
+@@ -0,0 +1,7 @@
++[DEFAULT]
++vendor = Test-Distro
++packaging-branch = srcdata/gbp-test/master
++packaging-tag = srcdata/gbp-test/release/%(version)s
++upstream-branch = srcdata/gbp-test/upstream
++upstream-tag = srcdata/gbp-test/upstream/%(upstreamversion)s
++
+--
+2.1.4
+
diff --git a/gbp-test.data/Create-a-forked-version.patch b/gbp-test.data/Create-a-forked-version.patch
new file mode 100644
index 0000000..50ca009
--- /dev/null
+++ b/gbp-test.data/Create-a-forked-version.patch
@@ -0,0 +1,59 @@
+From: Markus Lehtonen <markus.lehtonen@linux.intel.com>
+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 | 5 ++---
+ gbp-test.spec | 2 +-
+ my3.patch | 7 -------
+ 3 files changed, 3 insertions(+), 11 deletions(-)
+ delete mode 100644 my3.patch
+
+diff --git a/.gbp.conf b/.gbp.conf
+index 985a6c3..3ec3795 100644
+--- a/.gbp.conf
++++ b/.gbp.conf
+@@ -1,7 +1,6 @@
+ [DEFAULT]
+ vendor = Test-Distro
+-packaging-branch = srcdata/gbp-test/master
+-packaging-tag = srcdata/gbp-test/release/%(version)s
++packaging-branch = srcdata/gbp-test/fork
++packaging-tag = srcdata/gbp-test/fork/release/%(version)s
+ upstream-branch = srcdata/gbp-test/upstream
+ upstream-tag = srcdata/gbp-test/upstream/%(upstreamversion)s
+-
+diff --git a/gbp-test.spec b/gbp-test.spec
+index c46a734..4759934 100644
+--- a/gbp-test.spec
++++ b/gbp-test.spec
+@@ -10,11 +10,11 @@ Source20: bar.tar.gz
+ # Gbp-Ignore-Patches: 0
+ Patch0: my.patch
+ Patch10: my2.patch
+-Patch20: my3.patch
+
+
+ %description
+ Package for testing the RPM functionality of git-buildpackage.
++Other version.
+
+
+ %prep
+diff --git a/my3.patch b/my3.patch
+deleted file mode 100644
+index 9fee859..0000000
+--- a/my3.patch
++++ /dev/null
+@@ -1,7 +0,0 @@
+-diff --git a/README b/README
+-index a1311cb..a59f1b9 100644
+---- a/README
+-+++ b/README
+-@@ -1 +1 @@
+--Just for testing git-buildpackage.
+-+Just for testing GBP.
+--
+2.1.4
+
diff --git a/gbp-test.data/Initial-commit.patch b/gbp-test.data/Initial-commit.patch
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/gbp-test.data/Initial-commit.patch
diff --git a/gbp-test.data/Modify-README.patch b/gbp-test.data/Modify-README.patch
new file mode 100644
index 0000000..6f92152
--- /dev/null
+++ b/gbp-test.data/Modify-README.patch
@@ -0,0 +1,20 @@
+From: Markus Lehtonen <markus.lehtonen@linux.intel.com>
+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
+--- a/README
++++ b/README
+@@ -1 +1,3 @@
+ Just for testing git-buildpackage.
++
++Version 1.1
+--
+2.1.4
+
diff --git a/gbp-test.data/Repository-initialization.patch b/gbp-test.data/Repository-initialization.patch
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/gbp-test.data/Repository-initialization.patch
diff --git a/gbp-test.data/Update-gbp.conf-to-rename-the-generated-source-package.patch b/gbp-test.data/Update-gbp.conf-to-rename-the-generated-source-package.patch
new file mode 100644
index 0000000..00b9311
--- /dev/null
+++ b/gbp-test.data/Update-gbp.conf-to-rename-the-generated-source-package.patch
@@ -0,0 +1,21 @@
+From: Markus Lehtonen <markus.lehtonen@linux.intel.com>
+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 3ec3795..30e8489 100644
+--- a/.gbp.conf
++++ b/.gbp.conf
+@@ -4,3 +4,4 @@ packaging-branch = srcdata/gbp-test/fork
+ packaging-tag = srcdata/gbp-test/fork/release/%(version)s
+ upstream-branch = srcdata/gbp-test/upstream
+ upstream-tag = srcdata/gbp-test/upstream/%(upstreamversion)s
++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
new file mode 100644
index 0000000..5cf6d7c
--- /dev/null
+++ b/gbp-test.data/Version-bump-to-1.1.patch
@@ -0,0 +1,24 @@
+From: Markus Lehtonen <markus.lehtonen@linux.intel.com>
+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
+--- a/gbp-test.spec
++++ b/gbp-test.spec
+@@ -1,6 +1,6 @@
+ Name: gbp-test
+ Summary: Test package for git-buildpackage
+-Version: 1.0
++Version: 1.1
+ Release: 1
+ Group: Development/Libraries
+ License: GPLv2
+--
+2.1.4
+
diff --git a/gbp-test.data/manifest.json b/gbp-test.data/manifest.json
new file mode 100644
index 0000000..63ac55e
--- /dev/null
+++ b/gbp-test.data/manifest.json
@@ -0,0 +1,262 @@
+{
+ "commits": {
+ "2e1136967e0ad1ae5405222834f3dbc79f400a12": {
+ "committer": "Markus Lehtonen <markus.lehtonen@linux.intel.com> 1377529226 +0300",
+ "sha1": "2e1136967e0ad1ae5405222834f3dbc79f400a12",
+ "patchfile": "Add-initial-packaging-files.patch",
+ "author": "Markus Lehtonen <markus.lehtonen@linux.intel.com> 1352394741 +0200",
+ "tree": "44c5de3fd7c98365d77c759e8446e32a639c02cd",
+ "parents": [
+ "f0344fb18718d14eb8e2153998a3ed1478749139"
+ ],
+ "message": "Add initial packaging files\n\nSigned-off-by: Markus Lehtonen <markus.lehtonen@linux.intel.com>"
+ },
+ "42239c7f237b51a02b701dbd077f161c3a8036cb": {
+ "committer": "Markus Lehtonen <markus.lehtonen@linux.intel.com> 1405419535 +0300",
+ "sha1": "42239c7f237b51a02b701dbd077f161c3a8036cb",
+ "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"
+ },
+ "e15a409079398445a9a0f84ab4160b434c07b9ee": {
+ "committer": "Markus Lehtonen <markus.lehtonen@linux.intel.com> 1377611864 +0300",
+ "sha1": "e15a409079398445a9a0f84ab4160b434c07b9ee",
+ "patchfile": "Update-gbp.conf-to-rename-the-generated-source-package.patch",
+ "author": "Markus Lehtonen <markus.lehtonen@linux.intel.com> 1377611864 +0300",
+ "tree": "2aa746a455e7efe0829dd950005a204cd229f567",
+ "parents": [
+ "20f9f1cbc4da74f39f0746f64b944024d3594712"
+ ],
+ "message": "Update gbp.conf to rename the generated source package\n\nSigned-off-by: Markus Lehtonen <markus.lehtonen@linux.intel.com>"
+ },
+ "cbbe5a0a5308ca74ddb306ed781d26fc3a918afd": {
+ "committer": "Markus Lehtonen <markus.lehtonen@linux.intel.com> 1393318946 +0200",
+ "sha1": "cbbe5a0a5308ca74ddb306ed781d26fc3a918afd",
+ "patchfile": "Add-changelog.patch",
+ "author": "Markus Lehtonen <markus.lehtonen@linux.intel.com> 1393318946 +0200",
+ "tree": "0eed49fc02d40e8b0f0d341416c451065e8b2348",
+ "parents": [
+ "a70b69e5210f34b238627a9969b5cce48f600e77"
+ ],
+ "message": "Add changelog\n\nSigned-off-by: Markus Lehtonen <markus.lehtonen@linux.intel.com>"
+ },
+ "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",
+ "parents": [
+ "0579e0753b78476ad822c54b6ea07e2e80c0cdd2"
+ ],
+ "message": "Add dummy files\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>"
+ },
+ "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",
+ "parents": [
+ "cb5596d72659212d947f0cb882d758edb70a69b8"
+ ],
+ "message": "Modify README\n\nSigned-off-by: Markus Lehtonen <markus.lehtonen@linux.intel.com>"
+ },
+ "7ce872128f5d0f4970102bdd2fdfc85b77244c7a": {
+ "committer": "Markus Lehtonen <markus.lehtonen@linux.intel.com> 1352394455 +0200",
+ "sha1": "7ce872128f5d0f4970102bdd2fdfc85b77244c7a",
+ "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>"
+ },
+ "a70b69e5210f34b238627a9969b5cce48f600e77": {
+ "committer": "Markus Lehtonen <markus.lehtonen@linux.intel.com> 1377529226 +0300",
+ "sha1": "a70b69e5210f34b238627a9969b5cce48f600e77",
+ "patchfile": "Add-compressed-patches.patch",
+ "author": "Markus Lehtonen <markus.lehtonen@linux.intel.com> 1369033598 +0300",
+ "tree": "84b63b18c86260020ec356b42e05563310e093b3",
+ "parents": [
+ "c8a87a3eb63666545f1c62f1866d2a86afecfd57"
+ ],
+ "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>"
+ },
+ "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",
+ "parents": [
+ "42239c7f237b51a02b701dbd077f161c3a8036cb"
+ ],
+ "message": "pristine-tar data for gbp-test-1.1.tar.bz2"
+ },
+ "20f9f1cbc4da74f39f0746f64b944024d3594712": {
+ "committer": "Markus Lehtonen <markus.lehtonen@linux.intel.com> 1377531474 +0300",
+ "sha1": "20f9f1cbc4da74f39f0746f64b944024d3594712",
+ "patchfile": "Create-a-forked-version.patch",
+ "author": "Markus Lehtonen <markus.lehtonen@linux.intel.com> 1352396256 +0200",
+ "tree": "0c74a51d6fdcdb6fdfd787a6e41b0365dc013493",
+ "parents": [
+ "2e1136967e0ad1ae5405222834f3dbc79f400a12"
+ ],
+ "message": "Create a forked version.\n\nSigned-off-by: Markus Lehtonen <markus.lehtonen@linux.intel.com>"
+ },
+ "c8a87a3eb63666545f1c62f1866d2a86afecfd57": {
+ "committer": "Markus Lehtonen <markus.lehtonen@linux.intel.com> 1377529226 +0300",
+ "sha1": "c8a87a3eb63666545f1c62f1866d2a86afecfd57",
+ "patchfile": "Version-bump-to-1.1.patch",
+ "author": "Markus Lehtonen <markus.lehtonen@linux.intel.com> 1352396256 +0200",
+ "tree": "b9e814912804c262893b4c3b16adb34ab9fe5b78",
+ "parents": [
+ "2e1136967e0ad1ae5405222834f3dbc79f400a12"
+ ],
+ "message": "Version bump to 1.1\n\nSigned-off-by: Markus Lehtonen <markus.lehtonen@linux.intel.com>"
+ },
+ "d6e0b73d43baf78d5c99cfc2533b500940ed7021": {
+ "committer": "Markus Lehtonen <markus.lehtonen@linux.intel.com> 1405585647 +0300",
+ "sha1": "d6e0b73d43baf78d5c99cfc2533b500940ed7021",
+ "patchfile": "my-gz.patch",
+ "author": "Markus Lehtonen <markus.lehtonen@linux.intel.com> 1405585647 +0300",
+ "tree": "447ca5872d24b1e18bd1fe4dcf2c6cfec8685935",
+ "parents": [
+ "65f2a23e9b1144308d02fc8b16be7a027a9def70"
+ ],
+ "message": "my-gz\n"
+ },
+ "972ecde7c94eb00f4d310aa0e3e8f72ed215f591": {
+ "committer": "Markus Lehtonen <markus.lehtonen@linux.intel.com> 1405585647 +0300",
+ "sha1": "972ecde7c94eb00f4d310aa0e3e8f72ed215f591",
+ "patchfile": "my2.patch",
+ "author": "Markus Lehtonen <markus.lehtonen@linux.intel.com> 1405585647 +0300",
+ "tree": "2360793736e9a389b6d3897102fa3a2204b7c09e",
+ "parents": [
+ "87bf4bbebdbd30eda6bf2deeee7ae196a6bc6e2d"
+ ],
+ "message": "my2\n"
+ },
+ "65f2a23e9b1144308d02fc8b16be7a027a9def70": {
+ "committer": "Markus Lehtonen <markus.lehtonen@linux.intel.com> 1405585647 +0300",
+ "sha1": "65f2a23e9b1144308d02fc8b16be7a027a9def70",
+ "patchfile": "Auto-import-file-s-from-branch-srcdata-gbp-test-master.patch",
+ "author": "Markus Lehtonen <markus.lehtonen@linux.intel.com> 1405585647 +0300",
+ "tree": "ae0c0c423a6e17a8dab4c9648511d95fd57cb19c",
+ "parents": [
+ "6450890aa002b0868537ee50cc1aea177fdcc941"
+ ],
+ "message": "Auto-import file(s) from branch 'srcdata/gbp-test/master':\n .gbp.conf\n\nGbp: Ignore\nGbp-Rpm: Ignore"
+ },
+ "b82fd1a61db4221263b2c110f60c6d07cb0203df": {
+ "committer": "Markus Lehtonen <markus.lehtonen@linux.intel.com> 1404294645 +0300",
+ "sha1": "b82fd1a61db4221263b2c110f60c6d07cb0203df",
+ "patchfile": "Add-.gitignore.patch",
+ "author": "Markus Lehtonen <markus.lehtonen@linux.intel.com> 1404294590 +0300",
+ "tree": "d7ca61ee438e374fb2fdc0554a0b05d07f58b802",
+ "parents": [
+ "cbbe5a0a5308ca74ddb306ed781d26fc3a918afd"
+ ],
+ "message": "Add .gitignore\n\nIgnore '*.tmp' and '*.swp'.\n\nSigned-off-by: Markus Lehtonen <markus.lehtonen@linux.intel.com>"
+ },
+ "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>"
+ },
+ "f0344fb18718d14eb8e2153998a3ed1478749139": {
+ "committer": "Markus Lehtonen <markus.lehtonen@linux.intel.com> 1377529226 +0300",
+ "sha1": "f0344fb18718d14eb8e2153998a3ed1478749139",
+ "patchfile": "Add-gbp.conf.patch",
+ "author": "Markus Lehtonen <markus.lehtonen@linux.intel.com> 1352395217 +0200",
+ "tree": "ae777930c777718138ef0ca6585e04f338436409",
+ "parents": [
+ "7ce872128f5d0f4970102bdd2fdfc85b77244c7a"
+ ],
+ "message": "Add gbp.conf\n\nSigned-off-by: Markus Lehtonen <markus.lehtonen@linux.intel.com>"
+ },
+ "87bf4bbebdbd30eda6bf2deeee7ae196a6bc6e2d": {
+ "committer": "Markus Lehtonen <markus.lehtonen@linux.intel.com> 1405585647 +0300",
+ "sha1": "87bf4bbebdbd30eda6bf2deeee7ae196a6bc6e2d",
+ "patchfile": "my-bzip2.patch",
+ "author": "Markus Lehtonen <markus.lehtonen@linux.intel.com> 1405585647 +0300",
+ "tree": "ba7a682b8c0a486a6911730291a055242994dd82",
+ "parents": [
+ "d6e0b73d43baf78d5c99cfc2533b500940ed7021"
+ ],
+ "message": "my-bzip2\n"
+ }
+ },
+ "refs": {
+ "refs/heads/srcdata/gbp-test/fork": "e15a409079398445a9a0f84ab4160b434c07b9ee",
+ "refs/heads/srcdata/gbp-test/pristine_tar": "ee75150c3e9f3dacc1000d7ebc34a833e23b0356",
+ "refs/tags/srcdata/gbp-test/upstream/1.1": "8e2500d226793bb16afab3dde917f4023581e2e9",
+ "refs/tags/srcdata/gbp-test/fork/release/1.0-1": "72371bde2ac20cbb720459e23fc4f17320924ce1",
+ "refs/tags/srcdata/gbp-test/release/1.1-1": "41e836cb72c8e28ae26c20070b8122e5671c2dc2",
+ "refs/tags/srcdata/gbp-test/release/1.1-2": "158a4b27046916810df412f8b0d1190fffdbe02b",
+ "refs/tags/srcdata/gbp-test/release/1.0-1": "53493622bc522302b0bbc5540e1c535377a52c77",
+ "refs/heads/srcdata/gbp-test/upstream": "6450890aa002b0868537ee50cc1aea177fdcc941",
+ "refs/tags/srcdata/gbp-test/upstream/1.0": "876baa15c6a0f93cb1c785b756a1a75c2ff18c48",
+ "refs/heads/srcdata/gbp-test/master": "b82fd1a61db4221263b2c110f60c6d07cb0203df",
+ "refs/heads/srcdata/gbp-test/pq/master": "972ecde7c94eb00f4d310aa0e3e8f72ed215f591"
+ },
+ "HEAD": "ref: refs/heads/srcdata/gbp-test/master\n",
+ "tags": {
+ "41e836cb72c8e28ae26c20070b8122e5671c2dc2": {
+ "tagger": "Markus Lehtonen <markus.lehtonen@linux.intel.com> 1377529325 +0300",
+ "message": "Test-Distro release 1.1-1",
+ "tag": "srcdata/gbp-test/release/1.1-1",
+ "type": "commit",
+ "object": "c8a87a3eb63666545f1c62f1866d2a86afecfd57"
+ },
+ "8e2500d226793bb16afab3dde917f4023581e2e9": {
+ "tagger": "Markus Lehtonen <markus.lehtonen@linux.intel.com> 1377529755 +0300",
+ "message": "Version 1.1",
+ "tag": "srcdata/gbp-test/upstream/1.1",
+ "type": "commit",
+ "object": "6450890aa002b0868537ee50cc1aea177fdcc941"
+ },
+ "158a4b27046916810df412f8b0d1190fffdbe02b": {
+ "tagger": "Markus Lehtonen <markus.lehtonen@linux.intel.com> 1377529316 +0300",
+ "message": "Test-Distro release 1.1-2",
+ "tag": "srcdata/gbp-test/release/1.1-2",
+ "type": "commit",
+ "object": "a70b69e5210f34b238627a9969b5cce48f600e77"
+ },
+ "876baa15c6a0f93cb1c785b756a1a75c2ff18c48": {
+ "tagger": "Markus Lehtonen <markus.lehtonen@linux.intel.com> 1377529152 +0300",
+ "message": "Version 1.0",
+ "tag": "srcdata/gbp-test/upstream/1.0",
+ "type": "commit",
+ "object": "cb5596d72659212d947f0cb882d758edb70a69b8"
+ },
+ "72371bde2ac20cbb720459e23fc4f17320924ce1": {
+ "tagger": "Markus Lehtonen <markus.lehtonen@linux.intel.com> 1377611964 +0300",
+ "message": "Test-Distro release 1.0-1",
+ "tag": "srcdata/gbp-test/fork/release/1.0-1",
+ "type": "commit",
+ "object": "e15a409079398445a9a0f84ab4160b434c07b9ee"
+ },
+ "53493622bc522302b0bbc5540e1c535377a52c77": {
+ "tagger": "Markus Lehtonen <markus.lehtonen@linux.intel.com> 1377529327 +0300",
+ "message": "Test-Distro release 1.0-1",
+ "tag": "srcdata/gbp-test/release/1.0-1",
+ "type": "commit",
+ "object": "2e1136967e0ad1ae5405222834f3dbc79f400a12"
+ }
+ }
+} \ No newline at end of file
diff --git a/gbp-test.data/my-bzip2.patch b/gbp-test.data/my-bzip2.patch
new file mode 100644
index 0000000..b1940e4
--- /dev/null
+++ b/gbp-test.data/my-bzip2.patch
@@ -0,0 +1,19 @@
+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
+index 0000000..e2620b0
+--- /dev/null
++++ 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
new file mode 100644
index 0000000..01699a3
--- /dev/null
+++ b/gbp-test.data/my-gz.patch
@@ -0,0 +1,19 @@
+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
+index 0000000..9c3f518
+--- /dev/null
++++ 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
new file mode 100644
index 0000000..f852a6c
--- /dev/null
+++ b/gbp-test.data/my2.patch
@@ -0,0 +1,19 @@
+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
+index 0000000..2cdad29
+--- /dev/null
++++ 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
new file mode 100644
index 0000000..0de5157
--- /dev/null
+++ b/gbp-test.data/pristine-tar-data-for-gbp-test-1.0.tar.bz2.patch
@@ -0,0 +1,54 @@
+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
+index 0000000000000000000000000000000000000000..3f9f7283723d8738e02b5129e92846437c613e33
+GIT binary patch
+literal 1234
+zcmV;@1TFg?iwFP@0L4=P1MQi8OdDk!$Db>ZkxHNvLB?b>3JLg9?(Mm2mtaM~_!2gh
+z1<fX@*Y<!4rKKDQn~cUNYTOpV=w1@t&={Rt7UB!eh!X!GI;We;vZ>291BS2+M~02M
+z4p*O65!NeUu<26w`=sqXcfY64^W5{?_rA|PXDF(W+U}7hyX<K;h$3c+oKmBsMs8M6
+z)Sw9h&xf{z@GZ@7EMizrVA$Y}h{yo}^GM$oy(Y|0OS2+*NK^i6IpHT4CvddhsW_Z+
+zF~ifCXH1yG27wm@lToCNS`w8OjM~&uBZ&$EtG&`^2K*bMuXZ(a^v{U+FNrX-_XC<1
+zg>e02hC%w6h-gOtPRY~M;@Gf2K5~a#pqx0>f34Mhn?lCFNc&H!T&kCA91Zg9kq664
+zO3TY;_w6lCXS<=f4m2M37*zh>N>UD2V-)LHg8yTV1OJZ&k^O(h!z26uoGAEzoD+Su
+zt69|lX_fvtjKTk70qFGVM(zK0xj~VlTE`OnpW#IC|5y;&|HYt(8}U5;KPL+QALm40
+z?P?bBe}-kkpZ{4=gy;X5kpFP$I-2J5Lpy2cn((+sws~Ypkx3_6rG^HV$5H!t(k-=F
+zY8zZ6X{ihOM`)M{JQ+-y7sx$<W-$s5HD+j3JJZn~mrDtLF{`(^oKCq>DYjWLHVJl-
+z6|jkASi6ZAYiOI*Xk_goHp+IZNK1mrYSab|>hiK#fo2d6FIynN@J5ge4AH8LJQtpk
+z<8g$Hq-IV~mnpL9tO$7%5K8<mJ@<|Y?$(FKGMBwEO_x*;dn+hSN`YHaY;}6Oq)3G~
+z2G+JHt6jg3q#w=RnlO;DLqkz%VI6++o%v_0CY$-|tA6Z#{nEW1-U@`w2wh9*DiK;n
+z)n_A=Md{X3IvqkOl<o#nG5MtqYCfP4;zN<Sp8^WiA(TMX=OC03@qfED2vO8yE9Nhk
+z@+O~2Ts)I*JTX+$0xhJxSze+Ps`9d{5Qrh_`QPIn$?cXsQLJMr>p!dj^S@XSdH%--
+z-|%35p7|dajEW-6|NaL=U+roZTmQifuUh{RXqf-Sg52km$+T~%5+(e6{Lt#B=&Yni
+zkKLYBq#youvMlplwO^Z)-<6cwn#E1|s<wRdb$3(Wo*lj?Rv7XhNl$&IYVZ1w1|1U}
+zqx~;2-|p+$_DSJu)>mJi>Nr!rZS#u-2lQVJo#-l@PQCk`g5R24qkSh^`wpM}!g7S`
+zIKY+co9ODV-~XZgzNvNHZ@-sUZCP$JOuzL?&c_$qeS^DFHr=%8hr3Qs9ogc4HaXy5
+z+2-l#?9IrKdvqORgYTYm9N)@)cA@B}FWV3EfwK?j_blK0<fX}zW1oI+7{Qso!F0_Z
+zyEJ~Y>-_M_Ri^?Qc6RoR2l9^DPK>7MEmFXI@%`3cvd(AU@3*kNPVIPLU}(+8ao+`V
+zH#;7<u5{>yqnmTK2iBW&w{IL?)4x0L9Pc+L`8rRHyjiRa1ROg%_viV|Pan!INg^Hi
+z`N3OOxqEw1!Id7#rJ?qJrQIz@w~i(FKh47WPfURKKUX)=SG$_U{GUAeg|Ghzm;?Wh
+w1?1#GsQ>@~00000000000000000000000000000001#*V314n(5CBjB02+aB2mk;8
+
+literal 0
+HcmV?d00001
+
+diff --git a/gbp-test-1.0.tar.bz2.id b/gbp-test-1.0.tar.bz2.id
+new file mode 100644
+index 0000000..0221a07
+--- /dev/null
++++ 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
new file mode 100644
index 0000000..161e116
--- /dev/null
+++ b/gbp-test.data/pristine-tar-data-for-gbp-test-1.1.tar.bz2.patch
@@ -0,0 +1,54 @@
+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
+index 0000000000000000000000000000000000000000..f142beddaf21b582fea8eb837b22aea886209c28
+GIT binary patch
+literal 1236
+zcmV;_1S|U=iwFQ10L4=P1MQiAY!hV|$KUH_hJ!$f!W!9JBW`X)*ZX~|1O~}4Vp3Qb
+z1Qp_PyWX~L?ONLFHXyEDjLr#y0-~~jl7Pm*P{!i2#0+CH0q4e+88w=zlT5}R0|E;y
+znd5w0og2NfnRzK0JfF0^_wIT7zIXTb`+lE$n`OxptDcobyX^I43E4Dhsq~5-kL*SI
+zL1K884R0}#TasdEM9~aS(Rhc!$0>%Rcx0~9@f_}m-=~OPd@BF9oyd!uAuy!br8r#j
+zGKwWRma=jzo5j&q*2)Q_kcgw=q)|x|Wmp{LtW4tFzB1sypugI+Owd0iaDPjL8lMkH
+zj^ZNq&u}a<$3#S9`ge)mEq=$gN$TMla*}ptsQy!T%t9vAmXG2F-|JoT3Tb-HdSgjN
+z9Nl`OZ0X#J%ZHo0GO6U>-lCY6ZA;(m?%HW}mhNvozq)4k&=Y<AtLrUS2K!Dl?%vSc
+z-topz<KX9O54svX56|uRv-|0<T`Rw`KYk>=ul&gNHS6B)Tv!|QWuL45;pa|U|EHrn
+zlPc3*_jV8Y^Bd}Bx2<3D$L6{P?|yT3(Z;6yw%WaI>PriU)B1WYUtg@+zbnoi7zuce
+z@49X|+8)?ve7XPh$=>$XN7H}t1<ux0pJ3Jc!{rbBe&ETLi|WS84ek%(c2Q^4J$<U_
+zOV#nv^1<a7N6#Np-wCRc`I<qrnSNCp{3A7=SVjwrh6|n})HCST+WM=Go7O7<YiG{M
+z8ddUadhA%{g^|;NvSXh~-(FSmvBgOJ*f!iWvbj}FI<Vzd>Z={Wo<QgZ2KQAZ^fV=R
+zp^Updl+z+h<NtQqsffDvF%AExXaW2`7DV-bhQS`rQ+#y)XXsFrv4a2K1L&`IEmQbE
+zMdM`ucKy==5B?t$(w@(KktEr)@XkCmJ2LK-C9f<hGQLTLqSNX2I*R`(dc>-NVy7Dy
+z3rfQN5guj?iwBcrc|0f342MEP%~1?09=p+Aw_6FlIod3_T`sv?S;n&*nQbLSktFFt
+zGMmrl7(tdfQj#c97AZj}vP+Vcr4j{!i)fqXNfvRDZSypzISHDj5UHuilaUn}79Z18
+z#62^-woQT4R>e6%976Fwrf;&TDFfF^lUknX|A<^sAIu{Rb22=lB9)l!q9SH?Bp83%
+zzN7kuqo*2D+It`T{(S>M%!|0;H~p>0_wK*6V*Z6%!>QCSa)NmX<sdYlFy<qaK$Ja#
+zkclv^CyYjf<`BkY+%f(n&Ka5sgxGLo;wytdB?!e4Whn?Pi2A(`4G0lL>7qNgO9W?K
+zil4fYaUee2(<Em|1WiG#6e9n&Um*}fwE15JE;-!gI`%Q0^&gsn{4W+n&;Q19xaj%c
+zgec^HGaUWZu4StAAME<t^&b-QzgR$nPVZ~9{_hgY9YwNF(XWqb_<yK6_<szD?*9{3
+zc%t|}6^imS`2RhC{%Y4UrT+_&>p$53Vf`m26c>7)Qt<d&68|mP#4@?a;grXZtXs7*
+z*S2bW-|lz0wr2TCK;ttWt^X@qJ+i)iOvC^2L;?OE3*h<x{ziYbYnl4_pN;(ghi7^4
+y|5$)89+V0I0000000000000000000000000000000000pjK2Wb6&w2iPyhfnh<RE7
+
+literal 0
+HcmV?d00001
+
+diff --git a/gbp-test-1.1.tar.bz2.id b/gbp-test-1.1.tar.bz2.id
+new file mode 100644
+index 0000000..ea1b4e4
+--- /dev/null
++++ 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
new file mode 100644
index 0000000..1f9a75b
--- /dev/null
+++ b/gbp-test2.data/Add-dummy-Makefile.patch
@@ -0,0 +1,21 @@
+From: Markus Lehtonen <markus.lehtonen@linux.intel.com>
+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
+index 0000000..de5341d
+--- /dev/null
++++ b/Makefile
+@@ -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
new file mode 100644
index 0000000..0b8cd82
--- /dev/null
+++ b/gbp-test2.data/Add-dummy-files.patch
@@ -0,0 +1,32 @@
+From: Markus Lehtonen <markus.lehtonen@linux.intel.com>
+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
+index 0000000..1947ce8
+--- /dev/null
++++ b/README
+@@ -0,0 +1,2 @@
++Just for testing git-buildpackage.
++V2.0
+diff --git a/dummy.sh b/dummy.sh
+new file mode 100755
+index 0000000..7eeb298
+--- /dev/null
++++ b/dummy.sh
+@@ -0,0 +1,3 @@
++#!/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
new file mode 100644
index 0000000..4e05b98
--- /dev/null
+++ b/gbp-test2.data/Add-gbp.conf.patch
@@ -0,0 +1,28 @@
+From: Markus Lehtonen <markus.lehtonen@linux.intel.com>
+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 | 9 +++++++++
+ 1 file changed, 9 insertions(+)
+ create mode 100644 .gbp.conf
+
+diff --git a/.gbp.conf b/.gbp.conf
+new file mode 100644
+index 0000000..601d792
+--- /dev/null
++++ b/.gbp.conf
+@@ -0,0 +1,9 @@
++[DEFAULT]
++vendor = Test-Distro
++packaging-branch = srcdata/gbp-test2/master
++packaging-tag = srcdata/gbp-test2/release/%(version)s
++upstream-branch = srcdata/gbp-test2/upstream
++upstream-tag = srcdata/gbp-test2/upstream/%(upstreamversion)s
++packaging-dir = packaging
++patch-export-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
new file mode 100644
index 0000000..3b77369
--- /dev/null
+++ b/gbp-test2.data/Add-packaging-files.patch
@@ -0,0 +1,140 @@
+From: Markus Lehtonen <markus.lehtonen@linux.intel.com>
+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
+index 0000000000000000000000000000000000000000..f5dae8035202d6206a72803f35b756e8fbcb1d6c
+GIT binary patch
+literal 177
+zcmb2|=3oe$-XFlg{Pvt9Uz34I%foe+M|U?Y3Ej|XZQEqNf@_H&tG8#*a`B^EtqUIh
+zSJl^_d?txcZ^=iwt5d!t%uQXNpR?}%&7R7Xtw!E+*RF}oOukZJw%zN?lGS#<^mZvM
+z($l+B_5a5uZ71{N3o74k`|Uev%09g%IZa0vb^nX<%+SB|HTQOlhOg$-{%+^@uY+Ir
+arH6}VetLbE0U3OFKX1)<rOyl+3=9C`8d6&T
+
+literal 0
+HcmV?d00001
+
+diff --git a/packaging/foo.txt b/packaging/foo.txt
+new file mode 100644
+index 0000000..25ed442
+--- /dev/null
++++ b/packaging/foo.txt
+@@ -0,0 +1,3 @@
++FOO:
++
++file for testing rpm support of git-buildpackage.
+diff --git a/packaging/gbp-test2.spec b/packaging/gbp-test2.spec
+new file mode 100644
+index 0000000..61aae33
+--- /dev/null
++++ b/packaging/gbp-test2.spec
+@@ -0,0 +1,48 @@
++Name: gbp-test2
++Summary: Test package 2 for git-buildpackage
++Epoch: 1
++Version: 2.0
++Release: 0
++Group: Development/Libraries
++License: GPLv2
++Source10: ftp://ftp.host.com/%{name}-%{version}.tar.gz
++Source: foo.txt
++Source20: bar.tar.gz
++# Gbp-Ignore-Patches: 0
++Patch: my.patch
++Patch10: my2.patch
++Patch20: my3.patch
++Packager: Markus Lehtonen <markus.lehtonen@linux.intel.com>
++
++%description
++Package for testing the RPM functionality of git-buildpackage.
++Version 2 which has packaging and development in the same
++git branch.
++
++
++%prep
++%setup -T -n %{name}-%{version} -c -a 10
++
++%patch
++%patch -P 10 -p1
++
++echo "Do things"
++
++# Gbp-Patch-Macros
++
++%build
++make
++
++
++%install
++rm -rf %{buildroot}
++mkdir -p %{buildroot}/%{_datadir}/%{name}
++cp -R * %{buildroot}/%{_datadir}/%{name}
++install %{SOURCE0} %{buildroot}/%{_datadir}/%{name}
++
++
++
++%files
++%defattr(-,root,root,-)
++%dir %{_datadir}/%{name}
++%{_datadir}/%{name}
+diff --git a/packaging/my.patch b/packaging/my.patch
+new file mode 100644
+index 0000000..aa4eb5c
+--- /dev/null
++++ b/packaging/my.patch
+@@ -0,0 +1,9 @@
++diff --git a/dummy.sh b/dummy.sh
++index 8c33db6..6f04268 100755
++--- dummy.sh
+++++ dummy.sh
++@@ -1,3 +1,3 @@
++ #!/bin/sh
++
++-echo "Hello world 2.0"
+++echo "Hello GBP 2.0"
+diff --git a/packaging/my2.patch b/packaging/my2.patch
+new file mode 100644
+index 0000000..ad5ca2d
+--- /dev/null
++++ b/packaging/my2.patch
+@@ -0,0 +1,7 @@
++diff --git a/mydir/myfile.txt b/mydir/myfile.txt
++new file mode 100644
++index 0000000..2cdad29
++--- /dev/null
+++++ b/mydir/myfile.txt
++@@ -0,0 +1 @@
+++Dummy
+diff --git a/packaging/my3.patch b/packaging/my3.patch
+new file mode 100644
+index 0000000..9fee859
+--- /dev/null
++++ b/packaging/my3.patch
+@@ -0,0 +1,7 @@
++diff --git a/README b/README
++index a1311cb..a59f1b9 100644
++--- a/README
+++++ b/README
++@@ -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
new file mode 100644
index 0000000..c18d7b2
--- /dev/null
+++ b/gbp-test2.data/My-addition.patch
@@ -0,0 +1,22 @@
+From: Markus Lehtonen <markus.lehtonen@linux.intel.com>
+Date: Tue, 13 Nov 2012 13:55:46 +0200
+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
+index 0000000..2cdad29
+--- /dev/null
++++ 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
new file mode 100644
index 0000000..cd91ca0
--- /dev/null
+++ b/gbp-test2.data/Remove-imported-patches.patch
@@ -0,0 +1,96 @@
+From: Markus Lehtonen <markus.lehtonen@linux.intel.com>
+Date: Tue, 13 Nov 2012 13:57:35 +0200
+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 885f9bb..4af2c49 100644
+--- a/.gbp.conf
++++ b/.gbp.conf
+@@ -5,6 +5,7 @@ packaging-tag = srcdata/gbp-test2/release/%(version)s
+ upstream-branch = srcdata/gbp-test2/upstream
+ upstream-tag = srcdata/gbp-test2/upstream/%(upstreamversion)s
+ packaging-dir = packaging
++patch-export = True
+ patch-export-ignore-path = ^(packaging/.*|\.gbp.conf)
+ spec-file = packaging/gbp-test2.spec
+
+diff --git a/packaging/gbp-test2.spec b/packaging/gbp-test2.spec
+index 5b41aae..409a102 100644
+--- a/packaging/gbp-test2.spec
++++ b/packaging/gbp-test2.spec
+@@ -2,7 +2,7 @@ Name: gbp-test2
+ Summary: Test package 2 for git-buildpackage
+ Epoch: 1
+ Version: 2.0
+-Release: 0
++Release: 1
+ Group: Development/Libraries
+ License: GPLv2
+ Source10: ftp://ftp.host.com/%{name}-%{version}.tar.gz
+@@ -11,8 +11,6 @@ Source20: bar.tar.gz
+ Source9999: gbp-test2-alt.spec
+ # Gbp-Ignore-Patches: -1
+ Patch: my.patch
+-Patch10: http://example.com/patches/my2.patch
+-Patch20: my3.patch
+ Packager: Markus Lehtonen <markus.lehtonen@linux.intel.com>
+
+ %description
+@@ -25,7 +23,6 @@ git branch.
+ %setup -T -n %{name}-%{version} -c -a 10
+
+ %patch
+-%patch -P 10 -p1
+
+ echo "Do things"
+
+diff --git a/packaging/my2.patch b/packaging/my2.patch
+deleted file mode 100644
+index 5554d9c..0000000
+--- a/packaging/my2.patch
++++ /dev/null
+@@ -1,16 +0,0 @@
+-From fb613432f15bc199a724741883b23fff9946b567 Mon Sep 17 00:00:00 2001
+-From: Markus Lehtonen <markus.lehtonen@linux.intel.com>
+-Date: Tue, 13 Nov 2012 13:55:46 +0200
+-Subject: [PATCH] My modification
+-
+-Add new file 'mydir/myfile.txt'.
+-
+-Signed-off-by: Markus Lehtonen <markus.lehtonen@linux.intel.com>
+-
+-diff --git a/mydir/myfile.txt b/mydir/myfile.txt
+-new file mode 100644
+-index 0000000..2cdad29
+---- /dev/null
+-+++ b/mydir/myfile.txt
+-@@ -0,0 +1 @@
+-+Dummy
+diff --git a/packaging/my3.patch b/packaging/my3.patch
+deleted file mode 100644
+index 9fee859..0000000
+--- a/packaging/my3.patch
++++ /dev/null
+@@ -1,7 +0,0 @@
+-diff --git a/README b/README
+-index a1311cb..a59f1b9 100644
+---- a/README
+-+++ b/README
+-@@ -1 +1 @@
+--Just for testing git-buildpackage.
+-+Just for testing GBP.
+--
+2.1.4
+
diff --git a/gbp-test2.data/Repository-initialization.patch b/gbp-test2.data/Repository-initialization.patch
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/gbp-test2.data/Repository-initialization.patch
diff --git a/gbp-test2.data/Update-.gbp.conf.patch b/gbp-test2.data/Update-.gbp.conf.patch
new file mode 100644
index 0000000..08bf437
--- /dev/null
+++ b/gbp-test2.data/Update-.gbp.conf.patch
@@ -0,0 +1,26 @@
+From: Markus Lehtonen <markus.lehtonen@linux.intel.com>
+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 885f9bb..c611421 100644
+--- a/.gbp.conf
++++ b/.gbp.conf
+@@ -1,7 +1,7 @@
+ [DEFAULT]
+ vendor = Test-Distro
+-packaging-branch = srcdata/gbp-test2/master
+-packaging-tag = srcdata/gbp-test2/release/%(version)s
++packaging-branch = srcdata/gbp-test2/master-orphan
++packaging-tag = srcdata/gbp-test2/release-orphan/%(version)s
+ upstream-branch = srcdata/gbp-test2/upstream
+ upstream-tag = srcdata/gbp-test2/upstream/%(upstreamversion)s
+ packaging-dir = packaging
+--
+2.1.4
+
diff --git a/gbp-test2.data/gbp.conf-adapt-to-new-patch-export-option-names-2.patch b/gbp-test2.data/gbp.conf-adapt-to-new-patch-export-option-names-2.patch
new file mode 100644
index 0000000..b84ec63
--- /dev/null
+++ b/gbp-test2.data/gbp.conf-adapt-to-new-patch-export-option-names-2.patch
@@ -0,0 +1,24 @@
+From: Markus Lehtonen <markus.lehtonen@linux.intel.com>
+Date: Thu, 26 Feb 2015 11:12:42 +0200
+Subject: [PATCH] gbp.conf: adapt to new patch-export option names
+
+Signed-off-by: Markus Lehtonen <markus.lehtonen@linux.intel.com>
+---
+ .gbp.conf | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/.gbp.conf b/.gbp.conf
+index 4af2c49..b31adf7 100644
+--- a/.gbp.conf
++++ b/.gbp.conf
+@@ -6,6 +6,6 @@ upstream-branch = srcdata/gbp-test2/upstream
+ upstream-tag = srcdata/gbp-test2/upstream/%(upstreamversion)s
+ packaging-dir = packaging
+ patch-export = True
+-patch-export-ignore-path = ^(packaging/.*|\.gbp.conf)
++patch-ignore-path = ^(packaging/.*|\.gbp.conf)
+ spec-file = packaging/gbp-test2.spec
+
+--
+2.1.4
+
diff --git a/gbp-test2.data/gbp.conf-adapt-to-new-patch-export-option-names.patch b/gbp-test2.data/gbp.conf-adapt-to-new-patch-export-option-names.patch
new file mode 100644
index 0000000..c8210d1
--- /dev/null
+++ b/gbp-test2.data/gbp.conf-adapt-to-new-patch-export-option-names.patch
@@ -0,0 +1,24 @@
+From: Markus Lehtonen <markus.lehtonen@linux.intel.com>
+Date: Thu, 26 Feb 2015 11:10:16 +0200
+Subject: [PATCH] gbp.conf: adapt to new patch-export option names
+
+Signed-off-by: Markus Lehtonen <markus.lehtonen@linux.intel.com>
+---
+ .gbp.conf | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/.gbp.conf b/.gbp.conf
+index c611421..eb3aaae 100644
+--- a/.gbp.conf
++++ b/.gbp.conf
+@@ -5,6 +5,6 @@ packaging-tag = srcdata/gbp-test2/release-orphan/%(version)s
+ upstream-branch = srcdata/gbp-test2/upstream
+ upstream-tag = srcdata/gbp-test2/upstream/%(upstreamversion)s
+ packaging-dir = packaging
+-patch-export-ignore-path = ^(packaging/.*|\.gbp.conf)
++patch-ignore-path = ^(packaging/.*|\.gbp.conf)
+ spec-file = packaging/gbp-test2.spec
+
+--
+2.1.4
+
diff --git a/gbp-test2.data/manifest.json b/gbp-test2.data/manifest.json
new file mode 100644
index 0000000..561fcdd
--- /dev/null
+++ b/gbp-test2.data/manifest.json
@@ -0,0 +1,185 @@
+{
+ "commits": {
+ "9d9a1e4efc5c1a9ba48c7de7bb2f3158a29e40d8": {
+ "committer": "Markus Lehtonen <markus.lehtonen@linux.intel.com> 1424941962 +0200",
+ "sha1": "9d9a1e4efc5c1a9ba48c7de7bb2f3158a29e40d8",
+ "patchfile": "gbp.conf-adapt-to-new-patch-export-option-names-2.patch",
+ "author": "Markus Lehtonen <markus.lehtonen@linux.intel.com> 1424941962 +0200",
+ "tree": "d599726243f1b49586c4b6004779aa79d39c42a4",
+ "parents": [
+ "cd2763432f4ad93b29c6f22aee7f623552156a81"
+ ],
+ "message": "gbp.conf: adapt to new patch-export option names\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>"
+ },
+ "6dd11793b037a9f78473253b85832ab70226e2bc": {
+ "committer": "Markus Lehtonen <markus.lehtonen@linux.intel.com> 1377529985 +0300",
+ "sha1": "6dd11793b037a9f78473253b85832ab70226e2bc",
+ "patchfile": "Add-gbp.conf.patch",
+ "author": "Markus Lehtonen <markus.lehtonen@linux.intel.com> 1352806630 +0200",
+ "tree": "aecee30e09c6cb14eea17c622ae65e9a43c6b159",
+ "parents": [
+ "6dccee0ab7689e5ae446d39535138ea39a88e70c"
+ ],
+ "message": "Add gbp.conf\n\nSigned-off-by: Markus Lehtonen <markus.lehtonen@linux.intel.com>"
+ },
+ "4515c6e8041903b3aea45d4e424c90f88492fc66": {
+ "committer": "Markus Lehtonen <markus.lehtonen@linux.intel.com> 1377529986 +0300",
+ "sha1": "4515c6e8041903b3aea45d4e424c90f88492fc66",
+ "patchfile": "My-addition.patch",
+ "author": "Markus Lehtonen <markus.lehtonen@linux.intel.com> 1352807746 +0200",
+ "tree": "2478f4ee0e07ac1e900bcd9d23f2bb791cd6ede2",
+ "parents": [
+ "3445afd5e168f6a58046b473ff9380999599a374"
+ ],
+ "message": "My addition\n\nImport my2.patch to the git tree.\n\nSigned-off-by: Markus Lehtonen <markus.lehtonen@linux.intel.com>"
+ },
+ "846aee30702fff8519dcb8bdd591ac1a227859a2": {
+ "committer": "Markus Lehtonen <markus.lehtonen@linux.intel.com> 1377529985 +0300",
+ "sha1": "846aee30702fff8519dcb8bdd591ac1a227859a2",
+ "patchfile": "packaging-add-alternative-spec-file-and-change-patch-p.patch",
+ "author": "Markus Lehtonen <markus.lehtonen@linux.intel.com> 1357733987 +0200",
+ "tree": "7e4badd5dad4652ad5bb60f772f4296f276b9729",
+ "parents": [
+ "489dbece0462a2818e31b02b3e50d73e003e7a5d"
+ ],
+ "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>"
+ },
+ "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",
+ "parents": [
+ "dc4481d39005968f1f2673d760af69b411eccc33"
+ ],
+ "message": "Add dummy Makefile\n\nSigned-off-by: Markus Lehtonen <markus.lehtonen@linux.intel.com>"
+ },
+ "97d5c7e811c7b4160142606d1553172ca4567f21": {
+ "committer": "Markus Lehtonen <markus.lehtonen@linux.intel.com> 1424941816 +0200",
+ "sha1": "97d5c7e811c7b4160142606d1553172ca4567f21",
+ "patchfile": "gbp.conf-adapt-to-new-patch-export-option-names.patch",
+ "author": "Markus Lehtonen <markus.lehtonen@linux.intel.com> 1424941816 +0200",
+ "tree": "89a8decc2f72f146acc10f4cce68af19dd732b40",
+ "parents": [
+ "33c84e86148c3707d2880f439529074296f03d29"
+ ],
+ "message": "gbp.conf: adapt to new patch-export option names\n\nSigned-off-by: Markus Lehtonen <markus.lehtonen@linux.intel.com>"
+ },
+ "3445afd5e168f6a58046b473ff9380999599a374": {
+ "committer": "Markus Lehtonen <markus.lehtonen@linux.intel.com> 1377529985 +0300",
+ "sha1": "3445afd5e168f6a58046b473ff9380999599a374",
+ "patchfile": "packaging-change-my2.patch-to-git-email-format.patch",
+ "author": "Markus Lehtonen <markus.lehtonen@linux.intel.com> 1358253459 +0200",
+ "tree": "d5c31f1edb05290f70ca4434158aa0dbcac0ddb5",
+ "parents": [
+ "d10f8183822d1a9214d2ec1b98538c1a636d9fb4"
+ ],
+ "message": "packaging: change my2.patch to git email format\n\nChange my2.patch from plain diff to git email format to test author and\ndate parsing of gbp.\n\nSigned-off-by: Markus Lehtonen <markus.lehtonen@linux.intel.com>"
+ },
+ "489dbece0462a2818e31b02b3e50d73e003e7a5d": {
+ "committer": "Markus Lehtonen <markus.lehtonen@linux.intel.com> 1377529985 +0300",
+ "sha1": "489dbece0462a2818e31b02b3e50d73e003e7a5d",
+ "patchfile": "Add-packaging-files.patch",
+ "author": "Markus Lehtonen <markus.lehtonen@linux.intel.com> 1352806552 +0200",
+ "tree": "dc290850829f4818a45a9e968c6159ee28f62074",
+ "parents": [
+ "6dd11793b037a9f78473253b85832ab70226e2bc"
+ ],
+ "message": "Add packaging files\n\nSigned-off-by: Markus Lehtonen <markus.lehtonen@linux.intel.com>"
+ },
+ "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",
+ "parents": [
+ "0579e0753b78476ad822c54b6ea07e2e80c0cdd2"
+ ],
+ "message": "Add dummy files\n\nSigned-off-by: Markus Lehtonen <markus.lehtonen@linux.intel.com>"
+ },
+ "cd2763432f4ad93b29c6f22aee7f623552156a81": {
+ "committer": "Markus Lehtonen <markus.lehtonen@linux.intel.com> 1377610598 +0300",
+ "sha1": "cd2763432f4ad93b29c6f22aee7f623552156a81",
+ "patchfile": "Remove-imported-patches.patch",
+ "author": "Markus Lehtonen <markus.lehtonen@linux.intel.com> 1352807855 +0200",
+ "tree": "3ec74b66ae400b34d5dd615f5bfe462b71adcf7f",
+ "parents": [
+ "4515c6e8041903b3aea45d4e424c90f88492fc66"
+ ],
+ "message": "Remove imported patches\n\nAnd enable automatic patch-generation.\n\nSigned-off-by: Markus Lehtonen <markus.lehtonen@linux.intel.com>"
+ },
+ "33c84e86148c3707d2880f439529074296f03d29": {
+ "committer": "Markus Lehtonen <markus.lehtonen@linux.intel.com> 1386843313 +0200",
+ "sha1": "33c84e86148c3707d2880f439529074296f03d29",
+ "patchfile": "Update-.gbp.conf.patch",
+ "author": "Markus Lehtonen <markus.lehtonen@linux.intel.com> 1386843313 +0200",
+ "tree": "058029fd4202f33aa018e0622fef64b9a12aceae",
+ "parents": [
+ "3445afd5e168f6a58046b473ff9380999599a374"
+ ],
+ "message": "Update .gbp.conf\n\nSigned-off-by: Markus Lehtonen <markus.lehtonen@linux.intel.com>"
+ },
+ "d10f8183822d1a9214d2ec1b98538c1a636d9fb4": {
+ "committer": "Markus Lehtonen <markus.lehtonen@linux.intel.com> 1377529985 +0300",
+ "sha1": "d10f8183822d1a9214d2ec1b98538c1a636d9fb4",
+ "patchfile": "packaging-reflect-the-corrected-patch-number-handling.patch",
+ "author": "Markus Lehtonen <markus.lehtonen@linux.intel.com> 1357897260 +0200",
+ "tree": "0506db7aae8d2404ded39db7c1f1a6bea9c81b21",
+ "parents": [
+ "846aee30702fff8519dcb8bdd591ac1a227859a2"
+ ],
+ "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": {
+ "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"
+ }
+ },
+ "refs": {
+ "refs/tags/srcdata/gbp-test2/release/1%2.0-1": "c2ab8de23c48dfd24d8ab165279a595d0021cf41",
+ "refs/tags/srcdata/gbp-test2/release/1%2.0-0": "63a0cbe0ad67d592f838465e595df4688e3f84a5",
+ "refs/heads/srcdata/gbp-test2/pristine_tar": "75e1ee1d3c0b920491cb9fc827be6de8cd9f0d9f",
+ "refs/tags/srcdata/gbp-test2/upstream/2.0": "3006655226cb9f1508a0e5eb1562c5d051170648",
+ "refs/heads/srcdata/gbp-test2/master": "9d9a1e4efc5c1a9ba48c7de7bb2f3158a29e40d8",
+ "refs/heads/srcdata/gbp-test2/upstream": "6dccee0ab7689e5ae446d39535138ea39a88e70c",
+ "refs/heads/srcdata/gbp-test2/master-orphan": "97d5c7e811c7b4160142606d1553172ca4567f21"
+ },
+ "HEAD": "ref: refs/heads/srcdata/gbp-test2/master\n",
+ "tags": {
+ "3006655226cb9f1508a0e5eb1562c5d051170648": {
+ "tagger": "Markus Lehtonen <markus.lehtonen@linux.intel.com> 1377529719 +0300",
+ "message": "Version 2.0",
+ "tag": "srcdata/gbp-test2/upstream/2.0",
+ "type": "commit",
+ "object": "6dccee0ab7689e5ae446d39535138ea39a88e70c"
+ },
+ "63a0cbe0ad67d592f838465e595df4688e3f84a5": {
+ "tagger": "Markus Lehtonen <markus.lehtonen@linux.intel.com> 1377530035 +0300",
+ "message": "Test-Distro release 1:2.0-0",
+ "tag": "srcdata/gbp-test2/release/1%2.0-0",
+ "type": "commit",
+ "object": "3445afd5e168f6a58046b473ff9380999599a374"
+ },
+ "c2ab8de23c48dfd24d8ab165279a595d0021cf41": {
+ "tagger": "Markus Lehtonen <markus.lehtonen@linux.intel.com> 1377610676 +0300",
+ "message": "Test-Distro release 1:2.0-1",
+ "tag": "srcdata/gbp-test2/release/1%2.0-1",
+ "type": "commit",
+ "object": "cd2763432f4ad93b29c6f22aee7f623552156a81"
+ }
+ }
+} \ 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
new file mode 100644
index 0000000..f148df5
--- /dev/null
+++ b/gbp-test2.data/packaging-add-alternative-spec-file-and-change-patch-p.patch
@@ -0,0 +1,100 @@
+From: Markus Lehtonen <markus.lehtonen@linux.intel.com>
+Date: Wed, 9 Jan 2013 14:19:47 +0200
+Subject: [PATCH] packaging: add alternative spec file and change patch path
+
+Add a second spec file for testing import-srpm spec guessing.
+
+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 601d792..885f9bb 100644
+--- a/.gbp.conf
++++ b/.gbp.conf
+@@ -6,4 +6,5 @@ upstream-branch = srcdata/gbp-test2/upstream
+ upstream-tag = srcdata/gbp-test2/upstream/%(upstreamversion)s
+ packaging-dir = packaging
+ patch-export-ignore-path = ^(packaging/.*|\.gbp.conf)
++spec-file = packaging/gbp-test2.spec
+
+diff --git a/packaging/gbp-test2-alt.spec b/packaging/gbp-test2-alt.spec
+new file mode 100644
+index 0000000..155ea43
+--- /dev/null
++++ b/packaging/gbp-test2-alt.spec
+@@ -0,0 +1,48 @@
++Name: gbp-test2-alt
++Summary: Test package 2 alternative for git-buildpackage
++Epoch: 1
++Version: 2.0
++Release: 0
++Group: Development/Libraries
++License: GPLv2
++Source10: ftp://ftp.host.com/%{name}-%{version}.tar.gz
++Source: foo.txt
++Source20: bar.tar.gz
++# Gbp-Ignore-Patches: 0
++Patch: my.patch
++Patch10: http://example.com/patches/my2.patch
++Patch20: my3.patch
++Packager: Markus Lehtonen <markus.lehtonen@linux.intel.com>
++
++%description
++Package for testing the RPM functionality of git-buildpackage.
++Version 2 which has packaging and development in the same
++git branch. Alternative spec file used.
++
++
++%prep
++%setup -T -n %{name}-%{version} -c -a 10
++
++%patch
++%patch -P 20 -p1
++
++echo "Do things"
++
++# Gbp-Patch-Macros
++
++%build
++make
++
++
++%install
++rm -rf %{buildroot}
++mkdir -p %{buildroot}/%{_datadir}/%{name}
++cp -R * %{buildroot}/%{_datadir}/%{name}
++install %{SOURCE0} %{buildroot}/%{_datadir}/%{name}
++
++
++
++%files
++%defattr(-,root,root,-)
++%dir %{_datadir}/%{name}
++%{_datadir}/%{name}
+diff --git a/packaging/gbp-test2.spec b/packaging/gbp-test2.spec
+index 61aae33..eec5d26 100644
+--- a/packaging/gbp-test2.spec
++++ b/packaging/gbp-test2.spec
+@@ -8,9 +8,10 @@ License: GPLv2
+ Source10: ftp://ftp.host.com/%{name}-%{version}.tar.gz
+ Source: foo.txt
+ Source20: bar.tar.gz
++Source9999: gbp-test2-alt.spec
+ # Gbp-Ignore-Patches: 0
+ Patch: my.patch
+-Patch10: my2.patch
++Patch10: http://example.com/patches/my2.patch
+ 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
new file mode 100644
index 0000000..8bab862
--- /dev/null
+++ b/gbp-test2.data/packaging-change-my2.patch-to-git-email-format.patch
@@ -0,0 +1,32 @@
+From: Markus Lehtonen <markus.lehtonen@linux.intel.com>
+Date: Tue, 15 Jan 2013 14:37:39 +0200
+Subject: [PATCH] packaging: change my2.patch to git email format
+
+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
+--- a/packaging/my2.patch
++++ b/packaging/my2.patch
+@@ -1,3 +1,12 @@
++From fb613432f15bc199a724741883b23fff9946b567 Mon Sep 17 00:00:00 2001
++From: Markus Lehtonen <markus.lehtonen@linux.intel.com>
++Date: Tue, 13 Nov 2012 13:55:46 +0200
++Subject: [PATCH] My modification
++
++Add new file 'mydir/myfile.txt'.
++
++Signed-off-by: Markus Lehtonen <markus.lehtonen@linux.intel.com>
++
+ 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
new file mode 100644
index 0000000..51639d9
--- /dev/null
+++ b/gbp-test2.data/packaging-reflect-the-corrected-patch-number-handling.patch
@@ -0,0 +1,42 @@
+From: Markus Lehtonen <markus.lehtonen@linux.intel.com>
+Date: Fri, 11 Jan 2013 11:41:00 +0200
+Subject: [PATCH] packaging: reflect the corrected patch number handling
+
+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
+--- a/packaging/gbp-test2-alt.spec
++++ b/packaging/gbp-test2-alt.spec
+@@ -8,7 +8,7 @@ License: GPLv2
+ Source10: ftp://ftp.host.com/%{name}-%{version}.tar.gz
+ Source: foo.txt
+ Source20: bar.tar.gz
+-# Gbp-Ignore-Patches: 0
++# Gbp-Ignore-Patches: -1
+ Patch: my.patch
+ Patch10: http://example.com/patches/my2.patch
+ Patch20: my3.patch
+diff --git a/packaging/gbp-test2.spec b/packaging/gbp-test2.spec
+index eec5d26..5b41aae 100644
+--- a/packaging/gbp-test2.spec
++++ b/packaging/gbp-test2.spec
+@@ -9,7 +9,7 @@ Source10: ftp://ftp.host.com/%{name}-%{version}.tar.gz
+ Source: foo.txt
+ Source20: bar.tar.gz
+ Source9999: gbp-test2-alt.spec
+-# Gbp-Ignore-Patches: 0
++# Gbp-Ignore-Patches: -1
+ 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
new file mode 100644
index 0000000..fa6dc96
--- /dev/null
+++ b/gbp-test2.data/pristine-tar-data-for-gbp-test2-2.0.tar.gz.patch
@@ -0,0 +1,56 @@
+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
+index 0000000000000000000000000000000000000000..94f3aed61c8e4d15c7ba44ca7df329d00facc63f
+GIT binary patch
+literal 1302
+zcmV+x1?l=9iwFSs0L4=P1MQi6Y*SSn$Il%Dwr*iH0kSy)3xqIvtmnSl#ceP*UI8)z
+zqoStXwU@1~T}#`|Z3rump&~FbF^eLP1QT%hh!Z!3@Q4O=3XzvUm~%${KqMP7H4V)5
+zdRkZ*z3ob7Q?l&$N!xpFf4`o`J?DGBIk#E5BB^S=ESY7eD@)IDobF|(<Z#GN6g@CO
+z;JCn%5PZZm%OILz1)9N_6+}e7;8_7>R7J55VX1JrB`4|1|E(u@a6<$ZXV}~po18;)
+znCEDND2Q3KK_Dj#)@w*q8Zc@KjxyMPf(@MJVUG-W5TdVkHU0EYi~Jpl(D&{KSYU9l
+z{#k+OKPDpT)4xq}uBx!q43J0ekOR~+MD;)EjRfRHCzhcRotN5|Y`|!fwC#wd99=lO
+z^yhU~C)Olw{jI6M(RAwM3rBW-Q@Vfsj>V_G>Uqz-p>DU?m{*#6_|wDJFaPpWd-k#O
+zD^3c!1KEiS^>eScoViw?-#B@D9n+-Ee`ort^o>gw97<Z9*3tH{*z9WPzIf$td)K1O
+z?ZOUunQ_6ag|n`{{ejb<Yj4PJO=`I~rt3&=^^Mw&w6#-SxxB{Mtvk@2Gr8N9>sYQ+
+z>gd9^<|dw*=Sy$Pu{HFp>-aLw`K!L<UFF2CJxiYL`bYV`vN`SczDb=MeNQ*OubB2I
+z`(}|!_V(&3@|3fwxAQj5eC}WyS9Z?2q<GqQH<S{u<<_N9kAIukYi!)?t6%5a-TbG;
+zyY-l|y0<p<cO_x-^KYI{{HsS<d#k9WIq{3>RryMK%j>>+&)r0CZEdg7GUb|*+MPCM
+zCv!|mVGsRK@R_D^+m)V<rxLC!Po7rJjnC~odei6KrOfcopRLS0-j;X&92~E%9_c$U
+z;~FZ8{rqRC{NG*ekfYniAp9S*BKUtS2<89xJUo>D-xme{AL2w`?P?<VKgL{;{ux1F
+z!T)0c89XR;7^C)on^bODDZAX!Yhw`pF9;m?e=G>S|2L2mnl*&k|M!c6{||AZuXZ&N
+z{hy^(&;Mu){vQh#OJ(v(i&fSvEu2%ZxKLxRu-U4!T%{o2;ep!!D@n;>FOOmygYbWz
+zW5NGpLFoNI<M(ip4zvI77Y*V6ebI+KGT=dozS`A9-v6ug&k8*Fe=J}?r^6bx|C?p2
+zTZ(EMgYbWvgXjM-A+-Nv{|=uP!}x!{DER*nC;Dnv6T$y!7W1nA|1j+TW5U#D3RVz7
+zPYs-;prqiqQ#Lte$t{zMR4iGocBiG}ZqXrC8B45oQZ$wZ{39^Ug8#`anMfXUj3{6-
+znPjSYnnxvl7uspJyZvvT$uQY%Ho4rLBbZGlS;kVaDCi9`FUcGym{|kQ@-(ZLCDtJ6
+z^|FXf8eLHD{7s5vN#WooX>v<Kd~lPxJ6#OQWq6US#W1<Ns%nNT&oJqvD;%TB7Z^dE
+zkC0~sLL>DvU))l*_oGkt*G)({9lz$_VNVeimz?R4+@{hDv*eZ@tN8Fx&1)CNKJoP*
+zV_KW=mPJS7C@LjrRz~~&y_qd**3bTY+>efi##cQ>2o)mq2&G+y&}gdcQG`+{?Q%-1
+zMJSolPCzK0d{V7(EfhjrAkzPpi4a8!2#t^MQ;I?+gho*>O+;v1=&X_cEKkCnwDj<m
+zQJ!Q^d>~hAiqvPyGuA@{MpfOncmV(a0000000000000000000000000000000ATp=
+MA6fZ-?f_5#06lu0WdHyG
+
+literal 0
+HcmV?d00001
+
+diff --git a/gbp-test2-2.0.tar.gz.id b/gbp-test2-2.0.tar.gz.id
+new file mode 100644
+index 0000000..340feea
+--- /dev/null
++++ b/gbp-test2-2.0.tar.gz.id
+@@ -0,0 +1 @@
++afdd4586454b4648d29a606ebf6be9c52708332f
+--
+2.1.4
+