[freecol] 40/125: [freecol] Ready for upload

[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 9723e0fbcb34f196adf2b4ebb1d4bf86c84ed9e0
Author: Vincent Fourmond <fourmond at debian.org>
Date:   Tue Feb 24 18:04:09 2009 +0000

    [freecol] Ready for upload
---
 debian/NEWS      |  7 +++++++
 debian/changelog | 12 +++++++-----
 debian/control   |  2 +-
 debian/dirs      |  4 ++++
 debian/rules     | 57 +-------------------------------------------------------
 5 files changed, 20 insertions(+), 62 deletions(-)

diff --git a/debian/NEWS b/debian/NEWS
index 65760d9..368fe96 100644
--- a/debian/NEWS
+++ b/debian/NEWS
@@ -1,3 +1,10 @@
+freecol (0.8.1.dfsg-1) unstable; urgency=low
+
+  Saved games from version before 0.8 WILL NOT WORK with this version. 
+  Finish your games before upgrading !
+
+ -- Vincent Fourmond <fourmond at debian.org>  Tue, 24 Feb 2009 18:54:23 +0100
+
 freecol (0.7.3-1) unstable; urgency=low
 
   Apparently, saves for earlier versions of freecol might not be valid 
diff --git a/debian/changelog b/debian/changelog
index 1a1a408..935ba7e 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,7 +1,8 @@
-freecol (0.8.1.dfsg-1) UNRELEASED; urgency=low
+freecol (0.8.1.dfsg-1) unstable; urgency=low
 
-  * NOT RELEASED YET
-  * New upstream release
+  * New upstream release (closes: #514363)
+    - saves the log in ~/.freecol (closes: #488330)
+    - does not mess up language settings (closes: #497076)
   * Adding alternate dependency on the virtual package java6-runtime, since
     all variants seem to be able to run freecol. (closes: #503810)
   * Switched to a machine-readable debian/copyright file
@@ -15,9 +16,10 @@ freecol (0.8.1.dfsg-1) UNRELEASED; urgency=low
     upstream modifications
   * Remove unapplied patches
   * Switch to using cdbs for building
-  * New build-depends: ant-optional (for the Native2Ascii stuff)
+  * Update debian/NEWS to mention that save games from earlier
+    versions are not compatible.
 
- -- Vincent Fourmond <fourmond at debian.org>  Tue, 24 Feb 2009 17:42:51 +0100
+ -- Vincent Fourmond <fourmond at debian.org>  Tue, 24 Feb 2009 18:55:19 +0100
 
 freecol (0.7.4.dfsg+1-1) unstable; urgency=low
 
diff --git a/debian/control b/debian/control
index 6b6194f..7bbc896 100644
--- a/debian/control
+++ b/debian/control
@@ -4,7 +4,7 @@ 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, ant-optional, openjdk-6-jdk, cdbs
+ ant, openjdk-6-jdk, cdbs
 Build-Depends-Indep: libhiglayout-java, libwoodstox-java,
   tex4ht, texlive-base-bin, ant-optional, texlive-latex-recommended
 Standards-Version: 3.8.0
diff --git a/debian/dirs b/debian/dirs
new file mode 100644
index 0000000..1399945
--- /dev/null
+++ b/debian/dirs
@@ -0,0 +1,4 @@
+usr/share/java
+usr/share/games/freecol
+usr/share/applications
+usr/share/pixmaps
\ No newline at end of file
diff --git a/debian/rules b/debian/rules
index 00c0e24..fe9d432 100755
--- a/debian/rules
+++ b/debian/rules
@@ -25,7 +25,7 @@ DEB_BUILDDIR         := .
 DEB_ANT_BUILDFILE    := build.xml
 DEB_ANT_CLEAN_TARGET := clean
 
-target_jar_dir= debian/freecol/usr/share/java/
+target_jar_dir= debian/freecol/usr/share/java
 
 print-version:
 	echo $(VERSION)
@@ -33,58 +33,3 @@ print-version:
 install/freecol::
 	install -m 644 freecol.jar $(target_jar_dir)/freecol-$(VERSION).jar
 	ln -s freecol-$(VERSION).jar $(target_jar_dir)/freecol.jar
-	install -m 755 -t debian/freecol/usr/bin debian/wrappers/freecol
-
-
-# build: build-stamp
-# build-stamp: patch doc-saved
-# 	dh_testdir
-# 	$(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
-# 	rm -f doc/FreeCol.aux 
-# 	$(ANT) print-manual
-
-# 	touch build-stamp
-
-# clean: clean-patched unpatch
-# clean-patched:
-# 	dh_testdir
-# 	dh_testroot
-# 	rm -f build-stamp freecol*.jar
-# 	$(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
-
-# doc-saved:
-# 	[ -d doc-saved ] || cp -a doc doc-saved
-
-# # Build architecture-independent files here.
-# binary-indep: build
-# # We have nothing to do by default.
-# 	dh_testdir
-# 	dh_testroot
-# 	dh_install
-# 	dh_installchangelogs
-# 	dh_installdocs
-# 	dh_installman
-# 	dh_installmenu
-# 	dh_link
-# 	dh_compress
-# 	dh_fixperms
-# 	dh_perl -d -V
-# 	dh_installdeb
-# 	dh_gencontrol
-# 	dh_md5sums
-# 	dh_builddeb
-
-# # Build architecture-dependent files here.
-# binary-arch: 
-
-# binary: binary-indep binary-arch
-# .PHONY: build clean binary-indep binary-arch binary install

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