Skip to content

Instantly share code, notes, and snippets.

Show Gist options
  • Save matthijskooijman/c2a33827ea47c97eb497c3665cf1a71e to your computer and use it in GitHub Desktop.
Save matthijskooijman/c2a33827ea47c97eb497c3665cf1a71e to your computer and use it in GitHub Desktop.
diff -Nru grfcodec-6.0.6/debian/changelog grfcodec-6.0.6/debian/changelog
--- grfcodec-6.0.6/debian/changelog 2018-05-10 21:42:34.000000000 +0200
+++ grfcodec-6.0.6/debian/changelog 2019-03-12 21:36:07.000000000 +0100
@@ -1,3 +1,19 @@
+grfcodec (6.0.6-3) unstable; urgency=medium
+
+ [ Jordi Mallach ]
+ * [bc95db0] Force build to abort upon endian_check.cpp build failure.
+ Thanks to Helmut Grohne for suggesting this fix (Closes: #922625)
+ * [63c5aa0] Move M-A field to binary section.
+ * [f5127a0] Set Rules-Requires-Root: no.
+
+ [ Matthijs Kooijman ]
+ * [deddf2c] Support DEB_BUILD_OPTIONS=terse
+
+ [ Jordi Mallach ]
+ * [bbf8958] Update Standards-Version to 4.3.0.
+
+ -- Matthijs Kooijman <matthijs@stdin.nl> Tue, 12 Mar 2019 21:36:07 +0100
+
grfcodec (6.0.6-2) unstable; urgency=medium
* [4dce67c] Bump debhelper version to v11
diff -Nru grfcodec-6.0.6/debian/control grfcodec-6.0.6/debian/control
--- grfcodec-6.0.6/debian/control 2018-05-10 21:42:34.000000000 +0200
+++ grfcodec-6.0.6/debian/control 2019-03-12 21:36:07.000000000 +0100
@@ -4,17 +4,18 @@
Maintainer: Matthijs Kooijman <matthijs@stdin.nl>
Uploaders: Jordi Mallach <jordi@debian.org>
Build-Depends: debhelper (>= 11), libboost-dev, libpng-dev, dpkg-dev (>=1.16.1)
-Standards-Version: 4.1.4
-Multi-Arch: foreign
+Standards-Version: 4.3.0
Vcs-Browser: https://salsa.debian.org/openttd-team/grfcodec
Vcs-Git: https://salsa.debian.org/openttd-team/grfcodec.git
Homepage: http://dev.openttdcoop.org/projects/grfcodec
+Rules-Requires-Root: no
Package: grfcodec
Architecture: any
Depends: ${shlibs:Depends}, ${misc:Depends}
Replaces: nforenum
Conflicts: nforenum
+Multi-Arch: foreign
Description: suite of programs to modify Transport Tycoon Deluxe's GRF files
This package provides the grfcodec, grfdiff, grfmerge and nforenum commands
which can be used to work with the GRF used by the Transport Tycoon Deluxe,
diff -Nru grfcodec-6.0.6/debian/patches/endian_check_cpp_abort_on_ftbfs.patch grfcodec-6.0.6/debian/patches/endian_check_cpp_abort_on_ftbfs.patch
--- grfcodec-6.0.6/debian/patches/endian_check_cpp_abort_on_ftbfs.patch 1970-01-01 01:00:00.000000000 +0100
+++ grfcodec-6.0.6/debian/patches/endian_check_cpp_abort_on_ftbfs.patch 2019-03-12 21:36:07.000000000 +0100
@@ -0,0 +1,13 @@
+Index: grfcodec/Makefile
+===================================================================
+--- grfcodec.orig/Makefile
++++ grfcodec/Makefile
+@@ -213,7 +213,7 @@ objs/$(ENDIAN_CHECK): src/endian_check.c
+
+ src/endian.h: objs/$(ENDIAN_CHECK)
+ $(_E) [ENDIAN] Determining endianness
+- $(_C)objs/$(ENDIAN_CHECK) $(ENDIAN_PARAMS) > src/endian.h || rm src/endian.h
++ $(_C)objs/$(ENDIAN_CHECK) $(ENDIAN_PARAMS) > src/endian.h || { rm src/endian.h; exit 1; }
+
+ FORCE:
+ %_r: FORCE
diff -Nru grfcodec-6.0.6/debian/patches/series grfcodec-6.0.6/debian/patches/series
--- grfcodec-6.0.6/debian/patches/series 2018-05-10 21:42:34.000000000 +0200
+++ grfcodec-6.0.6/debian/patches/series 2019-03-12 21:36:07.000000000 +0100
@@ -1 +1,2 @@
# Series of quilt patches
+endian_check_cpp_abort_on_ftbfs.patch
diff -Nru grfcodec-6.0.6/debian/rules grfcodec-6.0.6/debian/rules
--- grfcodec-6.0.6/debian/rules 2018-05-10 21:42:34.000000000 +0200
+++ grfcodec-6.0.6/debian/rules 2019-03-12 21:36:07.000000000 +0100
@@ -29,7 +29,9 @@
echo "UPX=" >> Makefile.local
echo "DO_NOT_INSTALL_CHANGELOG=1" >> Makefile.local
echo "DO_NOT_INSTALL_LICENSE=1" >> Makefile.local
+ifeq (,$(filter terse,$(DEB_BUILD_OPTIONS)))
echo "V=1" >> Makefile.local
+endif
echo "CXXFLAGS=$(CXXFLAGS) $(CPPFLAGS)" >> Makefile.local
echo "LDOPT=$(LDFLAGS)" >> Makefile.local
echo "prefix=/usr" >> Makefile.local
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment