widelands-dev team mailing list archive

[Hans Joachim Desserud <launchpad@xxxxxxxxxxxx>]

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

Requested reviews:
  Widelands Developers (widelands-dev)

For more details, see:
https://code.launchpad.net/~hjd/widelands/merge-19-2/+merge/312742

Merge packaging of 1:19+repack-2 from Debian.

Really consists of updating the changelog, since the only change was using the same desktop file as us to fix the icon path.
-- 
Your team Widelands Developers is requested to review the proposed merge of lp:~hjd/widelands/merge-19-2 into lp:widelands.

=== modified file 'debian/changelog'
--- debian/changelog	2016-12-01 17:28:58 +0000
+++ debian/changelog	2016-12-07 20:04:59 +0000
@@ -1,3 +1,36 @@
+widelands (1:19+repack-2widelands1) UNRELEASED; urgency=medium
+
+  * Merged Debian packaging of Widelands 1:19+repack-2. Remaining changes:
+    - 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:
+        system-wide_minizip
+          (Should be included in trunk once we iron out the remaining bugs)
+        mips_gcc_ICE_with-03
+        s390_new_architecture
+          (Build 19 built successfully on mips and s390x, so removed these
+          patches. They were already commented out in Debian)
+    - 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
+    - Try to install appdata file in regular package instead of the -data one.
+      Though neither seem to work :(
+
+ -- Widelands <widelands-dev@xxxxxxxxxxxxxxxxxxx>  Wed, 07 Dec 2016 20:14:05 +0100
+
+widelands (1:19+repack-2) unstable; urgency=medium
+
+  * Pick a new desktop file from upstream, mainly to fix the icon path.
+
+ -- Martin Quinson <mquinson@xxxxxxxxxx>  Sun, 04 Dec 2016 21:42:21 +0100
+
 widelands (1:19+repack-1widelands1) UNRELEASED; urgency=medium
 
   * Merged Debian packaging of Widelands 1:19+repack-1. Remaining changes: