Package: freecol Version: 0.7.2-3 The attached debdiff contains changes I made to build it on Ubuntu. Besides these, there are also two other changes:
- Improved wrapper script, with no hardcoded paths (stolen from azureus), and not as a dpatch. (The dpatch, for that matter, has been dropped.) - Desktop file. I don't know if the file /etc/tex4ht/tex4ht.env exists in Debian, but if build fails because it doesn't, you can add a check and only set TEX4HTENV if the file exists. Sadly, I couldn't find any other way to fix tex4ht in Ubuntu.
diff -u freecol-0.7.2/debian/control freecol-0.7.2/debian/control --- freecol-0.7.2/debian/control +++ freecol-0.7.2/debian/control @@ -4,10 +4,9 @@ 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 + tex4ht, texlive-base-bin, ant-optional, texlive-latex-recommended Standards-Version: 3.7.2 Homepage: http://www.freecol.org Vcs-Svn: svn+ssh://svn.debian.org/svn/pkg-games/packages/trunk/freecol @@ -16,7 +15,7 @@ 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 -u freecol-0.7.2/debian/rules freecol-0.7.2/debian/rules --- freecol-0.7.2/debian/rules +++ freecol-0.7.2/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 @@ 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 -u freecol-0.7.2/debian/changelog freecol-0.7.2/debian/changelog --- freecol-0.7.2/debian/changelog +++ freecol-0.7.2/debian/changelog @@ -1,3 +1,14 @@ +freecol (0.7.2-3ubuntu1) hardy; urgency=low + + * Build with icedtea. + * Fixed upstream version detection in debian/rules (did not work with -XubuntuY). + * Build-depend on texlive-latex-recommended (fixes documentation generation). + * Dropped 20-freecol-executable.dpatch. The generated freecol executable + (in src/ - why?) uses a hardcoded JVM path. Added a replacement to debian/. + * Added .desktop file. + + -- Matvey Kozhev <[EMAIL PROTECTED]> Sun, 25 Nov 2007 18:00:11 +0600 + freecol (0.7.2-3) unstable; urgency=low * Add a dependency on j2re1.6 for java-package made packages diff -u freecol-0.7.2/debian/patches/00list freecol-0.7.2/debian/patches/00list --- freecol-0.7.2/debian/patches/00list +++ freecol-0.7.2/debian/patches/00list @@ -3,2 +3 @@ -20-freecol-executable -25-change-save-dir \ В конце файла нет новой строки +25-change-save-dir diff -u freecol-0.7.2/debian/install freecol-0.7.2/debian/install --- freecol-0.7.2/debian/install +++ freecol-0.7.2/debian/install @@ -3 +3,3 @@ -src/freecol usr/games +debian/wrapper/freecol usr/games +debian/freecol.desktop usr/share/applications +freecol.xpm usr/share/pixmaps only in patch2: unchanged: --- freecol-0.7.2.orig/debian/freecol.desktop +++ freecol-0.7.2/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; only in patch2: unchanged: --- freecol-0.7.2.orig/debian/wrapper/freecol +++ freecol-0.7.2/debian/wrapper/freecol @@ -0,0 +1,10 @@ +#!/bin/sh + +JAVA=java + +if [ -n "$JAVA_HOME" ]; then + PATH="$JAVA_HOME/bin:$PATH" +fi + +exec $JAVA -Xmx128M -jar /usr/share/java/freecol.jar --freecol-data \ + /usr/share/games/freecol "$@"
signature.asc
Description: This is a digitally signed message part.
