[freecol] 123/125: Install the old freecol.png icon again. Remove 64x64 xpm icon.

[Markus Koschany]

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

apo-guest pushed a commit to branch master
in repository freecol.

commit e668cfe9d8505cdbb4750427116deceeb8ca73e0
Author: Markus Koschany <apo at debian.org>
Date:   Sun Dec 20 20:13:07 2015 +0100

    Install the old freecol.png icon again. Remove 64x64 xpm icon.
---
 debian/changelog       | 1 -
 debian/control         | 4 ++--
 debian/docs            | 2 +-
 debian/freecol.install | 5 ++---
 debian/rules           | 2 --
 5 files changed, 5 insertions(+), 9 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index e216297..f8808e9 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -16,7 +16,6 @@ freecol (0.11.6+dfsg-1) unstable; urgency=medium
   * Rebase commons-cli-1.3.patch for new release.
   * Update installation path of freecol.xpm icon.
   * Install upstream's README file.
-  * Install 64x64 xpm icon to hicolor icon directory.
   * Start Freecol in windowed mode by default.
   * Drop README.Debian.
   * Use /bin/sh and set -e for wrapper script.
diff --git a/debian/control b/debian/control
index 6acbd04..12c7d41 100644
--- a/debian/control
+++ b/debian/control
@@ -9,11 +9,11 @@ Build-Depends:
  ant,
  ant-optional,
  debhelper (>= 9),
- openjdk-8-jdk,
  javahelper,
  libcommons-cli-java,
  libcortado-java,
  libmiglayout-java,
+ openjdk-8-jdk,
  tex4ht,
  texlive-binaries | texlive-base-bin,
  texlive-fonts-recommended,
@@ -26,8 +26,8 @@ Vcs-Git: git://anonscm.debian.org/pkg-games/freecol.git
 Package: freecol
 Architecture: all
 Depends:
- openjdk-8-jre | java8-runtime,
  java-wrappers,
+ openjdk-8-jre | java8-runtime,
  ${java:Depends},
  ${misc:Depends}
 Description: open source remake of the old Colonization
diff --git a/debian/docs b/debian/docs
index 0762395..c266867 100644
--- a/debian/docs
+++ b/debian/docs
@@ -1,5 +1,5 @@
 doc/FreeCol.html
-doc/specification.css
 doc/FreeCol.pdf
 doc/images
+doc/specification.css
 packaging/common/README
diff --git a/debian/freecol.install b/debian/freecol.install
index 7314b0c..a051ccf 100644
--- a/debian/freecol.install
+++ b/debian/freecol.install
@@ -1,7 +1,6 @@
 data/* usr/share/games/freecol
+data/freecol.png usr/share/pixmaps
 debian/freecol.desktop usr/share/applications
 debian/wrapper/freecol usr/games
-freecol.xpm usr/share/icons/hicolor/64x64/apps
-packaging/common/freecol.xpm usr/share/pixmaps
 packaging/common/freecol.appdata.xml usr/share/appdata
-
+packaging/common/freecol.xpm usr/share/pixmaps
diff --git a/debian/rules b/debian/rules
index 849b15e..c9115f0 100755
--- a/debian/rules
+++ b/debian/rules
@@ -14,11 +14,9 @@ override_dh_auto_build:
 		package \
 		online-manual \
 		print-manual
-	cp packaging/common/freecol_64x64.xpm freecol.xpm
 
 override_dh_clean:
 	dh_clean
-	$(RM) freecol.xpm
 	$(RM) src/MANIFEST.MF
 
 get-orig-source:

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