blob: 60dddb6ef76313ccf314529d3d1b44357016f525 (
plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
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 | 4 ++--
gbp-test.spec | 2 +-
my3.patch | 7 -------
3 files changed, 3 insertions(+), 10 deletions(-)
delete mode 100644 my3.patch
diff --git a/.gbp.conf b/.gbp.conf
index 598b658..1f3671f 100644
--- a/.gbp.conf
+++ b/.gbp.conf
@@ -1,7 +1,7 @@
[DEFAULT]
vendor = Test-Distro
-packaging-branch = master
-packaging-tag = release/%(version)s
+packaging-branch = fork
+packaging-tag = fork/release/%(version)s
upstream-branch = upstream
upstream-tag = upstream/%(upstreamversion)s
packaging-tag-msg = %(vendor)s release %(version)s
diff --git a/gbp-test.spec b/gbp-test.spec
index c46a734..4759934 100644
--- a/gbp-test.spec
+++ 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
|
