widelands-dev team mailing list archive

[Hans Joachim Desserud <launchpad@xxxxxxxxxxxx>]

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

Requested reviews:
  Widelands Developers (widelands-dev)

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

Updated the debian packaging, removed the path options which doesn't exist anymore and updated the paths we still have.

There is one unexpected consequence of this and that is that wl_map_info and wl_render_richtext will now be installed as part of the widelands package. They didn't used to be included and I'm not sure if they need to. An alternative would be to simply delete them. (I tried simply ignoring them, but the packaging process (rightfully) complains if left over files still exists when I'm done).

I have to admit I don't know why they suddenly show up, and the weird thing is that they did in the build based on r7228 which is before I touched BINDIR. 

(This is the packaging-half of this patch, the other part is Widelands itself. We will need both merged for the PPA to continue working. See https://code.launchpad.net/~widelands-dev/widelands/reducing-paths/+merge/239645 for the other half)
-- 
https://code.launchpad.net/~hjd/widelands/debian-reduce-paths/+merge/239646
Your team Widelands Developers is requested to review the proposed merge of lp:~hjd/widelands/debian-reduce-paths into lp:~widelands-dev/widelands/debian.

=== modified file 'debian/rules'
--- debian/rules	2014-10-19 10:55:07 +0000
+++ debian/rules	2014-10-25 17:22:19 +0000
@@ -14,12 +14,9 @@
 	CFLAGS="$(CFLAGS)" LDFLAGS="$(LDFLAGS)" CPPFLAGS="$(CPPFLAGS)" CXXFLAGS="$(CXXFLAGS)" \
 	  dh_auto_configure -Scmake -- \
 		-DWL_PATHS_ARE_ABSOLUTE="true" \
-		-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 \
+		-DWL_INSTALL_DATADIR=/usr/share/games/widelands \
 		-DCMAKE_BUILD_TYPE=Release 
+		# -DCMAKE_INSTALL_PREFIX=/usr/games \
 
 override_dh_strip:
 	dh_strip --dbg-package=widelands-dbg

=== modified file 'debian/widelands.install'
--- debian/widelands.install	2014-03-11 20:57:31 +0000
+++ debian/widelands.install	2014-10-25 17:22:19 +0000
@@ -1,3 +1,5 @@
-usr/games
+usr/widelands usr/games
+usr/wl_map_info usr/games
+usr/wl_render_richtext usr/games
 usr/share/applications
-usr/share/icons
\ No newline at end of file
+usr/share/icons