Author: fourmond Date: 2007-12-14 00:27:54 +0000 (Fri, 14 Dec 2007) New Revision: 4931
Added: packages/trunk/freecol/debian/freecol.desktop packages/trunk/freecol/debian/wrapper/ packages/trunk/freecol/debian/wrapper/freecol Modified: packages/trunk/freecol/debian/changelog packages/trunk/freecol/debian/control packages/trunk/freecol/debian/install packages/trunk/freecol/debian/menu packages/trunk/freecol/debian/patches/00list packages/trunk/freecol/debian/rules Log: [freecol] small improvements + fixes hopefully build on ubuntu Modified: packages/trunk/freecol/debian/changelog =================================================================== --- packages/trunk/freecol/debian/changelog 2007-12-14 00:03:36 UTC (rev 4930) +++ packages/trunk/freecol/debian/changelog 2007-12-14 00:27:54 UTC (rev 4931) @@ -1,8 +1,14 @@ freecol (0.7.2-5) UNRELEASED; urgency=low - * NOT RELEASED YET + * Bumped standards-version to 3.7.3 (no changes required) + * Added many changes by Matvey Kozhev <[EMAIL PROTECTED]> 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 <[EMAIL PROTECTED]> Fri, 14 Dec 2007 01:03:10 +0100 + -- Vincent Fourmond <[EMAIL PROTECTED]> Fri, 14 Dec 2007 01:18:14 +0100 freecol (0.7.2-4) unstable; urgency=low Modified: packages/trunk/freecol/debian/control =================================================================== --- packages/trunk/freecol/debian/control 2007-12-14 00:03:36 UTC (rev 4930) +++ packages/trunk/freecol/debian/control 2007-12-14 00:27:54 UTC (rev 4931) @@ -4,19 +4,18 @@ Maintainer: Debian Games Team <[EMAIL PROTECTED]> Uploaders: Vincent Fourmond <[EMAIL PROTECTED]> 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 Added: packages/trunk/freecol/debian/freecol.desktop =================================================================== --- packages/trunk/freecol/debian/freecol.desktop (rev 0) +++ packages/trunk/freecol/debian/freecol.desktop 2007-12-14 00:27:54 UTC (rev 4931) @@ -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; Modified: packages/trunk/freecol/debian/install =================================================================== --- packages/trunk/freecol/debian/install 2007-12-14 00:03:36 UTC (rev 4930) +++ packages/trunk/freecol/debian/install 2007-12-14 00:27:54 UTC (rev 4931) @@ -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 + + Modified: packages/trunk/freecol/debian/menu =================================================================== --- packages/trunk/freecol/debian/menu 2007-12-14 00:03:36 UTC (rev 4930) +++ packages/trunk/freecol/debian/menu 2007-12-14 00:27:54 UTC (rev 4931) @@ -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" Modified: packages/trunk/freecol/debian/patches/00list =================================================================== --- packages/trunk/freecol/debian/patches/00list 2007-12-14 00:03:36 UTC (rev 4930) +++ packages/trunk/freecol/debian/patches/00list 2007-12-14 00:27:54 UTC (rev 4931) @@ -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 Modified: packages/trunk/freecol/debian/rules =================================================================== --- packages/trunk/freecol/debian/rules 2007-12-14 00:03:36 UTC (rev 4930) +++ packages/trunk/freecol/debian/rules 2007-12-14 00:27:54 UTC (rev 4931) @@ -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 @@ 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 Added: packages/trunk/freecol/debian/wrapper/freecol =================================================================== --- packages/trunk/freecol/debian/wrapper/freecol (rev 0) +++ packages/trunk/freecol/debian/wrapper/freecol 2007-12-14 00:27:54 UTC (rev 4931) @@ -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 "$@" Property changes on: packages/trunk/freecol/debian/wrapper/freecol ___________________________________________________________________ Name: svn:executable + * _______________________________________________ Pkg-games-commits mailing list [email protected] http://lists.alioth.debian.org/mailman/listinfo/pkg-games-commits
