aniani
/
bsdgames
mirror of https://salsa.debian.org/games-team/bsdgames
1
0
Fork 0
Code

Convert patch system from quilt to git-buildpackage

This commit is contained in:
Dr. Tobias Quathamer 2018-04-26 14:13:37 +02:00
parent 887f46cb4f
commit 3744b4ea0a
16 changed files with 75 additions and 94 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
debian/patches/Custom-configuration-of-Debian-package-build.patch vendored
View File

@ -3,8 +3,8 @@ Date: Mon, 26 Mar 2012 10:06:45 +0200
Subject: Custom configuration of Debian package build
---
config.params | 49 +++++++++++++++++++++++++++++++++++++++++++++++++
1 files changed, 49 insertions(+), 0 deletions(-)
config.params | 49 +++++++++++++++++++++++++++++++++++++++++++++++++
1 file changed, 49 insertions(+)
create mode 100644 config.params
diff --git a/config.params b/config.params
@ -62,4 +62,3 @@ index 0000000..97d45fb
+# This is for dab, the corresponding variable other_cxxflags does not
+# exist, so append it to the "warning" flags
+bsd_games_cfg_cxx_warning_flags="-Wall -W -Wpointer-arith -Wcast-align -Wcast-qual -Wwrite-strings $(dpkg-buildflags --get CXXFLAGS) $(dpkg-buildflags --get CPPFLAGS)"
--

5
debian/patches/Define-__dead-for-GNU-GCC.patch vendored
View File

@ -3,8 +3,8 @@ Date: Thu, 16 Feb 2012 11:26:51 +0100
Subject: Define __dead for GNU GCC
---
include/sys/cdefs.h | 4 ++++
1 files changed, 4 insertions(+), 0 deletions(-)
include/sys/cdefs.h | 4 ++++
1 file changed, 4 insertions(+)
diff --git a/include/sys/cdefs.h b/include/sys/cdefs.h
index 138eaa8..f6e87c2 100644
@ -18,4 +18,3 @@ index 138eaa8..f6e87c2 100644
+#ifndef __dead
+#define __dead __attribute__((__noreturn__))
+#endif
--

31
debian/patches/Fix-format-security-compiling-errors.patch vendored
View File

