diff options
Diffstat (limited to 'gbp-test.data/Create-a-forked-version.patch')
| -rw-r--r-- | gbp-test.data/Create-a-forked-version.patch | 59 |
1 files changed, 59 insertions, 0 deletions
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 + |