Control: tags 881589 + pending
Dear maintainer,
I've prepared an NMU for d2x-rebirth (versioned as 0.58.1-1.1) and
uploaded it to DELAYED/10. Please feel free to tell me if I should
cancel it.
cu
Adrian
--
"Is there not promise of rain?" Ling Tan asked suddenly out
of the darkness. There had been need of rain for many days.
"Only a promise," Lao Er said.
Pearl S. Buck - Dragon Seed
diff -Nru d2x-rebirth-0.58.1/debian/changelog d2x-rebirth-0.58.1/debian/changelog
--- d2x-rebirth-0.58.1/debian/changelog 2013-08-03 22:48:56.000000000 +0300
+++ d2x-rebirth-0.58.1/debian/changelog 2017-12-09 16:16:38.000000000 +0200
@@ -1,3 +1,12 @@
+d2x-rebirth (0.58.1-1.1) unstable; urgency=medium
+
+ * Non-maintainer upload.
+ * Add patch from Markus Koschany to fix FTBFS with libphysfs 3.0.1.
+ (Closes: #881589)
+ * Stop manually setting xz compression, that is now the default.
+
+ -- Adrian Bunk <b...@debian.org> Sat, 09 Dec 2017 16:16:38 +0200
+
d2x-rebirth (0.58.1-1) unstable; urgency=low
* New upstream release [July 2013].
diff -Nru d2x-rebirth-0.58.1/debian/patches/libphysfs-3.0.1.patch d2x-rebirth-0.58.1/debian/patches/libphysfs-3.0.1.patch
--- d2x-rebirth-0.58.1/debian/patches/libphysfs-3.0.1.patch 1970-01-01 02:00:00.000000000 +0200
+++ d2x-rebirth-0.58.1/debian/patches/libphysfs-3.0.1.patch 2017-12-09 16:16:15.000000000 +0200
@@ -0,0 +1,43 @@
+From: Markus Koschany <a...@debian.org>
+Bug-Debian: https://bugs.debian.org/881589
+
+Index: d2x-rebirth-0.58.1/include/physfsrwops.h
+===================================================================
+--- d2x-rebirth-0.58.1.orig/include/physfsrwops.h
++++ d2x-rebirth-0.58.1/include/physfsrwops.h
+@@ -44,7 +44,7 @@ extern "C" {
+ * @return A valid SDL_RWops structure on success, NULL on error. Specifics
+ * of the error can be gleaned from PHYSFS_getLastError().
+ */
+-__EXPORT__ SDL_RWops *PHYSFSRWOPS_openRead(const char *fname);
++PHYSFS_DECL SDL_RWops *PHYSFSRWOPS_openRead(const char *fname);
+
+ /**
+ * Open a platform-independent filename for writing, and make it accessible
+@@ -56,7 +56,7 @@ __EXPORT__ SDL_RWops *PHYSFSRWOPS_openRe
+ * @return A valid SDL_RWops structure on success, NULL on error. Specifics
+ * of the error can be gleaned from PHYSFS_getLastError().
+ */
+-__EXPORT__ SDL_RWops *PHYSFSRWOPS_openWrite(const char *fname);
++PHYSFS_DECL SDL_RWops *PHYSFSRWOPS_openWrite(const char *fname);
+
+ /**
+ * Open a platform-independent filename for appending, and make it accessible
+@@ -68,7 +68,7 @@ __EXPORT__ SDL_RWops *PHYSFSRWOPS_openWr
+ * @return A valid SDL_RWops structure on success, NULL on error. Specifics
+ * of the error can be gleaned from PHYSFS_getLastError().
+ */
+-__EXPORT__ SDL_RWops *PHYSFSRWOPS_openAppend(const char *fname);
++PHYSFS_DECL SDL_RWops *PHYSFSRWOPS_openAppend(const char *fname);
+
+ /**
+ * Make a SDL_RWops from an existing PhysicsFS file handle. You should
+@@ -80,7 +80,7 @@ __EXPORT__ SDL_RWops *PHYSFSRWOPS_openAp
+ * @return A valid SDL_RWops structure on success, NULL on error. Specifics
+ * of the error can be gleaned from PHYSFS_getLastError().
+ */
+-__EXPORT__ SDL_RWops *PHYSFSRWOPS_makeRWops(PHYSFS_file *handle);
++PHYSFS_DECL SDL_RWops *PHYSFSRWOPS_makeRWops(PHYSFS_file *handle);
+
+ #ifdef __cplusplus
+ }
diff -Nru d2x-rebirth-0.58.1/debian/patches/series d2x-rebirth-0.58.1/debian/patches/series
--- d2x-rebirth-0.58.1/debian/patches/series 2013-08-03 22:47:37.000000000 +0300
+++ d2x-rebirth-0.58.1/debian/patches/series 2017-12-09 16:15:39.000000000 +0200
@@ -1,3 +1,4 @@
debian.patch
homepath.patch
spelling.patch
+libphysfs-3.0.1.patch
diff -Nru d2x-rebirth-0.58.1/debian/rules d2x-rebirth-0.58.1/debian/rules
--- d2x-rebirth-0.58.1/debian/rules 2013-08-03 22:18:12.000000000 +0300
+++ d2x-rebirth-0.58.1/debian/rules 2017-12-09 16:16:38.000000000 +0200
@@ -36,9 +36,6 @@
override_dh_installchangelogs:
dh_installchangelogs CHANGELOG.txt
-override_dh_builddeb:
- dh_builddeb -- -Zxz
-
## http://wiki.debian.org/onlyjob/get-orig-source
PKD = $(abspath $(dir $(MAKEFILE_LIST)))
PKG = $(word 2,$(shell dpkg-parsechangelog -l$(PKD)/changelog | grep ^Source))
diff -Nru d2x-rebirth-0.58.1/debian/source/options d2x-rebirth-0.58.1/debian/source/options
--- d2x-rebirth-0.58.1/debian/source/options 2012-12-31 05:20:11.000000000 +0200
+++ d2x-rebirth-0.58.1/debian/source/options 1970-01-01 02:00:00.000000000 +0200
@@ -1 +0,0 @@
-compression = "xz"