@ -3,21 +3,21 @@ Date: Mon, 26 Mar 2012 10:51:46 +0200
Subject: Fix format-security compiling errors
---
battlestar/room.c | 2 +-
cribbage/io.c | 10 +++++-----
hack/hack.apply.c | 2 +-
hack/hack.eat.c | 2 +-
hack/hack.end.c | 4 ++--
hack/hack.invent.c | 4 ++--
hack/hack.main.c | 2 +-
hack/hack.options.c | 2 +-
hack/hack.pager.c | 4 ++--
hack/hack.potion.c | 2 +-
hack/hack.rumors.c | 2 +-
hack/hack.timeout.c | 2 +-
hunt/hunt/hunt.c | 4 ++--
monop/misc.c | 2 +-
sail/assorted.c | 6 +++---
battlestar/room.c | 2 +-
cribbage/io.c | 10 +++++-----
hack/hack.apply.c | 2 +-
hack/hack.eat.c | 2 +-
hack/hack.end.c | 4 ++--
hack/hack.invent.c | 4 ++--
hack/hack.main.c | 2 +-
hack/hack.options.c | 2 +-
hack/hack.pager.c | 4 ++--
hack/hack.potion.c | 2 +-
hack/hack.rumors.c | 2 +-
hack/hack.timeout.c | 2 +-
hunt/hunt/hunt.c | 4 ++--
monop/misc.c | 2 +-
sail/assorted.c | 6 +++---
15 files changed, 25 insertions(+), 25 deletions(-)
diff --git a/battlestar/room.c b/battlestar/room.c
@ -295,4 +295,3 @@ index cfc7d2a..ecb8406 100644
}
/*
if (Chit > 1 && on->file->readyL&R_INITIAL && on->file->readyR&R_INITIAL) {
--

6
debian/patches/Fix-include-stdio.h-C-incompatibility.patch vendored
View File

@ -1,7 +1,6 @@
From 3735b53ebd56c007f46680a5be911d4451599310 Mon Sep 17 00:00:00 2001
From: Sven Joachim <svenjoac@gmx.de>
Date: Wed, 1 Nov 2017 09:03:28 +0100
Subject: [PATCH] Fix include/stdio.h C++ incompatibility
Subject: Fix include/stdio.h C++ incompatibility
I have seen the following error when building bsdgames with
libncurses6:
@ -42,6 +41,3 @@ index 32a4b71..b1ac049 100644
+}
+#endif
#endif
--
2.15.0

5
debian/patches/Fix-typos-spotted-by-Lintian.patch vendored
View File

@ -3,8 +3,8 @@ Date: Fri, 24 Feb 2012 14:29:11 +0100
Subject: Fix typos spotted by Lintian
---
atc/update.c | 2 +-
hack/hack.c | 2 +-
atc/update.c | 2 +-
hack/hack.c | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/atc/update.c b/atc/update.c
@ -33,4 +33,3 @@ index 05141af..6e5028e 100644
break;
}
if (wt > -5)
--

19
debian/patches/Replace-getline-with-get_line.patch vendored
View File

@ -3,15 +3,15 @@ Date: Thu, 16 Feb 2012 11:26:00 +0100
Subject: Replace getline() with get_line()
---
boggle/boggle/bog.c | 2 +-
boggle/boggle/extern.h | 2 +-
boggle/boggle/mach.c | 2 +-
cribbage/crib.c | 4 ++--
cribbage/cribbage.h | 2 +-
cribbage/io.c | 8 ++++----
gomoku/bdisp.c | 2 +-
gomoku/gomoku.h | 2 +-
gomoku/main.c | 14 +++++++-------
boggle/boggle/bog.c | 2 +-
boggle/boggle/extern.h | 2 +-
boggle/boggle/mach.c | 2 +-
cribbage/crib.c | 4 ++--
cribbage/cribbage.h | 2 +-
cribbage/io.c | 8 ++++----
gomoku/bdisp.c | 2 +-
gomoku/gomoku.h | 2 +-
gomoku/main.c | 14 +++++++-------
9 files changed, 19 insertions(+), 19 deletions(-)
diff --git a/boggle/boggle/bog.c b/boggle/boggle/bog.c
@ -217,4 +217,3 @@ index 299dee1..3ff4750 100644
quit();
switch (*fmtbuf) {
case '\0':
--

43
debian/patches/Unsorted-Debian-patches.patch vendored
View File

@ -3,27 +3,27 @@ Date: Mon, 26 Mar 2012 10:07:17 +0200
Subject: Unsorted Debian patches
---
adventure/crc.c | 4 ++-
arithmetic/arithmetic.6 | 2 +-
backgammon/backgammon/move.c | 3 ++
backgammon/common_source/allow.c | 4 ++-
backgammon/teachgammon/ttext1.c | 2 +-
backgammon/teachgammon/ttext2.c | 2 +-
dab/gamescreen.h | 6 ++--
dm/dm.c | 6 ++--
fish/Makefrag | 8 ++++--
fish/fish.6 | 4 +-
gomoku/gomoku.6 | 2 +-
hack/Makefrag | 3 +-
hack/config.h | 15 ++++++++----
hunt/hunt/hunt.6.in | 2 +-
hunt/hunt/hunt.c | 6 +++-
hunt/hunt/playit.c | 4 +-
number/number.c | 47 +++++++++++++++++++++++++-------------
sail/pl_main.c | 2 +-
tests/number.-0.1 | 2 +-
tetris/scores.c | 17 ++++++++-----
trek/setup.c | 5 +++-
adventure/crc.c | 4 +++-
arithmetic/arithmetic.6 | 2 +-
backgammon/backgammon/move.c | 3 +++
backgammon/common_source/allow.c | 4 +++-
backgammon/teachgammon/ttext1.c | 2 +-
backgammon/teachgammon/ttext2.c | 2 +-
dab/gamescreen.h | 6 ++---
dm/dm.c | 6 ++---
fish/Makefrag | 8 ++++---
fish/fish.6 | 4 ++--
gomoku/gomoku.6 | 2 +-
hack/Makefrag | 3 ++-
hack/config.h | 15 ++++++++-----
hunt/hunt/hunt.6.in | 2 +-
hunt/hunt/hunt.c | 6 +++--
hunt/hunt/playit.c | 4 ++--
number/number.c | 47 ++++++++++++++++++++++++++--------------
sail/pl_main.c | 2 +-
tests/number.-0.1 | 2 +-
tetris/scores.c | 17 +++++++++------
trek/setup.c | 5 ++++-
21 files changed, 92 insertions(+), 54 deletions(-)
diff --git a/adventure/crc.c b/adventure/crc.c
@ -550,4 +550,3 @@ index 1f14f27..fab5136 100644
q->qsystemname = 0;
}
--

5
debian/patches/hangman-Error-out-on-1000-unsuitable-words.-Closes-6.patch vendored
View File

@ -3,8 +3,8 @@ Date: Thu, 16 Feb 2012 22:37:50 +0100
Subject: hangman: Error out on 1000 unsuitable words. Closes: #610270
---
hangman/getword.c | 18 +++++++++++++++++-
1 files changed, 17 insertions(+), 1 deletions(-)
hangman/getword.c | 18 +++++++++++++++++-
1 file changed, 17 insertions(+), 1 deletion(-)
diff --git a/hangman/getword.c b/hangman/getword.c
index 1b5396a..dc42a53 100644
@ -44,4 +44,3 @@ index 1b5396a..dc42a53 100644
}
gp = Known;
wp = Word;
--

5
debian/patches/primes-Document-maximum-number-in-manpage.-Closes-63.patch vendored
View File

@ -3,8 +3,8 @@ Date: Thu, 16 Feb 2012 13:17:13 +0100
Subject: primes: Document maximum number in manpage. Closes: #636569
---
primes/primes.6 | 9 ++++++---
1 files changed, 6 insertions(+), 3 deletions(-)
primes/primes.6 | 9 ++++++---
1 file changed, 6 insertions(+), 3 deletions(-)
diff --git a/primes/primes.6 b/primes/primes.6
index 9499398..ac100c6 100644
@ -35,4 +35,3 @@ index 9499398..ac100c6 100644
The
.Ar start
value may be preceded by a single
--

5
debian/patches/primes-Update-to-NetBSD-CVS-2012-02-16.patch vendored
View File

@ -3,8 +3,8 @@ Date: Thu, 16 Feb 2012 13:05:28 +0100
Subject: primes: Update to NetBSD CVS, 2012-02-16
---
primes/primes.6 | 10 ++++++-
primes/primes.c | 67 +++++++++++++++++++++++++++++++++---------------------
primes/primes.6 | 10 +++++++--
primes/primes.c | 67 +++++++++++++++++++++++++++++++++++----------------------
2 files changed, 49 insertions(+), 28 deletions(-)
diff --git a/primes/primes.6 b/primes/primes.6
@ -225,4 +225,3 @@ index 2d93594..4693968 100644
+ (void)fprintf(stderr, "usage: primes [-d] [start [stop]]\n");
exit(1);
}
--

5
debian/patches/quiz-Add-answers-to-adults-babies.-Closes-659528.patch vendored
View File

@ -3,8 +3,8 @@ Date: Thu, 16 Feb 2012 12:53:51 +0100
Subject: quiz: Add answers to adults/babies. Closes: #659528
---
quiz/datfiles/babies | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
quiz/datfiles/babies | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/quiz/datfiles/babies b/quiz/datfiles/babies
index 5305c0c..45c4bb3 100644
@ -19,4 +19,3 @@ index 5305c0c..45c4bb3 100644
duckling:duck
fawn:deer
piglet|shoat:pig
--

15
debian/patches/quiz-Update-presidents-capitals-fix-typos-in-murders.patch vendored
View File

@ -3,13 +3,13 @@ Date: Thu, 16 Feb 2012 11:26:50 +0100
Subject: quiz: Update presidents, capitals, fix typos in murders, poetry
---
quiz/datfiles/africa | 51 ++++++++++++++++++++++++++++++------------------
quiz/datfiles/america | 45 ++++++++++++++++++++++++++++++++++--------
quiz/datfiles/asia | 40 ++++++++++++++++++++++++--------------
quiz/datfiles/europe | 44 ++++++++++++++++++++++++++++-------------
quiz/datfiles/murders | 2 +-
quiz/datfiles/poetry | 2 +-
quiz/datfiles/pres | 6 +++-
quiz/datfiles/africa | 51 ++++++++++++++++++++++++++++++++-------------------
quiz/datfiles/america | 45 ++++++++++++++++++++++++++++++++++++---------
quiz/datfiles/asia | 40 +++++++++++++++++++++++++---------------
quiz/datfiles/europe | 44 ++++++++++++++++++++++++++++++--------------
quiz/datfiles/murders | 2 +-
quiz/datfiles/poetry | 2 +-
quiz/datfiles/pres | 6 ++++--
7 files changed, 129 insertions(+), 61 deletions(-)
diff --git a/quiz/datfiles/africa b/quiz/datfiles/africa
@ -350,4 +350,3 @@ index 6f81228..4ce5862 100644
+{R{ichard} }{B{ruce} }Cheney:{B{arack} }{H{ussein} }Obama{ II}
+{B{arack} }{H{ussein} }Obama{ II}:2009-:\
+{J{oe{seph}} }{R{obinette} }{Biden}{{,} J{unio}r}:
--

5
debian/patches/rain-Update-default-delay.-Closes-579062.patch vendored
View File

@ -3,8 +3,8 @@ Date: Thu, 16 Feb 2012 11:26:53 +0100
Subject: rain: Update default delay. Closes: #579062
---
rain/rain.6 | 2 +-
rain/rain.c | 2 +-
rain/rain.6 | 2 +-
rain/rain.c | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/rain/rain.6 b/rain/rain.6
@ -32,4 +32,3 @@ index e388f46..63e6276 100644
unsigned long val = 0;
int ch;
char *ep;
--

5
debian/patches/robots-Refresh-screen.patch vendored
View File

@ -3,8 +3,8 @@ Date: Thu, 16 Feb 2012 11:26:49 +0100
Subject: robots: Refresh screen
---
robots/move.c | 1 +
1 files changed, 1 insertions(+), 0 deletions(-)
robots/move.c | 1 +
1 file changed, 1 insertion(+)
diff --git a/robots/move.c b/robots/move.c
index 7edaae3..b2703c5 100644
@ -18,4 +18,3 @@ index 7edaae3..b2703c5 100644
refresh();
break;
case EOF:
--

5
debian/patches/wtf-Add-NMU.-Closes-574036.patch vendored
View File

@ -3,8 +3,8 @@ Date: Thu, 16 Feb 2012 13:26:25 +0100
Subject: wtf: Add NMU. Closes: #574036
---
wtf/acronyms.comp | 1 +
1 files changed, 1 insertions(+), 0 deletions(-)
wtf/acronyms.comp | 1 +
1 file changed, 1 insertion(+)
diff --git a/wtf/acronyms.comp b/wtf/acronyms.comp
index c5283c4..e365d72 100644
@ -18,4 +18,3 @@ index c5283c4..e365d72 100644
NRZ non-return to zero
NUMA non uniform memory access
OCL object constraint language
--

5
debian/patches/wtf-Add-acronyms-and-sort-them-alphabetically.patch vendored
View File

@ -3,8 +3,8 @@ Date: Thu, 16 Feb 2012 11:26:48 +0100
Subject: wtf: Add acronyms and sort them alphabetically
---
wtf/acronyms | 8 ++++++++
wtf/acronyms.comp | 28 +++++++++++++++++++++-------
wtf/acronyms | 8 ++++++++
wtf/acronyms.comp | 28 +++++++++++++++++++++-------
2 files changed, 29 insertions(+), 7 deletions(-)
diff --git a/wtf/acronyms b/wtf/acronyms
@ -212,4 +212,3 @@ index 6f2b66f..c5283c4 100644
UUCP unix-to-unix copy protocol
VAX virtual address extension
VCM virtual channel memory
--