New upstream release [0.58.1] + changelog summarydebian/0.58.1-1

9 files changed, 45 insertions, 57 deletions

diff --git a/debian/NEWS b/debian/NEWS
new file mode 100644
index 0000000..a3cffd7
--- /dev/null
+++ b/debian/NEWS
@@ -0,0 +1,7 @@
+d2x-rebirth (0.58.1-1) unstable; urgency=low
+
+  AddOns now use filename extension ".dxa". Old AddOns will not work
+  anymore. You can either re-download them or simply rename them
+  from "*.zip" to "*.dxa".
+
+ -- Dmitry Smirnov <onlyjob@debian.org>  Sun, 04 Aug 2013 05:35:23 +1000
diff --git a/debian/README.Debian b/debian/README.Debian
index 77d9b71..146038f 100644
--- a/debian/README.Debian
+++ b/debian/README.Debian
@@ -72,11 +72,11 @@ was recorded with the Roland Sound Canvas SC-55 MIDI Module as they were
 meant to be heard in the 90s.
 
     mkdir ~/.d2x-rebirth ; cd ~/.d2x-rebirth ; \
-     wget --continue --timestamping http://www.dxx-rebirth.com/download/dxx/res/d2xr-sc55-music.zip
+     wget --continue --timestamping http://www.dxx-rebirth.com/download/dxx/res/d2xr-sc55-music.dxa
 
 Integrity check:
 
-    sha1sum ~/.d2x-rebirth/d2xr-sc55-music.zip
+    sha1sum ~/.d2x-rebirth/d2xr-sc55-music.dxa
 
 Expected SHA1 digest:
 
@@ -92,11 +92,11 @@ Soundtrack to DXX-Rebirth. For a nostalgic gaming experience, all music
 was recorded with the Yamaha YMF262 OPL3 Soundchip.
 
     mkdir ~/.d2x-rebirth ; cd ~/.d2x-rebirth ; \
-     wget --continue --timestamping http://www.dxx-rebirth.com/download/dxx/res/d2xr-opl3-music.zip
+     wget --continue --timestamping http://www.dxx-rebirth.com/download/dxx/res/d2xr-opl3-music.dxa
 
 Integrity check:
 
-    sha1sum ~/.d2x-rebirth/d2xr-opl3-music.zip
+    sha1sum ~/.d2x-rebirth/d2xr-opl3-music.dxa
 
 Expected SHA1 digest:
 
