[freeciv] 10/20: Revert "Add separate freeciv-client-gtk3 package."

[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 5f3046c1bfd58433e160e4cb29bf2d96e5f4727c
Author: Markus Koschany <apo at gambaru.de>
Date:   Mon Apr 13 14:12:47 2015 +0200

    Revert "Add separate freeciv-client-gtk3 package."
    
    This reverts commit 914e80af7726f4ce0f1906d456b9be00702857fa.
    
    Conflicts:
    	debian/control
---
 debian/control                     | 18 ------------------
 debian/freeciv-client-gtk.menu     |  2 +-
 debian/freeciv-client-gtk3.install |  2 --
 debian/freeciv-client-gtk3.links   |  2 --
 debian/freeciv-client-gtk3.menu    |  5 -----
 debian/rules                       |  3 +--
 6 files changed, 2 insertions(+), 30 deletions(-)

diff --git a/debian/control b/debian/control
index e48ce08..98c7b5d 100644
--- a/debian/control
+++ b/debian/control
@@ -87,24 +87,6 @@ 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-gtk3
-Architecture: any
-Depends:
- freeciv-data (= ${source:Version}),
- ${misc:Depends},
- ${shlibs:Depends}
-Recommends:
- freeciv-server (= ${binary:Version})
-Suggests:
- freeciv-client-extras,
- freeciv-sound
-Description: Civilization turn based strategy game (GTK-3 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 GTK+ 3 version of Freeciv.
-
 Package: freeciv-client-qt
 Architecture: any
 Depends:
diff --git a/debian/freeciv-client-gtk.menu b/debian/freeciv-client-gtk.menu
index cfec7f2..a8d8dce 100644
--- a/debian/freeciv-client-gtk.menu
+++ b/debian/freeciv-client-gtk.menu
@@ -1,5 +1,5 @@
 ?package(freeciv-client-gtk):needs="x11" \
  section="Games/Strategy" \
- title="Freeciv client (GTK-2 version)" \
+ title="Freeciv client (GTK version)" \
  command="/usr/games/freeciv-gtk2" \
  icon="/usr/share/pixmaps/freeciv.xpm"
diff --git a/debian/freeciv-client-gtk3.install b/debian/freeciv-client-gtk3.install
deleted file mode 100644
index 6d24352..0000000
--- a/debian/freeciv-client-gtk3.install
+++ /dev/null
@@ -1,2 +0,0 @@
-usr/games/freeciv-gtk3
-usr/share/applications/freeciv-gtk3.desktop
diff --git a/debian/freeciv-client-gtk3.links b/debian/freeciv-client-gtk3.links
deleted file mode 100644
index 670bed3..0000000
--- a/debian/freeciv-client-gtk3.links
+++ /dev/null
@@ -1,2 +0,0 @@
-/usr/share/doc/freeciv-data /usr/share/doc/freeciv-client-gtk3
-/usr/share/man/man6/freeciv-client.6.gz /usr/share/man/man6/freeciv-gtk3.6.gz
diff --git a/debian/freeciv-client-gtk3.menu b/debian/freeciv-client-gtk3.menu
deleted file mode 100644
index a01377d..0000000
--- a/debian/freeciv-client-gtk3.menu
+++ /dev/null
@@ -1,5 +0,0 @@
-?package(freeciv-client-gtk3):needs="x11" \
- section="Games/Strategy" \
- title="Freeciv client (GTK-3 version)" \
- command="/usr/games/freeciv-gtk3" \
- icon="/usr/share/pixmaps/freeciv.xpm"
diff --git a/debian/rules b/debian/rules
index 307bc7d..4d4ce82 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,gtk3,sdl,qt \
+		--enable-client=gtk2,sdl,qt \
 		--enable-fcmp=gtk3 \
 		--with-ggz-server=no \
 		--with-ggz-client=no \
@@ -73,7 +73,6 @@ 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-gtk/usr/share/doc/freeciv-client-gtk3
 	-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

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