[freecol] 34/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 cc57aaf7f240848fd5c3c70e3ac9cae96d0840b1
Author: Vincent Fourmond <fourmond at debian.org>
Date:   Sun Aug 10 12:48:21 2008 +0000

    [freecol] Ready for upload
---
 debian/changelog                 | 7 ++++---
 debian/patches/00list            | 2 +-
 debian/patches/40-manpage.dpatch | 3 +--
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index efe7ab4..8336584 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,14 +1,15 @@
-freecol (0.7.4.dfsg-2) UNRELEASED; urgency=low
+freecol (0.7.4.dfsg-2) unstable; urgency=low
 
-  * NOT RELEASED YET
   * Fix watchfile to ignore the alpha releases (users and developers
     seem to complain about their stability).
   * Add openjdk in the wrapper script, and tighten up dependency on
     java-wrappers accordingly.
   * freecol can now move to main ! (closes: #491260)
   * Adapted wrapper/freecol to work around a java-wrappers bug
+  * Document undocumented patches, and drop 15-fix-jar-manifest which
+    really isn't necessary now that we are using java-wrappers.
 
- -- Vincent Fourmond <fourmond at debian.org>  Sun, 10 Aug 2008 09:27:55 +0200
+ -- Vincent Fourmond <fourmond at debian.org>  Sun, 10 Aug 2008 14:42:28 +0200
 
 freecol (0.7.4.dfsg-1) unstable; urgency=low
 
diff --git a/debian/patches/00list b/debian/patches/00list
index ae9aee2..425e3c5 100644
--- a/debian/patches/00list
+++ b/debian/patches/00list
@@ -1,5 +1,5 @@
 10-fix-jar-path
-15-fix-jar-manifest
+# 15-fix-jar-manifest
 # 20-freecol-executable
 25-change-save-dir
 # 30-language-option
diff --git a/debian/patches/40-manpage.dpatch b/debian/patches/40-manpage.dpatch
index 500ebd8..fde5d42 100755
--- a/debian/patches/40-manpage.dpatch
+++ b/debian/patches/40-manpage.dpatch
@@ -1,8 +1,7 @@
 #! /bin/sh /usr/share/dpatch/dpatch-run
 ## 40-manpage.dpatch by  <fourmond at debian.org>
 ##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: No description.
+## DP: Small java-wrappers addition in the manual page
 
 @DPATCH@
 diff -urNad freecol-0.7.3~/packaging/debian/freecol.6 freecol-0.7.3/packaging/debian/freecol.6

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