diff options
| -rw-r--r-- | debian/README.Devuan | 9 | ||||
| -rw-r--r-- | debian/_service | 28 | ||||
| -rw-r--r-- | debian/changelog | 6 | ||||
| -rw-r--r-- | debian/control | 5 | ||||
| -rw-r--r-- | debian/d2x-rebirth+stackrpms.dsc | 15 | ||||
| -rw-r--r-- | debian/docs | 6 | ||||
| -rw-r--r-- | debian/install | 6 | ||||
| -rw-r--r-- | debian/patches/debian.patch | 51 | ||||
| -rw-r--r-- | debian/patches/series | 10 | ||||
| -rwxr-xr-x | debian/rules | 7 |
10 files changed, 93 insertions, 50 deletions
diff --git a/debian/README.Devuan b/debian/README.Devuan new file mode 100644 index 0000000..fa47802 --- /dev/null +++ b/debian/README.Devuan @@ -0,0 +1,9 @@ +d2x-rebirth (0.60.0-1+stackrpms) + + This package is a resurrection of the Debian sources of d2x-rebirth combined with the latest upstream of project dxx-rebirth. + + Sources include: + http://deb.debian.org/debian/pool/non-free/d/d2x-rebirth/d2x-rebirth_0.58.1-1.3.debian.tar.xz + https://alioth-archive.debian.org/git/users/onlyjob/d2x-rebirth.git.tar.xz + + -- B. Stack <bgstack15@gmail.com> Sat, 16 Sep 2023 16:55:33 -0400 diff --git a/debian/_service b/debian/_service new file mode 100644 index 0000000..b262a30 --- /dev/null +++ b/debian/_service @@ -0,0 +1,28 @@ +<services> + <service name="tar_scm"> + <param name="scm">git</param> + <param name="url">https://bgstack15.ddns.net/git/stackrpms.git</param> + <param name="subdir">d2x-rebirth/debian</param> + <param name="filename">debian</param> + <param name="revision">descent2-bump</param> + <param name="version">_none_</param> + </service> + <service name="recompress"> + <param name="file">*.tar</param> + <param name="compression">xz</param> + </service> + <service name="tar_scm"> + <param name="scm">git</param> + <param name="url">https://github.com/dxx-rebirth/dxx-rebirth</param> + <param name="revision">master</param> + <param name="version">_none_</param> + </service> + <service name="recompress"> + <param name="file">*.tar</param> + <param name="compression">gz</param> + </service> + <service name="extract_file"> + <param name="archive">*.tar.xz</param> + <param name="files">*/*.dsc</param> + </service> +</services> diff --git a/debian/changelog b/debian/changelog index 26e46ed..c690f2c 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +d2x-rebirth (0.60.0-1+stackrpms) obs; urgency=medium + + * Build with latest commit from upstream to get new features. + + -- B. Stack <bgstack15@gmail.com> Sat, 16 Sep 2023 16:55:33 -0400 + d2x-rebirth (0.58.1-1.3) unstable; urgency=medium * Non-maintainer upload. diff --git a/debian/control b/debian/control index 141d36d..bd53690 100644 --- a/debian/control +++ b/debian/control @@ -1,12 +1,14 @@ Source: d2x-rebirth Section: non-free/games Priority: optional -Maintainer: Dmitry Smirnov <onlyjob@debian.org> +Maintainer: B. Stack <bgstack15@gmail.com> +XSBC-Original-Maintainer: Dmitry Smirnov <onlyjob@debian.org> Standards-Version: 3.9.4 Build-Depends: debhelper (>= 9) ,imagemagick ,libphysfs-dev ,libsdl1.2-dev + ,libsdl-image1.2-dev ,libsdl-mixer1.2-dev ,scons XS-Autobuild: yes @@ -24,3 +26,4 @@ Description: port of the 1996 classic game Descent 2: Counterstrike a bunch of improvements and new features. . Original game data is needed to play this game. + Updated package maintained by stackrpms diff --git a/debian/d2x-rebirth+stackrpms.dsc b/debian/d2x-rebirth+stackrpms.dsc new file mode 100644 index 0000000..4a216b3 --- /dev/null +++ b/debian/d2x-rebirth+stackrpms.dsc @@ -0,0 +1,15 @@ +Format: 3.0 (quilt) +Source: d2x-rebirth +Binary: d2x-rebirth +Architecture: any +Version: 0.60.0-1+stackrpms +Maintainer: B. Stack <bgstack15@gmail.com> +Homepage: https://www.dxx-rebirth.com/ +Standards-Version: 4.1.4 +Build-Depends: debhelper (>= 9~), imagemagick, imagemagick, libphysfs-dev, libsdl1.2-dev, libsdl-image1.2-dev, libsdl-mixer1.2-dev, scons +XS-Autobuild: yes +Package-List: + d2x-rebirth deb non-free/games optional arch=any +Files: + 00000000000000000000000000000000 1 d2x-rebirth.orig.tar.gz + 00000000000000000000000000000000 1 d2x-rebirth+stackrpms.debian.tar.xz diff --git a/debian/docs b/debian/docs index 3899fbd..5e3ec8e 100644 --- a/debian/docs +++ b/debian/docs @@ -1,3 +1,3 @@ -INSTALL.txt -README.txt -RELEASE-NOTES.txt +INSTALL.markdown +README.md +d2x-rebirth/RELEASE-NOTES.txt diff --git a/debian/install b/debian/install index fc58098..d7e259a 100644 --- a/debian/install +++ b/debian/install @@ -1,5 +1,5 @@ debian/vrms/* /usr/share/vrms/reasons -d2x-rebirth /usr/games -*.desktop /usr/share/applications -*.xpm /usr/share/pixmaps +build/d2x-rebirth/d2x-rebirth /usr/games +d2x-rebirth/*.desktop /usr/share/applications +d2x-rebirth/*.xpm /usr/share/pixmaps debian/*.xpm /usr/share/pixmaps diff --git a/debian/patches/debian.patch b/debian/patches/debian.patch index 8438722..96f05a7 100644 --- a/debian/patches/debian.patch +++ b/debian/patches/debian.patch @@ -5,40 +5,21 @@ Description: set prefix and path to game data file --- a/SConstruct +++ b/SConstruct -@@ -261,10 +261,10 @@ - class UserSettings(DXXCommon.UserSettings): - def __init__(self,ARGUMENTS,target): - DXXCommon.UserSettings.__init__(self, ARGUMENTS.ARGUMENTS) +@@ -3521,7 +3521,7 @@ class DXXCommon(LazyObjectConstructor): + RPI_DEFAULT_VC_PATH='/opt/vc' + default_OGLES_LIB = 'GLES_CM' + default_EGL_LIB = 'EGL' +- _default_prefix = '/usr/local' ++ _default_prefix = '/usr' + __stdout_is_not_a_tty = None + __has_git_dir = None + def default_poison(self): +@@ -5039,7 +5039,7 @@ class DXXProgram(DXXCommon): + @property + def BIN_DIR(self): # installation path -- PREFIX = str(ARGUMENTS.get('prefix', '/usr/local')) -- self.BIN_DIR = PREFIX + '/bin' -+ PREFIX = str(ARGUMENTS.get('prefix', '/usr')) -+ self.BIN_DIR = PREFIX + '/games' - self.DATA_DIR = PREFIX + '/share/games/' + target - # command-line parms - self.sharepath = str(ARGUMENTS.get('sharepath', self.DATA_DIR)) +- return f'{self.prefix}/bin' ++ return f'{self.prefix}/games' # Settings to apply to mingw32 builds -@@ -635,9 +635,9 @@ - Type 'scons -c' to clean up. - - Extra options (add them to command line, like 'scons extraoption=value'): - -- 'sharepath=[DIR]' (non-Mac OS *NIX only) use [DIR] for shared game data. [default: /usr/local/share/games/d2x-rebirth] -+ 'sharepath=[DIR]' (non-Mac OS *NIX only) use [DIR] for shared game data. [default: /usr/share/games/d2x-rebirth] - 'opengl=[0/1]' build with OpenGL support [default: 1] - 'opengles=[0/1]' build with OpenGL ES support [default: 0] - 'opengles_lib=[NAME]' specify the name of the OpenGL ES library to link against - 'sdlmixer=[0/1]' build with SDL_Mixer support for sound and music (includes external music support) [default: 1] ---- a/INSTALL.txt -+++ b/INSTALL.txt -@@ -101,9 +101,9 @@ - =========================
-
- *NIX
- ----
-- The Sharepath (/usr/local/share/games/d1x-rebirth/ by default - if not reconfigured via SCons) or
-+ The Sharepath (/usr/share/games/d2x-rebirth/ by default - if not reconfigured via SCons) or
- ~/.d1x-rebirth or
- another directory specified by -hogdir via d1x.ini
-
- MacOS
+ class Win32PlatformSettings(DXXCommon.Win32PlatformSettings): + def adjust_environment(self,program,env): diff --git a/debian/patches/series b/debian/patches/series index 83ec5be..9443db9 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -1,6 +1,6 @@ debian.patch -homepath.patch -spelling.patch -libphysfs-3.0.1.patch -python3.patch -common-objects.patch +#homepath.patch +#spelling.patch +#libphysfs-3.0.1.patch +#python3.patch +#common-objects.patch diff --git a/debian/rules b/debian/rules index 01ce32c..aaff96e 100755 --- a/debian/rules +++ b/debian/rules @@ -2,9 +2,10 @@ # Uncomment this to turn on verbose mode. #export DH_VERBOSE=1 +export SUBDIR=d2x-rebirth %: - dh $@ --parallel + dh $@ --parallel --sourcedirectory="${SUBDIR}" override_dh_clean: scons --clean @@ -13,7 +14,7 @@ override_dh_clean: override_dh_auto_build: dh_auto_build ## build menu icon - convert d2x-rebirth.xpm -resize 32x32 debian/d2x-rebirth32.xpm + convert "${SUBDIR}"/d2x-rebirth.xpm -resize 32x32 debian/d2x-rebirth32.xpm CFLAGS="$(CFLAGS) $(CPPFLAGS)" LDFLAGS="$(LDFLAGS)" \ scons prefix=/usr verbosebuild=1 --debug=presub @@ -34,7 +35,7 @@ override_dh_auto_install: dh_auto_install --destdir=$(CURDIR)/tmp override_dh_installchangelogs: - dh_installchangelogs CHANGELOG.txt + dh_installchangelogs "${SUBDIR}"/CHANGELOG.txt ## http://wiki.debian.org/onlyjob/get-orig-source PKD = $(abspath $(dir $(MAKEFILE_LIST))) |