Merge ~gsilvapt/kubuntu-packaging/+git/konquest:kubuntu_unstable into ~kubuntu-packagers/kubuntu-packaging/+git/ksnakeduel:kubuntu_unstable

[Gustavo Silva]

Added dependencies requires to build in KF5.

[Clive Johnston (clivejo)]

Not sure what has happened in this MP. There are a number of merge markers left in the files, did you merge with Debian ?

[Gustavo Silva (gsilvapt)]

I messed up the links here. I'm trying to merge in the repository we already fixed. Walter warned me!!!

Sorry, please close this MR and I'll do it again later and, hopefully, correctly.

Unmerged commits

09fc460... by Gustavo Silva on 2017-06-11

Added dependencies required to build in KF5 framework

b5ff9c4... by Jose Manuel Santamaria Lema on 2017-05-12

Fix changelog.

dd899ec... by Jose Manuel Santamaria Lema on 2017-05-12

konquest.install: install usr/

52389da... by Jose Manuel Santamaria Lema on 2017-05-10

New upstream release (17.04.1)

7a397ee... by Rik Mills on 2017-04-18

and appstream

38a2fb2... by Rik Mills on 2017-04-18

Install renamed desktop file

e6a6124... by Rik Mills on 2017-03-10

NOCI
Release to zesty

ce35645... by Jose Manuel Santamaria Lema on 2017-03-07

New upstream release (16.12.3)

2453ed1... by Rik Mills on 2017-02-21

NOCI

6ca9280... by Rik Mills on 2017-02-21

New upstream release (16.12.2)

diff --git a/debian/changelog b/debian/changelog
index fbc29f3..9f70da6 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,4 @@
+<<<<<<< debian/changelog
 ksnakeduel (4:17.04.1-0ubuntu1) UNRELEASED; urgency=low
 
   * New upstream release (17.04.1)
@@ -5,6 +6,17 @@ ksnakeduel (4:17.04.1-0ubuntu1) UNRELEASED; urgency=low
  -- José Manuel Santamaría Lema <[e-mail]>  Wed, 10 May 2017 14:07:38 +0200
 
 ksnakeduel (4:16.12.3-0ubuntu1) zesty; urgency=low
+=======
+konquest (4:17.04.1-0ubuntu1) UNRELEASED; urgency=medium
+
+  [ José Manuel Santamaría Lema ]
+  * New upstream release (17.04.1)
+  * konquest.install: install usr/
+
+ -- José Manuel Santamaría Lema <[e-mail]>  Wed, 10 May 2017 14:08:24 +0200
+
+konquest (4:16.12.3-0ubuntu1) zesty; urgency=low
+>>>>>>> debian/changelog
 
   [ Darin Miller ]
   * New upstream release (16.12.2)
@@ -12,9 +24,15 @@ ksnakeduel (4:16.12.3-0ubuntu1) zesty; urgency=low
   [ José Manuel Santamaría Lema ]
   * New upstream release (16.12.3)
 
+<<<<<<< debian/changelog
  -- José Manuel Santamaría Lema <[e-mail]>  Fri, 10 Mar 2017 21:28:25 +0000
 
 ksnakeduel (4:16.12.1-0ubuntu1) zesty; urgency=medium
+=======
+ -- José Manuel Santamaría Lema <[e-mail]>  Fri, 10 Mar 2017 21:26:24 +0000
+
+konquest (4:16.12.1-0ubuntu1) zesty; urgency=medium
+>>>>>>> debian/changelog
 
   [ José Manuel Santamaría Lema ]
   * Update Vcs-Git fields to use https:// instead of git://
@@ -23,9 +41,15 @@ ksnakeduel (4:16.12.1-0ubuntu1) zesty; urgency=medium
   * New upstream release (16.12.0)
   * New upstream release (16.12.1)
 
+<<<<<<< debian/changelog
  -- Rik Mills <[e-mail]>  Thu, 19 Jan 2017 16:17:03 +0000
 
 ksnakeduel (4:16.04.3-0ubuntu1) yakkety; urgency=medium
+=======
+ -- Rik Mills <[e-mail]>  Thu, 19 Jan 2017 16:15:04 +0000
+
+konquest (4:16.04.3-0ubuntu1) yakkety; urgency=medium
+>>>>>>> debian/changelog
 
   [ Scarlett Clark ]
   * New upstream release.
@@ -42,13 +66,20 @@ ksnakeduel (4:16.04.3-0ubuntu1) yakkety; urgency=medium
   * New upstream release (16.04.2)
   * New upstream release (16.04.3)
 
+<<<<<<< debian/changelog
  -- José Manuel Santamaría Lema <[e-mail]>  Fri, 30 Sep 2016 06:45:19 +0200
 
 ksnakeduel (4:15.12.3-0ubuntu1) xenial; urgency=medium
+=======
+ -- José Manuel Santamaría Lema <[e-mail]>  Fri, 30 Sep 2016 06:29:33 +0200
+
+konquest (4:15.12.3-0ubuntu1) xenial; urgency=medium
+>>>>>>> debian/changelog
 
   * New upstream bugfix release
   * New upstream bugfix release
 
+<<<<<<< debian/changelog
  -- Scarlett Clark <[e-mail]>  Thu, 14 Apr 2016 15:51:19 -0700
 
 ksnakeduel (4:15.12.1-0ubuntu1) xenial; urgency=medium
@@ -221,10 +252,173 @@ ksnakeduel (4:4.12.4-1) unstable; urgency=medium
  -- Maximiliano Curia <[e-mail]>  Mon, 28 Apr 2014 12:24:22 +0200
 
 ksnakeduel (4:4.11.3-1) unstable; urgency=low
