[gemrb] 03/03: Debian packaging for version 0.8.4-1

Beren Minor berenm-guest at moszumanska.debian.org
Sun Apr 10 12:00:33 UTC 2016


This is an automated email from the git hooks/post-receive script.

berenm-guest pushed a commit to branch master
in repository gemrb.

commit a9568e8f21d5f08bc19a9ea6446aa8a8a098a363
Author: Beren Minor <beren.minor+git at gmail.com>
Date:   Tue Mar 22 00:02:45 2016 +0100

    Debian packaging for version 0.8.4-1
---
 debian/changelog                                   |  13 ++
 debian/control                                     |  10 +-
 debian/copyright                                   |   4 +-
 debian/gemrb-data.install                          |   1 -
 ...ve-unnecessary-links-against-various-libr.patch |   8 +-
 ...full-config-path-instead-of-the-16-char-b.patch |   4 +-
 ...default-values-for-GemRBPath-and-PluginsP.patch |   6 +-
 ...config-file-from-.gemrb-before-trying-fro.patch |   2 +-
 ...some-spelling-errors-in-man-pages-gemrb_c.patch | 141 +++++++++++++++++++++
 debian/patches/series                              |   1 +
 debian/rules                                       |   5 +-
 gemrb.6.in                                         |  10 +-
 gemrb/core/Scriptable/Actor.cpp                    |   2 +-
 gemrb/docs/en/GUIScript/controls.txt               |   2 +-
 gemrb/plugins/GUIScript/GUIScript.cpp              |  12 +-
 15 files changed, 187 insertions(+), 34 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index cec0893..422c4cc 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,16 @@
