[freeciv] 01/20: Create a separate package and enable the Qt client

[Markus Koschany]

This is an automated email from the git hooks/post-receive script.

apo-guest pushed a commit to branch experimental
in repository freeciv.

commit ef29694caae1aebdf94b5ab8832657663eddc68a
Author: Markus Koschany <apo at gambaru.de>
Date:   Sun Apr 12 20:42:53 2015 +0200

    Create a separate package and enable the Qt client
    
    Thanks: Reiner Herrmann for the patch.
    Closes: #780926
---
 debian/changelog                           |  6 ++++++
 debian/control                             | 23 +++++++++++++++++++++++
 debian/freeciv-client-qt.install           |  3 +++
 debian/freeciv-client-qt.links             |  1 +
 debian/freeciv-client-qt.lintian-overrides |  3 +++
 debian/freeciv-client-qt.menu              |  5 +++++
 debian/freeciv-client-qt.postinst          | 11 +++++++++++
 debian/freeciv-client-qt.prerm             |  7 +++++++
 debian/rules                               |  4 ++--
 9 files changed, 61 insertions(+), 2 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 2ffa074..afd81db 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+freeciv (2.5.0-1.1) UNRELEASED; urgency=low
+
+  * Added binary package for Qt client.
+
+ -- Reiner Herrmann <reiner at reiner-h.de>  Sat, 21 Mar 2015 21:24:23 +0100
+
 freeciv (2.5.0-1) experimental; urgency=medium
 
   * Imported Upstream version 2.5.0.
diff --git a/debian/control b/debian/control
index a5fd76a..37fb04f 100644
--- a/debian/control
+++ b/debian/control
@@ -33,6 +33,8 @@ Build-Depends:
  libtolua-dev,
  libx11-dev,
  python-minimal,
+ qtbase5-dev,
+ qtbase5-dev-tools,
  x11proto-core-dev,
  zlib1g-dev
 Build-Depends-Indep:
@@ -75,6 +77,27 @@ Description: Civilization turn based strategy game (GTK+ client)
  This is the GTK+ 2 version of Freeciv. It is the most sophisticated and
  recommended client to play the game.
 
+Package: freeciv-client-qt
+Architecture: any
+Depends:
+ freeciv-data (= ${source:Version}),
+ ${misc:Depends},
+ ${shlibs:Depends}
+Recommends:
+ freeciv-server (= ${binary:Version})
+Suggests:
+ freeciv-client-extras,
+ freeciv-sound
+Provides:
+ freeciv,
+ freeciv-client
+Description: Civilization turn based strategy game (Qt client)
+ Freeciv is a free clone of the turn based strategy game Civilization.
+ In this game, each player becomes leader of a civilisation, fighting to
+ obtain the ultimate goal: the extinction of all other civilisations.
+ .
+ This is the Qt version of Freeciv.
+
 Package: freeciv-client-sdl
 Architecture: any
 Depends:
diff --git a/debian/freeciv-client-qt.install b/debian/freeciv-client-qt.install
new file mode 100644
index 0000000..1c24a80
--- /dev/null
+++ b/debian/freeciv-client-qt.install
@@ -0,0 +1,3 @@
+usr/games/freeciv-qt
+usr/share/applications/freeciv-qt.desktop
+usr/share/man/man6/freeciv-qt.6
diff --git a/debian/freeciv-client-qt.links b/debian/freeciv-client-qt.links
new file mode 100644
index 0000000..a28a313
--- /dev/null
+++ b/debian/freeciv-client-qt.links
@@ -0,0 +1 @@
+/usr/share/doc/freeciv-data /usr/share/doc/freeciv-client-qt
diff --git a/debian/freeciv-client-qt.lintian-overrides b/debian/freeciv-client-qt.lintian-overrides
new file mode 100644
index 0000000..58a9179
--- /dev/null
+++ b/debian/freeciv-client-qt.lintian-overrides
@@ -0,0 +1,3 @@
+# The man pages import all information from freeciv-client.6 in freeciv-data
+# Hence this is not a bug
+manpage-has-bad-whatis-entry
diff --git a/debian/freeciv-client-qt.menu b/debian/freeciv-client-qt.menu
new file mode 100644
index 0000000..7327ee2
--- /dev/null
+++ b/debian/freeciv-client-qt.menu
@@ -0,0 +1,5 @@
+?package(freeciv-client-qt):needs="x11" \
+ section="Games/Strategy" \
+ title="Freeciv client (Qt version)" \
+ command="/usr/games/freeciv-qt" \
+ icon="/usr/share/pixmaps/freeciv.xpm"
diff --git a/debian/freeciv-client-qt.postinst b/debian/freeciv-client-qt.postinst
new file mode 100644
index 0000000..7917889
--- /dev/null
+++ b/debian/freeciv-client-qt.postinst
@@ -0,0 +1,11 @@
+#!/bin/sh
+
+set -e
+
+update-alternatives --install /usr/games/freeciv freeciv /usr/games/freeciv-qt 30
+
+if [ -f /usr/share/applications/freeciv.desktop ]; then
+    rm -f /usr/share/applications/freeciv.desktop
+fi
+
+#DEBHELPER#
diff --git a/debian/freeciv-client-qt.prerm b/debian/freeciv-client-qt.prerm
new file mode 100644
index 0000000..334044e
--- /dev/null
+++ b/debian/freeciv-client-qt.prerm
@@ -0,0 +1,7 @@
+#!/bin/sh
+
+set -e
+
+update-alternatives --remove freeciv /usr/games/freeciv-qt
+
+#DEBHELPER#
diff --git a/debian/rules b/debian/rules
index 78207bf..2c8b6c8 100755
--- a/debian/rules
+++ b/debian/rules
@@ -22,7 +22,7 @@ override_dh_auto_configure:
 		--datadir=\$${prefix}/share/games \
 		--bindir=\$${prefix}/games \
 		--enable-debug=no \
-		--enable-client=gtk2,sdl \
+		--enable-client=gtk2,sdl,qt \
 		--enable-fcmp=gtk3 \
 		--with-ggz-server=no \
 		--with-ggz-client=no \
@@ -43,7 +43,6 @@ override_dh_install:
 	# Delete man pages which are unneeded.
 	rm -f debian/tmp/usr/share/man/man6/freeciv-gtk3.6
 	rm -f debian/tmp/usr/share/man/man6/freeciv-xaw.6
-	rm -f debian/tmp/usr/share/man/man6/freeciv-qt.6
 	rm -f debian/tmp/usr/share/man/man6/freeciv-manual.6
 	rm -f debian/tmp/usr/share/man/man6/freeciv-mp-cli.6
 	rm -f debian/tmp/usr/share/man/man6/freeciv-mp-gtk2.6
@@ -71,6 +70,7 @@ override_dh_link:
 	# to freeciv-data's in dh_link
 	-rm -rf debian/freeciv-server/usr/share/doc/freeciv-server
 	-rm -rf debian/freeciv-client-gtk/usr/share/doc/freeciv-client-gtk
+	-rm -rf debian/freeciv-client-qt/usr/share/doc/freeciv-client-qt
 	-rm -rf debian/freeciv-client-sdl/usr/share/doc/freeciv-client-sdl
 	-rm -rf debian/freeciv-client-extras/usr/share/doc/freeciv-client-extras
 	# After deleting we can link correctly

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-games/freeciv.git