Fux typos in debiab manpages. Fix 0005-SeriousSam.cpp.patch

tx00100xt · Mar 2, 2024 · 5881b79 · 5881b79
1 parent 52a9d45
commit 5881b79
Show file tree

Hide file tree

Showing 9 changed files with 68 additions and 40 deletions.
diff --git a/debian/README.Debian b/debian/README.Debian
@@ -39,11 +39,12 @@ The dedicated server and the font creation utility for the game are also located
 /usr/games/"internal game name"-vk-texconv
 
 The game libraries will be searched in the following directories:
-/usr/lib/games/"internal game name"-vk/
-
+/usr/lib/games/serioussam-vk/
+/usr/lib/games/serioussam-vk-se/
 
 The location of the libraries of modifications is also on the same principle.
-/usr/lib/games/"internal game name"-vk/Mods/"Mod name"/
+/usr/lib/games/serioussam-vk/Mods/"Mod name"/
+/usr/lib/games/serioussam-vk-se/Mods/"Mod name"/
 
 Game libraries are assigned a suffix defined in file ModEXT.txt
 The suffix is assigned to both game libraries and mod libraries.
@@ -67,17 +68,17 @@ In accordance with the naming convention, we get the following location of the e
 /usr/games/serioussamse-vk-ded
 /usr/games/serioussamse-vk-mkfont
 /usr/games/serioussamse-vk-texconv
-/usr/lib/games/serioussamse-vk/libEngineMP.so
-/usr/lib/games/serioussamse-vk/libShaders.so
-/usr/lib/games/serioussamse-vk/libGameMP.so
-/usr/lib/games/serioussamse-vk/libEntitiesMP.so
-/usr/lib/games/serioussamse-vk/libamp11lib.so
+/usr/lib/games/serioussam-vk-se/libEngineMP.so
+/usr/lib/games/serioussam-vk-se/libShaders.so
+/usr/lib/games/serioussam-vk-se/libGameMP.so
+/usr/lib/games/serioussam-vk-se/libEntitiesMP.so
+/usr/lib/games/serioussam-vk-se/libamp11lib.so
 
 For mod XPLUS:
 /usr/lib/games/serioussam-vk/Mods/XPLUS/libGame.so
 /usr/lib/games/serioussam-vk/Mods/XPLUS/libEntities.so
-/usr/lib/games/serioussamse-vk/Mods/XPLUS/libGameMP.so
-/usr/lib/games/serioussamse-vk/Mods/XPLUS/libEntitiesMP.so
+/usr/lib/games/serioussam-vk-se/Mods/XPLUS/libGameMP.so
+/usr/lib/games/serioussam-vk-se/Mods/XPLUS/libEntitiesMP.so
 
 For mod Serious Sam Alpha Remake (SSA):
 /usr/lib/games/serioussam-vk/Mods/SSA/libGame.so

diff --git a/debian/README.source b/debian/README.source
@@ -39,11 +39,12 @@ The dedicated server and the font creation utility for the game are also located
 /usr/games/"internal game name"-vk-texconv
 
 The game libraries will be searched in the following directories:
-/usr/lib/games/"internal game name"-vk/
-
+/usr/lib/games/serioussam-vk/
+/usr/lib/games/serioussam-vk-se/
 
 The location of the libraries of modifications is also on the same principle.
-/usr/lib/games/"internal game name"-vk/Mods/"Mod name"/
+/usr/lib/games/serioussam-vk/Mods/"Mod name"/
+/usr/lib/games/serioussam-vk-se/Mods/"Mod name"/
 
 Game libraries are assigned a suffix defined in file ModEXT.txt
 The suffix is assigned to both game libraries and mod libraries.
@@ -67,17 +68,17 @@ In accordance with the naming convention, we get the following location of the e
 /usr/games/serioussamse-vk-ded
 /usr/games/serioussamse-vk-mkfont
 /usr/games/serioussamse-vk-texconv
