[freecol] 16/125: [freecol] small improvements + fixes hopefully build on ubuntu

Sun Dec 20 19:39:03 UTC 2015

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

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

commit 6b392ce5224f5e57fe32f7896465f24478dcfc7c
Author: Vincent Fourmond <fourmond at debian.org>
Date:   Fri Dec 14 00:27:54 2007 +0000

    [freecol] small improvements + fixes hopefully build on ubuntu
---
 debian/changelog       | 12 +++++++++---
 debian/control         | 11 +++++------
 debian/freecol.desktop |  9 +++++++++
 debian/install         |  6 +++++-
 debian/menu            |  3 ++-
 debian/patches/00list  |  2 +-
 debian/rules           | 13 +++++++------
 debian/wrapper/freecol | 26 ++++++++++++++++++++++++++
 8 files changed, 64 insertions(+), 18 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index a602afc..82aa6b0 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,8 +1,14 @@
 freecol (0.7.2-5) UNRELEASED; urgency=low
 
-  * NOT RELEASED YET
-
- -- Vincent Fourmond <fourmond at debian.org>  Fri, 14 Dec 2007 01:03:10 +0100
+  * Bumped standards-version to 3.7.3 (no changes required)
+  * Added many changes by Matvey Kozhev <sikon at lucidfox.org> for
+    Ubuntu (closes: #453836)
+    - added a desktop file
+    - fix wrapper file position and pathes
+    - added icedtea dependencies 
+  * Added an icon for the menu 
+
+ -- Vincent Fourmond <fourmond at debian.org>  Fri, 14 Dec 2007 01:18:14 +0100
 
 freecol (0.7.2-4) unstable; urgency=low
 
diff --git a/debian/control b/debian/control
index 46a9970..95371e7 100644
--- a/debian/control
+++ b/debian/control
@@ -4,19 +4,18 @@ Priority: optional
 Maintainer: Debian Games Team <pkg-games-devel at lists.alioth.debian.org>
 Uploaders: Vincent Fourmond <fourmond at debian.org>
 Build-Depends: debhelper (>= 5), dpatch, 
- ant, sun-java6-jdk
+ ant, icedtea-java7-jdk | sun-java6-jdk
 Build-Depends-Indep: libhiglayout-java, libwoodstox-java,
-  tex4ht, texlive-base-bin, ant-optional
-Build-Conflicts: sun-java5-jdk, sun-java5-bin, sun-java5-jre
-Standards-Version: 3.7.2
+  tex4ht, texlive-base-bin, ant-optional, texlive-latex-recommended
+Standards-Version: 3.7.3
 Homepage: http://www.freecol.org
-Vcs-Svn: svn+ssh://svn.debian.org/svn/pkg-games/packages/trunk/freecol
+Vcs-Svn: svn://svn.debian.org/svn/pkg-games/packages/trunk/freecol
 Vcs-Browser: http://svn.debian.org/wsvn/pkg-games/packages/trunk/freecol
 
 
 Package: freecol
 Architecture: all
-Depends: sun-java6-jre | j2re1.6 , libhiglayout-java, 
+Depends: icedtea-java7-jre | sun-java6-jre | j2re1.6 , libhiglayout-java, 
  libwoodstox-java
 Description: an open version of Colonization
  freecol is a game in the spirit of Civilization but taking place in a
diff --git a/debian/freecol.desktop b/debian/freecol.desktop
new file mode 100644
index 0000000..e8c78ba
--- /dev/null
+++ b/debian/freecol.desktop
@@ -0,0 +1,9 @@
+[Desktop Entry]
+Encoding=UTF-8
+Name=FreeCol
+Comment=Turn-based strategy game
+Exec=/usr/games/freecol
+Icon=freecol
+Terminal=false
+Type=Application
+Categories=Java;Game;StrategyGame;
diff --git a/debian/install b/debian/install
index 1c55b65..a780262 100644
--- a/debian/install
+++ b/debian/install
@@ -1,3 +1,7 @@
 data/* usr/share/games/freecol
 freecol*.jar usr/share/java
-src/freecol usr/games
+debian/wrapper/freecol usr/games
+debian/freecol.desktop usr/share/applications
+freecol.xpm usr/share/pixmaps
+
+
diff --git a/debian/menu b/debian/menu
index ccc1d7d..f1376d9 100644
--- a/debian/menu
+++ b/debian/menu
@@ -1,2 +1,3 @@
 ?package(freecol):needs="X11" section="Games/Strategy"\
-  title="FreeCol" command="/usr/games/freecol"
+  title="FreeCol" command="/usr/games/freecol" \
+  icon="/usr/share/pixmaps/freecol.xpm"
diff --git a/debian/patches/00list b/debian/patches/00list
index 923d2e1..2cfe513 100644
--- a/debian/patches/00list
+++ b/debian/patches/00list
@@ -1,5 +1,5 @@
 10-fix-jar-path
 15-fix-jar-manifest
-20-freecol-executable
+# 20-freecol-executable
 25-change-save-dir
 30-language-option
\ No newline at end of file
diff --git a/debian/rules b/debian/rules
index c5fa340..ee0986d 100755
--- a/debian/rules
+++ b/debian/rules
@@ -7,21 +7,22 @@
 
 include /usr/share/dpatch/dpatch.make
 
-SOURCE_VERSION = $(shell dpkg-parsechangelog | egrep '^Version' | egrep -o '[0-9][^-]+')
+SOURCE_VERSION = $(shell dpkg-parsechangelog | egrep '^Version' | egrep -o '[0-9][^-]+' | head -n 1)
+JAVA_HOME = $(or $(shell [ -x /usr/lib/jvm/java-6-sun/lib ] && echo "/usr/lib/jvm/java-6-sun"), /usr/lib/jvm/java-7-icedtea)
+ANT = JAVA_HOME=$(JAVA_HOME) TEX4HTENV=/etc/tex4ht/tex4ht.env ant
 
 build: build-stamp
 build-stamp: patch doc-saved
 	dh_testdir
-
-	JAVA_HOME=/usr/lib/jvm/java-6-sun ant package
+	$(ANT) package
 # Then according to current Java policy, we move the freecol.jar file
 # to a versioned one.
 	[ -e freecol-$(SOURCE_VERSION).jar ] || mv freecol.jar freecol-$(SOURCE_VERSION).jar
 	[ -e freecol.jar ] || ln -s freecol-$(SOURCE_VERSION).jar freecol.jar
 # Then, we make the manual:
-	ant online-manual
+	$(ANT) online-manual
 	rm -f doc/FreeCol.aux 
-	ant print-manual
+	$(ANT) print-manual
 
 	touch build-stamp
 
@@ -30,7 +31,7 @@ clean-patched:
 	dh_testdir
 	dh_testroot
 	rm -f build-stamp freecol*.jar
-	ant clean
+	$(ANT) clean
 # We now move the doc-saved/ directory back to doc/, if it exists.
 	-[ -d doc-saved ] && ( rm -Rf doc ; mv doc-saved doc )
 	dh_clean
diff --git a/debian/wrapper/freecol b/debian/wrapper/freecol
new file mode 100755
index 0000000..945bc5c
--- /dev/null
+++ b/debian/wrapper/freecol
@@ -0,0 +1,26 @@
+#!/bin/sh
+
+# Script 'greatly inspired' from the one of jabref
+
+# Unless there already is a JAVA_HOME, we use icedtea or java6
+
+if [ -z "$JAVA_HOME" ]
+then
+    if [ -d /usr/lib/jvm/java-7-icedtea/jre ]; then
+	JAVA_HOME=/usr/lib/jvm/java-7-icedtea
+	JAVA=java
+    else				# We use java6 from Sun
+	JAVA_HOME=/usr/lib/jvm/java-6-sun 
+	JAVA=${JAVA_HOME}/jre/bin/java
+    fi
+fi
+
+# We test if LC_MESSAGES is different from LC_CTYPE, if that is the case,
+# we pass to freecol the --default-locale argument
+if [ "$LC_CTYPE" != "$LC_MESSAGES" -a "$LC_MESSAGES" ]; then
+    lang_argument="--default-locale=$LC_MESSAGES"
+fi
+
+export JAVA=${JAVA:=java}
+exec $JAVA -Xmx128M -jar /usr/share/java/freecol.jar --freecol-data \
+    /usr/share/games/freecol $lang_argument "$@"

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