+gemrb (0.8.4-1) unstable; urgency=medium
+
+  * Import upstream version 0.8.4
+  * Revert libsdl2 dependency to libsdl1.2. (Closes: #815215)
+  * Increase Standards-Version to 3.9.7.
+  * Fix some spelling errors.
+  * Refresh patches line numbers.
+  * Enable hardening options in debian/rules.
+  * Update copyright dates.
+  * Update Vcs-Git and Vcs-Browser URIs to https.
+
+ -- Beren Minor <beren.minor+debian at gmail.com>  Mon, 21 Mar 2016 22:29:21 +0100
+
 gemrb (0.8.3-1) unstable; urgency=medium
 
   * Imported Upstream version 0.8.3
diff --git a/debian/control b/debian/control
index 4a37a82..3fad52b 100644
--- a/debian/control
+++ b/debian/control
@@ -2,14 +2,14 @@ Source: gemrb
 Section: contrib/games
 Priority: optional
 Maintainer: Beren Minor <beren.minor+debian at gmail.com>
-Build-Depends: debhelper (>= 9), cmake, python-dev, libsdl2-dev,
- libsdl2-mixer-dev, libz-dev, libopenal-dev, libpng-dev,
+Build-Depends: debhelper (>= 9), cmake, python-dev, libsdl1.2-dev,
+ libsdl-mixer1.2-dev, libz-dev, libopenal-dev, libpng-dev,
  libogg-dev, libvorbis-dev, libvlc-dev, libglew-dev, libfreetype6-dev,
  dh-python
-Standards-Version: 3.9.6
+Standards-Version: 3.9.7
 Homepage: http://www.gemrb.org/
-Vcs-Git: git://anonscm.debian.org/pkg-games/gemrb.git
-Vcs-Browser: http://anonscm.debian.org/gitweb/?p=pkg-games/gemrb.git
+Vcs-Git: https://anonscm.debian.org/git/pkg-games/gemrb.git
+Vcs-Browser: https://anonscm.debian.org/gitweb/?p=pkg-games/gemrb.git
 
 Package: gemrb
 Architecture: any
diff --git a/debian/copyright b/debian/copyright
index 049b0d4..08f8890 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -3,7 +3,7 @@ Upstream-Name: gemrb
 Source: http://www.gemrb.org/
 
 Files: *
-Copyright: 2003 - 2015 The GemRB Project
+Copyright: 2003 - 2016 The GemRB Project
 License: GPL-2.0+
 
 Files: gemrb/plugins/BIKPlayer/GetBitContext.cpp
@@ -60,7 +60,7 @@ Copyright: 1992, 1996, 1997 Free Software Foundation, Inc.
 License: LGPL-2.1+
 
 Files: debian/*
-Copyright: 2011 - 2015 Beren Minor <beren.minor+debian at gmail.com>
+Copyright: 2011 - 2016 Beren Minor <beren.minor+debian at gmail.com>
 License: GPL-2.0+
 
 License: GPL-2.0+
diff --git a/debian/gemrb-data.install b/debian/gemrb-data.install
index ec401e7..f81a29a 100644
--- a/debian/gemrb-data.install
+++ b/debian/gemrb-data.install
@@ -3,4 +3,3 @@ usr/share/gemrb/override/shared/
 usr/share/gemrb/unhardcoded/shared/
 usr/share/gemrb/GUIScripts/*.py
 usr/share/gemrb/GUIScripts/test/
-usr/share/gemrb/Shaders/
diff --git a/debian/patches/0001-DEBIAN-Remove-unnecessary-links-against-various-libr.patch b/debian/patches/0001-DEBIAN-Remove-unnecessary-links-against-various-libr.patch
index e0951c0..3113247 100644
--- a/debian/patches/0001-DEBIAN-Remove-unnecessary-links-against-various-libr.patch
+++ b/debian/patches/0001-DEBIAN-Remove-unnecessary-links-against-various-libr.patch
@@ -8,10 +8,10 @@ Subject: DEBIAN: Remove unnecessary links against various libraries.
  2 files changed, 8 insertions(+), 5 deletions(-)
 
 diff --git a/gemrb/CMakeLists.txt b/gemrb/CMakeLists.txt
-index af58ede..e78e027 100644
+index 5f59efd..9cede6f 100644
 --- a/gemrb/CMakeLists.txt
 +++ b/gemrb/CMakeLists.txt
-@@ -84,18 +84,17 @@ ELSE(WIN32)
+@@ -82,18 +82,17 @@ ELSE(WIN32)
  
  	if (STATIC_LINK)
  		TARGET_LINK_LIBRARIES(gemrb
@@ -35,10 +35,10 @@ index af58ede..e78e027 100644
   ENDIF(APPLE)
  ENDIF(WIN32)
 diff --git a/gemrb/core/CMakeLists.txt b/gemrb/core/CMakeLists.txt
-index 3b7c39f..341869d 100644
+index 9d5cee4..a0e8c09 100644
 --- a/gemrb/core/CMakeLists.txt
 +++ b/gemrb/core/CMakeLists.txt
-@@ -154,6 +154,10 @@ else (STATIC_LINK)
+@@ -155,6 +155,10 @@ else (STATIC_LINK)
  	ENDIF(WIN32)
  endif (STATIC_LINK)
  
diff --git a/debian/patches/0002-DEBIAN-Log-full-config-path-instead-of-the-16-char-b.patch b/debian/patches/0002-DEBIAN-Log-full-config-path-instead-of-the-16-char-b.patch
index 12f9cac..576baaf 100644
--- a/debian/patches/0002-DEBIAN-Log-full-config-path-instead-of-the-16-char-b.patch
+++ b/debian/patches/0002-DEBIAN-Log-full-config-path-instead-of-the-16-char-b.patch
@@ -8,10 +8,10 @@ Subject: DEBIAN: Log full config path instead of the 16-char buffer that
  1 file changed, 2 insertions(+), 2 deletions(-)
 
 diff --git a/gemrb/core/InterfaceConfig.cpp b/gemrb/core/InterfaceConfig.cpp
-index e37ed66..8aa9c23 100644
+index d91b9b6..c12ef79 100644
 --- a/gemrb/core/InterfaceConfig.cpp
 +++ b/gemrb/core/InterfaceConfig.cpp
-@@ -180,9 +180,9 @@ bool CFGConfig::InitWithINIData(DataStream* const cfgStream)
+@@ -190,9 +190,9 @@ bool CFGConfig::InitWithINIData(DataStream* const cfgStream)
  	}
  
  	if (isValid) {
diff --git a/debian/patches/0003-DEBIAN-Fix-default-values-for-GemRBPath-and-PluginsP.patch b/debian/patches/0003-DEBIAN-Fix-default-values-for-GemRBPath-and-PluginsP.patch
index 21225ac..9751e3c 100644
--- a/debian/patches/0003-DEBIAN-Fix-default-values-for-GemRBPath-and-PluginsP.patch
+++ b/debian/patches/0003-DEBIAN-Fix-default-values-for-GemRBPath-and-PluginsP.patch
@@ -8,10 +8,10 @@ Subject: DEBIAN: Fix default values for GemRBPath and PluginsPath to match
  1 file changed, 2 insertions(+), 3 deletions(-)
 
 diff --git a/gemrb/core/Interface.cpp b/gemrb/core/Interface.cpp
-index 8d87b80..197180c 100644
+index bca6ca7..40c4d5f 100644
 --- a/gemrb/core/Interface.cpp
 +++ b/gemrb/core/Interface.cpp
-@@ -1553,8 +1553,7 @@ int Interface::Init(InterfaceConfig* config)
+@@ -1356,8 +1356,7 @@ int Interface::Init(InterfaceConfig* config)
  	CONFIG_PATH("GameSoundsPath", GameSoundsPath, "sounds");
  
  	// Path configureation
@@ -21,7 +21,7 @@ index 8d87b80..197180c 100644
  
  	CONFIG_PATH("CachePath", CachePath, "./Cache");
  	FixPath( CachePath, false );
-@@ -1567,7 +1566,7 @@ int Interface::Init(InterfaceConfig* config)
+@@ -1370,7 +1369,7 @@ int Interface::Init(InterfaceConfig* config)
  #ifdef PLUGIN_DIR
  	CONFIG_PATH("PluginsPath", PluginsPath, PLUGIN_DIR);
  #else
diff --git a/debian/patches/0005-DEBIAN-Try-config-file-from-.gemrb-before-trying-fro.patch b/debian/patches/0005-DEBIAN-Try-config-file-from-.gemrb-before-trying-fro.patch
index ea19d62..5d804ec 100644
--- a/debian/patches/0005-DEBIAN-Try-config-file-from-.gemrb-before-trying-fro.patch
+++ b/debian/patches/0005-DEBIAN-Try-config-file-from-.gemrb-before-trying-fro.patch
@@ -7,7 +7,7 @@ Subject: DEBIAN: Try config file from ~/.gemrb before trying from /etc
  1 file changed, 7 insertions(+), 9 deletions(-)
 
 diff --git a/gemrb/core/InterfaceConfig.cpp b/gemrb/core/InterfaceConfig.cpp
-index 8aa9c23..8f887f3 100644
+index c12ef79..db537a4 100644
 --- a/gemrb/core/InterfaceConfig.cpp
 +++ b/gemrb/core/InterfaceConfig.cpp
 @@ -128,21 +128,19 @@ CFGConfig::CFGConfig(int argc, char *argv[])
diff --git a/debian/patches/0006-DEBIAN-Fix-some-spelling-errors-in-man-pages-gemrb_c.patch b/debian/patches/0006-DEBIAN-Fix-some-spelling-errors-in-man-pages-gemrb_c.patch
new file mode 100644
index 0000000..7fa5b12
--- /dev/null
+++ b/debian/patches/0006-DEBIAN-Fix-some-spelling-errors-in-man-pages-gemrb_c.patch
@@ -0,0 +1,141 @@
+From: Beren Minor <beren.minor+git at gmail.com>
+Date: Tue, 22 Mar 2016 01:13:52 +0100
+Subject: DEBIAN: Fix some spelling errors in man pages,
+ gemrb_core and in GUIScript
+
+---
+ gemrb.6.in                            | 10 +++++-----
+ gemrb/core/Scriptable/Actor.cpp       |  2 +-
+ gemrb/docs/en/GUIScript/controls.txt  |  2 +-
+ gemrb/plugins/GUIScript/GUIScript.cpp | 12 ++++++------
+ 4 files changed, 13 insertions(+), 13 deletions(-)
+
+diff --git a/gemrb.6.in b/gemrb.6.in
+index 9bb766a..489edea 100644
+--- a/gemrb.6.in
++++ b/gemrb.6.in
+@@ -45,7 +45,7 @@ For example, if the program's name is
+ .I torment 
+ instead of
+ .IR gemrb ,
+-the engine first seaches for 
++the engine first searches for 
+ .I torment.cfg 
+ and only if it's not found it searches for 
+ .IR gemrb.cfg .
+@@ -65,7 +65,7 @@ A configuration file consists of pairs
+ .IR PARAMETER=VALUE ,
+ each on its own line. The case of PARAMETER is not significant, 
+ GameType is the same as GAMETYPE. If the same PARAMETER is defined 
+-more than once, only the last occurence is used.
++more than once, only the last occurrence is used.
+ 
+ Empty lines and lines starting with `#' (hash sign) are ignored.
+ 
+@@ -143,7 +143,7 @@ Whether the game should run in fullscreen mode.
+ 
+ .TP
+ .BR TooltipDelay =INT
+-Delay (in miliseconds) before tooltips are displayed when the mouse is not moving.
++Delay (in milliseconds) before tooltips are displayed when the mouse is not moving.
+ A reasonable number for this option is e.g.
+ .IR 500 .
+ The default is
+@@ -337,11 +337,11 @@ It is not set by default.
+ 
+ .TP
+ .BR DoubleClickDelay =INT
+-Milisecond threshold for detecting a double click. The default is 250.
++Millisecond threshold for detecting a double click. The default is 250.
+ 
+ .TP
+ .BR RepeatKeyDelay =INT
+-Milisecond threshold for detecting a repeated key press. The default is 250.
++Millisecond threshold for detecting a repeated key press. The default is 250.
+ 
+ .TP
+ .BR UseSoftKeyboard =(0|1)
+diff --git a/gemrb/core/Scriptable/Actor.cpp b/gemrb/core/Scriptable/Actor.cpp
+index 3fd0bc9..58325d3 100644
+--- a/gemrb/core/Scriptable/Actor.cpp
++++ b/gemrb/core/Scriptable/Actor.cpp
+@@ -3895,7 +3895,7 @@ bool Actor::OverrideActions()
+ void Actor::Panic(Scriptable *attacker, int panicmode)
+ {
+ 	if (GetStat(IE_STATE_ID)&STATE_PANIC) {
+-		print("Already paniced");
++		print("Already panicked");
+ 		//already in panic
+ 		return;
+ 	}
+diff --git a/gemrb/docs/en/GUIScript/controls.txt b/gemrb/docs/en/GUIScript/controls.txt
+index 35a0b12..e11646d 100644
+--- a/gemrb/docs/en/GUIScript/controls.txt
++++ b/gemrb/docs/en/GUIScript/controls.txt
+@@ -3,7 +3,7 @@
+ ==== Button ====
+ 
+ Buttons are the most versatile controls in the GUI engine. The following button types exist: checkbox, radiobutton and normal button.
+-Checkboxes of the same type are cummulative, and usually hold a bit value.
++Checkboxes of the same type are cumulative, and usually hold a bit value.
+ Radiobuttons of the same type are mutually exclusive.
+ Normal buttons are similar to radiobuttons, but they are not affecting each other.
+ 
+diff --git a/gemrb/plugins/GUIScript/GUIScript.cpp b/gemrb/plugins/GUIScript/GUIScript.cpp
+index a185ef5..fe6ae04 100644
+--- a/gemrb/plugins/GUIScript/GUIScript.cpp
++++ b/gemrb/plugins/GUIScript/GUIScript.cpp
+@@ -465,7 +465,7 @@ position value:\n\
+   * 1  - bottom\n\
+   * 2  - right\n\
+   * 3  - top\n\
+-  * 4  - bottom (cummulative)\n\
++  * 4  - bottom (cumulative)\n\
+ \n\
+ **Parameters:** N/A\n\
+ \n\
+@@ -5491,7 +5491,7 @@ being visible, selectable, dead, etc.\n\
+ \n\
+ **Parameters:** \n\
+   * PartyID - party ID or global ID of the actor to check\n\
+-  * flags   - bits to check agains (see GameControlSetTargetMode)\n\
++  * flags   - bits to check against (see GameControlSetTargetMode)\n\
+ \n\
+ **See also:** [[guiscript:GameControlSetTargetMode]]\n\
+ \n\
+@@ -8312,7 +8312,7 @@ must be called once after a character was created and before EnterGame().\n\
+   * Portrait2 - small portrait\n\
+   * clear - clear all the quickslot/spell/item fields?\n\
+ \n\
+-avprefix.2da is a gemrb specific table. Its first row contains the base animationID used for the actor. Its optional additional rows contain other table resrefs which refine the animationID by different player stats. The first row of these tables contain the stat which affects the animationID. The other rows assign cummulative values to the animationID. \n\
++avprefix.2da is a gemrb specific table. Its first row contains the base animationID used for the actor. Its optional additional rows contain other table resrefs which refine the animationID by different player stats. The first row of these tables contain the stat which affects the animationID. The other rows assign cumulative values to the animationID. \n\
+ \n\
+ **For example:**\n\
+ avprefix.2da\n\
+@@ -10438,7 +10438,7 @@ parameter matches the arguments.\n\
+ **Parameters:** \n\
+   * globalID  - party ID or global ID of the actor to use\n\
+   * EffectName - effect reference name (eg. 'State:Helpless')\n\
+-  * Parameter2 - parameter2 of targetted effect\n\
++  * Parameter2 - parameter2 of targeted effect\n\
+ \n\
+ **Return value:** N/A"
+ );
+@@ -12771,7 +12771,7 @@ static bool CanUseActionButton(Actor *pcc, int type)
+ 			capability = pcc->GetSkill(IE_LOCKPICKING) + pcc->GetSkill(IE_PICKPOCKET);
+ 			break;
+ 		default:
+-			Log(WARNING, "GUIScript", "Uknown action (button) type: %d", type);
++			Log(WARNING, "GUIScript", "Unknown action (button) type: %d", type);
+ 		}
+ 	} else {
+ 		// use levels instead, so inactive dualclasses work as expected
+@@ -12783,7 +12783,7 @@ static bool CanUseActionButton(Actor *pcc, int type)
+ 			capability = pcc->GetThiefLevel() + pcc->GetBardLevel();
+ 			break;
+ 		default:
+-			Log(WARNING, "GUIScript", "Uknown action (button) type: %d", type);
++			Log(WARNING, "GUIScript", "Unknown action (button) type: %d", type);
+ 		}
+ 	}
+ 	return capability > 0;
diff --git a/debian/patches/series b/debian/patches/series
index f0c98e1..536bb92 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -3,3 +3,4 @@
 0003-DEBIAN-Fix-default-values-for-GemRBPath-and-PluginsP.patch
 0004-DEBIAN-Don-t-look-for-unnecessary-libvlccore-dev-whe.patch
 0005-DEBIAN-Try-config-file-from-.gemrb-before-trying-fro.patch
+0006-DEBIAN-Fix-some-spelling-errors-in-man-pages-gemrb_c.patch
diff --git a/debian/rules b/debian/rules
index 2f37dee..d9f39bf 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,11 +1,10 @@
 #!/usr/bin/make -f
 # -*- makefile -*-
 
+export DEB_BUILD_MAINT_OPTIONS = hardening=+all
+
 %:
 	dh $@ --with python2
 
 override_dh_makeshlibs:
 	dh_makeshlibs -n
-
-override_dh_auto_configure:
-	dh_auto_configure -- -DUSE_SDL2=1 -DUSE_OPENGL=1
diff --git a/gemrb.6.in b/gemrb.6.in
index 9bb766a..489edea 100644
--- a/gemrb.6.in
+++ b/gemrb.6.in
@@ -45,7 +45,7 @@ For example, if the program's name is
 .I torment 
 instead of
 .IR gemrb ,
-the engine first seaches for 
+the engine first searches for 
 .I torment.cfg 
 and only if it's not found it searches for 
 .IR gemrb.cfg .
@@ -65,7 +65,7 @@ A configuration file consists of pairs
 .IR PARAMETER=VALUE ,
 each on its own line. The case of PARAMETER is not significant, 
 GameType is the same as GAMETYPE. If the same PARAMETER is defined 
-more than once, only the last occurence is used.
+more than once, only the last occurrence is used.
 
 Empty lines and lines starting with `#' (hash sign) are ignored.
 
@@ -143,7 +143,7 @@ Whether the game should run in fullscreen mode.
 
 .TP
 .BR TooltipDelay =INT
-Delay (in miliseconds) before tooltips are displayed when the mouse is not moving.
+Delay (in milliseconds) before tooltips are displayed when the mouse is not moving.
 A reasonable number for this option is e.g.
 .IR 500 .
 The default is
@@ -337,11 +337,11 @@ It is not set by default.
 
 .TP
 .BR DoubleClickDelay =INT
-Milisecond threshold for detecting a double click. The default is 250.
+Millisecond threshold for detecting a double click. The default is 250.
 
 .TP
 .BR RepeatKeyDelay =INT
-Milisecond threshold for detecting a repeated key press. The default is 250.
+Millisecond threshold for detecting a repeated key press. The default is 250.
 
 .TP
 .BR UseSoftKeyboard =(0|1)
diff --git a/gemrb/core/Scriptable/Actor.cpp b/gemrb/core/Scriptable/Actor.cpp
index 3fd0bc9..58325d3 100644
--- a/gemrb/core/Scriptable/Actor.cpp
+++ b/gemrb/core/Scriptable/Actor.cpp
@@ -3895,7 +3895,7 @@ bool Actor::OverrideActions()
 void Actor::Panic(Scriptable *attacker, int panicmode)
 {
 	if (GetStat(IE_STATE_ID)&STATE_PANIC) {
-		print("Already paniced");
+		print("Already panicked");
 		//already in panic
 		return;
 	}
diff --git a/gemrb/docs/en/GUIScript/controls.txt b/gemrb/docs/en/GUIScript/controls.txt
index 35a0b12..e11646d 100644
--- a/gemrb/docs/en/GUIScript/controls.txt
+++ b/gemrb/docs/en/GUIScript/controls.txt
@@ -3,7 +3,7 @@
 ==== Button ====
 
 Buttons are the most versatile controls in the GUI engine. The following button types exist: checkbox, radiobutton and normal button.
-Checkboxes of the same type are cummulative, and usually hold a bit value.
+Checkboxes of the same type are cumulative, and usually hold a bit value.
 Radiobuttons of the same type are mutually exclusive.
 Normal buttons are similar to radiobuttons, but they are not affecting each other.
 
diff --git a/gemrb/plugins/GUIScript/GUIScript.cpp b/gemrb/plugins/GUIScript/GUIScript.cpp
index a185ef5..fe6ae04 100644
--- a/gemrb/plugins/GUIScript/GUIScript.cpp
+++ b/gemrb/plugins/GUIScript/GUIScript.cpp
@@ -465,7 +465,7 @@ position value:\n\
   * 1  - bottom\n\
   * 2  - right\n\
   * 3  - top\n\
-  * 4  - bottom (cummulative)\n\
+  * 4  - bottom (cumulative)\n\
 \n\
 **Parameters:** N/A\n\
 \n\
@@ -5491,7 +5491,7 @@ being visible, selectable, dead, etc.\n\
 \n\
 **Parameters:** \n\
   * PartyID - party ID or global ID of the actor to check\n\
-  * flags   - bits to check agains (see GameControlSetTargetMode)\n\
+  * flags   - bits to check against (see GameControlSetTargetMode)\n\
 \n\
 **See also:** [[guiscript:GameControlSetTargetMode]]\n\
 \n\
@@ -8312,7 +8312,7 @@ must be called once after a character was created and before EnterGame().\n\
   * Portrait2 - small portrait\n\
   * clear - clear all the quickslot/spell/item fields?\n\
 \n\
-avprefix.2da is a gemrb specific table. Its first row contains the base animationID used for the actor. Its optional additional rows contain other table resrefs which refine the animationID by different player stats. The first row of these tables contain the stat which affects the animationID. The other rows assign cummulative values to the animationID. \n\
+avprefix.2da is a gemrb specific table. Its first row contains the base animationID used for the actor. Its optional additional rows contain other table resrefs which refine the animationID by different player stats. The first row of these tables contain the stat which affects the animationID. The other rows assign cumulative values to the animationID. \n\
 \n\
 **For example:**\n\
 avprefix.2da\n\
@@ -10438,7 +10438,7 @@ parameter matches the arguments.\n\
 **Parameters:** \n\
   * globalID  - party ID or global ID of the actor to use\n\
   * EffectName - effect reference name (eg. 'State:Helpless')\n\
-  * Parameter2 - parameter2 of targetted effect\n\
+  * Parameter2 - parameter2 of targeted effect\n\
 \n\
 **Return value:** N/A"
 );
@@ -12771,7 +12771,7 @@ static bool CanUseActionButton(Actor *pcc, int type)
 			capability = pcc->GetSkill(IE_LOCKPICKING) + pcc->GetSkill(IE_PICKPOCKET);
 			break;
 		default:
-			Log(WARNING, "GUIScript", "Uknown action (button) type: %d", type);
+			Log(WARNING, "GUIScript", "Unknown action (button) type: %d", type);
 		}
 	} else {
 		// use levels instead, so inactive dualclasses work as expected
@@ -12783,7 +12783,7 @@ static bool CanUseActionButton(Actor *pcc, int type)
 			capability = pcc->GetThiefLevel() + pcc->GetBardLevel();
 			break;
 		default:
-			Log(WARNING, "GUIScript", "Uknown action (button) type: %d", type);
+			Log(WARNING, "GUIScript", "Unknown action (button) type: %d", type);
 		}
 	}
 	return capability > 0;

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-games/gemrb.git



More information about the Pkg-games-commits mailing list