From bac39b1bc037d4075ee0c0fc687f2980f6d223ee Mon Sep 17 00:00:00 2001
From: Alam Ed Arias <alam@srb2.org>
Date: Sat, 6 Feb 2016 12:31:37 -0500
Subject: [PATCH] debian: untested update for Debian packages
---
{bin/Resources => assets}/debian/README.Debian | 0
{bin/Resources => assets}/debian/README.source | 0
{bin/Resources => assets}/debian/changelog | 6 ++++++
{bin/Resources => assets}/debian/compat | 0
{bin/Resources => assets}/debian/control | 0
{bin/Resources => assets}/debian/copyright | 0
{bin/Resources => assets}/debian/rules | 4 ++--
{bin/Resources => assets}/debian/source/format | 0
debian/control | 14 ++++++++++----
debian/rules | 2 +-
10 files changed, 19 insertions(+), 7 deletions(-)
rename {bin/Resources => assets}/debian/README.Debian (100%)
rename {bin/Resources => assets}/debian/README.source (100%)
rename {bin/Resources => assets}/debian/changelog (51%)
rename {bin/Resources => assets}/debian/compat (100%)
rename {bin/Resources => assets}/debian/control (100%)
rename {bin/Resources => assets}/debian/copyright (100%)
rename {bin/Resources => assets}/debian/rules (95%)
rename {bin/Resources => assets}/debian/source/format (100%)
diff --git a/bin/Resources/debian/README.Debian b/assets/debian/README.Debian
similarity index 100%
rename from bin/Resources/debian/README.Debian
rename to assets/debian/README.Debian
diff --git a/bin/Resources/debian/README.source b/assets/debian/README.source
similarity index 100%
rename from bin/Resources/debian/README.source
rename to assets/debian/README.source
diff --git a/bin/Resources/debian/changelog b/assets/debian/changelog
similarity index 51%
rename from bin/Resources/debian/changelog
rename to assets/debian/changelog
index 0c514d4d2..05c29fffe 100644
--- a/bin/Resources/debian/changelog
+++ b/assets/debian/changelog
@@ -1,3 +1,9 @@
+srb2-data (2.1.14~1) unstable; urgency=low
+
+ * Updated for SRB2 v2.1.14
+
+ -- Alam Arias <alam+debian@srb2.org> Sat, 06 Feb 2016 11:00:00 +0500
+
srb2-data (2.0.6-2) maverick; urgency=high
* Initial proper release..
diff --git a/bin/Resources/debian/compat b/assets/debian/compat
similarity index 100%
rename from bin/Resources/debian/compat
rename to assets/debian/compat
diff --git a/bin/Resources/debian/control b/assets/debian/control
similarity index 100%
rename from bin/Resources/debian/control
rename to assets/debian/control
diff --git a/bin/Resources/debian/copyright b/assets/debian/copyright
similarity index 100%
rename from bin/Resources/debian/copyright
rename to assets/debian/copyright
diff --git a/bin/Resources/debian/rules b/assets/debian/rules
similarity index 95%
rename from bin/Resources/debian/rules
rename to assets/debian/rules
index 514d8e07c..d86f92af2 100755
--- a/bin/Resources/debian/rules
+++ b/assets/debian/rules
@@ -37,7 +37,7 @@ RM := rm -rf
DIR := $(shell pwd)
PACKAGE := $(shell cat $(DIR)/debian/control | grep 'Package:' | sed -e 's/Package: //g')
-DATAFILES := drill.dta music.dta soar.dta zones.dta player.dta rings.wpn srb2.wad
+DATAFILES := srb2.srb zones.dta player.dta rings.dta music.dta
DATADIR := usr/games/SRB2
RESOURCEDIR := .
@@ -48,7 +48,7 @@ build:
# This will need to be updated every time SRB2 official version is
# Copy data files to their install locations, and add data files to include-binaries
for file in $(DATAFILES); do \
- $(WGET) http://alam.srb2.org/SRB2/2.0.6-Final/Resources/$$file; \
+ $(WGET) http://alam.srb2.org/SRB2/2.1.14-Final/Resources/$$file; \
if test "$$file" = "srb2.wad"; then \
$(INSTALL) $(RESOURCEDIR)/$$file $(DIR)/debian/tmp/$(DATADIR)/srb2.srb; \
else \
diff --git a/bin/Resources/debian/source/format b/assets/debian/source/format
similarity index 100%
rename from bin/Resources/debian/source/format
rename to assets/debian/source/format
diff --git a/debian/control b/debian/control
index c64a85c48..b3e95b587 100644
--- a/debian/control
+++ b/debian/control
@@ -4,13 +4,19 @@ Source: srb2
Section: games
Priority: extra
Maintainer: Callum Dickinson <gcfreak_ag20@hotmail.com>
-Build-Depends: debhelper (>= 7.0.50~), libsdl1.2-dev (>= 1.2.7), libsdl-mixer1.2-dev (>= 1.2.7), libpng12-dev (>= 1.2.7), libglu1-dev | libglu-dev, libosmesa6-dev | libgl-dev, nasm [i386]
+Build-Depends: debhelper (>= 7.0.50~),
+ libsdl2-dev,
+ libsdl2-mixer-dev,
+ libpng12-dev (>= 1.2.7),
+ libglu1-dev | libglu-dev,
+ libosmesa6-dev | libgl-dev,
+ nasm [i386]
Standards-Version: 3.8.4
Homepage: http://www.srb2.org
Package: srb2
Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}, srb2-data (= 2.0.6)
+Depends: ${shlibs:Depends}, ${misc:Depends}, srb2-data (= 2.1.4)
Description: A cross-platform 3D Sonic fangame
Sonic Robo Blast 2 is a 3D open-source Sonic the Hedgehog
fangame built using a modified version of the Doom Legacy
@@ -22,8 +28,8 @@ Description: A cross-platform 3D Sonic fangame
Package: srb2-dbg
Architecture: any
-# FIXME: should be Depends: ${shlibs:Depends}, ${misc:Depends}, srb2-data (= 2.0.6), srb2 but dh_shlibdeps is being an asshat
-Depends: libc6, ${misc:Depends}, srb2-data (= 2.0.6), srb2
+# FIXME: should be Depends: ${shlibs:Depends}, ${misc:Depends}, srb2-data (= 2.1.4), srb2 but dh_shlibdeps is being an asshat
+Depends: libc6, ${misc:Depends}, srb2-data (= 2.1.4), srb2
Description: A cross-platform 3D Sonic fangame
Sonic Robo Blast 2 is a 3D open-source Sonic the Hedgehog
fangame built using a modified version of the Doom Legacy
diff --git a/debian/rules b/debian/rules
index 33ade54c8..50572f1da 100755
--- a/debian/rules
+++ b/debian/rules
@@ -62,7 +62,7 @@ DBGDIR = usr/lib/debug/$(PKGDIR)
PREFIX = $(shell test "$(CROSS_COMPILE_BUILD)" != "$(CROSS_COMPILE_HOST)" && echo "PREFIX=$(CROSS_COMPILE_HOST)")
OS = LINUX=1
NONX86 = $(shell test "`echo $(CROSS_COMPILE_HOST) | grep 'i[3-6]86'`" || echo "NONX86=1")
-MAKEARGS = $(OS) $(NONX86) $(PREFIX) EXENAME=$(EXENAME) DBGNAME=$(DBGNAME) SDL_PKGCONFIG=sdl PNG_PKGCONFIG=libpng NOOBJDUMP=1
+MAKEARGS = $(OS) $(NONX86) $(PREFIX) EXENAME=$(EXENAME) DBGNAME=$(DBGNAME) SDL_PKGCONFIG=sdl2 PNG_PKGCONFIG=libpng NOOBJDUMP=1
MENUFILE1 = ?package($(PACKAGE)):needs="X11" section="$(SECTION)"
MENUFILE2 = title="$(TITLE)" command="/$(PKGDIR)/$(PACKAGE)"
# FIXME pkg-config dir hacks
--
GitLab