widelands-dev team mailing list archive

[Hans Joachim Desserud <launchpad@xxxxxxxxxxxx>]

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

Requested reviews:
  Widelands Developers (widelands-dev)

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

Pulled in latest changes from the Debian package (version 1:19+repack-3). Some exceptions:

* the desktop and appdata files. There were some differences between these, but I assumed that trunk would have the most recent version.
* The install files. Looks like the Debian package installs appdata in `widelands-data`, while trunk (used to) put it in `widelands`. I see it was briefly mentioned in the changelog as an experiment, but I don't if it is a change which should be kept or if it makes any difference.
-- 
Your team Widelands Developers is requested to review the proposed merge of lp:~hjd/widelands/debian-19-3 into lp:widelands.

=== modified file 'debian/changelog'
--- debian/changelog	2016-12-07 20:00:53 +0000
+++ debian/changelog	2017-03-12 11:36:47 +0000
@@ -1,3 +1,37 @@
+widelands (1:19+repack-3widelands1) UNRELEASED; urgency=medium
+
+
+  * Merged Debian packaging of Widelands 1:19+repack-3. 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)
+    - 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>  Sun, 12 Mar 2017 12:18:30 +0100
+
+widelands (1:19+repack-3) unstable; urgency=medium
+
+  * Pick a new appdata file from upstream, so that widelands appears
+    back in the software center.
+  * 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.
+
+ -- Martin Quinson <mquinson@xxxxxxxxxx>  Sat, 11 Mar 2017 09:14:22 +0100
+
 widelands (1:19+repack-2widelands1) UNRELEASED; urgency=medium
 
   * Merged Debian packaging of Widelands 1:19+repack-2. Remaining changes:

=== modified file 'debian/copyright'
--- debian/copyright	2016-11-20 10:39:36 +0000
+++ debian/copyright	2017-03-12 11:36:47 +0000
@@ -229,7 +229,7 @@
   permissions and limitations under the License.
 
 Files: data/i18n/fonts/*mmrCensus*
-Copyright SIG, http://www.myanmarlanguage.org/site-info/SIG-Myanmar-Language
+Copyright: SIG, http://www.myanmarlanguage.org/site-info/SIG-Myanmar-Language
 License: SIL Open Font License, Version 1.1 (http://scripts.sil.org/OFL)
  PREAMBLE
  The goals of the Open Font License (OFL) are to stimulate worldwide

=== modified file 'debian/patches/series'
--- debian/patches/series	2016-11-20 10:26:55 +0000
+++ debian/patches/series	2017-03-12 11:36:47 +0000
@@ -1,5 +1,3 @@
-# mips_gcc_ICE_with-03
-# s390_new_architecture
 # system-wide_minizip
 # hurd_PATH_MAX_missing
 # dbg_symbols

=== modified file 'debian/rules'
--- debian/rules	2017-03-10 12:39:34 +0000
+++ debian/rules	2017-03-12 11:36:47 +0000
@@ -31,7 +31,7 @@
 	# Not doing so would violate the Debian Policy, preventing the package to enter the official repositories
 	# Skip this part for our packages, since we use the embedded fonts :/
 	# rm -r debian/tmp/usr/share/games/widelands/data/i18n/fonts/amiri
-	# ln -s /usr/share/fonts/opentype/fonts-hosny-amiri debian/tmp/usr/share/games/widelands/data/i18n/fonts
+	# ln -s /usr/share/fonts/opentype/fonts-hosny-amiri debian/tmp/usr/share/games/widelands/data/i18n/fonts/amiri
 	# rm -r debian/tmp/usr/share/games/widelands/data/i18n/fonts/DejaVu
 	# ln -s /usr/share/fonts/truetype/dejavu debian/tmp/usr/share/games/widelands/data/i18n/fonts/DejaVu
 	# rm -r debian/tmp/usr/share/games/widelands/data/i18n/fonts/MicroHei
@@ -68,8 +68,9 @@
 	#  rm debian/tmp/usr/$${b} ;\
 	# done
 	# Move the main binary to the right location (no idea why it's misplaced)
+	mkdir debian/tmp/usr/games
 	# ... but we want to place them in the right location so that the .install files work
-	mkdir debian/tmp/usr/games
+	# mv debian/tmp/usr/widelands debian/tmp/usr/games
 	for b in wl_map_info wl_map_object_info wl_render_richtext widelands ; do \
 	  mv debian/tmp/usr/$${b} debian/tmp/usr/games ;\
 	done
@@ -81,5 +82,5 @@
 	dh_install --fail-missing
 
 # Just build the current trunk, don't replace with any potentially newer versions.
-#get-orig-source:
+# get-orig-source:
 #	uscan --verbose --force-download

=== modified file 'debian/widelands-data.install'
--- debian/widelands-data.install	2016-11-22 19:49:25 +0000
+++ debian/widelands-data.install	2017-03-12 11:36:47 +0000
@@ -1,1 +1,2 @@
 usr/share/games
+usr/share/appdata/widelands.appdata.xml

=== modified file 'debian/widelands.install'
--- debian/widelands.install	2016-11-22 19:49:25 +0000
+++ debian/widelands.install	2017-03-12 11:36:47 +0000
@@ -1,4 +1,3 @@
 usr/games
 usr/share/applications
-usr/share/icons
-usr/share/appdata/widelands.appdata.xml
+usr/share/icons
\ No newline at end of file