[gemrb] 02/02: Debian packaging for version 0.8.5-1
Beren Minor
berenm-guest at moszumanska.debian.org
Tue Nov 28 18:25:32 UTC 2017
This is an automated email from the git hooks/post-receive script.
berenm-guest pushed a commit to branch master
in repository gemrb.
commit 54ba34c2632774ce7eb857137ce4eedb5487308f
Author: Beren Minor <beren.minor+git at gmail.com>
Date: Mon Nov 27 19:47:23 2017 +0100
Debian packaging for version 0.8.5-1
---
debian/changelog | 9 ++
debian/control | 2 +-
debian/copyright | 6 +-
...ve-unnecessary-links-against-various-libr.patch | 8 +-
...full-config-path-instead-of-the-16-char-b.patch | 2 +-
...default-values-for-GemRBPath-and-PluginsP.patch | 6 +-
...config-file-from-.gemrb-before-trying-fro.patch | 4 +-
...some-spelling-errors-in-man-pages-gemrb_c.patch | 97 ++++++++++++++++++----
8 files changed, 106 insertions(+), 28 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index 422c4cc..3234b03 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,12 @@
+gemrb (0.8.5-1) unstable; urgency=medium
+
+ * Import upstream version 0.8.5
+ * Increase Standards-Version to 4.1.1.
+ * Refresh patches line numbers.
+ * Update copyright dates.
+
+ -- Beren Minor <beren.minor+debian at gmail.com> Mon, 27 Nov 2017 19:45:37 +0100
+
gemrb (0.8.4-1) unstable; urgency=medium
* Import upstream version 0.8.4
diff --git a/debian/control b/debian/control
index 3fad52b..064e39d 100644
--- a/debian/control
+++ b/debian/control
@@ -6,7 +6,7 @@ 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.7
+Standards-Version: 4.1.1
Homepage: http://www.gemrb.org/
Vcs-Git: https://anonscm.debian.org/git/pkg-games/gemrb.git
Vcs-Browser: https://anonscm.debian.org/gitweb/?p=pkg-games/gemrb.git
diff --git a/debian/copyright b/debian/copyright
index 08f8890..f886607 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -3,13 +3,13 @@ Upstream-Name: gemrb
Source: http://www.gemrb.org/
Files: *
-Copyright: 2003 - 2016 The GemRB Project
+Copyright: 2003 - 2017 The GemRB Project
License: GPL-2.0+
Files: gemrb/plugins/BIKPlayer/GetBitContext.cpp
gemrb/plugins/BIKPlayer/BIKPlayer.cpp
Copyright: 2003 - 2015 The GemRB Project
- 2004 Michael Niedermayer <michaelni at gmx.at>
+ 2004 Michael Niedermayer <michaelni at gmx.at>
2007 - 2009 Peter Ross <pross at xvid.org>
2009 Daniel Verkamp <daniel at drv.nu>
2009 Konstantin Shishkov
@@ -60,7 +60,7 @@ Copyright: 1992, 1996, 1997 Free Software Foundation, Inc.
License: LGPL-2.1+
Files: debian/*
-Copyright: 2011 - 2016 Beren Minor <beren.minor+debian at gmail.com>
+Copyright: 2011 - 2017 Beren Minor <beren.minor+debian at gmail.com>
License: GPL-2.0+
License: GPL-2.0+
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 3113247..c7a8110 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 5f59efd..9cede6f 100644
+index 3871f61..e2bd58e 100644
--- a/gemrb/CMakeLists.txt
+++ b/gemrb/CMakeLists.txt
-@@ -82,18 +82,17 @@ ELSE(WIN32)
+@@ -105,18 +105,17 @@ ELSE(WIN32)
if (STATIC_LINK)
TARGET_LINK_LIBRARIES(gemrb
@@ -35,10 +35,10 @@ index 5f59efd..9cede6f 100644
ENDIF(APPLE)
ENDIF(WIN32)
diff --git a/gemrb/core/CMakeLists.txt b/gemrb/core/CMakeLists.txt
-index 9d5cee4..a0e8c09 100644
+index 46f3141..a6c07bd 100644
--- a/gemrb/core/CMakeLists.txt
+++ b/gemrb/core/CMakeLists.txt
-@@ -155,6 +155,10 @@ else (STATIC_LINK)
+@@ -156,6 +156,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 576baaf..7e705ea 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,7 +8,7 @@ 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 d91b9b6..c12ef79 100644
+index 51e029c..5db7689 100644
--- a/gemrb/core/InterfaceConfig.cpp
+++ b/gemrb/core/InterfaceConfig.cpp
@@ -190,9 +190,9 @@ bool CFGConfig::InitWithINIData(DataStream* const cfgStream)
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 9751e3c..b401997 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 bca6ca7..40c4d5f 100644
+index 1e8ff87..f2d1f38 100644
--- a/gemrb/core/Interface.cpp
+++ b/gemrb/core/Interface.cpp
-@@ -1356,8 +1356,7 @@ int Interface::Init(InterfaceConfig* config)
+@@ -1361,8 +1361,7 @@ int Interface::Init(InterfaceConfig* config)
CONFIG_PATH("GameSoundsPath", GameSoundsPath, "sounds");
// Path configureation
@@ -21,7 +21,7 @@ index bca6ca7..40c4d5f 100644
CONFIG_PATH("CachePath", CachePath, "./Cache");
FixPath( CachePath, false );
-@@ -1370,7 +1369,7 @@ int Interface::Init(InterfaceConfig* config)
+@@ -1375,7 +1374,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 5d804ec..ca01729 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,11 +7,11 @@ 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 c12ef79..db537a4 100644
+index 5db7689..425971a 100644
--- a/gemrb/core/InterfaceConfig.cpp
+++ b/gemrb/core/InterfaceConfig.cpp
@@ -128,21 +128,19 @@ CFGConfig::CFGConfig(int argc, char *argv[])
- strcpy( name, appName );
+ strlcpy(name, appName, _MAX_PATH);
assert(name[0]);
-#if TARGET_OS_MAC
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
index 7fa5b12..b04415d 100644
--- 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
@@ -4,12 +4,28 @@ 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(-)
+ android/prep_env.sh | 2 +-
+ gemrb.6.in | 10 +++++-----
+ gemrb/core/SaveGameIterator.cpp | 4 ++--
+ gemrb/core/Scriptable/Actor.cpp | 2 +-
+ gemrb/docs/en/GUIScript/controls.txt | 2 +-
+ gemrb/plugins/GUIScript/GUIScript.cpp | 16 ++++++++--------
+ gemrb/plugins/OpenALAudio/OpenALAudio.cpp | 2 +-
+ 7 files changed, 19 insertions(+), 19 deletions(-)
+diff --git a/android/prep_env.sh b/android/prep_env.sh
+index 92764b2..1959e4e 100644
+--- a/android/prep_env.sh
++++ b/android/prep_env.sh
+@@ -243,7 +243,7 @@ function move_and_edit_projectfiles {
+ function finished {
+ popd # back from $ENVROOT
+ local build_path=${ENVROOT##$PWD/}
+- echo -en "That should be it, provided all the commands ran succesfully.\n\n" # TODO: Error checking beyond $1
++ echo -en "That should be it, provided all the commands ran successfully.\n\n" # TODO: Error checking beyond $1
+ echo -en "To build:\n"
+ echo -en " cd $build_path/build/gemrb\n"
+ echo -en " ndk-build && ant debug\n\n"
diff --git a/gemrb.6.in b/gemrb.6.in
index 9bb766a..489edea 100644
--- a/gemrb.6.in
@@ -55,11 +71,33 @@ index 9bb766a..489edea 100644
.TP
.BR UseSoftKeyboard =(0|1)
+diff --git a/gemrb/core/SaveGameIterator.cpp b/gemrb/core/SaveGameIterator.cpp
+index e82955d..b0511ce 100644
+--- a/gemrb/core/SaveGameIterator.cpp
++++ b/gemrb/core/SaveGameIterator.cpp
+@@ -623,7 +623,7 @@ int SaveGameIterator::CreateSaveGame(int index, bool mqs)
+ return -1;
+ }
+
+- // Save succesful / Quick-save succesful
++ // Save successful / Quick-save successful
+ if (qsave) {
+ displaymsg->DisplayConstantString(STR_QSAVESUCCEED, DMC_BG2XPGREEN);
+ if (gc) {
+@@ -685,7 +685,7 @@ int SaveGameIterator::CreateSaveGame(Holder<SaveGame> save, const char *slotname
+ return -1;
+ }
+
+- // Save succesful
++ // Save successful
+ displaymsg->DisplayConstantString(STR_SAVESUCCEED, DMC_BG2XPGREEN);
+ if (gc) {
+ gc->SetDisplayText(STR_SAVESUCCEED, 30);
diff --git a/gemrb/core/Scriptable/Actor.cpp b/gemrb/core/Scriptable/Actor.cpp
-index 3fd0bc9..58325d3 100644
+index e8d6fa0..855e70e 100644
--- a/gemrb/core/Scriptable/Actor.cpp
+++ b/gemrb/core/Scriptable/Actor.cpp
-@@ -3895,7 +3895,7 @@ bool Actor::OverrideActions()
+@@ -4010,7 +4010,7 @@ bool Actor::OverrideActions()
void Actor::Panic(Scriptable *attacker, int panicmode)
{
if (GetStat(IE_STATE_ID)&STATE_PANIC) {
@@ -82,10 +120,10 @@ index 35a0b12..e11646d 100644
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
+index 499b81b..e508df7 100644
--- a/gemrb/plugins/GUIScript/GUIScript.cpp
+++ b/gemrb/plugins/GUIScript/GUIScript.cpp
-@@ -465,7 +465,7 @@ position value:\n\
+@@ -486,7 +486,7 @@ position value:\n\
* 1 - bottom\n\
* 2 - right\n\
* 3 - top\n\
@@ -94,7 +132,16 @@ index a185ef5..fe6ae04 100644
\n\
**Parameters:** N/A\n\
\n\
-@@ -5491,7 +5491,7 @@ being visible, selectable, dead, etc.\n\
+@@ -2594,7 +2594,7 @@ PyDoc_STRVAR( GemRB_Window_SetKeyPressEvent__doc,
+ \n\
+ **Parameters:**\n\
+ * callback - Python function that accepts (windowIndex, key, mod) arguments and returns\n\
+- * 1 indicating succesful key press consumption or 0 otherwise. \n\
++ * 1 indicating successful key press consumption or 0 otherwise. \n\
+ \n\
+ **Return value:** N/A\n\
+ \n\
+@@ -5554,7 +5554,7 @@ being visible, selectable, dead, etc.\n\
\n\
**Parameters:** \n\
* PartyID - party ID or global ID of the actor to check\n\
@@ -103,7 +150,7 @@ index a185ef5..fe6ae04 100644
\n\
**See also:** [[guiscript:GameControlSetTargetMode]]\n\
\n\
-@@ -8312,7 +8312,7 @@ must be called once after a character was created and before EnterGame().\n\
+@@ -8380,7 +8380,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\
@@ -112,7 +159,7 @@ index a185ef5..fe6ae04 100644
\n\
**For example:**\n\
avprefix.2da\n\
-@@ -10438,7 +10438,7 @@ parameter matches the arguments.\n\
+@@ -10506,7 +10506,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\
@@ -121,7 +168,7 @@ index a185ef5..fe6ae04 100644
\n\
**Return value:** N/A"
);
-@@ -12771,7 +12771,7 @@ static bool CanUseActionButton(Actor *pcc, int type)
+@@ -12846,7 +12846,7 @@ static bool CanUseActionButton(Actor *pcc, int type)
capability = pcc->GetSkill(IE_LOCKPICKING) + pcc->GetSkill(IE_PICKPOCKET);
break;
default:
@@ -130,7 +177,7 @@ index a185ef5..fe6ae04 100644
}
} else {
// use levels instead, so inactive dualclasses work as expected
-@@ -12783,7 +12783,7 @@ static bool CanUseActionButton(Actor *pcc, int type)
+@@ -12858,7 +12858,7 @@ static bool CanUseActionButton(Actor *pcc, int type)
capability = pcc->GetThiefLevel() + pcc->GetBardLevel();
break;
default:
@@ -139,3 +186,25 @@ index a185ef5..fe6ae04 100644
}
}
return capability > 0;
+@@ -14855,7 +14855,7 @@ PyDoc_STRVAR( GemRB_SetTickHook__doc,
+ This is useful for things like running a twisted reactor.\n\
+ \n\
+ **Parameters:**\n\
+- * callback - pyton function to run\
++ * callback - python function to run\
+ \n\
+ **Return value:** N/A"
+ );
+diff --git a/gemrb/plugins/OpenALAudio/OpenALAudio.cpp b/gemrb/plugins/OpenALAudio/OpenALAudio.cpp
+index bf449a7..edc7a96 100644
+--- a/gemrb/plugins/OpenALAudio/OpenALAudio.cpp
++++ b/gemrb/plugins/OpenALAudio/OpenALAudio.cpp
+@@ -335,7 +335,7 @@ int OpenALAudioDriver::CountAvailableSources(int limit)
+
+ checkALError("Error while auto-detecting number of sources", WARNING);
+
+- // Return number of succesfully allocated sources
++ // Return number of successfully allocated sources
+ return i;
+ }
+
--
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