uncommitted - pekka-kana-2
Ready changes
Summary
Import uploads missing from VCS:Diff
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index ac2bb06..8af1436 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -2,15 +2,15 @@ default:
image: debian:unstable
stages:
- - build
+ - pekka-kana-2
before_script:
- apt-get update
- apt-get upgrade -y
- - apt-get install g++ libsdl2-dev libsdl2-image-dev libsdl2-mixer-dev make -y
+ - apt-get install -y g++ libsdl2-dev libsdl2-image-dev libsdl2-mixer-dev make
building:
- stage: build
+ stage: pekka-kana-2
script:
- - make
- - make clean
+ - make V=1
+ - make clean V=1
diff --git a/.pc/.quilt_patches b/.pc/.quilt_patches
new file mode 100644
index 0000000..6857a8d
--- /dev/null
+++ b/.pc/.quilt_patches
@@ -0,0 +1 @@
+debian/patches
diff --git a/.pc/.quilt_series b/.pc/.quilt_series
new file mode 100644
index 0000000..c206706
--- /dev/null
+++ b/.pc/.quilt_series
@@ -0,0 +1 @@
+series
diff --git a/.pc/.version b/.pc/.version
new file mode 100644
index 0000000..0cfbf08
--- /dev/null
+++ b/.pc/.version
@@ -0,0 +1 @@
+2
diff --git a/.pc/applied-patches b/.pc/applied-patches
new file mode 100644
index 0000000..e69de29
diff --git a/CHANGELOG b/CHANGELOG
index 3b53db3..5b6a24c 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,3 +1,9 @@
+**Changelog version: 1.2.7**
+ * Version updated to 1.2.7: "pk2.cpp" and "sprite.h".
+ * Fixed Makefile:
+ + Integrated support fixed for pkg-config.
+ * Updated the authors in the introduction of the game.
+
**Changelog version: 1.2.6**
* Fixed Makefile:
+ Added in LDFLAGS: "-lSDL2_image" and "-pie".
diff --git a/Makefile b/Makefile
index ee07282..2c4fdd1 100644
--- a/Makefile
+++ b/Makefile
@@ -1,6 +1,8 @@
# Pekka Kana 2 by Janne Kivilahti from Piste Gamez (2003-2007)
# https://pistegamez.net/game_pk2.html
#
+# Individual work by Carlos Donizete Froes [a.k.a coringao] (2018-2020).
+#
# This public release and rewritten is governed by a BSD-2-clause license.
#
# Makefile command:
@@ -11,15 +13,16 @@
# Use 'make V=1' to see the full commands
CXX = g++
-CXXFLAGS += $(shell pkg-config --cflags sdl2) -g -O2 -std=gnu++17 -fPIE \
--D_FORTIFY_SOURCE=2 -Wno-unused-result -Wno-write-strings
-LDFLAGS += $(shell pkg-config --libs sdl2) -lSDL2_image -lSDL2_mixer \
+PKG_CONFIG ?= pkg-config
+CXXFLAGS += $(shell $(PKG_CONFIG) --cflags sdl2) -g -O2 -std=gnu++17 \
+-D_FORTIFY_SOURCE=2 -fPIE -Wno-unused-result -Wno-write-strings
+LDFLAGS += $(shell $(PKG_CONFIG) --libs sdl2 SDL2_image SDL2_mixer) \
-pie -Wl,-z,relro
# Defines directories
-SRC_DIR = src/
BIN_DIR = bin/
BUILD_DIR = build/
+SRC_DIR = src/
# Defines the engine and src used in main codes
ENGINE_SRC = $(wildcard $(SRC_DIR)*.cpp)
@@ -38,7 +41,7 @@ PK2_SRC = $(SRC_DIR)pk2.cpp
PK2_OBJ = $(BUILD_DIR)pk2.o
# Defines the destination of each binary file
-PK2_BIN = $(BIN_DIR)/pekka-kana-2
+PK2_BIN = $(BIN_DIR)pekka-kana-2
DEPENDENCIES := $(PK2_OBJ) $(PK2_SPRITE_OBJ) $(PK2_MAP_OBJ) $(ENGINE_OBJ)
DEPENDENCIES := $(basename $(DEPENDENCIES))
diff --git a/debian/changelog b/debian/changelog
index dd355b6..f3edb19 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,13 @@
+pekka-kana-2 (1.2.7-1) unstable; urgency=medium
+
+ * New upstream release. FTCBFS bug fix. (Closes: #933080)
+ + Integrated support fixed for pkg-config.
+ * debian/control:
+ + Bump debhelper compat to version 13.
+ * Added debian/docs.
+
+ -- Carlos Donizete Froes <coringao@riseup.net> Sun, 01 Nov 2020 00:41:34 -0300
+
pekka-kana-2 (1.2.6-1) unstable; urgency=medium
* New upstream release. FTBFS bug fix. (Closes: #952049)
diff --git a/debian/control b/debian/control
index e4c350f..948f2f4 100644
--- a/debian/control
+++ b/debian/control
@@ -3,7 +3,7 @@ Section: games
Priority: optional
Maintainer: Debian Games Team <pkg-games-devel@lists.alioth.debian.org>
Uploaders: Carlos Donizete Froes <coringao@riseup.net>
-Build-Depends: debhelper-compat (= 12),
+Build-Depends: debhelper-compat (= 13),
libsdl2-dev,
libsdl2-image-dev,
libsdl2-mixer-dev
diff --git a/debian/docs b/debian/docs
new file mode 100644
index 0000000..061166d
--- /dev/null
+++ b/debian/docs
@@ -0,0 +1,2 @@
+CONTRIBUTING.md
+Readme.md
diff --git a/src/pk2.cpp b/src/pk2.cpp
index 501b857..69fc0c1 100644
--- a/src/pk2.cpp
+++ b/src/pk2.cpp
@@ -8,7 +8,7 @@
/* DEFINITIONS --------------------------------------------------------------*/
#define GAME_NAME "Pekka Kana 2"
-#define PK2_VERSION "1.2"
+#define PK2_VERSION "1.2.7"
#define SCREEN_WIDTH 800
#define SCREEN_HEIGHT 480
@@ -7309,26 +7309,26 @@ int PK_Piirra_Intro(){
if (introlaskuri > tekijat_alku) {
PK_Piirra_Intro_Teksti(tekstit->Hae_Teksti(txt_intro_a_game_by),fontti1, 120, 200, tekijat_alku, tekijat_loppu);
- PK_Piirra_Intro_Teksti("Janne Kivilahti from Piste Gamez (2003-2007)", fontti1, 120, 220, tekijat_alku+20, tekijat_loppu+20);
+ PK_Piirra_Intro_Teksti("- Janne Kivilahti from Piste Gamez (2003-2007)", fontti1, 120, 220, tekijat_alku+20, tekijat_loppu+20);
PK_Piirra_Intro_Teksti(tekstit->Hae_Teksti(txt_intro_original), fontti1, 120, 245, tekijat_alku+40, tekijat_loppu+40);
- PK_Piirra_Intro_Teksti("Antti Suuronen (1998)", fontti1, 120, 265, tekijat_alku+50, tekijat_loppu+50);
+ PK_Piirra_Intro_Teksti("- Antti Suuronen (1998)", fontti1, 120, 265, tekijat_alku+50, tekijat_loppu+50);
PK_Piirra_Intro_Teksti("Ported to SDL by", fontti1, 120, 290, tekijat_alku+70, tekijat_loppu+70);
- PK_Piirra_Intro_Teksti("Samuli Tuomola (2010)", fontti1, 120, 310, tekijat_alku+80, tekijat_loppu+80);
+ PK_Piirra_Intro_Teksti("- Samuli Tuomola (2010)", fontti1, 120, 310, tekijat_alku+80, tekijat_loppu+80);
PK_Piirra_Intro_Teksti("Translated and ported to SDL2 and Bug Fixes by", fontti1, 120, 335, tekijat_alku + 90, tekijat_loppu + 90);
- PK_Piirra_Intro_Teksti("Danilo Lemos (2016-2019)", fontti1, 120, 355, tekijat_alku + 100, tekijat_loppu + 100);
+ PK_Piirra_Intro_Teksti("- Danilo Lemos (2016-2019)", fontti1, 120, 355, tekijat_alku + 100, tekijat_loppu + 100);
PK_Piirra_Intro_Teksti("Individual work by", fontti1, 120, 375, tekijat_alku + 120, tekijat_loppu + 120);
- PK_Piirra_Intro_Teksti("Carlos Donizete Froes [a.k.a coringao (2018-2019)", fontti1, 120, 395, tekijat_alku + 130, tekijat_loppu + 130);
+ PK_Piirra_Intro_Teksti("- Carlos Donizete Froes [a.k.a coringao] (2018-2020)", fontti1, 120, 395, tekijat_alku + 130, tekijat_loppu + 130);
}
if (introlaskuri > testaajat_alku) {
PK_Piirra_Intro_Teksti(tekstit->Hae_Teksti(txt_intro_tested_by),fontti1, 120, 230, testaajat_alku, testaajat_loppu);
- PK_Piirra_Intro_Teksti("Antti Suuronen", fontti1, 120, 250, testaajat_alku+10, testaajat_loppu+10);
- PK_Piirra_Intro_Teksti("Toni Hurskainen", fontti1, 120, 270, testaajat_alku+20, testaajat_loppu+20);
- PK_Piirra_Intro_Teksti("Juho Rytkonen", fontti1, 120, 290, testaajat_alku+30, testaajat_loppu+30);
- PK_Piirra_Intro_Teksti("Annukka Korja", fontti1, 120, 310, testaajat_alku+40, testaajat_loppu+40);
+ PK_Piirra_Intro_Teksti("- Antti Suuronen", fontti1, 120, 250, testaajat_alku+10, testaajat_loppu+10);
+ PK_Piirra_Intro_Teksti("- Toni Hurskainen", fontti1, 120, 270, testaajat_alku+20, testaajat_loppu+20);
+ PK_Piirra_Intro_Teksti("- Juho Rytkonen", fontti1, 120, 290, testaajat_alku+30, testaajat_loppu+30);
+ PK_Piirra_Intro_Teksti("- Annukka Korja", fontti1, 120, 310, testaajat_alku+40, testaajat_loppu+40);
PK_Piirra_Intro_Teksti(tekstit->Hae_Teksti(txt_intro_thanks_to),fontti1, 120, 330, testaajat_alku+70, testaajat_loppu+70);
- PK_Piirra_Intro_Teksti("Oskari Raunio", fontti1, 120, 350, testaajat_alku+70, testaajat_loppu+70);
- PK_Piirra_Intro_Teksti("Assembly Organization", fontti1, 120, 370, testaajat_alku+80, testaajat_loppu+80);
+ PK_Piirra_Intro_Teksti("- Oskari Raunio", fontti1, 120, 350, testaajat_alku+70, testaajat_loppu+70);
+ PK_Piirra_Intro_Teksti("- Assembly Organization", fontti1, 120, 370, testaajat_alku+80, testaajat_loppu+80);
}
if (introlaskuri > kaantaja_alku) {
diff --git a/src/sprite.h b/src/sprite.h
index 9929667..2e61025 100644
--- a/src/sprite.h
+++ b/src/sprite.h
@@ -10,7 +10,7 @@
#ifndef PK2SPRITE
#define PK2SPRITE
-#define PK2SPRITE_VIIMEISIN_VERSIO "1.3"
+#define PK2SPRITE_VIIMEISIN_VERSIO "1.2.7"
#define MAX_SPRITEJA 800
#define MAX_PROTOTYYPPEJA 100
#define SPRITE_MAX_FRAMEJA 50
@@ -481,7 +481,7 @@ class PK2Sprite_Prototyyppi{
public:
//Version
- char versio[4];
+ char versio[6];
//.spr filename
char tiedosto[255];
//Prototype index
Debdiff
[The following lists of changes regard files as different if they have different names, permissions or owners.]
Files in second set of .debs but not in first
-rw-r--r-- root/root /usr/lib/debug/.build-id/a2/4b893aa025fabc90aa736fd1b19ed58e763721.debug -rw-r--r-- root/root /usr/share/doc/pekka-kana-2/CONTRIBUTING.md -rw-r--r-- root/root /usr/share/doc/pekka-kana-2/Readme.md
Files in first set of .debs but not in second
-rw-r--r-- root/root /usr/lib/debug/.build-id/0e/09e8823c6623cefd5a144847a5748644160845.debug
No differences were encountered between the control files of package pekka-kana-2
No differences were encountered between the control files of package pekka-kana-2-data
Control files of package pekka-kana-2-dbgsym: lines which differ (wdiff format)
Build-Ids: 0e09e8823c6623cefd5a144847a5748644160845 a24b893aa025fabc90aa736fd1b19ed58e763721