widelands-dev team mailing list archive
-
widelands-dev team
-
Mailing list archive
-
Message #01823
[Merge] lp:~widelands-dev/widelands/debian-merged-b18-3 into lp:~widelands-dev/widelands/debian
Hans Joachim Desserud has proposed merging lp:~widelands-dev/widelands/debian-merged-b18-3 into lp:~widelands-dev/widelands/debian.
Requested reviews:
Widelands Developers (widelands-dev)
For more details, see:
https://code.launchpad.net/~widelands-dev/widelands/debian-merged-b18-3/+merge/210502
Merged version 1:18-3 of the Debian packaging.
We still carry the changes from previous merge and have removed the kfreebsd patch because it didn't like being applied on top of trunk (see https://code.launchpad.net/~hjd/widelands/debian-disable-patch/+merge/210030 for details).
--
https://code.launchpad.net/~widelands-dev/widelands/debian-merged-b18-3/+merge/210502
Your team Widelands Developers is requested to review the proposed merge of lp:~widelands-dev/widelands/debian-merged-b18-3 into lp:~widelands-dev/widelands/debian.
=== modified file 'debian/changelog'
--- debian/changelog 2014-02-25 18:12:33 +0000
+++ debian/changelog 2014-03-11 20:59:21 +0000
@@ -1,3 +1,22 @@
+widelands (1:18-3) unstable; urgency=medium
+
+ Packaging cleanup version only, no user-visible changes.
+
+ * d/rules: massive cleanups to follow the debhelper way of life
+ As a side effect, the package can now build in parallel.
+ * d/rules: don't include another version of GPL-2 text file
+ * d/widelands.6: update the contact information to launchpad
+ * d/patches: various cosmetics before proposing our patches upstream
+
+ -- Martin Quinson <mquinson@xxxxxxxxxx> Tue, 11 Mar 2014 19:09:57 +0100
+
+widelands (1:18-2) unstable; urgency=medium
+
+ * Reduce optimization level to -02 on mips, as "gcc -03" spits ICE.
+ Thanks to Teppo Maenpaa for the hint about how to solve that FTBFS.
+
+ -- Martin Quinson <mquinson@xxxxxxxxxx> Fri, 28 Feb 2014 22:33:11 +0100
+
widelands (1:18-1) unstable; urgency=medium
* New upstream release. Upstream changes:
=== removed file 'debian/patches/PATH_MAX'
--- debian/patches/PATH_MAX 2014-02-15 13:00:44 +0000
+++ debian/patches/PATH_MAX 1970-01-01 00:00:00 +0000
@@ -1,38 +0,0 @@
-Author: Enrico Tassi <gareuselesinge@xxxxxxxxxx>
-Description: define PATH_MAX if not defined (i.e. on hurd)
-
----
- src/io/filesystem/filesystem.cc | 4 ++++
- src/wlapplication.cc | 4 ++++
- 2 files changed, 8 insertions(+)
-
-Index: b/src/io/filesystem/filesystem.cc
-===================================================================
---- a/src/io/filesystem/filesystem.cc
-+++ b/src/io/filesystem/filesystem.cc
-@@ -60,6 +60,10 @@
- #define PATH_MAX MAX_PATH
- #endif
-
-+#ifndef PATH_MAX
-+ #define PATH_MAX 1024
-+#endif
-+
- FileSystem::FileSystem()
- {
- m_root = "";
-Index: b/src/wlapplication.cc
-===================================================================
---- a/src/wlapplication.cc
-+++ b/src/wlapplication.cc
-@@ -92,6 +92,10 @@
- #endif
- #endif
-
-+#ifndef PATH_MAX
-+ #define PATH_MAX 1024
-+#endif
-+
- #define MINIMUM_DISK_SPACE 250000000lu
- #define SCREENSHOT_DIR "screenshots"
-
=== modified file 'debian/patches/dbg_symbols'
--- debian/patches/dbg_symbols 2014-02-15 13:00:44 +0000
+++ debian/patches/dbg_symbols 2014-03-11 20:59:21 +0000
@@ -1,4 +1,5 @@
Description: compile with -g so that the dbg package contains something
+Forwarded-Upstream: n/a (upstream strips dbg symbols on purpose from releases)
---
CMakeLists.txt | 2 +-
@@ -8,7 +9,7 @@
===================================================================
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
-@@ -271,7 +271,7 @@
+@@ -273,7 +273,7 @@
ENDIF (WLBUILD_COMPILERVERSION_REP STREQUAL "4.5.1" OR WLBUILD_COMPILERVERSION_REP STREQUAL "4.5.2")
ENDIF (CMAKE_COMPILER_IS_GNUCXX)
=== added file 'debian/patches/hurd_PATH_MAX_missing'
--- debian/patches/hurd_PATH_MAX_missing 1970-01-01 00:00:00 +0000
+++ debian/patches/hurd_PATH_MAX_missing 2014-03-11 20:59:21 +0000
@@ -0,0 +1,39 @@
+Author: Enrico Tassi <gareuselesinge@xxxxxxxxxx>
+Description: define PATH_MAX if not defined (i.e. on hurd)
+Forwarded-Upstream: should be
+
+---
+ src/io/filesystem/filesystem.cc | 4 ++++
+ src/wlapplication.cc | 4 ++++
+ 2 files changed, 8 insertions(+)
+
+Index: b/src/io/filesystem/filesystem.cc
+===================================================================
+--- a/src/io/filesystem/filesystem.cc
++++ b/src/io/filesystem/filesystem.cc
+@@ -60,6 +60,10 @@
+ #define PATH_MAX MAX_PATH
+ #endif
+
++#ifndef PATH_MAX /* This happens, for example on the Hurd architecture */
++ #define PATH_MAX 1024
++#endif
++
+ FileSystem::FileSystem()
+ {
+ m_root = "";
+Index: b/src/wlapplication.cc
+===================================================================
+--- a/src/wlapplication.cc
++++ b/src/wlapplication.cc
+@@ -92,6 +92,10 @@
+ #endif
+ #endif
+
++#ifndef PATH_MAX /* This happens, for example on the Hurd architecture */
++ #define PATH_MAX 1024
++#endif
++
+ #define MINIMUM_DISK_SPACE 250000000lu
+ #define SCREENSHOT_DIR "screenshots"
+
=== added file 'debian/patches/mips_gcc_ICE_with-03'
--- debian/patches/mips_gcc_ICE_with-03 1970-01-01 00:00:00 +0000
+++ debian/patches/mips_gcc_ICE_with-03 2014-03-11 20:59:21 +0000
@@ -0,0 +1,31 @@
+Description: Set compilation level to -02 on mips (it's -03 by default upstream)
+ .
+ Optimizing further drives gcc nuts and produce ICE.
+ .
+ https://buildd.debian.org/status/fetch.php?pkg=widelands&arch=mips&ver=1%3A18-1&stamp=1393243179
+Author: Martin Quinson
+Forwarded-Upstream: should be
+
+---
+ CMakeLists.txt | 6 ++++--
+ 1 file changed, 4 insertions(+), 2 deletions(-)
+
+Index: b/CMakeLists.txt
+===================================================================
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -264,10 +264,12 @@
+ OUTPUT_VARIABLE WLBUILD_COMPILERVERSION
+ )
+ STRING(REGEX REPLACE ".*(4)\\.(5)\\.([0-9]).*" "\\1.\\2.\\3" WLBUILD_COMPILERVERSION_REP ${WLBUILD_COMPILERVERSION})
+- IF (WLBUILD_COMPILERVERSION_REP STREQUAL "4.5.1" OR WLBUILD_COMPILERVERSION_REP STREQUAL "4.5.2")
+- message("Detected gcc ${WLBUILD_COMPILERVERSION_REP}")
++ IF (WLBUILD_COMPILERVERSION_REP STREQUAL "4.5.1" OR WLBUILD_COMPILERVERSION_REP STREQUAL "4.5.2" OR PROCESSOR_ARCHITECTURE STREQUAL "mips64" OR PROCESSOR_ARCHITECTURE STREQUAL "mips")
++ message("Detected gcc ${WLBUILD_COMPILERVERSION_REP} on ${PROCESSOR_ARCHITECTURE}")
+ message("Suffering from gcc bug, disabling -O3")
+ set (WL_COMPILERFLAG_OPTIMIZATIONS "-O2")
++ else (WLBUILD_COMPILERVERSION_REP STREQUAL "4.5.1" OR WLBUILD_COMPILERVERSION_REP STREQUAL "4.5.2" OR PROCESSOR_ARCHITECTURE STREQUAL "mips64" OR PROCESSOR_ARCHITECTURE STREQUAL "mips")
++ message("Detected architecture: ${PROCESSOR_ARCHITECTURE}")
+ ENDIF (WLBUILD_COMPILERVERSION_REP STREQUAL "4.5.1" OR WLBUILD_COMPILERVERSION_REP STREQUAL "4.5.2")
+ ENDIF (CMAKE_COMPILER_IS_GNUCXX)
+
=== removed file 'debian/patches/s390'
--- debian/patches/s390 2014-02-15 13:00:44 +0000
+++ debian/patches/s390 1970-01-01 00:00:00 +0000
@@ -1,51 +0,0 @@
-Description: Port the game to the s390 architecture
-
----
- src/logic/widelands.h | 20 ++++++++++++++++++++
- 1 file changed, 20 insertions(+)
-
-Index: b/src/logic/widelands.h
-===================================================================
---- a/src/logic/widelands.h
-+++ b/src/logic/widelands.h
-@@ -78,6 +78,13 @@
- {
- assert(I < std::numeric_limits<value_t>::max());
- }
-+#if (defined(__s390__) && !defined(__s390x__))
-+ explicit _Index(uintptr_t const I)
-+ : i(static_cast<value_t>(I))
-+ {
-+ assert(I < std::numeric_limits<value_t>::max());
-+ }
-+#endif
-
- /// For compatibility with old code that use int32_t for building index
- /// and use -1 to indicate invalidity.
-@@ -116,6 +123,17 @@
- value_t i;
- };
-
-+#if (defined(__s390__) && !defined(__s390x__))
-+#define DEFINE_INDEX(NAME) \
-+ struct NAME : public _Index<NAME> { \
-+ NAME(NAME const & other = Null()) : _Index<NAME>(other) {} \
-+ explicit NAME(value_t const I) : _Index<NAME>(I) {} \
-+ explicit NAME(size_t const I) : _Index<NAME>(I) {} \
-+ explicit NAME(int32_t const I) __attribute__((deprecated)); \
-+ explicit NAME(uintptr_t const I) : _Index<NAME>(I) {} \
-+ }; \
-+
-+#else
- #define DEFINE_INDEX(NAME) \
- struct NAME : public Index_<NAME> { \
- NAME(const NAME & other = Null()) : Index_<NAME>(other) {} \
-@@ -124,6 +142,8 @@
- explicit NAME(int32_t const I) __attribute__((deprecated)); \
- }; \
-
-+#endif
-+
- DEFINE_INDEX(Building_Index)
- DEFINE_INDEX(Ware_Index)
-
=== added file 'debian/patches/s390_new_architecture'
--- debian/patches/s390_new_architecture 1970-01-01 00:00:00 +0000
+++ debian/patches/s390_new_architecture 2014-03-11 20:59:21 +0000
@@ -0,0 +1,52 @@
+Description: Port the game to the s390 architecture
+Forwarded-Upstream: should be
+
+---
+ src/logic/widelands.h | 20 ++++++++++++++++++++
+ 1 file changed, 20 insertions(+)
+
+Index: b/src/logic/widelands.h
+===================================================================
+--- a/src/logic/widelands.h
++++ b/src/logic/widelands.h
+@@ -78,6 +78,13 @@
+ {
+ assert(I < std::numeric_limits<value_t>::max());
+ }
++#if (defined(__s390__) && !defined(__s390x__))
++ explicit _Index(uintptr_t const I)
++ : i(static_cast<value_t>(I))
++ {
++ assert(I < std::numeric_limits<value_t>::max());
++ }
++#endif
+
+ /// For compatibility with old code that use int32_t for building index
+ /// and use -1 to indicate invalidity.
+@@ -116,6 +123,17 @@
+ value_t i;
+ };
+
++#if (defined(__s390__) && !defined(__s390x__))
++#define DEFINE_INDEX(NAME) \
++ struct NAME : public _Index<NAME> { \
++ NAME(NAME const & other = Null()) : _Index<NAME>(other) {} \
++ explicit NAME(value_t const I) : _Index<NAME>(I) {} \
++ explicit NAME(size_t const I) : _Index<NAME>(I) {} \
++ explicit NAME(int32_t const I) __attribute__((deprecated)); \
++ explicit NAME(uintptr_t const I) : _Index<NAME>(I) {} \
++ }; \
++
++#else
+ #define DEFINE_INDEX(NAME) \
+ struct NAME : public Index_<NAME> { \
+ NAME(const NAME & other = Null()) : Index_<NAME>(other) {} \
+@@ -124,6 +142,8 @@
+ explicit NAME(int32_t const I) __attribute__((deprecated)); \
+ }; \
+
++#endif /* s390 architecture */
++
+ DEFINE_INDEX(Building_Index)
+ DEFINE_INDEX(Ware_Index)
+
=== modified file 'debian/patches/series'
--- debian/patches/series 2014-03-07 20:01:59 +0000
+++ debian/patches/series 2014-03-11 20:59:21 +0000
@@ -1,4 +1,4 @@
-s390
+mips_gcc_ICE_with-03
+s390_new_architecture
+hurd_PATH_MAX_missing
dbg_symbols
-PATH_MAX
-
=== modified file 'debian/rules'
--- debian/rules 2014-03-10 18:44:00 +0000
+++ debian/rules 2014-03-11 20:59:21 +0000
@@ -7,24 +7,24 @@
LDFLAGS:=$(shell dpkg-buildflags --get LDFLAGS)
%:
- dh $@
+ dh $@ $(DH_ARGS) --parallel --buildsystem=cmake
+
override_dh_auto_configure:
- mkdir -p build-debian
- cd build-debian && cmake \
+ CFLAGS="$(CFLAGS)" LDFLAGS="$(LDFLAGS)" CPPFLAGS="$(CPPFLAGS)" CXXFLAGS="$(CXXFLAGS)" \
+ dh_auto_configure -Scmake -- \
-DWL_INSTALL_PREFIX=/usr \
-DWL_INSTALL_DATADIR=share/games/widelands \
-DWL_INSTALL_BINDIR=games \
-DWL_INSTALL_LOCALEDIR=/usr/share/games/widelands/locale \
-DCMAKE_INSTALL_PREFIX=/usr \
- -DCMAKE_BUILD_TYPE=Release \
- ../ && cat src/config.h
+ -DCMAKE_BUILD_TYPE=Release
-override_dh_auto_build:
- dh_auto_build --parallel
+override_dh_strip:
+ dh_strip --dbg-package=widelands-dbg
override_dh_auto_install:
- cd build-debian && make install DESTDIR=`pwd`/../debian/tmp
+ dh_auto_install --parallel
mkdir -p debian/tmp/usr/share/applications/
cp debian/widelands.desktop debian/tmp/usr/share/applications/
# Take care of the fonts (use system-wide ones)
@@ -59,17 +59,27 @@
fi; \
done
rm debian/tmp/usr/share/games/widelands/fonts/Widelands/LICENSE
+ # Do not include the GPL-2 license file again to keep lintian happy
+ # (but the file is listed from the user interface, so dont kill it completely)
+ # (we cannot patch the user interface because that's in a translated text)
+ if cmp --quiet debian/tmp/usr/share/games/widelands/COPYING /usr/share/common-licenses/GPL-2 ; then \
+ rm debian/tmp/usr/share/games/widelands/COPYING; \
+ cd debian/tmp/usr/share/games/widelands/ ; \
+ ln -s /usr/share/common-licenses/GPL-2 COPYING ; \
+ else \
+ echo "Error: Licence file changed. Please check it out:"; \
+ diff -u debian/tmp/usr/share/games/widelands/COPYING /usr/share/common-licenses/GPL-2; \
+ exit 1; \
+ fi
# Take care of the logo
for size in 16 32 48 64 128 ; do \
- mkdir -p debian/widelands/usr/share/icons/hicolor/$${size}x$${size}/apps ; \
+ mkdir -p debian/tmp/usr/share/icons/hicolor/$${size}x$${size}/apps ; \
cp debian/tmp/usr/share/games/widelands/pics/wl-ico-$${size}.png \
- debian/widelands/usr/share/icons/hicolor/$${size}x$${size}/apps/widelands.png; \
+ debian/tmp/usr/share/icons/hicolor/$${size}x$${size}/apps/widelands.png; \
done
- convert debian/widelands/usr/share/icons/hicolor/32x32/apps/widelands.png \
- debian/widelands/usr/share/icons/hicolor/32x32/apps/widelands.xpm
+ convert debian/tmp/usr/share/icons/hicolor/32x32/apps/widelands.png \
+ debian/tmp/usr/share/icons/hicolor/32x32/apps/widelands.xpm
override_dh_install:
- dh_install --list-missing
+ dh_install --fail-missing
-override_dh_strip:
- dh_strip --dbg-package=widelands-dbg
=== modified file 'debian/widelands.6'
--- debian/widelands.6 2012-04-07 17:00:40 +0000
+++ debian/widelands.6 2014-03-11 20:59:21 +0000
@@ -73,12 +73,17 @@
play in, and you could even create new types of worlds (who says you can't
build a settlement on the moon?).
-.SH "OTHER INFO"
-Bug reports? Suggestions? Check out the project website:
-.IP
-http://www.sourceforge.net/projects/widelands
-.PP
-Hope you enjoy this game!
+.SH "MORE INFORMATION"
+For more information and support you can find the website, the wiki,
+and the forum for quesions or general support at:
+.IP
+http://wl.widelands.org/
+.PP
+You can also find the bug and translations trackers at:
+.IP
+https://launchpad.net/widelands
+.PP
+
.SH AUTHORS
=== modified file 'debian/widelands.install'
--- debian/widelands.install 2012-04-07 17:00:40 +0000
+++ debian/widelands.install 2014-03-11 20:59:21 +0000
@@ -1,2 +1,3 @@
usr/games
usr/share/applications
+usr/share/icons
\ No newline at end of file
Follow ups