-/usr/lib/games/serioussamse-vk/libEngineMP.so
-/usr/lib/games/serioussamse-vk/libShaders.so
-/usr/lib/games/serioussamse-vk/libGameMP.so
-/usr/lib/games/serioussamse-vk/libEntitiesMP.so
-/usr/lib/games/serioussamse-vk/libamp11lib.so
+/usr/lib/games/serioussam-vk-se/libEngineMP.so
+/usr/lib/games/serioussam-vk-se/libShaders.so
+/usr/lib/games/serioussam-vk-se/libGameMP.so
+/usr/lib/games/serioussam-vk-se/libEntitiesMP.so
+/usr/lib/games/serioussam-vk-se/libamp11lib.so
 
 For mod XPLUS:
 /usr/lib/games/serioussam-vk/Mods/XPLUS/libGame.so
 /usr/lib/games/serioussam-vk/Mods/XPLUS/libEntities.so
-/usr/lib/games/serioussamse-vk/Mods/XPLUS/libGameMP.so
-/usr/lib/games/serioussamse-vk/Mods/XPLUS/libEntitiesMP.so
+/usr/lib/games/serioussam-vk-se/Mods/XPLUS/libGameMP.so
+/usr/lib/games/serioussam-vk-se/Mods/XPLUS/libEntitiesMP.so
 
 For mod Serious Sam Alpha Remake (SSA):
 /usr/lib/games/serioussam-vk/Mods/SSA/libGame.so

diff --git a/debian/control b/debian/control
@@ -13,7 +13,7 @@ Package: serioussam-vk
 Architecture: any
 Depends: ${shlibs:Depends}, ${misc:Depends}, libsdl2-2.0-0 (>= 2.0.6), libstdc++6 (>= 5), zlib1g (>= 1:1.1.4), libvorbisfile3, libvulkan1
 Description: Linux port of Serious Sam Classic with Vulkan support
- Open source game engine version developed by Croteam for Serious Sam Classic 
+ Open source game engine version developed by Croteam for Serious Sam Classic
  with Vulkan support (Windows, Linux, FreeBSD, Raspberry Pi OS, macOS)
  .
  This package alone isn't of any use; it only contains the game engine,

diff --git a/debian/copyright b/debian/copyright
@@ -37,6 +37,7 @@ Files-Excluded: appimage
       SamTFE/Sources/SamTFE.sln
       SamTFE/Mods/SeriousSamTbn.tex
       SamTFE/Mods/XPLUSTbn.tex
+      SamTFE/Sources/Engine/Graphics/Vulkan/Shaders/CompiledSpirv
       SamTSE/Bin
       SamTSE/Controls
       SamTSE/Data
@@ -66,6 +67,7 @@ Files-Excluded: appimage
       SamTSE/Sources/SamTSE.sln
       SamTSE/Mods/SecondEncounterTbn.tex
       SamTSE/Mods/XPLUSTbn.tex
+      SamTSE/Sources/Engine/Graphics/Vulkan/Shaders/CompiledSpirv
 Disclaimer:
      This package is in the contrib archive area, which is not part of Debian.
      The engine itself is free software, but it is only useful when combined

diff --git a/debian/patches/0005-SeriousSam.cpp.patch b/debian/patches/0005-SeriousSam.cpp.patch
@@ -11,6 +11,15 @@ Forwarded: not-needed
  #else
  __extern INDEX sam_iGfxAPI = 0;                                // 0==OpenGL
  #endif // SE1_VULKAN
+@@ -1586,7 +1586,7 @@
+ #else
+     CTString strCommand;
+     if (sys_iSysPath == 1) {
+-      strCommand = sam_strGameName;
++      strCommand = sam_strGameName + "-vk";
+     } else {
+       strCommand = "SeriousSam";
+     }
 --- a/SamTSE/Sources/SeriousSam/SeriousSam.cpp	2024-02-14 22:53:00.349090113 +0300
 +++ b/SamTSE/Sources/SeriousSam/SeriousSam.cpp	2024-02-14 23:08:49.377669933 +0300
 @@ -110,7 +110,7 @@
@@ -22,3 +31,12 @@ Forwarded: not-needed
  #else
  __extern INDEX sam_iGfxAPI = 0;                                // 0==OpenGL
  #endif // SE1_VULKAN
+@@ -1586,7 +1586,7 @@
+ #else
+     CTString strCommand;
+     if (sys_iSysPath == 1) {
+-      strCommand = sam_strGameName;
++      strCommand = sam_strGameName + "-vk";
+     } else {
+       strCommand = "SeriousSam";
+     }
diff --git a/debian/serioussam-vk.6 b/debian/serioussam-vk.6
@@ -188,11 +188,13 @@ located in this directory.
 .PP
 The game libraries will be searched in the following directories:
 .PP
-\fB /usr/lib/games/"internal-game-name"-vk/\fR
+\fB /usr/lib/games/serioussam-vk/\fR
+\fB /usr/lib/games/serioussam-vk-se/\fR
 .PP
 The location of the libraries of modifications is also on the same principle.
 .PP
-\fB /usr/lib/games/"internal game name"-vk/Mods/"Mod name"/\fR
+\fB /usr/lib/games/serioussam-vk/Mods/"Mod name"/\fR
+\fB /usr/lib/games/serioussam-vk-se/Mods/"Mod name"/\fR
 .PP
 Game libraries are assigned a suffix defined in file \fIModEXT.txt\fR
 The suffix is assigned to both game libraries and mod libraries.
@@ -218,17 +220,17 @@ and Serious Sam The Second Encounter for Debian/Ubuntu:
 \fB /usr/games/serioussamse-vk-ded\fR
 \fB /usr/games/serioussamse-vk-mkfont\fR
 \fB /usr/games/serioussamse-vk-texconv\fR
-\fB /usr/lib/games/serioussamse-vk/libEngineMP.so\fR
-\fB /usr/lib/games/serioussamse-vk/libShaders.so\fR
-\fB /usr/lib/games/serioussamse-vk/libGameMP.so\fR
-\fB /usr/lib/games/serioussamse-vk/libEntitiesMP.so\fR
-\fB /usr/lib/games/serioussamse-vk/libamp11lib.so\fR
+\fB /usr/lib/games/serioussam-vk-se/libEngineMP.so\fR
+\fB /usr/lib/games/serioussam-vk-se/libShaders.so\fR
+\fB /usr/lib/games/serioussam-vk-se/libGameMP.so\fR
+\fB /usr/lib/games/serioussam-vk-se/libEntitiesMP.so\fR
+\fB /usr/lib/games/serioussam-vk-se/libamp11lib.so\fR
 .PP
 For mod XPLUS:
 \fB /usr/lib/games/serioussam-vk/Mods/XPLUS/libGame.so\fR
 \fB /usr/lib/games/serioussam-vk/Mods/XPLUS/libEntities.so\fR
-\fB /usr/lib/games/serioussamse-vk/Mods/XPLUS/libGameMP.so\fR
-\fB /usr/lib/games/serioussamse-vk/Mods/XPLUS/libEntitiesMP.so\fR
+\fB /usr/lib/games/serioussam-vk-se/Mods/XPLUS/libGameMP.so\fR
+\fB /usr/lib/games/serioussam-vk-se/Mods/XPLUS/libEntitiesMP.so\fR
 .PP
 For mod Serious Sam Alpha Remake (SSA):
 \fB /usr/lib/games/serioussam-vk/Mods/SSA/libGame.so\fR

diff --git a/debian/serioussamse-vk-mkfont.6 b/debian/serioussamse-vk-mkfont.6
@@ -6,7 +6,7 @@ serioussamse-vk-mkfont \- Font tables maker for the game Serious Sam Classic TSE
 .PP
 .SH DESCRIPTION
 .PP
-.BR serioussam-vk-mkfont
+.BR serioussamse-vk-mkfont
 is utility for creating fonts for the game Serious Sam Classic TSE. With this utility you can create your own
 fonts for the game. For example, this is how localization fonts were created for different languages.
 The placement of the input files must be in the game data directory.

