Your message dated Fri, 14 Dec 2007 18:17:04 +0000
with message-id <[EMAIL PROTECTED]>
and subject line Bug#453836: fixed in freecol 0.7.2-5
has caused the attached Bug report to be marked as done.
This means that you claim that the problem has been dealt with.
If this is not the case it is now your responsibility to reopen the
Bug report if necessary, and/or fix the problem forthwith.
(NB: If you are a system administrator and have no idea what I am
talking about this indicates a serious mail system misconfiguration
somewhere. Please contact me immediately.)
Debian bug tracking system administrator
(administrator, Debian Bugs database)
--- Begin Message ---
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 <pkg-games-devel@lists.alioth.debian.org>
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.
--- End Message ---
--- Begin Message ---
Source: freecol
Source-Version: 0.7.2-5
We believe that the bug you reported is fixed in the latest version of
freecol, which is due to be installed in the Debian FTP archive:
freecol_0.7.2-5.diff.gz
to pool/contrib/f/freecol/freecol_0.7.2-5.diff.gz
freecol_0.7.2-5.dsc
to pool/contrib/f/freecol/freecol_0.7.2-5.dsc
freecol_0.7.2-5_all.deb
to pool/contrib/f/freecol/freecol_0.7.2-5_all.deb
A summary of the changes between this version and the previous one is
attached.
Thank you for reporting the bug, which will now be closed. If you
have further comments please address them to [EMAIL PROTECTED],
and the maintainer will reopen the bug report if appropriate.
Debian distribution maintenance software
pp.
Vincent Fourmond <[EMAIL PROTECTED]> (supplier of updated freecol package)
(This message was generated automatically at their request; if you
believe that there is a problem with it please contact the archive
administrators by mailing [EMAIL PROTECTED])
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1
Format: 1.7
Date: Fri, 14 Dec 2007 01:18:14 +0100
Source: freecol
Binary: freecol
Architecture: source all
Version: 0.7.2-5
Distribution: unstable
Urgency: low
Maintainer: Debian Games Team <pkg-games-devel@lists.alioth.debian.org>
Changed-By: Vincent Fourmond <[EMAIL PROTECTED]>
Description:
freecol - an open version of Colonization
Closes: 453836
Changes:
freecol (0.7.2-5) unstable; urgency=low
.
* 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
Files:
385813d7ce56fada0aad5cdbd3d1a256 980 contrib/games optional freecol_0.7.2-5.dsc
2f099477ab803d33fb534b3d429f4aaa 6586 contrib/games optional
freecol_0.7.2-5.diff.gz
d1eb2418d5334469c6f3aeb8f60c3589 13024582 contrib/games optional
freecol_0.7.2-5_all.deb
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.6 (GNU/Linux)
iD8DBQFHYsegx/UhwSKygsoRAsU8AKCTJo+5hDBrMadVj9aIoFaithqb4ACgkYb0
VIocc+ARn1BiIs2s+5x/c3s=
=4K2m
-----END PGP SIGNATURE-----
--- End Message ---
_______________________________________________
Pkg-games-devel mailing list
Pkg-games-devel@lists.alioth.debian.org
http://lists.alioth.debian.org/mailman/listinfo/pkg-games-devel
