1diff -Nur instead-3.3.0/debian/compat instead-3.3.0.maemo/debian/compat 2--- instead-3.3.0/debian/compat 2019-03-08 12:05:53.000000000 +0300 3+++ instead-3.3.0.maemo/debian/compat 2019-03-08 12:13:34.438490056 +0300 4@@ -1 +1 @@ 5-7 6+4 7diff -Nur instead-3.3.0/debian/control instead-3.3.0.maemo/debian/control 8--- instead-3.3.0/debian/control 2019-03-08 12:05:53.000000000 +0300 9+++ instead-3.3.0.maemo/debian/control 2019-03-08 12:13:34.438490056 +0300 10@@ -2,7 +2,7 @@ 11 Section: games 12 Priority: optional 13 Maintainer: Peter Kosyh <p.kosyh@gmail.com> 14-Build-Depends: debhelper (>= 7), pkg-config, liblua5.1-dev, libsdl2-dev, libsdl2-ttf-dev, libsdl2-image-dev, libsdl2-mixer-dev, zlib1g-dev 15+Build-Depends: debhelper (>= 5), pkg-config, liblua5.1-dev, libsdl1.2-dev, libsdl-ttf2.0-dev, libsdl-image1.2-dev, libsdl-mixer1.2-dev, zlib1g-dev 16 Standards-Version: 3.8.3 17 Homepage: http://instead.sourceforge.net 18 19@@ -11,4 +11,3 @@ 20 Depends: ${shlibs:Depends}, ${misc:Depends} 21 Description: simple text adventures/visual novels engine 22 Visual novell/text quest-like engine. 23- 24diff -Nur instead-3.3.0/debian/rules instead-3.3.0.maemo/debian/rules 25--- instead-3.3.0/debian/rules 2019-03-08 12:05:53.000000000 +0300 26+++ instead-3.3.0.maemo/debian/rules 2019-03-08 12:13:34.438490056 +0300 27@@ -61,7 +61,7 @@ 28 install: build 29 dh_testdir 30 dh_testroot 31- dh_prep 32+# dh_prep 33 dh_installdirs 34 35 # Add here commands to install the package into debian/instead. 36diff -Nur instead-3.3.0/desktop/instead.desktop.in instead-3.3.0.maemo/desktop/instead.desktop.in 37--- instead-3.3.0/desktop/instead.desktop.in 2019-03-08 12:05:53.000000000 +0300 38+++ instead-3.3.0.maemo/desktop/instead.desktop.in 2019-03-08 12:13:34.438490056 +0300 39@@ -13,4 +13,8 @@ 40 Exec=@BIN@/sdl-instead 41 Icon=sdl_instead 42 Terminal=false 43+X-Window-Icon=sdl_instead 44+X-Window-Icon-Dimmed=sdl_instead 45+X-HildonDesk-ShowInToolbar=true 46+StartupWMClass=instead 47 Categories=Game;LogicGame; 48diff -Nur instead-3.3.0/desktop/Makefile instead-3.3.0.maemo/desktop/Makefile 49--- instead-3.3.0/desktop/Makefile 2019-03-08 12:05:53.000000000 +0300 50+++ instead-3.3.0.maemo/desktop/Makefile 2019-03-08 12:13:34.438490056 +0300 51@@ -10,9 +10,9 @@ 52 cat instead.desktop.in | sed -e "s|@BIN@|$(BIN)|g" > instead.desktop 53 54 install: 55- $(INSTALLD) $(DESTDIR)$(PREFIX)/share/applications 56- $(INSTALL) instead.desktop $(DESTDIR)$(PREFIX)/share/applications/instead.desktop 57+ $(INSTALLD) $(DESTDIR)$(PREFIX)/share/applications/hildon 58+ $(INSTALL) instead.desktop $(DESTDIR)$(PREFIX)/share/applications/hildon/instead.desktop 59 60 uninstall: 61- $(RM) $(DESTDIR)$(PREFIX)/share/applications/instead.desktop 62+ $(RM) $(DESTDIR)$(PREFIX)/share/applications/hildon/instead.desktop 63 64diff -Nur instead-3.3.0/Rules.make.system instead-3.3.0.maemo/Rules.make.system 65--- instead-3.3.0/Rules.make.system 2019-03-08 12:05:53.000000000 +0300 66+++ instead-3.3.0.maemo/Rules.make.system 2019-03-08 12:13:34.438490056 +0300 67@@ -28,7 +28,7 @@ 68 SDL_CFLAGS=$(shell sdl-config --cflags) 69 SDL_LFLAGS=$(shell sdl-config --libs) -lSDL_ttf -lSDL_mixer -lSDL_image -lm 70 71-CFLAGS += -Wall -Dunix -D_USE_UNPACK # -D_SDL_MOD_BUG 72+CFLAGS += -Wall -Dunix -D_USE_UNPACK -DMAEMO # -D_SDL_MOD_BUG 73 74 INSTALLD=install -d -m 0755 75 INSTALLB=install -m 0755 76diff -Nur instead-3.3.0/src/instead/util.h instead-3.3.0.maemo/src/instead/util.h 77--- instead-3.3.0/src/instead/util.h 2019-03-08 12:05:55.000000000 +0300 78+++ instead-3.3.0.maemo/src/instead/util.h 2019-03-08 12:13:34.438490056 +0300 79@@ -52,7 +52,7 @@ 80 #define FREE(v) do { if ((v)) free((v)); v = NULL; } while(0) 81 82 #ifdef _USE_SDL 83- #include <SDL_config.h> 84+/* #include <SDL_config.h> */ 85 #include <SDL_mutex.h> 86 #ifdef _USE_SDL_ICONV 87 #include <SDL_stdinc.h> 88diff -Nur instead-3.3.0/src/sound.c instead-3.3.0.maemo/src/sound.c 89--- instead-3.3.0/src/sound.c 2019-03-08 12:05:55.000000000 +0300 90+++ instead-3.3.0.maemo/src/sound.c 2019-03-08 12:13:34.442490085 +0300 91@@ -32,7 +32,9 @@ 92 93 #include <SDL.h> 94 #include <SDL_mixer.h> 95- 96+#define SDL_memcpy memcpy 97+#define SDL_calloc calloc 98+#define SDL_free free 99 #ifdef S60 100 int audio_rate = 11025; 101 #else 102diff -Nur instead-3.3.0/themes/default/theme.ini instead-3.3.0.maemo/themes/default/theme.ini 103--- instead-3.3.0/themes/default/theme.ini 2019-03-08 12:05:58.000000000 +0300 104+++ instead-3.3.0.maemo/themes/default/theme.ini 2019-03-08 12:13:34.442490085 +0300 105@@ -5,7 +5,7 @@ 106 ; $Name(it): Predefinito$ 107 108 scr.w = 800 109-scr.h = 600 110+scr.h = 480 111 scr.gfx.scalable = 1 112 113 scr.gfx.h = -1 114@@ -23,7 +23,7 @@ 115 win.x = 48 116 win.y = 8 117 win.w = 500 118-win.h = 568 119+win.h = 448 120 121 win.fnt.name = {sans,sans-b,sans-i,sans-bi}.ttf 122 win.fnt.size = 16 123@@ -43,7 +43,8 @@ 124 inv.x = 620 125 inv.y = 8 126 inv.w = 144 127-inv.h = 564 128+inv.h = 448 129+ 130 131 inv.fnt.name = {sans,sans-b,sans-i,sans-bi}.ttf 132 inv.fnt.size = 16 133@@ -71,8 +72,8 @@ 134 menu.fnt.height = 1.0 135 menu.gfx.button = menu.png 136 menu.button.x = 776 137-menu.button.y = 576 138 139+menu.button.y = 456 140 141 snd.click = click.wav ; click.ogg 142 143diff -Nur instead-3.3.0/themes/wide/theme.ini instead-3.3.0.maemo/themes/wide/theme.ini 144--- instead-3.3.0/themes/wide/theme.ini 2019-03-08 12:05:59.000000000 +0300 145+++ instead-3.3.0.maemo/themes/wide/theme.ini 1970-01-01 03:00:00.000000000 +0300 146@@ -1,34 +0,0 @@ 147-; $Name:Wide$ 148-; $Name(ru):Широкая$ 149-; $Name(uk):Широка$ 150-; $Name(es):Amplio$ 151-; $Name(it):Ampio$ 152- 153-scr.w = 960 154-scr.h = 540 155- 156-scr.gfx.bg = bg.png 157-scr.col.bg = white 158- 159-win.align = justify 160-win.x = 48 161-win.y = 8 162-win.w = 664 163-win.h = 524 164- 165-inv.x = 780 166-inv.y = 8 167-inv.w = 144 168-inv.h = 504 169- 170-win.fnt.size = 16 171-win.fnt.height = 1.2 172- 173-inv.fnt.size = 16 174-inv.fnt.height = 1.2 175- 176-menu.fnt.size = 16 177-menu.fnt.height = 1.0 178- 179-menu.button.x = 936 180-menu.button.y = 516 181