+=======
+ -- Scarlett Clark <[e-mail]>  Thu, 14 Apr 2016 15:39:39 -0700
+
+konquest (4:15.12.1-0ubuntu1) xenial; urgency=medium
+
+  * New upstream release
+  * Merged with Debian
+
+ -- Clive Johnston <[e-mail]>  Wed, 09 Mar 2016 10:57:36 +0100
+
+konquest (4:15.08.2-0ubuntu1) wily; urgency=medium
+
+  * New upstream release
+
+ -- Scarlett Clark <[e-mail]>  Wed, 14 Oct 2015 12:38:15 +0100
+
+konquest (4:15.08.1-0ubuntu1) wily; urgency=medium
+
+  * New upstream release (15.08.1)
+
+ -- Clive Johnston <[e-mail]>  Tue, 22 Sep 2015 17:12:41 +0100
+
+konquest (4:15.08.0-1) unstable; urgency=medium
+
+  * New upstream release (15.04.0).
+  * New upstream release (15.08.0).
+
+ -- Maximiliano Curia <[e-mail]>  Sat, 19 Sep 2015 19:10:36 +0200
+
+konquest (4:15.08.0-0ubuntu1) wily; urgency=medium
+
+  * new upstream release
+
+ -- Clive Johnston <[e-mail]>  Wed, 26 Aug 2015 17:33:19 +0100
+
+konquest (4:15.07.90-0ubuntu1) wily; urgency=medium
+
+  * new upstream beta release
+
+ -- Jonathan Riddell <[e-mail]>  Tue, 18 Aug 2015 10:50:23 +0100
+
+konquest (4:15.04.2-0ubuntu1) wily; urgency=medium
+
+  [ Scarlett Clark ]
+  * New upstream release
+  * kde4 games need to depend on 14.12 series libkdegames. 
+
+  [ Jonathan Riddell ]
+  * New upstream release
+
+ -- Jonathan Riddell <[e-mail]>  Tue, 09 Jun 2015 19:15:03 +0200
+
+konquest (4:14.12.3-0ubuntu1) vivid; urgency=medium
+
+  * New upstream release
+
+ -- Scarlett Clark <[e-mail]>  Fri, 13 Mar 2015 14:18:18 -0700
+
+konquest (4:14.12.2-1) experimental; urgency=medium
+
+  * New upstream release (14.12.2).
+  * Bump Standards-Version to 3.9.6, no changes needed.
+
+ -- Maximiliano Curia <[e-mail]>  Sun, 22 Feb 2015 16:23:07 +0100
+
+konquest (4:14.12.2-0ubuntu1) vivid; urgency=medium
+
+  * New upstream release
+
+ -- Scarlett Clark <[e-mail]>  Tue, 10 Feb 2015 09:12:42 -0800
+
+konquest (4:14.12.0-0ubuntu1) vivid; urgency=medium
+
+  * New upstream release
+  * Remove kdelibs5-dev depend version as there was not a new release.
+
+ -- Scarlett Clark <[e-mail]>  Mon, 15 Dec 2014 16:55:31 +0100
+
+konquest (4:14.11.97-0ubuntu1) vivid; urgency=medium
+
+  * New upstream RC release
+
+ -- Jonathan Riddell <[e-mail]>  Fri, 28 Nov 2014 19:23:42 +0100
+
+konquest (4:4.14.0-1) unstable; urgency=medium
+
+  * New upstream release.
+
+ -- Maximiliano Curia <[e-mail]>  Sat, 23 Aug 2014 02:31:34 +0200
+
+konquest (4:4.14.2-0ubuntu1) vivid; urgency=medium
+
+  * New upstream release
+
+ -- Scarlett Clark <[e-mail]>  Fri, 10 Oct 2014 05:39:46 -0700
+
+konquest (4:4.14.1-0ubuntu1) utopic; urgency=medium
+
+  * New upstream release
+
+ -- Scarlett Clark <[e-mail]>  Mon, 22 Sep 2014 17:25:45 +0200
+
+konquest (4:4.14.0-0ubuntu1) utopic; urgency=medium
+
+  * New upstream release
+
+ -- Jonathan Riddell <[e-mail]>  Wed, 20 Aug 2014 13:17:46 +0200
+
+konquest (4:4.13.97-0ubuntu1) utopic; urgency=medium
+
+  * New upstream beta release RC
+
+ -- Scarlett Clark <[e-mail]>  Fri, 01 Aug 2014 17:00:30 +0200
+
+konquest (4:4.13.95-0ubuntu1) utopic; urgency=medium
+
+  * New upstream beta release
+
+ -- Scarlett Clark <[e-mail]>  Wed, 30 Jul 2014 18:27:07 +0200
+
+konquest (4:4.13.90-0ubuntu1) utopic; urgency=medium
+
+  * New upstream beta release
+
+ -- Scarlett Clark <[e-mail]>  Thu, 24 Jul 2014 23:20:51 +0200
+
+konquest (4:4.13.2-0ubuntu1) utopic; urgency=medium
+
+  * New upstream release
+  * Merge with Debian, no changes
+
+ -- Jonathan Riddell <[e-mail]>  Tue, 17 Jun 2014 10:41:55 +0100
+
+konquest (4:4.13.1-1) unstable; urgency=medium
+
+  * New upstream release.
+
+ -- Maximiliano Curia <[e-mail]>  Fri, 23 May 2014 10:15:38 +0200
+
+konquest (4:4.12.2-2) unstable; urgency=medium
+
+  * Release to unstable
+
+ -- Maximiliano Curia <[e-mail]>  Mon, 28 Apr 2014 12:23:42 +0200
+
+konquest (4:4.12.2-1) experimental; urgency=medium
+
+  * New upstream release.
+  * Bump kde-sc-dev-latest build dependency.
+
+ -- Maximiliano Curia <[e-mail]>  Mon, 10 Feb 2014 11:31:27 +0100
+
+konquest (4:4.11.5-1) unstable; urgency=medium
+
+  * New upstream release.
+  * Do not disable an empty test set.
+  * Bump Standards-Version to 3.9.5, no changes needed.
+
+ -- Maximiliano Curia <[e-mail]>  Thu, 30 Jan 2014 14:37:40 +0100
+
+konquest (4:4.11.3-1) unstable; urgency=low
+>>>>>>> debian/changelog
 
   * New upstream release.
   * Update build dependencies.
 
+<<<<<<< debian/changelog
  -- Maximiliano Curia <[e-mail]>  Thu, 07 Nov 2013 14:28:02 +0100
 
 ksnakeduel (4:4.11.2-1) experimental; urgency=low
@@ -240,10 +434,28 @@ ksnakeduel (4:4.10.5-1) unstable; urgency=low
  -- Maximiliano Curia <[e-mail]>  Fri, 12 Jul 2013 00:15:55 +0200
 
 ksnakeduel (4:4.10.4-1) experimental; urgency=low
+=======
+ -- Maximiliano Curia <[e-mail]>  Thu, 07 Nov 2013 14:28:47 +0100
+
+konquest (4:4.11.2-1) experimental; urgency=low
+
+  * New upstream release.
+
+ -- Maximiliano Curia <[e-mail]>  Mon, 07 Oct 2013 15:30:05 +0200
+
+konquest (4:4.10.5-1) unstable; urgency=low
+
+  * New upstream release.
+
+ -- Maximiliano Curia <[e-mail]>  Fri, 12 Jul 2013 00:15:38 +0200
+
+konquest (4:4.10.4-1) experimental; urgency=low
+>>>>>>> debian/changelog
 
   * New upstream release.
   * Update vcs fields.
 
+<<<<<<< debian/changelog
  -- Maximiliano Curia <[e-mail]>  Fri, 14 Jun 2013 10:54:26 +0200
 
 ksnakeduel (4:4.13.0-0ubuntu1) trusty; urgency=medium
@@ -325,6 +537,95 @@ ksnakeduel (4:4.11.1-0ubuntu1) saucy; urgency=low
  -- Philip Muškovac <[e-mail]>  Fri, 06 Sep 2013 22:31:27 +0100
 
 ksnakeduel (4:4.11.0-0ubuntu1) saucy; urgency=low
+=======
+ -- Maximiliano Curia <[e-mail]>  Fri, 14 Jun 2013 10:55:18 +0200
+
+konquest (4:4.10.2-1) experimental; urgency=low
+
+  * First release of kdegames after being split by upstream.
+
+ -- Maximiliano Curia <[e-mail]>  Wed, 10 Apr 2013 20:15:05 +0200
+
+konquest (4:4.13.0-0ubuntu1) trusty; urgency=medium
+
+  * New upstream KDE Software Compilation release
+
+ -- Jonathan Riddell <[e-mail]>  Thu, 10 Apr 2014 22:10:19 +0100
+
+konquest (4:4.12.97-0ubuntu1) trusty; urgency=medium
+
+  * New upstream release candidate
+
+ -- Philip Muškovac <[e-mail]>  Wed, 02 Apr 2014 11:35:03 +0200
+
+konquest (4:4.12.95-0ubuntu1) trusty; urgency=medium
+
+  * New upstream beta release
+
+ -- Rohan Garg <[e-mail]>  Sun, 23 Mar 2014 12:36:26 +0100
+
+konquest (4:4.12.90-0ubuntu1) trusty; urgency=medium
+
+  * New upstream beta release
+
+ -- Jonathan Riddell <[e-mail]>  Wed, 19 Mar 2014 11:07:07 +0000
+
+konquest (4:4.12.3-0ubuntu1) trusty; urgency=medium
+
+  * New upstream bugfix release
+
+ -- Rohan Garg <[e-mail]>  Tue, 04 Mar 2014 20:56:49 +0100
+
+konquest (4:4.12.2-0ubuntu1) trusty; urgency=medium
+
+  * New upstream bugfix release
+
+ -- Rohan Garg <[e-mail]>  Wed, 05 Feb 2014 00:08:54 +0000
+
+konquest (4:4.12.1-0ubuntu1) trusty; urgency=low
+
+  * New upstream bugfix release
+
+ -- Rohan Garg <[e-mail]>  Thu, 16 Jan 2014 08:24:45 +0000
+
+konquest (4:4.12.0-0ubuntu1) trusty; urgency=low
+
+  * New upstream release
+
+ -- Jonathan Riddell <[e-mail]>  Wed, 18 Dec 2013 17:18:00 +0000
+
+konquest (4:4.11.97-0ubuntu1) trusty; urgency=low
+
+  * New upstream RC release
+
+ -- Jonathan Riddell <[e-mail]>  Fri, 29 Nov 2013 13:18:24 +0000
+
+konquest (4:4.11.95-0ubuntu1) trusty; urgency=low
+
+  * New upstream beta release
+
+ -- Rohan Garg <[e-mail]>  Mon, 25 Nov 2013 18:15:46 +0100
+
+konquest (4:4.11.80-0ubuntu1) trusty; urgency=low
+
+  * New upstream beta release
+
+ -- Rohan Garg <[e-mail]>  Sat, 23 Nov 2013 17:46:07 +0100
+
+konquest (4:4.11.2-0ubuntu1) saucy; urgency=low
+
+  * New upstream bugfix release
+
+ -- Jonathan Riddell <[e-mail]>  Mon, 30 Sep 2013 14:33:42 +0100
+
+konquest (4:4.11.1-0ubuntu1) saucy; urgency=low
+
+  * New upstream bugfix release.
+
+ -- Philip Muškovac <[e-mail]>  Fri, 06 Sep 2013 22:28:06 +0100
+
+konquest (4:4.11.0-0ubuntu1) saucy; urgency=low
+>>>>>>> debian/changelog
 
   [ Howard Chan ]
   * New upstream release
@@ -332,6 +633,7 @@ ksnakeduel (4:4.11.0-0ubuntu1) saucy; urgency=low
   [ Jonathan Riddell ]
   * New upstream release
 
+<<<<<<< debian/changelog
  -- Jonathan Riddell <[e-mail]>  Wed, 14 Aug 2013 00:27:49 +0100
 
 ksnakeduel (4:4.10.97-0ubuntu1) saucy; urgency=low
@@ -434,11 +736,89 @@ ksnakeduel (4:4.9.97-0ubuntu1) raring; urgency=low
  -- Philip Muškovac <[e-mail]>  Thu, 03 Jan 2013 22:42:30 +0100
 
 ksnakeduel (4:4.9.95-0ubuntu1) raring; urgency=low
+=======
+ -- Jonathan Riddell <[e-mail]>  Wed, 14 Aug 2013 00:23:22 +0100
+
+konquest (4:4.10.97-0ubuntu1) saucy; urgency=low
+
+  * New upstream RC 2 release
+
+ -- Jonathan Riddell <[e-mail]>  Fri, 26 Jul 2013 19:44:16 +0100
+
+konquest (4:4.10.95-0ubuntu1) saucy; urgency=low
+
+  * New upstream RC release
+
+ -- Rohan Garg <[e-mail]>  Fri, 19 Jul 2013 12:32:50 +0000
+
+konquest (4:4.10.90-0ubuntu1) saucy; urgency=low
+
+  * New upstream bet release
+
+ -- Michał Zając <[e-mail]>  Fri, 28 Jun 2013 18:19:34 +0100
+
+konquest (4:4.10.80-0ubuntu1) saucy; urgency=low
+
+  * New upstream release
+
+ -- Rohan Garg <[e-mail]>  Fri, 21 Jun 2013 01:28:30 +0100
+
+konquest (4:4.10.4-0ubuntu1) saucy-proposed; urgency=low
+
+  * New upstream bugfix release
+
+ -- Rohan Garg <[e-mail]>  Fri, 07 Jun 2013 00:38:47 +0100
+
+konquest (4:4.10.3-0ubuntu1) saucy; urgency=low
+
+  * New upstream release
+
+ -- Jonathan Riddell <[e-mail]>  Thu, 23 May 2013 11:04:48 +0000
+
+konquest (4:4.10.2-1) experimental; urgency=low
+
+  * First release of kdegames after being split by upstream.
+
+ -- Maximiliano Curia <[e-mail]>  Wed, 10 Apr 2013 20:15:05 +0200
+
+konquest (4:4.10.2-0ubuntu1) raring; urgency=low
+
+  * New upstream bugfix release
+
+ -- Philip Muškovac <[e-mail]>  Sun, 31 Mar 2013 14:53:56 +0200
+
+konquest (4:4.10.1-0ubuntu1) raring-proposed; urgency=low
+
+  * New upstream bugfix release
+
+ -- Philip Muškovac <[e-mail]>  Tue, 05 Mar 2013 16:35:02 +0000
+
+konquest (4:4.10.0-0ubuntu1) raring-proposed; urgency=low
+
+  * New upstream release
+
+ -- Rohan Garg <[e-mail]>  Wed, 06 Feb 2013 11:59:59 +0000
+
+konquest (4:4.9.98-0ubuntu1) raring-proposed; urgency=low
+
+  * New upstream release candidate
+
+ -- Jonathan Riddell <[e-mail]>  Fri, 18 Jan 2013 15:48:12 +0000
+
+konquest (4:4.9.97-0ubuntu1) raring; urgency=low
+
+  * New upstream release candidate
+
+ -- Philip Muškovac <[e-mail]>  Thu, 03 Jan 2013 22:40:03 +0100
+
+konquest (4:4.9.95-0ubuntu1) raring; urgency=low
+>>>>>>> debian/changelog
 
   * Install to /usr/games
   * Version dependency on kdegames-data
   * New upstream RC release
 
+<<<<<<< debian/changelog
  -- Jonathan Riddell <[e-mail]>  Tue, 18 Dec 2012 23:39:11 +0000
 
 ksnakeduel (4:4.9.90-0ubuntu3) raring; urgency=low
@@ -458,3 +838,14 @@ ksnakeduel (4:4.9.90-0ubuntu1) raring; urgency=low
   * Initial release
 
  -- Jonathan Riddell <[e-mail]>  Mon, 03 Dec 2012 17:39:47 +0000
+=======
+ -- Jonathan Riddell <[e-mail]>  Tue, 18 Dec 2012 23:36:22 +0000
+
+konquest (4:4.9.90-0ubuntu1) raring; urgency=low
+
+  * Initial release
+  * PPA build
+  * Add kubuntu_01_copyright.diff from upstream, fix copyright declarations
+
+ -- Jonathan Riddell <[e-mail]>  Mon, 03 Dec 2012 17:39:46 +0000
+>>>>>>> debian/changelog
diff --git a/debian/control b/debian/control
index d7c08fc..0493da3 100644
--- a/debian/control
+++ b/debian/control
@@ -1,4 +1,8 @@
+<<<<<<< debian/control
 Source: ksnakeduel
+=======
+Source: konquest
+>>>>>>> debian/control
 Section: games
 Priority: optional
 Maintainer: Debian/Kubuntu Qt/KDE Maintainers <[e-mail]>
@@ -13,9 +17,13 @@ Uploaders: Daniel Schepler <[e-mail]>,
 Build-Depends: cmake,
                debhelper (>= 9),
                extra-cmake-modules (>= 1.7.0),
+<<<<<<< debian/control
                libkf5completion-dev (>= 5.15.0),
                libkf5config-dev (>= 5.15.0),
                libkf5configwidgets-dev (>= 5.15.0),
+=======
+               libkf5config-dev (>= 5.15.0),
+>>>>>>> debian/control
                libkf5coreaddons-dev (>= 5.15.0),
                libkf5crash-dev (>= 5.15.0),
                libkf5dbusaddons-dev (>= 5.15.0),
@@ -23,6 +31,7 @@ Build-Depends: cmake,
                libkf5guiaddons-dev (>= 5.15.0),
                libkf5i18n-dev (>= 5.15.0),
                libkf5kdegames-dev (>= 4.9.0),
+<<<<<<< debian/control
                libkf5widgetsaddons-dev (>= 5.15.0),
                libkf5xmlgui-dev (>= 5.15.0),
                libqt5svg5-dev (>= 5.3.0),
@@ -49,5 +58,24 @@ Description: snake race game
  food. While eating, the snake grows. But once a player collides with the other
  snake or the wall, the game is lost. This becomes, of course, more and more
  difficult the longer the snakes grow.
+=======
+               libkf5xmlgui-dev (>= 5.15.0),
+               libkf5widgetsaddons-dev (>= 5.15.0),
+               libqt5svg5-dev (>= 5.3.0), 
+               pkg-kde-tools (>= 0.14)
+Standards-Version: 3.9.6
+Homepage: http://games.kde.org/
+Vcs-Browser: https://code.launchpad.net/~kubuntu-packagers/kubuntu-packaging/+git/konquest
+Vcs-Git: https://git.launchpad.net/~kubuntu-packagers/kubuntu-packaging/+git/konquest
+
+Package: konquest
+Architecture: any
+Depends: ${misc:Depends}, ${shlibs:Depends}
+Recommends: khelpcenter
+Description: simple turn-based strategy game
+ Konquest is a game of galactic conquest for KDE, where rival empires vie to
+ conquer planets and crush all opposition.  The game can be played with up to
+ nine empires, commanded either by the computer or by puny earthlings.
+>>>>>>> debian/control
  .
  This package is part of the KDE games module.
diff --git a/debian/copyright b/debian/copyright
index d96d389..a04f6fc 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -1,10 +1,15 @@
 Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
+<<<<<<< debian/copyright
 Upstream-Name: ksnakeduel
+=======
+Upstream-Name: konquest
+>>>>>>> debian/copyright
 Upstream-Contact: Albert Astals Cid <[e-mail]>
                   Wolfgang Rohdewald <[e-mail]>
 Source: http://www.kde.org/download/
 
 Files: *
+<<<<<<< debian/copyright
 Copyright: 2005, Benjamin C. Meyer <[e-mail]>
            1989-1991, Free Software Foundation, Inc
            1998-2000, Matthias Kiefer <[e-mail]>
@@ -17,6 +22,88 @@ Copyright: 1998-2000, Matthias Kiefer <[e-mail]>
            2008-2009, Stas Verberkt <[e-mail]>
 License: GFDL-1.2+
 