diff --git a/debian/changelog b/debian/changelog
index 15a3a42..8ca0d49 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,14 @@
+d2x-rebirth (0.58.1-1) unstable; urgency=low
+
+  * New upstream release [July 2013].
+    + no longer repack orig.tar as there is no need to remove any files.
+  * "XS-Autobuild: yes" + autobuild, thanks to Philipp Kern.
+  * Patchworks:
+    - dropped "LDFLAGS.patch".
+    + updated "debian.patch".
+
+ -- Dmitry Smirnov <onlyjob@debian.org>  Sun, 04 Aug 2013 05:40:30 +1000
+
 d2x-rebirth (0.57.3+repack-1) unstable; urgency=low
 
   * Initial release (Closes: #709660).
diff --git a/debian/copyright b/debian/copyright
index 43b223f..bc74ed6 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -12,7 +12,8 @@ Files: arch/carbon/SDL_main.c
 Copyright: 1997-2004 Sam Lantinga
 License: LGPL-2+
 
-Files: utilities/tex27*
+Files: utilities/tex2*
+       utilities/txb2*
 Copyright: 1995 Bryan Aamot
 License: GPL-2+
 
diff --git a/debian/patches/LDFLAGS.patch b/debian/patches/LDFLAGS.patch
deleted file mode 100644
index 0de9c2a..0000000
--- a/debian/patches/LDFLAGS.patch
+++ /dev/null
@@ -1,18 +0,0 @@
-Last-Update: 2012-12-31
-Author: Dmitry Smirnov <onlyjob@member.fsf.org>
-Forwarded: not-needed
-Description: use LDFLAGS from system environment
-
---- a/SConstruct
-+++ b/SConstruct
-@@ -295,9 +295,9 @@
- 	env['CXX'] = os.environ['CXX']
- if os.environ.has_key('CXXFLAGS'):
- 	env['CXXFLAGS'] += SCons.Util.CLVar(os.environ['CXXFLAGS'])
- if os.environ.has_key('LDFLAGS'):
--	env['LINKFLAGS'] += SCons.Util.CLVar(os.environ['LDFLAGS'])
-+	env['__RPATH'] += SCons.Util.CLVar(os.environ['LDFLAGS'])
- 
- # windows or *nix?
- if sys.platform == 'win32':
- 	print "compiling on Windows"
diff --git a/debian/patches/debian.patch b/debian/patches/debian.patch
index 5b550ea..8438722 100644
--- a/debian/patches/debian.patch
+++ b/debian/patches/debian.patch
@@ -1,34 +1,34 @@
-Last-Update: 2012-12-31
-Author: Dmitry Smirnov <onlyjob@member.fsf.org>
+Last-Update: 2013-08-04
 Forwarded: not-needed
+Author: Dmitry Smirnov <onlyjob@member.fsf.org>
 Description: set prefix and path to game data file
 
 --- a/SConstruct
 +++ b/SConstruct
-@@ -14,10 +14,10 @@
- D2XMICRO = 3
- VERSION_STRING = ' v' + str(D2XMAJOR) + '.' + str(D2XMINOR) + '.' + str(D2XMICRO)
- 
- # installation path
--PREFIX = str(ARGUMENTS.get('prefix', '/usr/local'))
--BIN_SUBDIR = '/bin'
-+PREFIX = str(ARGUMENTS.get('prefix', '/usr'))
-+BIN_SUBDIR = '/games'
- DATA_SUBDIR = '/share/games/d2x-rebirth'
- BIN_DIR = PREFIX + BIN_SUBDIR
- DATA_DIR = PREFIX + DATA_SUBDIR
- 
-@@ -451,9 +451,9 @@
+@@ -261,10 +261,10 @@
+ 	class UserSettings(DXXCommon.UserSettings):
+ 		def __init__(self,ARGUMENTS,target):
+ 			DXXCommon.UserSettings.__init__(self, ARGUMENTS.ARGUMENTS)
+ 			# 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))
+ 	# 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]
+-	'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]
- 	'asm=[0/1]'           build with ASSEMBLER code (only with opengl=0, requires NASM and x86) [default: 0]
 --- a/INSTALL.txt
 +++ b/INSTALL.txt
 @@ -101,9 +101,9 @@
diff --git a/debian/patches/series b/debian/patches/series
index 34fbbe4..e09e40a 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,4 +1,3 @@
 debian.patch
 homepath.patch
-LDFLAGS.patch
 spelling.patch
diff --git a/debian/patches/spelling.patch b/debian/patches/spelling.patch
index 38afe63..d65ef86 100644
--- a/debian/patches/spelling.patch
+++ b/debian/patches/spelling.patch
@@ -5,7 +5,7 @@ Description: minor spelling corrections
 
 --- a/main/inferno.c
 +++ b/main/inferno.c
-@@ -117,9 +117,9 @@
+@@ -106,9 +106,9 @@
  void print_commandline_help()
  {
  	printf( "\n System Options:\n\n");
diff --git a/debian/rules b/debian/rules
index fd15757..0adb695 100755
--- a/debian/rules
+++ b/debian/rules
@@ -43,7 +43,7 @@ override_dh_builddeb:
 PKD   = $(abspath $(dir $(MAKEFILE_LIST)))
 PKG   = $(word 2,$(shell dpkg-parsechangelog -l$(PKD)/changelog | grep ^Source))
 VER  ?= $(shell dpkg-parsechangelog -l$(PKD)/changelog | perl -ne 'print $$1 if m{Version:\s*([\d\.]+)}')
-DTYPE = +repack
+DTYPE =
 .PHONY: get-orig-source
 get-orig-source: $(PKG)_$(VER)$(DTYPE).orig.tar.xz
 	@
@@ -51,15 +51,3 @@ get-orig-source: $(PKG)_$(VER)$(DTYPE).orig.tar.xz
 $(PKG)_$(VER)$(DTYPE).orig.tar.xz:
 	@echo "# Downloading..."
 	uscan --noconf --verbose --rename --destdir=$(CURDIR) --check-dirname-level=0 --force-download --download-version $(VER) $(PKD)
-	$(if $(wildcard $(PKG)-$(VER)),$(error $(PKG)-$(VER) exist, aborting..))
-	@echo "# Extracting..."
-	mkdir $(PKG)-$(VER) \
-        && tar -xf $(PKG)_$(VER).orig.tar.* --directory $(PKG)-$(VER) --strip-components 1 \
-        || $(RM) -r $(PKG)-$(VER)
-	@echo "# Clean-up..."
-	cd $(PKG)-$(VER) \
-        && $(RM) -r -v \
-            include/psmacros.inc
-	@echo "# Packing..."
-	XZ_OPT="-6v" tar -caf "$(PKG)_$(VER)$(DTYPE).orig.tar.xz" "$(PKG)-$(VER)" \
-        && $(RM) -r "$(PKG)-$(VER)"