widelands-dev team mailing list archive

[Hans Joachim Desserud <launchpad@xxxxxxxxxxxx>]

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

Requested reviews:
  Widelands Developers (widelands-dev)

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

Merged with the Debian packaging of build18.

>From the previous merge I did (r10), most of those changes was picked up/tweaked by the offical package. The only two changes still remaining is adjusting the depencies for boost and some font packages which doesn't exist on older releases. Apart from that, it is straight synced from the Debian repo.

As the last time, I've smoketested the packages across Ubuntu 12.04, 12.10. 13.10 and Trusty (upcoming 14.04) making sure it is buildable/runnable.
-- 
https://code.launchpad.net/~hjd/widelands/debian-b18/+merge/208464
Your team Widelands Developers is requested to review the proposed merge of lp:~hjd/widelands/debian-b18 into lp:~widelands-dev/widelands/debian.

=== modified file 'debian/changelog'
--- debian/changelog	2014-02-15 13:00:44 +0000
+++ debian/changelog	2014-02-26 19:58:21 +0000
@@ -1,3 +1,29 @@
+widelands (1:18-1) unstable; urgency=medium
+
+  * New upstream release. Upstream changes:
+    - Seafaring enhancements: expeditions and colonization.
+    - Eviction of workers from production sites.
+    - Soldier preference selection in military sites.
+    - Better in-game stock charts with new information.
+    - New maps, sounds, music, graphics & animations.
+    - On demand loading of graphics improves startup time.
+    - Better performance: Widelands needs less CPU and memory.
+  * Only use system-wide fonts if they exist (portability for older
+    systems).
+
+ -- Martin Quinson <mquinson@xxxxxxxxxx>  Sun, 23 Feb 2014 21:45:49 +0100
+
+widelands (1:18~rc1-3) unstable; urgency=medium
+
+  [Hans Joachim Desserud]
+  * Drop buildep on libboost-signals-dev: signal2 are within boost now
+  * Bump buildep to libglew1.6-dev, fallback on versionless libglew-dev
+
+  [Martin Quinson]
+  * d/watch: point on launchpad instead of sourceforge (at least)
+
+ -- Martin Quinson <mquinson@xxxxxxxxxx>  Thu, 20 Feb 2014 21:58:26 +0100
+
 widelands (1:18~rc1-2) unstable; urgency=medium
 
   * Rework the kfreebsd patch to fix the FTBFS [Teppo Maenpaa]

=== modified file 'debian/control'
--- debian/control	2014-02-26 19:46:37 +0000
+++ debian/control	2014-02-26 19:58:21 +0000
@@ -19,7 +19,7 @@
   cmake, 
   imagemagick,
   liblua5.1-dev, 
-  libglew-dev, 
+  libglew1.6-dev | libglew-dev,
   libpng-dev, 
   zlib1g-dev
 Vcs-Git: git://git.debian.org/git/pkg-games/widelands.git

=== modified file 'debian/rules'
--- debian/rules	2014-02-17 18:25:57 +0000
+++ debian/rules	2014-02-26 19:58:21 +0000
@@ -37,29 +37,30 @@
 	done
 	# Damn, widelands does not use the standard name of fonts, 
 	# but removes the hyphen (-) from those names
-	# Note! Don't replace the dejavu font files with symlinks because the paths doesn't exist on Ubuntu 12.04 :(
-	#for hyphen in \
-	#  DejaVuSans-BoldOblique.ttf \
-	#  DejaVuSans-Bold.ttf \
-	#  DejaVuSansCondensed-Bold.ttf \
-	#  DejaVuSansCondensed.ttf \
-	#  DejaVuSans-ExtraLight.ttf \
-	#  DejaVuSansMono-Bold.ttf \
-	#  DejaVuSansMono.ttf \
-	#  DejaVuSans.ttf \
-	#  DejaVuSerif-BoldItalic.ttf \
-	#  DejaVuSerif-Bold.ttf \
-	#  DejaVuSerifCondensed-BoldItalic.ttf \
-	#  DejaVuSerifCondensed-Bold.ttf \
-	#  DejaVuSerifCondensed-Italic.ttf \
-	#  DejaVuSerifCondensed.ttf \
-	#  DejaVuSerif-Italic.ttf \
-	#  DejaVuSerif.ttf \
-	#  ; do \
-	#  ttf=`echo $$hyphen | sed 's/-//'` ; \
-	#  rm debian/tmp/usr/share/games/widelands/fonts/$$ttf; \
-	#  (cd debian/tmp/usr/share/games/widelands/fonts/; ln -s /usr/share/fonts/truetype/dejavu/$$hyphen $$ttf) ;\
-	#done
+	for hyphen in \
+	  DejaVuSans-BoldOblique.ttf \
+	  DejaVuSans-Bold.ttf \
+	  DejaVuSansCondensed-Bold.ttf \
+	  DejaVuSansCondensed.ttf \
+	  DejaVuSans-ExtraLight.ttf \
+	  DejaVuSansMono-Bold.ttf \
+	  DejaVuSansMono.ttf \
+	  DejaVuSans.ttf \
+	  DejaVuSerif-BoldItalic.ttf \
+	  DejaVuSerif-Bold.ttf \
+	  DejaVuSerifCondensed-BoldItalic.ttf \
+	  DejaVuSerifCondensed-Bold.ttf \
+	  DejaVuSerifCondensed-Italic.ttf \
+	  DejaVuSerifCondensed.ttf \
+	  DejaVuSerif-Italic.ttf \
+	  DejaVuSerif.ttf \
+	  ; do \
+	  ttf=`echo $$hyphen | sed 's/-//'` ; \
+	  if [ -e /usr/share/fonts/truetype/dejavu/$$hyphen ]; then \
+	    rm debian/tmp/usr/share/games/widelands/fonts/$$ttf; \
+	    (cd debian/tmp/usr/share/games/widelands/fonts/; ln -s /usr/share/fonts/truetype/dejavu/$$hyphen $$ttf) ;\
+	  fi; \
+	done
 	rm debian/tmp/usr/share/games/widelands/fonts/Widelands/LICENSE
 	# Take care of the logo
 	for size in 16 32 48 64 128 ; do \

=== modified file 'debian/watch'
--- debian/watch	2012-04-07 17:00:40 +0000
+++ debian/watch	2014-02-26 19:58:21 +0000
@@ -2,5 +2,6 @@
 # uscan --watchfile debian/watch --upstream-version 0.0.1 --package widelands
 #
 version=3
-opts="uversionmangle=s/^/build/,uversionmangle=s/rc$/~rc/" \
-  http://sf.net/widelands/widelands-build-(.+)-source.tar.bz2
+opts="uversionmangle=s/^/build/,uversionmangle=s/-rc$/~rc/,dversionmangle=s/^1://" \
+https://launchpad.net/widelands/+download https://launchpad.net/widelands/.*/widelands-(.*)-src\.tar\.bz2
+