+=======
+Copyright: 1998, the GNU-Lactic Conquest Project
+           2000, Nicholas Robbins <[e-mail]>
+           2012, Viktor Chynarov
+License: GPL-2+
+
+Files: doc/*
+Copyright: 2000, Nicholas Robbins <[e-mail]>
+           2012, Viktor Chynarov
+License: GFDL-1.2+
+
+Files: dialogs/fleetdlg.cc
+       dialogs/fleetdlg.h
+       dialogs/newgamedlg.h
+       dialogs/scoredlg.cc
+       dialogs/scoredlg.h
+       fleet.cc
+       fleet.h
+       game.cpp
+       game.h
+       gameview.h
+       images.h
+       Konquest.cc
+       mainwin.cc
+       mainwin.h
+       map/map.cc
+       map/map.h
+       map/mapitems.h
+       map/mapscene.cc
+       map/mapscene.h
+       map/mapview.cc
+       map/mapview.h
+       planet.cc
+       planet.h
+       players/computerplayer.cpp
+       players/localplayer.cpp
+       players/localplayer.h
+       players/neutralplayer.h
+       sector.cc
+       sector.h
+Copyright: 2003, Russell Steffen <[e-mail]>
+           2003, Stephan Zehetner <[e-mail]>
+           2006, Dmitry Suzdalev <[e-mail]>
+           2006, Inge Wallin <[e-mail]>
+           2006, Pierre Ducroquet <[e-mail]>
+License: GPL-2+
+
+Files: dialogs/newgamedlg.cc
+       gameview.cc
+       map/mapitems.cc
+Copyright: 2003, Russell Steffen <[e-mail]>
+           2003, Stephan Zehetner <[e-mail]>
+           2006, Dmitry Suzdalev <[e-mail]>
+           2006, Inge Wallin <[e-mail]>
+           2006, Pierre Ducroquet <[e-mail]>
+           2011, Jeffrey Kelling <[e-mail]>
+License: GPL-2+
+
+Files: localgame.cpp
+       localgame.h
+       players/computerplayer.h
+       players/neutralplayer.cpp
+       players/player.h
+Copyright: 2006, Pierre Ducroquet <[e-mail]>
+License: GPL-2+
+
+Files: minimapview.cc
+       minimapview.h
+Copyright: 2003, Russell Steffen <[e-mail]>
+           2003, Stephan Zehetner <[e-mail]>
+           2006, Dmitry Suzdalev <[e-mail]>
+           2006, Inge Wallin <[e-mail]>
+           2006, Pierre Ducroquet <[e-mail]>
+           Sean D'Epagnier <[e-mail]>
+License: GPL-2+
+
+Files: players/player.cpp
+Copyright: 2006, Pierre Ducroquet <[e-mail]>
+           2011, Jeffrey Kelling <[e-mail]>
+License: GPL-2+
+
+>>>>>>> debian/copyright
 Files: debian/*
 Copyright: 2007-2013, Debian Qt/KDE Maintainers <[e-mail]>
 License: GPL-2+
@@ -34,9 +121,15 @@ License: GPL-2+
  .
  You should have received a copy of the GNU General Public License
  along with this program. If not, see <http://www.gnu.org/licenses/>
+<<<<<<< debian/copyright
  --
  On Debian systems, the complete text of the GNU General Public
  License version 2 can be found in `/usr/share/common-licenses/GPL-2'.
+=======
+ .
+ On Debian systems, the complete text of the GNU General Public
+ License version 2 can be found in "/usr/share/common-licenses/GPL-2".
+>>>>>>> debian/copyright
 
 License: GFDL-1.2+
  Permission is granted to copy, distribute and/or modify this document
@@ -45,6 +138,12 @@ License: GFDL-1.2+
  with no Invariant Sections, no Front-Cover Texts, and no Back-Cover Texts.
  A copy of the license is included in the section entitled "GNU
  Free Documentation License".
+<<<<<<< debian/copyright
  --
  On Debian systems, the complete text of the GNU Free Documentation
  License version 1.2 can be found in `/usr/share/common-licenses/GFDL-1.2'.
+=======
+ .
+ On Debian systems, the complete text of the GNU Free Documentation
+ License version 1.2 can be found in "/usr/share/common-licenses/GFDL-1.2".
+>>>>>>> debian/copyright
diff --git a/debian/icon-list b/debian/icon-list
new file mode 100644
index 0000000..0db6f12
--- /dev/null
+++ b/debian/icon-list
@@ -0,0 +1,2 @@
+/usr/share/icons/hicolor/16x16/apps/konquest.png	konquest-16.xpm
+/usr/share/icons/hicolor/32x32/apps/konquest.png	konquest.xpm
diff --git a/debian/icons/konquest-16.xpm b/debian/icons/konquest-16.xpm
new file mode 100644
index 0000000..cb1e1ca
--- /dev/null
+++ b/debian/icons/konquest-16.xpm
@@ -0,0 +1,278 @@
+/* XPM */
+static char *konquest_16[] = {
+/* columns rows colors chars-per-pixel */
+"16 16 256 2 ",
+"   c None",
+".  c black",
+"X  c black",
+"o  c black",
+"O  c black",
+"+  c black",
+"@  c black",
+"#  c black",
+"$  c black",
+"%  c black",
+"&  c black",
+"*  c black",
+"=  c black",
+"-  c black",
+";  c black",
+":  c black",
+">  c black",
+",  c black",
+"<  c black",
+"1  c black",
+"2  c black",
+"3  c black",
+"4  c black",
+"5  c black",
+"6  c black",
+"7  c black",
+"8  c black",
+"9  c black",
+"0  c black",
+"q  c black",
+"w  c black",
+"e  c black",
+"r  c #0D0D1F",
+"t  c #5A5E86",
+"y  c #484B71",
+"u  c #181A35",
+"i  c black",
+"p  c black",
+"a  c black",
+"s  c #00003F",
+"d  c black",
+"f  c black",
+"g  c black",
+"h  c black",
+"j  c black",
+"k  c black",
+"l  c black",
+"z  c black",
+"x  c #414158",
+"c  c #D0D3F6",
+"v  c #8B8FB6",
+"b  c #2F3351",
+"n  c #121735",
+"m  c #0F1227",
+"M  c #5A5F5F",
+"N  c #7F9B92",
+"B  c #578987",
+"V  c #0E343E",
+"C  c black",
+"Z  c black",
+"A  c black",
+"S  c black",
+"D  c black",
+"F  c black",
+"G  c #03030A",
+"H  c #D3D4ED",
+"J  c #71748D",
+"K  c black",
+"L  c black",
+"P  c #635D64",
+"I  c #C8DCCE",
+"U  c #F7FFFC",
+"Y  c #EAFFFF",
+"T  c #9EEEE5",
+"R  c #386B6F",
+"E  c black",
+"W  c black",
+"Q  c black",
+"!  c black",
+"~  c black",
+"^  c black",
+"/  c #535561",
+"(  c #D1D2E7",
+")  c #0B0510",
+"_  c #382124",
+"`  c #A6A09D",
+"'  c #F4FBF3",
+"]  c gray100",
+"[  c gray100",
+"{  c #F7FFFF",
+"}  c #A6F0D9",
+"|  c #253330",
+" . c black",
+".. c black",
+"X. c black",
+"o. c black",
+"O. c black",
+"+. c black",
+"@. c #828390",
+"#. c #BEBCCB",
+"$. c #8C766A",
+"%. c #BBB7A4",
+"&. c #DCDFD4",
+"*. c #FDFFFC",
+"=. c gray100",
+"-. c #F7FFFC",
+";. c #BEF6D5",
+":. c #647B6D",
+">. c black",
+",. c black",
+"<. c black",
+"1. c black",
+"2. c black",
+"3. c black",
+"4. c black",
+"5. c #8C8C97",
+"6. c #E4E1E4",
+"7. c #C7C3A6",
+"8. c #B8B99E",
+"9. c #CCD0C1",
+"0. c #D2DDD1",
+"q. c #B9D7C2",
+"w. c #97C1A8",
+"e. c #697572",
+"r. c black",
+"t. c black",
+"y. c black",
+"u. c black",
+"i. c black",
+"p. c black",
+"a. c black",
+"s. c black",
+"d. c #81818B",
+"f. c #EAEBF2",
+"g. c #C6C6AE",
+"h. c #A1A482",
+"j. c #8B907D",
+"k. c #808A80",
+"l. c #7D857E",
+"z. c #413E43",
+"x. c #050B26",
+"c. c black",
+"v. c black",
+"b. c black",
+"n. c black",
+"m. c black",
+"M. c black",
+"N. c black",
+"B. c black",
+"V. c #727979",
+"C. c #D3D9E1",
+"Z. c #DADAD4",
+"A. c #BABAA0",
+"S. c #A49F84",
+"D. c #77685E",
+"F. c #0A0001",
+"G. c black",
+"H. c #151B3E",
+"J. c black",
+"K. c black",
+"L. c black",
+"P. c black",
+"I. c black",
+"U. c black",
+"Y. c black",
+"T. c #0E0000",
+"R. c #464941",
+"E. c #9FA6AD",
+"W. c #E1E2ED",
+"Q. c #D9D2CF",
+"!. c #7A6862",
+"~. c black",
+"^. c black",
+"/. c #383D62",
+"(. c #2E345A",
+"). c black",
+"_. c black",
+"`. c black",
+"'. c black",
+"]. c black",
+"[. c black",
+"{. c black",
+"}. c #020000",
+"|. c #070600",
+" X c #2E3234",
+".X c #898A96",
+"XX c #C6C7DA",
+"oX c #B1B4CD",
+"OX c #8F93B0",
+"+X c #8B8FB9",
+"@X c #6F75A6",
+"#X c #16192D",
+"$X c black",
+"%X c black",
+"&X c black",
+"*X c black",
+"=X c black",
+"-X c black",
+";X c black",
+":X c black",
+">X c black",
+",X c black",
+"<X c #000003",
+"1X c #50505B",
+"2X c #9596AD",
+"3X c #ADAFCE",
+"4X c #9DA0C8",
+"5X c #303248",
+"6X c black",
+"7X c black",
+"8X c black",
+"9X c black",
+"0X c black",
+"qX c black",
+"wX c black",
+"eX c black",
+"rX c black",
+"tX c black",
+"yX c black",
+"uX c black",
+"iX c black",
+"pX c black",
+"aX c #000005",
+"sX c black",
+"dX c black",
+"fX c black",
+"gX c black",
+"hX c black",
+"jX c black",
+"kX c black",
+"lX c black",
+"zX c black",
+"xX c black",
+"cX c black",
+"vX c black",
+"bX c black",
+"nX c black",
+"mX c black",
+"MX c black",
+"NX c black",
+"BX c black",
+"VX c black",
+"CX c black",
+"ZX c black",
+"AX c black",
+"SX c black",
+"DX c black",
+"FX c black",
+"GX c black",
+"HX c black",
+"JX c black",
+"KX c black",
+"LX c black",
+"PX c black",
+"IX c black",
+"UX c black",
+/* pixels */
+"  . X o O + @ # $ % & * = - ; : ",
+"> , < 1 2 3 4 5 6 7 8 9 0 q w e ",
+"r t y u i p a s d f g h j k l z ",
+"x c v b n m M N B V C Z A S D F ",
+"G H J K L P I U Y T R E W Q ! ~ ",
+"^ / ( ) _ ` ' ] [ { } |  ...X.o.",
+"O.+.@.#.$.%.&.*.=.-.;.:.>.,.<.1.",
+"2.3.4.5.6.7.8.9.0.q.w.e.r.t.y.u.",
+"i.p.a.s.d.f.g.h.j.k.l.z.x.c.v.b.",
+"n.m.M.N.B.V.C.Z.A.S.D.F.G.H.J.K.",
+"L.P.I.U.Y.T.R.E.W.Q.!.~.^./.(.).",
+"_.`.'.].[.{.}.|. X.XXXoXOX+X@X#X",
+"$X%X&X*X=X-X;X:X>X,X<X1X2X3X4X5X",
+"6X7X8X9X0XqXwXeXrXtXyXuXiXpXaXsX",
+"dXfXgXhXjXkXlXzXxXcXvXbXnXmXMXNX",
+"BXVXCXZXAXSXDXFXGXHXJXKXLXPXIXUX"
+};
diff --git a/debian/icons/konquest.xpm b/debian/icons/konquest.xpm
new file mode 100644
index 0000000..63fc3f9
--- /dev/null
+++ b/debian/icons/konquest.xpm
@@ -0,0 +1,242 @@
+/* XPM */
+static char *konquest[] = {
+/* columns rows colors chars-per-pixel */
+"32 32 204 2 ",
+"   c #150805",
+".  c #140C0F",
+"X  c #2C150F",
+"o  c #261815",
+"O  c #321914",
+"+  c #2F2018",
+"@  c #141823",
+"#  c #231F22",
+"$  c #281F24",
+"%  c #202421",
+"&  c #282520",
+"*  c #3C2E2C",
+"=  c #2E322E",
+"-  c #3D342C",
+";  c #2C2D32",
+":  c #393830",
+">  c #34343C",
+",  c #3A3B3F",
+"<  c #41281E",
+"1  c #374039",
+"2  c #3E483F",
+"3  c #59463D",
+"4  c #272B44",
+"5  c #2D324A",
+"6  c #31354B",
+"7  c #37394E",
+"8  c #353651",
+"9  c #333957",
+"0  c #33395B",
+"q  c #363E62",
+"w  c #563D49",
+"e  c #3F4153",
+"r  c #3E415A",
+"t  c #3F4566",
+"y  c #55444C",
+"u  c #5A464C",
+"i  c #484856",
+"p  c #524F5A",
+"a  c #4C5951",
+"s  c #5A5C5F",
+"d  c #6A4945",
+"f  c #404463",
+"g  c #454C75",
+"h  c #5A5A70",
+"j  c #695E65",
+"k  c #46646F",
+"l  c #5B6A60",
+"z  c #636160",
+"x  c #626E67",
+"c  c #6E6A6A",
+"v  c #7B6567",
+"b  c #7F6862",
+"n  c #796C6B",
+"m  c #696972",
+"M  c #796E76",
+"N  c #70727E",
+"B  c #7C7C7A",
+"V  c #8C726A",
+"C  c #957D72",
+"Z  c #968876",
+"A  c #97877E",
+"S  c #535981",
+"D  c #5E6184",
+"F  c #5D628A",
+"G  c #4C7E8A",
+"H  c #597E80",
+"J  c #6C6E87",
+"K  c #65698D",
+"L  c #7A7D83",
+"P  c #636994",
+"I  c #6D729E",
+"U  c #75799D",
+"Y  c #777CA0",
+"T  c #7A7EA3",
+"R  c #6C8784",
+"E  c #788381",
+"W  c #738B8B",
+"Q  c #7C809D",
+"!  c #7D81AB",
+"~  c #60A9AD",
+"^  c #6EADAC",
+"/  c #6ABCBB",
+"(  c #7EDED2",
+")  c #828984",
+"_  c #85898D",
+"`  c #8C8D8A",
+"'  c #968E8E",
+"]  c #8D948F",
+"[  c #979186",
+"{  c #93958B",
+"}  c #979A89",
+"|  c #87899E",
+" . c #8C9791",
+".. c #8B9A91",
+"X. c #949891",
+"o. c #95929C",
+"O. c #979F9E",
+"+. c #AD9E88",
+"@. c #92A198",
+"#. c #A0A28A",
+"$. c #AAAC8C",
+"%. c #B1A88C",
+"&. c #A2A398",
+"*. c #ADAC9A",
+"=. c #B3B692",
+"-. c #B3B39A",
+";. c #BCB29F",
+":. c #BABB9A",
+">. c #888AA7",
+",. c #9394A3",
+"<. c #8387B1",
+"1. c #8D92BD",
+"2. c #9599BF",
+"3. c #95B3A3",
+"4. c #9FA0B1",
+"5. c #B6AEA6",
+"6. c #ABB0AB",
+"7. c #A0BDAC",
+"8. c #A5A6B3",
+"9. c #A7BFB0",
+"0. c #C5BFA0",
+"q. c #C5BFAD",
+"w. c #9FC6B2",
+"e. c #BEC0A9",
+"r. c #A8C3B2",
+"t. c #A1CAB3",
+"y. c #B1C3B7",
+"u. c #B6CBBB",
+"i. c #C0C09F",
+"p. c #CAC8A4",
+"a. c #C5C5AD",
+"s. c #CEC8A9",
+"d. c #C5C5B3",
+"f. c #C3C5BD",
+"g. c #C8C6BF",
+"h. c #C4CABF",
+"j. c #CFCDB9",
+"k. c #D2CFBE",
+"l. c #969AC2",
+"z. c #9A9DC2",
+"x. c #A9ACCF",
+"c. c #AEB0C5",
+"v. c #B9B3C3",
+"b. c #B6BACC",
+"n. c #BDBECD",
+"m. c #ABAED2",
+"M. c #B7B9D7",
+"N. c #BCBED4",
+"B. c #B3B6D8",
+"V. c #BBBDDA",
+"C. c #96DFC8",
+"Z. c #8FDDD0",
+"A. c #BBC0C3",
+"S. c #B3DDC4",
+"D. c #BEC1DA",
+"F. c #8DE5D3",
+"G. c #ADE1C2",
+"H. c #B3F0CE",
+"J. c #B1EDDB",
+"K. c #BFC1E1",
+"L. c #B0F7EB",
+"P. c #C1CEC0",
+"I. c #CECEC4",
+"U. c #D0D2C4",
+"Y. c #D6D7CE",
+"T. c #C1C3D6",
+"R. c #C8C8D5",
+"E. c #C6C8D9",
+"W. c #D4D4DB",
+"Q. c #DBDBDB",
+"!. c #C1E3CD",
+"~. c #DFE2D6",
+"^. c #DFE3DA",
+"/. c #D6EFDE",
+"(. c #DAE9DC",
+"). c #C7F2DD",
+"_. c #CCF0D9",
+"`. c #C7F9DB",
+"'. c #CBCCE2",
+"]. c #CFD1EB",
+"[. c #D6D6E3",
+"{. c #DDDEEA",
+"}. c #D3D4F2",
+"|. c #DBDCF3",
+" X c #C2FDE8",
+".X c #D7FFEC",
+"XX c #DEE0F1",
+"oX c #C3FEF2",
+"OX c #DCFFF9",
+"+X c #E7ECE1",
+"@X c #E4E4EC",
+"#X c #ECF2E6",
+"$X c #EAF4E8",
+"%X c #E6FBEC",
+"&X c #E3E5F5",
+"*X c #E2E4FE",
+"=X c #EDEEFD",
+"-X c #EDFFF6",
+";X c #EFF1FF",
+":X c #F3FDF2",
+">X c #F3F3FF",
+",X c #F4FCFF",
+"<X c #FEFFFE",
+"1X c None",
+/* pixels */
+"1X1X1X1X1X1X1X1X1X1X1X1X1X1X1X1X1X1X1X1X1X1X1X1X1X1X1X1X1X1X1X1X",
+"1X1X1X1X1X1X1X1X1X1X1X1X1X1X1X1X1X1X1X1X1X1X1X1X1X1X1X1X1X1X1X1X",
+"1X1X1X1X1X1X1X1X1X1X1X1X1X1X1X1X1X1X1X1X1X1X1X1X1X1X1X1X1X1X1X1X",
+"1X1X1X1X1X1X1X1X1X1X1X1X1X1X1X1X1X1X1X1X1X1X1X1X1X1X1X1X1X1X1X1X",
+"1X1X1X1X1X1X1X1X1X1X1X1X1X1X1X1X1X1X1X1X1X1X1X1X1X1X1X1X1X1X1X1X",
+"1X1X1X5 1X1X1X1X1X1X1X1X1X1X1X1X1X1X1X1X1X1X1X1X1X1X1X1X1X1X1X1X",
+"1XU 1.l.1.T F f 1X1X1X1X1X1X1X1X1X1X1X1X1X1X1X1X1X1X1X1X1X1X1X1X",
+"1Xl.V.|.M.l.Y F S g 5 1X1X1XE R H k 1X1X1X1X1X1X1X1X1X1X1X1X1X1X",
+"1X>.|.|.l.D 1X1X1X@ 8 h ) 9.!.).J.Z./ G 1X1X1X1X1X1X1X1X1X1X1X1X",
+"1Xi ].=Xm.e 1X1X1X1Xy ` y./.-X<X,XOXL.( ~ 1X1X1X1X1X1X1X1X1X1X1X",
+"1X1X| =XXXJ 1X1X1Xw M 6.(.<X<X<X<X<X,XoXF.^ 1X1X1X1X1X1X1X1X1X1X",
+"1X1X1Xc.,X'.1X1X1Xv ' f.$X<X<X<X<X<X<X,X XC.W 1X1X1X1X1X1X1X1X1X",
+"1X1X1X1XT.<Xb.1Xd A 5.I.Q.<X<X<X<X<X<X<X.XH.w.1X1X1X1X1X1X1X1X1X",
+"1X1X1X1X1XE.<Xv.V +.q.d.I.+X<X<X<X<X<X-X`.G.w.z 1X1X1X1X1X1X1X1X",
+"1X1X1X1X1X1Xn.<XW.0.s.q.q.I.~.#X:X:X%X_.S.t.3.c 1X1X1X1X1X1X1X1X",
+"1X1X1X1X1X1X1X8.,X@Xk.p.:.e.d.f.P.P.u.r.7.3...m 1X1X1X1X1X1X1X1X",
+"1X1X1X1X1X1X1X1Xo.>X=XY.i.=.-.*.&.X.]  ... .E p 0 4 1X1X1X1X1X1X",
+"1X1X1X1X1X1X1X1X# L {.,X@Xa.=.$.#.} { { ` B j $ 1X0 0 1X1X1X1X1X",
+"1X1X1X1X1X1X1X1X. = x A.>X>XQ.a.:.:.-.*.[ v u 1X1X1Xt 0 1X1X1X1X",
+"1X1X1X1X1X1X1X1X1Xo : a ..W.>X=XQ.j.0.%.Z V * 1X1X1X5 g f 1X1X1X",
+"1X1X1X1X1X1X1X1X1X1XO - 2 l O.[.>X=XW.5.C 3 1X1X1X1X7 P S r 1X1X",
+"1X1X1X1X1X1X1X1X1X1X1XX < : 1 a _ R.>X>X[.,.1X1X1X1XT <.F I 1X1X",
+"1X1X1X1X1X1X1X1X1X1X1X1X  X + & % = s 8.&X,X=X}.V.B.m.l.! ! K 1X",
+"1X1X1X1X1X1X1X1X1X1X1X1X1X1X1X1X1X1X1X1X; L n.|.*X}.T.m.z.l.1.1X",
+"1X1X1X1X1X1X1X1X1X1X1X1X1X1X1X1X1X1X1X1X1X1X1X, N 8.N.D.M.x.Y 1X",
+"1X1X1X1X1X1X1X1X1X1X1X1X1X1X1X1X1X1X1X1X1X1X1X1X1X1X1X; > ; 1X1X",
+"1X1X1X1X1X1X1X1X1X1X1X1X1X1X1X1X1X1X1X1X1X1X1X1X1X1X1X1X1X1X1X1X",
+"1X1X1X1X1X1X1X1X1X1X1X1X1X1X1X1X1X1X1X1X1X1X1X1X1X1X1X1X1X1X1X1X",
+"1X1X1X1X1X1X1X1X1X1X1X1X1X1X1X1X1X1X1X1X1X1X1X1X1X1X1X1X1X1X1X1X",
+"1X1X1X1X1X1X1X1X1X1X1X1X1X1X1X1X1X1X1X1X1X1X1X1X1X1X1X1X1X1X1X1X",
+"1X1X1X1X1X1X1X1X1X1X1X1X1X1X1X1X1X1X1X1X1X1X1X1X1X1X1X1X1X1X1X1X",
+"1X1X1X1X1X1X1X1X1X1X1X1X1X1X1X1X1X1X1X1X1X1X1X1X1X1X1X1X1X1X1X1X"
+};
diff --git a/debian/konquest.docs b/debian/konquest.docs
new file mode 100644
index 0000000..ca0272a
--- /dev/null
+++ b/debian/konquest.docs
@@ -0,0 +1,3 @@
+AUTHORS
+README
+TODO
diff --git a/debian/konquest.install b/debian/konquest.install
new file mode 100644
index 0000000..663227b
--- /dev/null
+++ b/debian/konquest.install
@@ -0,0 +1,3 @@
+../icons/konquest-16.xpm /usr/share/pixmaps
+../icons/konquest.xpm /usr/share/pixmaps
+usr/
diff --git a/debian/konquest.manpages b/debian/konquest.manpages
new file mode 100644
index 0000000..6511747
--- /dev/null
+++ b/debian/konquest.manpages
@@ -0,0 +1 @@
+debian/man/out/konquest.6
diff --git a/debian/konquest.menu b/debian/konquest.menu
new file mode 100644
index 0000000..44bb11d
--- /dev/null
+++ b/debian/konquest.menu
@@ -0,0 +1,8 @@
+?package(konquest):\
+	needs="x11"\
+	section="Games/Strategy"\
+	hints="KDE"\
+	title="Konquest"\
+	icon32x32="/usr/share/pixmaps/konquest.xpm"\
+	icon16x16="/usr/share/pixmaps/konquest-16.xpm"\
+	command="/usr/games/konquest"
diff --git a/debian/man/kdeopt.part b/debian/man/kdeopt.part
new file mode 100644
index 0000000..5557afa
--- /dev/null
+++ b/debian/man/kdeopt.part
@@ -0,0 +1,110 @@
+.\" This portion of the manual page is from kdeopt.man, from the
+.\" kdegames Debian package.
+.SH GENERIC OPTIONS
+.TP
+.B \-\-help
+Show help about options.
+.TP
+.B \-\-help-qt
+Show Qt specific options.
+.TP
+.B \-\-help-kde
+Show KDE specific options.
+.TP
+.B \-\-help-all
+Show all options.
+.TP
+.B \-\-author
+Show author information.
+.TP
+.B \-v, \-\-version
+Show version information.
+.TP
+.B \-\-license
+Show license information.
+.TP
+.B \-\-
+End of options.
+.SH QT OPTIONS
+.TP
+.B \-\-display \fI<displayname>\fB
+Use the X-server display `displayname'.
+.TP
+.B \-\-session \fI<sessionId>\fB
+Restore the application for the given `sessionId'.
+.TP
+.B \-\-cmap
+Causes the application to install a private color map on an 8\-bit
+display.
+.TP
+.B \-\-ncols \fI<count>\fB
+Limits the number of colors allocated in the color cube on an 8\-bit
+display, if the application is using the QApplication::ManyColor color
+specification.
+.TP
+.B \-\-nograb
+Tells Qt to never grab the mouse or the keyboard.
+.TP
+.B \-\-dograb
+Running under a debugger can cause an implicit \-nograb, use \-dograb
+to override.
+.TP
+.B \-\-sync
+Switches to synchronous mode for debugging.
+.TP
+.B \-\-fn, \-\-font \fI<fontname>\fB
+Defines the application font.
+.TP
+.B \-\-bg, \-\-background \fI<color>\fB
+Sets the default background color and an application palette (light
+and dark shades are calculated).
+.TP
+.B \-\-fg, \-\-foreground \fI<color>\fB
+Sets the default foreground color.
+.TP
+.B \-\-btn, \-\-button \fI<color>\fB
+Sets the default button color.
+.TP
+.B \-\-name \fI<name>\fB
+Sets the application name.
+.TP
+.B \-\-title \fI<title>\fB
+Sets the application title (caption).
+.TP
+.B \-\-visual TrueColor
+Forces the application to use a TrueColor visual on an 8-bit display.
+.TP
+.B \-\-inputstyle \fI<inputstyle>\fB
+Sets XIM (X Input Method) input style. Possible values are
+\fIonthespot\fP, \fIoverthespot\fP, \fIoffthespot\fP and \fIroot\fP.
+.TP
+.B \-\-im \fI<XIM server>\fB
+Set XIM server.
+.TP
+.B \-\-noxim
+Disable XIM.
+.TP
+.B \-\-reverse
+Mirrors the whole layout of widgets.
+.SH KDE OPTIONS
+.TP
+.B \-\-caption \fI<caption>\fB
+Use `caption' as name in the titlebar.
+.TP
+.B \-\-icon \fI<icon>\fB
+Use `icon' as the application icon.
+.TP
+.B \-\-config \fI<filename>\fB
+Use alternative configuration file.
+.TP
+.B \-\-nocrashhandler
+Disable crash handler, to get core dumps.
+.TP
+.B \-\-waitforwm
+Waits for a WM_NET compatible windowmanager.
+.TP
+.B \-\-style \fI<style>\fB
+Sets the application GUI style.
+.TP
+.B \-\-geometry \fI<geometry>\fB
+Sets the client geometry of the main widget.
diff --git a/debian/man/konquest.man b/debian/man/konquest.man
new file mode 100644
index 0000000..3fbef82
--- /dev/null
+++ b/debian/man/konquest.man
@@ -0,0 +1,17 @@
+.TH KONQUEST 6
+.SH NAME
+konquest \- Gnu-Lactic Konquest
+.SH SYNOPSIS
+.B konquest
+.I [Qt-options] [KDE-options]
+.SH DESCRIPTION
+This is the KDE version of Gnu-Lactic Konquest, a multi-player
+strategy game. The goal of the game is to expand your interstellar
+empire across the galaxy and, of course, crush your rivals in the
+process.
+.so kdeopt.part
+.SH SEE ALSO
+More detailed user documentation is available from
+.BR help:/konquest
+(either enter this URL into \fBkonqueror\fP, or run `khelpcenter
+help:/konquest').
diff --git a/debian/rules b/debian/rules
index af1bd9b..c05284e 100755
--- a/debian/rules
+++ b/debian/rules
@@ -7,3 +7,11 @@ override_dh_auto_configure:
 
 override_dh_auto_install:
 	$(overridden_command) --destdir=debian/tmp
+<<<<<<< debian/rules
+=======
+
+generate-icons:
+	while read src dest; do \
+		convert debian/tmp/$$src debian/icons/$$dest; \
+	done <debian/icon-list
+>>>>>>> debian/rules
diff --git a/debian/watch b/debian/watch
index 1e8c3ca..8029088 100644
--- a/debian/watch
+++ b/debian/watch
@@ -1,2 +1,7 @@
 version=3
+<<<<<<< debian/watch
 http://download.kde.org/stable/applications/([\d.]+)/src/ksnakeduel-([\d.]+).tar.xz
+=======
+http://download.kde.org/stable/applications/([\d.]+)/src/konquest-([\d.]+).tar.xz
+http://download.kde.org/unstable/applications/([\d.]+)/src/konquest-([\d.]+).tar.xz
+>>>>>>> debian/watch