diff options
| author | jc_gargma <jc_gargma@iserlohn-fortress.net> | 2023-10-02 22:07:03 -0700 |
|---|---|---|
| committer | jc_gargma <jc_gargma@iserlohn-fortress.net> | 2023-10-02 22:07:03 -0700 |
| commit | c1f927736d83626b3e1ed59ab6036bbe4ed3514f (patch) | |
| tree | ac4ee985a807828f3c8935b789493ba7525f8512 | |
| parent | Updated to 2023-09-26-2048 (diff) | |
| download | cataclysm-bn-c1f927736d83626b3e1ed59ab6036bbe4ed3514f.tar.xz | |
Updated to 2023-09-26-2048
Fix conflicting readme files in split packages.
| -rw-r--r-- | PKGBUILD | 10 | ||||
| -rw-r--r-- | vampirism.patch | 12 |
2 files changed, 20 insertions, 2 deletions
@@ -19,7 +19,7 @@ pkgname=cataclysm-bn _pkgname=Cataclysm-BN-cbn-experimental pkgver=202309262048 _pkgver=2023-09-26-2048 -pkgrel=1 +pkgrel=4 pkgdesc="A post-apocalyptic roguelike." #url="http://cataclysmrl.blogspot.com/" #url="http://www.cataclysm.glyphgryph.com/" @@ -249,7 +249,7 @@ b2sums=('b0157fd92e0203aa7ed087cdd9e6c6bf75f6deaf230dff1f7b4b79e54a9abe3158afae2 '4bd44cbe85c53902b8a360509703e3d38e8a5da75dd2c534a77f03ce6440632f6c83c92939069c60473c88ffb3abab0fbf11e39271f44f813b9f6432ea5f9a6b' 'f115314dd2bb1da07bba7a90fec5c3acb7ccb5145efaea03d6806942e24d402c9a144a2fd07b82e727a0b79dedd4bdd87de0bbaf0944236563164fb6f117965e' 'e0a9e8f1129650208f7a5a37680091a6d2abaa60f5d4fd7fc691854d49c9f59317ca18dbe764cb05cacd4a2a95de702bbdd072571862ee0b27bd8df3be7a5764' - 'e283794a78d6d691ed7a3769ec97dcf40d242720c0d077955a85025237bcb019188237575ce0b1bd621670bca1ede829f6e8fed4a0fe42a3eab6ec818a1e570b' + '9b7eda7ec3fb99280001360ce2004ab14de9dedcc5b41769bc27ab75d25209a5f259cdad09a60204bd05959d60670963c85609293b97696769f5cf0f1b9066a1' '9295e05268225c790bd5633cf33611177bbaf9c76143de56c066040f1f2969b435e38d190d69a1ea24caab9bd2e17864194e464d1bd1e08cd9a26bf93c225385' 'a56efdaae0344726debf5b74846edce8df7aa2357fbc7a05a3d369d1f457b02934a0d0ce2330072e03f1ac901e06e333c9393f795c761f8440307e7649ed5596' 'd6e3f2be3c37bf02c2a526323eb9b828ddf025e4d11d7f064a488102348d193d10a7186148088edc27c4e5316e8d62e96693b77b28cb78322fab79d94b8d262a' @@ -733,6 +733,9 @@ package_cataclysm-bn() { install -d "$pkgdir/usr/share/doc/cataclysm-bn" cp --reflink -r doc/* "$pkgdir/usr/share/doc/cataclysm-bn" + # Fix tileset readme being duplicated in curses package + rm "$pkgdir/usr/share/cataclysm-bn/json/external_tileset/README.md" + # License install -Dm644 LICENSE.txt "$pkgdir/usr/share/licenses/$pkgname/LICENSE" @@ -793,4 +796,7 @@ package_cataclysm-bn-tiles() { find . -type f -exec rm -f "$pkgdir"/{} \; cd "$pkgdir" find . -type d -empty -delete + + # Fix mapgen readme being duplicated in tileset package + rm "$pkgdir/usr/share/cataclysm-bn/json/mapgen/lab/README.md" } diff --git a/vampirism.patch b/vampirism.patch index 2ae5cac..67b7f62 100644 --- a/vampirism.patch +++ b/vampirism.patch @@ -744,6 +744,18 @@ "type": "json_flag", "context": [ ] +--- a/data/json/flags_mutation.json ++++ b/data/json/flags_mutation.json +@@ -128,5 +132,9 @@ + { + "id": "UNARMED_BONUS", + "type": "mutation_flag" ++ }, ++ { ++ "id": "VAMPIRE", ++ "type": "mutation_flag" + } + ] --- a/data/json/morale_types.json +++ b/data/json/morale_types.json @@ -125,6 +125,11 @@ |