diff --git a/debian/serioussamse-vk.6 b/debian/serioussamse-vk.6
@@ -188,11 +188,13 @@ located in this directory.
 .PP
 The game libraries will be searched in the following directories:
 .PP
-\fB /usr/lib/games/"internal-game-name"-vk/\fR
+\fB /usr/lib/games/serioussam-vk/\fR
+\fB /usr/lib/games/serioussam-vk-se/\fR
 .PP
 The location of the libraries of modifications is also on the same principle.
 .PP
-\fB /usr/lib/games/"internal game name"-vk/Mods/"Mod name"/\fR
+\fB /usr/lib/games/serioussam-vk/Mods/"Mod name"/\fR
+\fB /usr/lib/games/serioussam-vk-se/Mods/"Mod name"/\fR
 .PP
 Game libraries are assigned a suffix defined in file \fIModEXT.txt\fR
 The suffix is assigned to both game libraries and mod libraries.
@@ -218,17 +220,17 @@ and Serious Sam The Second Encounter for Debian/Ubuntu:
 \fB /usr/games/serioussamse-vk-ded\fR
 \fB /usr/games/serioussamse-vk-mkfont\fR
 \fB /usr/games/serioussamse-vk-texconv\fR
-\fB /usr/lib/games/serioussamse-vk/libEngineMP.so\fR
-\fB /usr/lib/games/serioussamse-vk/libShaders.so\fR
-\fB /usr/lib/games/serioussamse-vk/libGameMP.so\fR
-\fB /usr/lib/games/serioussamse-vk/libEntitiesMP.so\fR
-\fB /usr/lib/games/serioussamse-vk/libamp11lib.so\fR
+\fB /usr/lib/games/serioussam-vk-se/libEngineMP.so\fR
+\fB /usr/lib/games/serioussam-vk-se/libShaders.so\fR
+\fB /usr/lib/games/serioussam-vk-se/libGameMP.so\fR
+\fB /usr/lib/games/serioussam-vk-se/libEntitiesMP.so\fR
+\fB /usr/lib/games/serioussam-vk-se/libamp11lib.so\fR
 .PP
 For mod XPLUS:
 \fB /usr/lib/games/serioussam-vk/Mods/XPLUS/libGame.so\fR
 \fB /usr/lib/games/serioussam-vk/Mods/XPLUS/libEntities.so\fR
-\fB /usr/lib/games/serioussamse-vk/Mods/XPLUS/libGameMP.so\fR
-\fB /usr/lib/games/serioussamse-vk/Mods/XPLUS/libEntitiesMP.so\fR
+\fB /usr/lib/games/serioussam-vk-se/Mods/XPLUS/libGameMP.so\fR
+\fB /usr/lib/games/serioussam-vk-se/Mods/XPLUS/libEntitiesMP.so\fR
 .PP
 For mod Serious Sam Alpha Remake (SSA):
 \fB /usr/lib/games/serioussam-vk/Mods/SSA/libGame.so\fR

diff --git a/debian/source/options b/debian/source/options
@@ -34,6 +34,7 @@ tar-ignore  "SamTFE/Sources/libogg"
 tar-ignore  "SamTFE/Sources/SamTFE.sln"
 tar-ignore  "SamTFE/Mods/SeriousSamTbn.tex"
 tar-ignore  "SamTFE/Mods/XPLUSTbn.tex"
+tar-ignore  "SamTFE/Sources/Engine/Graphics/Vulkan/Shaders/CompiledSpirv"
 tar-ignore  "SamTSE/Bin"
 tar-ignore  "SamTSE/Controls"
 tar-ignore  "SamTSE/Data"
@@ -63,3 +64,4 @@ tar-ignore  "SamTSE/Sources/libogg"
 tar-ignore  "SamTSE/Sources/SamTSE.sln"
 tar-ignore  "SamTSE/Mods/SecondEncounterTbn.tex"
 tar-ignore  "SamTSE/Mods/XPLUSTbn.tex"
+tar-ignore  "SamTFE/Sources/Engine/Graphics/Vulkan/Shaders/CompiledSpirv"