widelands-dev team mailing list archive

[Hans Joachim Desserud <launchpad@xxxxxxxxxxxx>]

Hans Joachim Desserud has proposed merging lp:~hjd/widelands/debian-merge into lp:widelands.

Requested reviews:
  Widelands Developers (widelands-dev)

For more details, see:
https://code.launchpad.net/~hjd/widelands/debian-merge/+merge/329686

Merged in the lastet packaging changes, after Debian picked up the GCC7-patch and some other various changes.

Built successfully for all currently supported Ubuntu versions in my PPA (https://code.launchpad.net/~hjd/+recipe/widelands-test). I tested it by installing on 14.04 and artful and verifying that I could start a new game, so it works on the oldest and newest version.


PS. Rather unrelated, I see that the daily builds PPA (https://code.launchpad.net/~widelands-dev/+recipe/widelands-daily) still list Yakkety (16.10) which has reached End of Life among the targeted releases. I think the builds for yakkety can be disabled (Launchpad doesn't seem to build for it anymore either way), and the old yakkety binaries deleted. 

The main reason I mention this is that while I'm not completely gone, my contributions to Widelands are a bit more sporadic these days. And I might be the main person updating the PPA by adding or removing releases as Ubuntu starts a new development sprint or a release reaches End of Life. At least I seem to remember doing all the last updates of this list (let me know if this is just my impression :) ). It doesn't change often, yakkety reached End of Life in July and in October there will be a new development version of Ubuntu to target. I'd probably get round to doing these updates, but it might take some time so it would be great if someone else could keep an eye on the PPA from time to time as well. 
-- 
Your team Widelands Developers is requested to review the proposed merge of lp:~hjd/widelands/debian-merge into lp:widelands.

=== modified file 'debian/changelog'
--- debian/changelog	2017-06-27 16:49:41 +0000
+++ debian/changelog	2017-08-27 10:07:40 +0000
@@ -1,3 +1,51 @@
+widelands (1:19+repack-4widelands1) UNRELEASED; urgency=medium
+
+  * Changed build dependencies:
+      - New build dependencies required:
+        libboost-system-dev
+      - No longer needed;
+        libsdl2-net-dev
+      - Also dropped version-specific glew alternative.
+        1.6 doesn't seem to be around anymore and the versionless one
+        seems to work across the different distro releases we build for
+  * Merged Debian packaging of Widelands 1:19+repack-4. Remaining changes:
+    - Revert debhelper/compat level to 9. (Ubuntu 14.04 doesn't have debhelper 10.)
+    - Disabled all Debian-patches since applying them might cause conflicts as
+      development moves along in latest trunk. They mostly concern
+      architectures which we don't have access to build/test with normally, so
+      they would be hard to maintain.
+    - Dropped patches:
+        gcc7 
+          (Already applied in trunk)
+        system-wide_minizip
+          (Should be included in trunk once we iron out the remaining bugs)
+    - Build using embedded minizip since we support older Ubuntu releases where
+      the package is not available.
+    - .stub-files to make widelands.desktop and appdata localizable.
+    - Additional translations for appdata and desktop file.
+    - Re-added font entries to copyright file, since we will most likely be using
+      the embedded fonts.
+    - Modified rules to use our embedded fonts and install all binaries.
+    - Comment out get-orig-source. We just want to build current trunk
+
+ -- Widelands <widelands-dev@xxxxxxxxxxxxxxxxxxx>  Sat, 26 Aug 2017 11:14:47 +0200
+
+widelands (1:19+repack-4) unstable; urgency=medium
+
+  * Team upload.
+  * Remove empty gbp.conf file.
+  * Switch to compat level 10.
+  * Declare compliance with Debian Policy 4.1.0.
+  * Vcs-Browser: Use canonical Vcs-URI.
+  * Do not convert png files to xpm anymore. Drop imagemagick from B-D.
+  * Move font dependencies from widelands to widelands-data. (Closes: #861043)
+  * Add gcc7.patch and fix FTBFS with GCC 7. (Closes: #871114)
+  * Drop -dbg package and use the automatically provided -dbgsym package
+    instead.
+  * Install appdata file into canonical /usr/share/metainfo directory.
+
+ -- Markus Koschany <apo@xxxxxxxxxx>  Thu, 24 Aug 2017 00:05:16 +0200
+
 widelands (1:19+repack-3widelands1) UNRELEASED; urgency=medium
 
   * Changed build dependencies:
@@ -33,7 +81,7 @@
 
   * Pick a new appdata file from upstream, so that widelands appears
     back in the software center.
-  * Fix path to amiri-font (Closes: #845660) 
+  * Fix path to amiri-font (Closes: #845660)
     Thanks to eingousef for the report and Nobuhiro Ban for the patch.
   * Forget commented patches: they are actually useless now.
 
@@ -221,7 +269,7 @@
 widelands (1:18~rc1-1) unstable; urgency=medium
 
   * New upstream release (release candidate)
-    - Update our patches, drop the ones that were integrated upstream 
+    - Update our patches, drop the ones that were integrated upstream
       (gcc4.7, Werror, boost-linking-4.7)
     - The following bugs were fixed upstream (Closes: #668894, #678310)
   * d/control: Move build-deps to boost 1.54
@@ -278,7 +326,7 @@
 
   * new upstream release
   * disable patches/s390
-  * debian/rules: use && istead of ; so that failures are reported correctly 
+  * debian/rules: use && istead of ; so that failures are reported correctly
   * we go to experimental to see if s390 is happy and not to disturb
     transitions for libpng15 and boost
 
@@ -314,9 +362,9 @@
 
 widelands (1:16~rc1-1) unstable; urgency=low
 
-  * New upsteram release candidate 
-  * Updated Standards-Version to 3.9.1, no changes required 
-  * Removed patches/secfix-617960 since part of the new release 
+  * New upsteram release candidate
+  * Updated Standards-Version to 3.9.1, no changes required
+  * Removed patches/secfix-617960 since part of the new release
   * Do not override widelands version number in debian/rules
 
  -- Enrico Tassi <gareuselesinge@xxxxxxxxxx>  Wed, 06 Apr 2011 10:02:21 +0200
@@ -339,7 +387,7 @@
 widelands (1:15-1) unstable; urgency=low
 
   * New upstream release
-  * source format 3.0 (quilt) 
+  * source format 3.0 (quilt)
 
  -- Enrico Tassi <gareuselesinge@xxxxxxxxxx>  Sat, 17 Apr 2010 16:43:43 +0200
 
@@ -351,8 +399,8 @@
 
 widelands (1:15~rc1-2) unstable; urgency=low
 
-  * fix typo in package description, thanks Erik Esterer (Closes: #566267) 
-  * fixed paths passed to cmake, locale are working (Closes: #472406) 
+  * fix typo in package description, thanks Erik Esterer (Closes: #566267)
+  * fixed paths passed to cmake, locale are working (Closes: #472406)
 
  -- Enrico Tassi <gareuselesinge@xxxxxxxxxx>  Wed, 17 Mar 2010 22:28:04 +0100
 
@@ -362,7 +410,7 @@
   * new build-dependencies over lua5.1 and cmake
   * all debian/patches were obsolete and are thus have been removed
   * switched from CDBS to dh
-  * standard versions to 3.8.4, no changes 
+  * standard versions to 3.8.4, no changes
   * get rid of duplicate fonts in ttf-freefont, install symlinks instead
 
  -- Enrico Tassi <gareuselesinge@xxxxxxxxxx>  Tue, 16 Mar 2010 20:34:24 +0100
@@ -370,7 +418,7 @@
 widelands (1:14-3) unstable; urgency=low
 
   * more prcise build-depends to ease backporting, thanks Romain Chantereau
-    (Closes: #546840) 
+    (Closes: #546840)
 
  -- Enrico Tassi <gareuselesinge@xxxxxxxxxx>  Mon, 12 Oct 2009 22:24:26 +0200
 
@@ -428,8 +476,8 @@
 
 widelands (1:13~3230-1) experimental; urgency=low
 
-  * Svn snapshot with many bugfixes, most notably the game is not using 
-    100% of CPU time anymore (Closes: #370528) 
+  * Svn snapshot with many bugfixes, most notably the game is not using
+    100% of CPU time anymore (Closes: #370528)
 
  -- Enrico Tassi <gareuselesinge@xxxxxxxxxx>  Thu, 31 Jul 2008 09:29:23 +0200
 
@@ -482,7 +530,7 @@
   * versions must be strictly increasing, thus use epoch 1 to make
     11 greater than build10
   * Standards-Version bumped to 3.7.3, no modifications needed
-  * debian/ directory put under vcs on svn.d.o/collab-maint 
+  * debian/ directory put under vcs on svn.d.o/collab-maint
 
  -- Enrico Tassi <gareuselesinge@xxxxxxxxxx>  Sat, 19 Jan 2008 17:02:26 +0100
 
@@ -497,11 +545,11 @@
       Forwarded upstream and solved at some point.
     - closes #345386: --coredump option use is not intuitive.
       Was marked fixed-upstream in debian since a while
-    - The building mecanism was completely changed upstream. 
+    - The building mecanism was completely changed upstream.
       Completely redo the packaging.
   * Drop the most of the patches since they were integrated upstream.
     Only locale is still there, but this is because upstream hardcoded
-    a path in the game...    
+    a path in the game...
 
  -- Martin Quinson <mquinson@xxxxxxxxxx>  Wed, 21 Mar 2007 10:11:56 +0100
 
@@ -590,10 +638,10 @@
       road are more expensive and thus less taken
     - lowering_requested_soldiers [Nanne Wams] (bug fix)
     - Fisher_run_mine_bug_1196918 [Ted Carlson] (bug fix)
-  * Debian packaging: 
+  * Debian packaging:
     - let -data depend on ttf-bitstream-vera which provide the Vera.ttf
       font, and don't include our own copy (Closes: #302054)
-    
+
  -- Martin Quinson <mquinson@xxxxxxxxxx>  Sun,  20 Dec 2005 11:17:27 +0200
 
 widelands (build9-7) unstable; urgency=low
@@ -650,7 +698,7 @@
   * New upstream release.
   * Remove the Knights.ttf font for licencing reasons (Thanks to Josh
     Triplett for noticing and sorry for not having checked myself).
-    Vera.ttf is used instead, as done upstream. 
+    Vera.ttf is used instead, as done upstream.
     (Closes: #289750)
   * Add patch to port to AMD64 from Andreas Jochens (Thanks!).
     (Closes: #289678)
@@ -693,7 +741,7 @@
   * Fix a typo in postinst (s/urge/purge)
   * Rename {menu,postinst,postrm} to widelands.{menu,postinst,postrm} since
     we build more than one package.
-    
+
   [Martin Quinson]
   * Fix the versionning scheme. This is not a native package.
 

=== modified file 'debian/control'
--- debian/control	2017-06-27 16:49:41 +0000
+++ debian/control	2017-08-27 10:07:40 +0000
@@ -2,39 +2,51 @@
 Section: games
 Priority: extra
 Maintainer: Debian Games Team <pkg-games-devel@xxxxxxxxxxxxxxxxxxxxxxx>
-Uploaders: 
+Uploaders:
   Martin Quinson <mquinson@xxxxxxxxxx>,
-  Enrico Tassi <gareuselesinge@xxxxxxxxxx> 
+  Enrico Tassi <gareuselesinge@xxxxxxxxxx>
 Standards-Version: 3.9.8
-Build-Depends: debhelper (>= 9), 
-  cmake, 
-  doxygen, 
-  imagemagick,
-# This package isn't available in older Ubuntu releases.
-# As long as we support 14.04, we build using the embedded one.
+Build-Depends: debhelper (>= 9),
+  cmake,
+  doxygen,
+#  This package isn't available in older Ubuntu releases.
+#  As long as we support 14.04, we build using the embedded one.
 #  libminizip-dev,
-  libboost-dev, 
-  libboost-regex-dev, 
-  libboost-system-dev, 
-  libboost-test-dev, 
+  libboost-dev,
+  libboost-regex-dev,
+  libboost-system-dev,
+  libboost-test-dev,
   libglew-dev,
-  libpng-dev, 
-  libsdl2-dev, 
-  libsdl2-image-dev, 
-  libsdl2-mixer-dev, 
-  libsdl2-ttf-dev, 
+  libpng-dev,
+  libsdl2-dev,
+  libsdl2-image-dev,
+  libsdl2-mixer-dev,
+  libsdl2-ttf-dev,
   python,
   zlib1g-dev
 Vcs-Git: https://anonscm.debian.org/git/pkg-games/widelands.git
-Vcs-Browser: https://anonscm.debian.org/gitweb/?p=pkg-games/widelands.git
+Vcs-Browser: https://anonscm.debian.org/git/pkg-games/widelands.git
 #Vcs-Svn: svn://svn.debian.org/svn/collab-maint/deb-maint/widelands/ <-- Location of old packaging
 Homepage: http://www.widelands.org/
 
 Package: widelands
 Architecture: any
-Depends: widelands-data (= ${source:Version}), 
-  ${shlibs:Depends}, 
-  ${misc:Depends}, 
+Depends: widelands-data (= ${source:Version}),
+  ${shlibs:Depends},
+  ${misc:Depends},
+Description: fantasy real-time strategy game
+ Widelands is a strategy game aiming for gameplay similar to Settlers II by
+ BlueByte.
+ .
+ In this game, you start out on a small piece of land with nothing more than
+ a few of useful resources. Using those, you can build yourself an empire
+ with many thousands of inhabitants. On your way towards this goal, you will
+ have to build up an economic infrastructure, explore the lands around you
+ and face enemies who are trying to rule the world just like you do.
+
+Package: widelands-data
+Architecture: all
+Depends: fonts-freefont-ttf,
   fonts-freefont-ttf,
   fonts-dejavu-core,
   fonts-dejavu-extra,
@@ -42,19 +54,6 @@
   fonts-lklug-sinhala,
   fonts-nakula,
   fonts-wqy-microhei,
-Description: fantasy real-time strategy game
- Widelands is a strategy game aiming for gameplay similar to Settlers II by
- BlueByte.
- .
- In this game, you start out on a small piece of land with nothing more than
- a few of useful resources. Using those, you can build yourself an empire
- with many thousands of inhabitants. On your way towards this goal, you will
- have to build up an economic infrastructure, explore the lands around you
- and face enemies who are trying to rule the world just like you do.
-
-Package: widelands-data
-Architecture: all
-Depends: fonts-freefont-ttf,
   ${misc:Depends}
 Description: fantasy real-time strategy game (data files)
  This package contains the graphics and levels for Widelands.
@@ -67,15 +66,3 @@
  with many thousands of inhabitants. On your way towards this goal, you will
  have to build up an economic infrastructure, explore the lands around you
  and face enemies who are trying to rule the world just like you do.
-
-Package: widelands-dbg
-Architecture: any
-Section: debug
-Depends: widelands (= ${binary:Version}), 
- ${misc:Depends}
-Description: fantasy real-time strategy game (debug cruft)
- This package contains the debugging symbols associated to widelands.
- .
- If you don't want to debug widelands (nor report bugs against it), you
- don't need it. 
-   

=== removed file 'debian/gbp.conf'
=== modified file 'debian/patches/series'
--- debian/patches/series	2017-03-12 11:22:07 +0000
+++ debian/patches/series	2017-08-27 10:07:40 +0000
@@ -1,3 +1,4 @@
 # system-wide_minizip
 # hurd_PATH_MAX_missing
 # dbg_symbols
+# gcc7.patch

=== modified file 'debian/rules'
--- debian/rules	2017-03-12 11:22:07 +0000
+++ debian/rules	2017-08-27 10:07:40 +0000
@@ -20,9 +20,6 @@
 		-DOPTION_USE_GLBINDING:BOOL=OFF \
 		-DCMAKE_BUILD_TYPE=Release
 
-override_dh_strip:
-	dh_strip --dbg-package=widelands-dbg
-
 override_dh_auto_install:
 	dh_auto_install --parallel
 	mkdir -p debian/tmp/usr/share/applications/
@@ -60,8 +57,6 @@
 	  cp ./debian/tmp/usr/share/games/widelands/data/images/logos/wl-ico-$${size}.png \
 	     debian/tmp/usr/share/icons/hicolor/$${size}x$${size}/apps/widelands.png; \
 	done
-	convert debian/tmp/usr/share/icons/hicolor/32x32/apps/widelands.png \
-	        debian/tmp/usr/share/icons/hicolor/32x32/apps/widelands.xpm
 	# Remove binaries that are not intended for the user (according to SirVer)
 	# We want all binaries for our PPA...
 	# for b in wl_map_info wl_map_object_info wl_render_richtext ; do \
@@ -75,8 +70,8 @@
 	  mv debian/tmp/usr/$${b} debian/tmp/usr/games ;\
 	done
 	# appdata
-	mkdir -p debian/tmp/usr/share/appdata/
-	cp debian/widelands.appdata.xml debian/tmp/usr/share/appdata/
+	mkdir -p debian/tmp/usr/share/metainfo/
+	cp debian/widelands.appdata.xml debian/tmp/usr/share/metainfo/
 
 override_dh_install:
 	dh_install --fail-missing

=== modified file 'debian/widelands-data.install'
--- debian/widelands-data.install	2017-03-12 11:22:07 +0000
+++ debian/widelands-data.install	2017-08-27 10:07:40 +0000
@@ -1,2 +1,1 @@
 usr/share/games
-usr/share/appdata/widelands.appdata.xml

=== modified file 'debian/widelands.6'
--- debian/widelands.6	2016-05-19 16:15:48 +0000
+++ debian/widelands.6	2017-08-27 10:07:40 +0000
@@ -12,7 +12,7 @@
 with many thousands of inhabitants. On your way towards this goal, you will
 have to build up an economic infrastructure, explore the land around you
 and face enemies who are trying to rule the world just like you are.
-     
+
 .SH OPTIONS
 .HP
 \fB\-\-\fR<config\-entry\-name>=value overwrites a config file setting

=== modified file 'debian/widelands.appdata.xml'
--- debian/widelands.appdata.xml	2017-06-28 07:11:18 +0000
+++ debian/widelands.appdata.xml	2017-08-27 10:07:40 +0000
@@ -227,6 +227,7 @@
   <url type="homepage">https://wl.widelands.org/</url>
   <update_contact>widelands-dev_at_lists.launchpad.net</update_contact>
   <releases>
+    <release date="2016-11-11" version="Build 19"/>
     <release date="2014-02-22" version="Build 18"/>
     <release date="2012-04-23" version="Build 17"/>
     <release date="2011-04-15" version="Build 16"/>

=== modified file 'debian/widelands.appdata.xml.stub'
--- debian/widelands.appdata.xml.stub	2017-03-10 12:39:34 +0000
+++ debian/widelands.appdata.xml.stub	2017-08-27 10:07:40 +0000
@@ -31,6 +31,7 @@
   <url type="homepage">https://wl.widelands.org/</url>
   <update_contact>widelands-dev_at_lists.launchpad.net</update_contact>
   <releases>
+    <release date="2016-11-11" version="Build 19"/>
     <release date="2014-02-22" version="Build 18"/>
     <release date="2012-04-23" version="Build 17"/>
     <release date="2011-04-15" version="Build 16"/>

=== modified file 'debian/widelands.install'
--- debian/widelands.install	2017-03-12 11:22:07 +0000
+++ debian/widelands.install	2017-08-27 10:07:40 +0000
@@ -1,3 +1,5 @@
 usr/games
+usr/share/metainfo/widelands.appdata.xml
 usr/share/applications
-usr/share/icons
\ No newline at end of file
+usr/share/icons
+