[Freeciv-Dev] (PR#2868) debian

["ue80@xxxxxxxxxxxxxxxxxxxxx via RT" <rt@xxxxxxxxxxxxxx>]

Hi,

i tried to get 1.14.0 to work with debian but i didn't work out of the
box.

Following changes should help. Problem is that i don't know whow do do
it correct, but the changes should work.

Thomas
-- 
Thomas Strub  ***  eMail ue80@xxxxxxxxxxxxxxxxxxxxx
Wenn Du nicht programmieren kannst und Dir für Arbeit zu schade bist:
Werde Berater, Analyst oder organisiere Kongresse.

diff -Nur /home/freeciv/freeciv-1.14.0/debian/build.debian 
freeciv-1.14.0/debian/build.debian
--- /home/freeciv/freeciv-1.14.0/debian/build.debian    2002-04-11 
12:14:04.000000000 +0200
+++ freeciv-1.14.0/debian/build.debian  1970-01-01 01:00:00.000000000 +0100
@@ -1,69 +0,0 @@
-#!/bin/sh
-set -e
-
-if [ `whoami` != "root" ]
-then
-       echo "You need to either run this script as root, or run it using the"
-       echo "'fakeroot' utility (as in: \"fakeroot build.debian\")"
-       exit 1
-fi
-
-username=`id -run`
-fninfo="`grep \^$username /etc/passwd|cut -f 5 -d :`"
-realname=${fninfo%%,*}
-if [ -z "$EMAIL" ]
-then
-       defaultemail="$realname <$username@`hostname`>"
-       echo "Please enter your email address, or type ENTER to use 
\"$defaultemail\""
-       echo "You can avoid this query in the future by setting the EMAIL"
-       echo "environment variable to your address."
-       echo -n ">"
-       read EMAIL
-       echo
-       if [ -z "$EMAIL" ]
-       then
-               EMAIL="$defaultemail"
-       fi
-fi
-if echo "$EMAIL" |grep " "
-then
-       # address is OK
-       :
-else
-       EMAIL="$realname <$EMAIL>"
-fi
-
-
-if [ ! -r debian/changelog.save ]
-then
-       cp debian/changelog debian/changelog.save
-fi
-lastversion="`dpkg-parsechangelog -ldebian/changelog.save |grep Version |cut 
-f 2 -d " "`"
-
-MAJOR_VERSION=`awk -F= '$1 == "MAJOR_VERSION" {print $2}' configure.in`
-MINOR_VERSION=`awk -F= '$1 == "MINOR_VERSION" {print $2}' configure.in`
-PATCH_VERSION=`awk -F= '$1 == "PATCH_VERSION" {print $2}' configure.in`
-snapversion="${MAJOR_VERSION}.${MINOR_VERSION}.${PATCH_VERSION}-cvs`date 
+%Y%m%d`"
-
-cat >debian/changelog <<EOF
-freeciv ($snapversion) experimental; urgency=low
-
-  * New upstream release (CVS snapshot)
-
- -- $EMAIL  `822-date`
-
-EOF
-
-cat debian/changelog.save >>debian/changelog
-
-
-echo
-echo "Now let's build it..."
-echo
-
-
-debian/rules binary
-
-echo
-echo "Done, you can now install your newly-compiled snapshot. It is at:"
-ls -l "../freeciv_${snapversion}_`dpkg --print-architecture`.deb"
diff -Nur /home/freeciv/freeciv-1.14.0/debian/changelog 
freeciv-1.14.0/debian/changelog
--- /home/freeciv/freeciv-1.14.0/debian/changelog       2001-06-22 
18:18:41.000000000 +0200
+++ freeciv-1.14.0/debian/changelog     2003-01-20 23:18:31.000000000 +0100
@@ -1,3 +1,67 @@
+freeciv (1.14.0-0.1) unstable; urgency=low
+
+  * Non-Maintainer Upload
+  * New upstream version
+  * Update the client packages to depend on freeciv >= 1.14.
+  
+ -- Thomas Strub <ue80@xxxxxxxxxxxxxxxxxxxxx>  Mon, 20 Jan 2003 20:29:36 +0100
+
+freeciv (1.13.0-0.1) unstable; urgency=low
+
+  * Non-Maintainer Upload, after trying to contact Jules with no luck.
+  * This release was cooked up by Filip Van Raemdonck and Jordi Mallach,
+    in an amazing lesson of cooperation.
+  * New upstream version, which works with online servers (closes: #154329).
+  * Correct the description (closes: #124640).
+  * Install the upstream changelog only once (closes: #140618).
+  * Remove the emacs variables from this changelog.
+  * Remove the debian/obsolete/ directory.
+  * Build with GTK+ 2.0. This means gdk-imlib-dev is no longer needed. Update
+    Build-Depends:.
+    Remove unneeded include of gdk_imlib.h.
+  * Update Standards-Version:.
+  * Update the client packages to depend on freeciv >= 1.13.
+  * Set DH_COMPAT=3 to allow globbing for doc/*.
+    Install the server and data files into debian/freeciv/ since compatibility
+    level 3 expects them there.
+    Use dh_installman instead of dh_installmanpages.
+  * Don't install HOWTOPLAY into the freeciv package twice.
+  * The repeated sentence has been fixed in this version (closes: #108385).
+  * Fixes and additions for the .desktop file (closes: #153413).
+  * Compress game scenarios (closes: #113499).
+  * Not applying patch in #153018, letting Jules decide. I (Jordi) think it's
+    a bad idea, not knowing how it'll look when playing in a non-Debian
+    server.
+  * Remove po/nl.gmo in clean so it builds ok the second time.
+
+ -- Jordi Mallach <jordi@xxxxxxxxxx>  Thu, 15 Aug 2002 21:18:06 +0200
+
+freeciv (1.12.0-0.1) unstable; urgency=low
+
+  * Non maintainer upload with Jules' permission.
+  * New upstream version. Fixes a memory leak in the xaw3d
+    client, and an issue with the Colosseum help. As far as I can tell the goto
+    bug report is also fixed.
+    (Closes: #24037, #88539, #100768, #106283, #108038)
+  * Increase Standards-Version.
+  * Add Build-Depends. (Closes: #68964, #92096)
+  * Add alternatives for civclient, not only civ. (Closes: #47352, #71276)
+  * Add readline support. (Closes: #94492)
+  * Remove kludge for pot files not getting installed; add another one for pot
+    files getting installed in the wrong location.
+  * Move freeciv-{gtk,xaw3d}.postrm to .prerm for update-alternatives.
+  * Bump server package version in clients dependencies.
+    (Closes: #94486, #95203)
+  * Remove xaw3dg from Depends: in control for freeciv-xaw3d; dh_shlibdeps
+    takes care of this. (Closes: #94485)
+  * Add --without-zlib to the clients configure calls so it doesn't get linked
+    in (clients don't need it). (Closes: #94487, #94488)
+  * Fix typo in nl translation.
+  * Go through bugs and weed out the already fixed ones. (Closes: #47352)
+  * Yay! I got more bugs fixed as Thorsten did (15 vs. 16).
+
+ -- Filip Van Raemdonck <mechanix@xxxxxxxxxx>  Mon, 23 Jul 2001 12:13:17 +0200
+
 freeciv (1.11.4-3) unstable; urgency=low
 
   * Double-doh! Still one helix dependency on the -gtk package, namely on
@@ -338,7 +402,3 @@
   * civ: FREECIV_DATADIR set to /usr/games/freeciv/data.
 
  -- Karl Sackett <krs@xxxxxxxxxx>  Tue, 1 Apr 1997 10:37:50 -0600
-
-Local variables:
-mode: debian-changelog
-End:
Binary files /home/freeciv/freeciv-1.14.0/debian/.changelog.swp and 
freeciv-1.14.0/debian/.changelog.swp differ
diff -Nur /home/freeciv/freeciv-1.14.0/debian/control 
freeciv-1.14.0/debian/control
--- /home/freeciv/freeciv-1.14.0/debian/control 2001-06-22 18:18:41.000000000 
+0200
+++ freeciv-1.14.0/debian/control       2003-01-20 23:13:24.000000000 +0100
@@ -2,7 +2,8 @@
 Section: games
 Priority: optional
 Maintainer: Jules Bean <jules@xxxxxxxxxx>
-Standards-Version: 3.0.1
+Standards-Version: 3.5.6.2
+Build-Depends: debhelper (>= 3.0.0), gettext, libgtk2.0-dev (>= 2.0.6-1), 
libreadline4-dev, xaw3dg-dev, xlibs-dev, zlib1g-dev
 
 Package: freeciv
 Architecture: any
@@ -14,11 +15,11 @@
  each player becomes leader of a civilization, fighting to obtain
  the ultimate goal: The extinction of all other civilizations.
  .
- This package now contains only the server and common datafiles.
+ This package now contains only the server and common data files.
 
 Package: freeciv-xaw3d
 Architecture: any
-Depends: freeciv (>= 1.10), xaw3dg (>=1.3-1), ${shlibs:Depends}
+Depends: freeciv (>= 1.14), ${shlibs:Depends}
 Provides: freeciv-client
 Description: A free Civilization clone for Unix and X.
  Freeciv is a clone of Civilization, distributed under the GPL and
@@ -32,7 +33,7 @@
 
 Package: freeciv-gtk
 Architecture: any
-Depends: freeciv (>= 1.10), ${shlibs:Depends}
+Depends: freeciv (>= 1.14), ${shlibs:Depends}
 Provides: freeciv-client
 Description: A free Civilization clone for Unix and X.
  Freeciv is a clone of Civilization, distributed under the GPL and
@@ -43,3 +44,31 @@
  This package contains only the civclient-gtk executable, which is the GTK+
  version of the Freeciv client (so you get rid of xaw-variants problems).
  You still need the freeciv package for the data files.
+
+Package: freeciv-gtk2
+Architecture: any
+Depends: freeciv (>= 1.14), ${shlibs:Depends}
+Provides: freeciv-client
+Description: A free Civilization clone for Unix and X.
+ Freeciv is a clone of Civilization, distributed under the GPL and
+ implemented for X.  Freeciv is a turn-based strategy game, in which
+ each player becomes leader of a civilization, fighting to obtain
+ the ultimate goal: The extinction of all other civilizations.
+ .
+ This package contains only the civclient-gtk executable, which is the GTK2
+ version of the Freeciv client (so you get rid of xaw-variants problems).
+ You still need the freeciv package for the data files.
+
+Package: freeciv-gtk2-sound
+Architecture: any
+Depends: freeciv (>= 1.14), ${shlibs:Depends}
+Provides: freeciv-client
+Description: A free Civilization clone for Unix and X.
+ Freeciv is a clone of Civilization, distributed under the GPL and
+ implemented for X.  Freeciv is a turn-based strategy game, in which
+ each player becomes leader of a civilization, fighting to obtain
+ the ultimate goal: The extinction of all other civilizations.
+ .
+ This package contains only the civclient-gtk-sdl executable, which is the 
+ GTK2 version of the Freeciv client  You still need the freeciv package for 
+ the data and sound files.
diff -Nur /home/freeciv/freeciv-1.14.0/debian/docs freeciv-1.14.0/debian/docs
--- /home/freeciv/freeciv-1.14.0/debian/docs    2001-12-11 17:16:46.000000000 
+0100
+++ freeciv-1.14.0/debian/docs  2003-01-20 20:35:03.000000000 +0100
@@ -1 +1,2 @@
-ChangeLog NEWS README README.AI
+NEWS
+doc/*
diff -Nur /home/freeciv/freeciv-1.14.0/debian/freeciv.desktop 
freeciv-1.14.0/debian/freeciv.desktop
--- /home/freeciv/freeciv-1.14.0/debian/freeciv.desktop 1999-09-19 
22:32:55.000000000 +0200
+++ freeciv-1.14.0/debian/freeciv.desktop       2003-01-20 23:21:00.000000000 
+0100
@@ -1,11 +1,15 @@
 [Desktop Entry]
 Name=Freeciv
+Name[ca]=Freeciv
 Name[es]=Freeciv
 Name[fr]=Freeciv
 Name[no]=Freeciv
 Name[pt]=Freeciv
 Comment=Civilization(TM)-like game
-Comment[pt]=Jogo similar ao Civilization
+Comment[ca]=Joc similar a Civilization(TM)
+Comment[es]=Juego similar a Civilization(TM)
+Comment[nl]=Civilization(TM)-achtig spel
+Comment[pt]=Jogo similar ao Civilization(TM)
 Exec=civclient-gtk
 Icon=gnome-globe.png
 Terminal=0
diff -Nur /home/freeciv/freeciv-1.14.0/debian/freeciv-gtk2.dirs 
freeciv-1.14.0/debian/freeciv-gtk2.dirs
--- /home/freeciv/freeciv-1.14.0/debian/freeciv-gtk2.dirs       1970-01-01 
01:00:00.000000000 +0100
+++ freeciv-1.14.0/debian/freeciv-gtk2.dirs     2003-01-20 21:35:38.000000000 
+0100
@@ -0,0 +1,4 @@
+usr/games
+usr/share/man/man6
+usr/lib/menu
+usr/share/gnome/apps/Games
diff -Nur /home/freeciv/freeciv-1.14.0/debian/freeciv-gtk2.postinst 
freeciv-1.14.0/debian/freeciv-gtk2.postinst
--- /home/freeciv/freeciv-1.14.0/debian/freeciv-gtk2.postinst   1970-01-01 
01:00:00.000000000 +0100
+++ freeciv-1.14.0/debian/freeciv-gtk2.postinst 2003-01-20 22:43:36.000000000 
+0100
@@ -0,0 +1,7 @@
+#!/bin/sh
+set -e
+update-alternatives --install /usr/games/civ civ /usr/games/civclient-gtk2 50 \
+  --slave /usr/share/man/man6/civ.6.gz civ.6.gz 
/usr/share/man/man6/civclient-gtk2.6.gz
+update-alternatives --install /usr/games/civclient civclient 
/usr/games/civclient-gtk2 50
+
+#DEBHELPER#
diff -Nur /home/freeciv/freeciv-1.14.0/debian/freeciv-gtk2-sound.dirs 
freeciv-1.14.0/debian/freeciv-gtk2-sound.dirs
--- /home/freeciv/freeciv-1.14.0/debian/freeciv-gtk2-sound.dirs 1970-01-01 
01:00:00.000000000 +0100
+++ freeciv-1.14.0/debian/freeciv-gtk2-sound.dirs       2003-01-20 
22:42:29.000000000 +0100
@@ -0,0 +1,4 @@
+usr/games
+usr/share/man/man6
+usr/lib/menu
+usr/share/gnome/apps/Games
diff -Nur /home/freeciv/freeciv-1.14.0/debian/freeciv-gtk2-sound.postinst 
freeciv-1.14.0/debian/freeciv-gtk2-sound.postinst
--- /home/freeciv/freeciv-1.14.0/debian/freeciv-gtk2-sound.postinst     
1970-01-01 01:00:00.000000000 +0100
+++ freeciv-1.14.0/debian/freeciv-gtk2-sound.postinst   2003-01-20 
23:13:04.000000000 +0100
@@ -0,0 +1,7 @@
+#!/bin/sh
+set -e
+update-alternatives --install /usr/games/civ civ 
/usr/games/civclient-gtk2-sound 50 \
+  --slave /usr/share/man/man6/civ.6.gz civ.6.gz 
/usr/share/man/man6/civclient-gtk2-sound.6.gz
+update-alternatives --install /usr/games/civclient civclient 
/usr/games/civclient-gtk2-sound 50
+
+#DEBHELPER#
diff -Nur /home/freeciv/freeciv-1.14.0/debian/freeciv-gtk.postinst 
freeciv-1.14.0/debian/freeciv-gtk.postinst
--- /home/freeciv/freeciv-1.14.0/debian/freeciv-gtk.postinst    2000-02-25 
00:58:51.000000000 +0100
+++ freeciv-1.14.0/debian/freeciv-gtk.postinst  2003-01-20 20:35:03.000000000 
+0100
@@ -2,5 +2,6 @@
 set -e
 update-alternatives --install /usr/games/civ civ /usr/games/civclient-gtk 50 \
   --slave /usr/share/man/man6/civ.6.gz civ.6.gz 
/usr/share/man/man6/civclient-gtk.6.gz
+update-alternatives --install /usr/games/civclient civclient 
/usr/games/civclient-gtk 50
 
 #DEBHELPER#
diff -Nur /home/freeciv/freeciv-1.14.0/debian/freeciv-gtk.postrm 
freeciv-1.14.0/debian/freeciv-gtk.postrm
--- /home/freeciv/freeciv-1.14.0/debian/freeciv-gtk.postrm      2000-02-25 
00:58:52.000000000 +0100
+++ freeciv-1.14.0/debian/freeciv-gtk.postrm    1970-01-01 01:00:00.000000000 
+0100
@@ -1,5 +0,0 @@
-#!/bin/sh
-set -e
-update-alternatives --remove civ /usr/games/civclient-gtk
-
-#DEBHELPER#
diff -Nur /home/freeciv/freeciv-1.14.0/debian/freeciv-gtk.prerm 
freeciv-1.14.0/debian/freeciv-gtk.prerm
--- /home/freeciv/freeciv-1.14.0/debian/freeciv-gtk.prerm       1970-01-01 
01:00:00.000000000 +0100
+++ freeciv-1.14.0/debian/freeciv-gtk.prerm     2003-01-20 20:35:03.000000000 
+0100
@@ -0,0 +1,6 @@
+#!/bin/sh -e
+
+update-alternatives --remove civ /usr/games/civclient-gtk
+update-alternatives --remove civclient /usr/games/civclient-gtk
+
+#DEBHELPER#
diff -Nur /home/freeciv/freeciv-1.14.0/debian/freeciv-xaw3d.postinst 
freeciv-1.14.0/debian/freeciv-xaw3d.postinst
--- /home/freeciv/freeciv-1.14.0/debian/freeciv-xaw3d.postinst  2000-02-25 
00:58:52.000000000 +0100
+++ freeciv-1.14.0/debian/freeciv-xaw3d.postinst        2003-01-20 
20:35:03.000000000 +0100
@@ -2,5 +2,6 @@
 set -e
 update-alternatives --install /usr/games/civ civ /usr/games/civclient-xaw3d 20 
\
   --slave /usr/share/man/man6/civ.6.gz civ.6.gz 
/usr/share/man/man6/civclient-xaw3d.6.gz
+update-alternatives --install /usr/games/civclient civclient 
/usr/games/civclient-xaw3d 20
 
 #DEBHELPER#
diff -Nur /home/freeciv/freeciv-1.14.0/debian/freeciv-xaw3d.postrm 
freeciv-1.14.0/debian/freeciv-xaw3d.postrm
--- /home/freeciv/freeciv-1.14.0/debian/freeciv-xaw3d.postrm    2000-02-25 
00:58:52.000000000 +0100
+++ freeciv-1.14.0/debian/freeciv-xaw3d.postrm  1970-01-01 01:00:00.000000000 
+0100
@@ -1,5 +0,0 @@
-#!/bin/sh
-set -e
-update-alternatives --remove civ /usr/games/civclient-xaw3d
-
-#DEBHELPER#
diff -Nur /home/freeciv/freeciv-1.14.0/debian/freeciv-xaw3d.prerm 
freeciv-1.14.0/debian/freeciv-xaw3d.prerm
--- /home/freeciv/freeciv-1.14.0/debian/freeciv-xaw3d.prerm     1970-01-01 
01:00:00.000000000 +0100
+++ freeciv-1.14.0/debian/freeciv-xaw3d.prerm   2003-01-20 20:35:03.000000000 
+0100
@@ -0,0 +1,6 @@
+#!/bin/sh -e
+
+update-alternatives --remove civ /usr/games/civclient-xaw3d
+update-alternatives --remove civclient /usr/games/civclient-xaw3d
+
+#DEBHELPER#
diff -Nur /home/freeciv/freeciv-1.14.0/debian/manpages 
freeciv-1.14.0/debian/manpages
--- /home/freeciv/freeciv-1.14.0/debian/manpages        1970-01-01 
01:00:00.000000000 +0100
+++ freeciv-1.14.0/debian/manpages      2003-01-20 20:35:03.000000000 +0100
@@ -0,0 +1,2 @@
+debian/civclient.6
+debian/civserver.6
diff -Nur /home/freeciv/freeciv-1.14.0/debian/rules freeciv-1.14.0/debian/rules
--- /home/freeciv/freeciv-1.14.0/debian/rules   2001-06-30 15:52:27.000000000 
+0200
+++ freeciv-1.14.0/debian/rules 2003-01-20 23:02:07.000000000 +0100
@@ -5,11 +5,12 @@
 
 # Uncomment this to turn on verbose mode.
 #export DH_VERBOSE=1
+export DH_COMPAT=3
 
 COMMON_CONFIG := --cache-file=$(shell pwd)/config.cache                \
                 --prefix=/usr --datadir=/usr/share/games --bindir=/usr/games
 
-build: build-xaw3d build-gtk build-base
+build: build-xaw3d build-gtk build-gtk2 build-gtk2-with-sound build-base
 build-stamp:
        dh_testdir
 
@@ -25,19 +26,30 @@
        dh_testdir
 
        mkdir build-xaw3d
-       (cd build-xaw3d;        \
-        ../configure $(COMMON_CONFIG) --disable-server --with-xaw3d; $(MAKE))
+       (cd build-xaw3d; ../configure $(COMMON_CONFIG) --disable-server 
--enable-client=xaw --disable-esd --disable-sdl-mixer --disable-winmm 
--with-xaw --without-zlib; $(MAKE))
 
 build-gtk:
        dh_testdir
 
        mkdir build-gtk
-       (cd build-gtk; ../configure $(COMMON_CONFIG) --disable-server; $(MAKE))
+       (cd build-gtk; ../configure $(COMMON_CONFIG) --disable-server 
--disable-esd --disable-sdl-mixer --disable-winmm --enable-client=gtk 
--without-zlib; $(MAKE))
+
+build-gtk2:
+       dh_testdir
+
+       mkdir build-gtk2
+       (cd build-gtk2; ../configure $(COMMON_CONFIG) --disable-server 
--disable-esd --disable-sdl-mixer --disable-winmm --enable-client=gtk2 
--without-zlib; $(MAKE))
+
+build-gtk2-with-sound:
+       dh_testdir
+
+       mkdir build-gtk2-with-sound
+       (cd build-gtk2-with-sound; ../configure $(COMMON_CONFIG) 
--disable-server --enable-client=gtk2 --without-zlib; $(MAKE))
 
 clean:
        dh_testdir
        dh_testroot
-       -rm -Rf build-stamp build-xaw3d build-xaw build-gtk build-base 
+       -rm -Rf build-stamp build-xaw3d build-xaw build-gtk build-gtk2 
build-gtk2-with-sound build-base 
        -rm -f install-stamp config.cache
        dh_clean
 
@@ -49,17 +61,17 @@
        dh_testroot
        dh_clean -k
        dh_installdirs
-#      dh_installdirs -pfreeciv-xaw
        dh_installdirs -pfreeciv-xaw3d
        dh_installdirs -pfreeciv-gtk
+       dh_installdirs -pfreeciv-gtk2
+       dh_installdirs -pfreeciv-gtk2-with-sound
+
+
+       (cd build-base; $(MAKE) DESTDIR=`pwd`/../debian/freeciv install)
+
+       # Potfiles do get installed now, but in /usr/share/games/locale
+       mv debian/freeciv/usr/share/games/locale debian/freeciv/usr/share
 
-       (cd build-base; $(MAKE) DESTDIR=`pwd`/../debian/tmp install)
-       # Temporary kludge because the potfiles are not getting installed
-       (cd build-base/po; $(MAKE) prefix=`pwd`/../../debian/tmp/usr install)
-#      (cd build-xaw; $(MAKE) DESTDIR=`pwd`/../debian/freeciv-xaw install)
-#      mv debian/freeciv-xaw/usr/games/civclient 
debian/freeciv-xaw/usr/games/civclient-xaw.real
-#      rm -rf debian/freeciv-xaw/usr/share 
debian/freeciv-xaw/usr/share/man/man6/*
-#      ln -s civclient.6.gz 
debian/freeciv-xaw/usr/share/man/man6/civclient-xaw.6.gz
        (cd build-xaw3d; $(MAKE) DESTDIR=`pwd`/../debian/freeciv-xaw3d install)
        mv debian/freeciv-xaw3d/usr/games/civclient 
debian/freeciv-xaw3d/usr/games/civclient-xaw3d
        rm -rf debian/freeciv-xaw3d/usr/share/games 
debian/freeciv-xaw3d/usr/share/man/man6/*
@@ -68,11 +80,21 @@
        mv debian/freeciv-gtk/usr/games/civclient 
debian/freeciv-gtk/usr/games/civclient-gtk
        rm -rf debian/freeciv-gtk/usr/share/games 
debian/freeciv-gtk/usr/share/man/man6/*
        ln -s civclient.6.gz 
debian/freeciv-gtk/usr/share/man/man6/civclient-gtk.6.gz
+       (cd build-gtk2; $(MAKE) DESTDIR=`pwd`/../debian/freeciv-gtk2 install)
+       mv debian/freeciv-gtk2/usr/games/civclient 
debian/freeciv-gtk2/usr/games/civclient-gtk2
+       rm -rf debian/freeciv-gtk2/usr/share/games 
debian/freeciv-gtk2/usr/share/man/man6/*
+       ln -s civclient.6.gz 
debian/freeciv-gtk2/usr/share/man/man6/civclient-gtk2.6.gz
+       (cd build-gtk2-with-sound; $(MAKE) 
DESTDIR=`pwd`/../debian/freeciv-gtk2-with-sound install)
+       mv debian/freeciv-gtk2-with-sound/usr/games/civclient 
debian/freeciv-gtk2-with-sound/usr/games/civclient-gtk2-with-sound
+       rm -rf debian/freeciv-gtk2-with-sound/usr/share/games 
debian/freeciv-gtk2-with-sound/usr/share/man/man6/*
+       ln -s civclient.6.gz 
debian/freeciv-gtk2-with-sound/usr/share/man/man6/civclient-gtk2-with-sound.6.gz
+
        cp debian/freeciv.desktop debian/freeciv-gtk/usr/share/gnome/apps/Games
 
        touch install-stamp
 
 # Build architecture-independent files here (ie none).
+# Think here we should add data/
 binary-indep:
 
 # Build architecture-dependent files here.
@@ -81,33 +103,28 @@
        dh_testdir
        dh_testroot
        dh_installdocs -pfreeciv
-       dh_installdocs -a HOWTOPLAY
-#      ln -fs freeciv debian/freeciv-xaw/usr/doc/freeciv-xaw
+       -rm -f debian/freeciv/usr/share/doc/freeciv/Makefile.* 
debian/freeciv/usr/share/doc/freeciv/??/INSTALL*
+       dh_installdocs -a -Nfreeciv doc/HOWTOPLAY
 #      ln -fs freeciv debian/freeciv-xaw3d/usr/doc/freeciv-xaw3d
 #      ln -fs freeciv debian/freeciv-gtk/usr/doc/freeciv-gtk
        dh_installexamples
        dh_installmenu
-#      dh_installxaw
-# allow for old debhelper versions
-#      if [ -f debian/freeciv-xaw/usr/lib/xaw-wrappers/conf/freeciv-xaw ]; \
-#      then \
-#              mkdir debian/freeciv-xaw/usr/lib/xaw-wrappers/config; \
-#              mv debian/freeciv-xaw/usr/lib/xaw-wrappers/conf/freeciv-xaw 
debian/freeciv-xaw/usr/lib/xaw-wrappers/config; \
-#      fi
-       dh_installmanpages -pfreeciv
-#      /usr/bin/install debian/xaw-wrappers 
debian/tmp/usr/lib/xaw-wrappers/conf/freeciv
+       dh_installman -pfreeciv
 #      dh_undocumented
        dh_installchangelogs ChangeLog
        dh_strip
-#      dh_strip -pfreeciv-xaw
        dh_strip -pfreeciv-xaw3d
        dh_strip -pfreeciv-gtk
+       dh_strip -pfreeciv-gtk2
+       dh_strip -pfreeciv-gtk2-with-sound
        dh_compress
+       -gzip -9 debian/freeciv/usr/share/games/freeciv/scenario/*.sav
        dh_fixperms
        dh_installdeb
-#      dh_installdeb -pfreeciv-xaw
        dh_installdeb -pfreeciv-xaw3d
        dh_installdeb -pfreeciv-gtk
+       dh_installdeb -pfreeciv-gtk2
+       dh_installdeb -pfreeciv-gtk2-with-sound
        dh_shlibdeps -A
        dh_gencontrol -A
 #      dh_makeshlibs
Binary files /home/freeciv/freeciv-1.14.0/debian/.rules.swp and 
freeciv-1.14.0/debian/.rules.swp differ