[freecol] 55/125: [freecol] (very) old version that should have been committed ages ago

[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 d59c8441d574f3aeef956824d857b4ac25adb2c8
Author: Vincent Fourmond <fourmond at debian.org>
Date:   Mon Jan 30 23:40:36 2012 +0000

    [freecol] (very) old version that should have been committed ages ago
---
 debian/changelog | 7 +++++++
 debian/control   | 5 +++--
 debian/rules     | 2 +-
 3 files changed, 11 insertions(+), 3 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index e1ebcd8..5a41e3a 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+freecol (0.10.0+dfsg-4) unstable; urgency=low
+
+  * Handle the rename of ttf-liberation to fonts-liberation (and the
+    corresponding file rename)
+
+ -- Vincent Fourmond <fourmond at debian.org>  Mon, 24 Oct 2011 19:28:57 +0200
+
 freecol (0.10.0+dfsg-3) unstable; urgency=low
 
   * Fix FTBS with recent openjdk-6 (closes: #642788)
diff --git a/debian/control b/debian/control
index 06fb3b0..b7c5437 100644
--- a/debian/control
+++ b/debian/control
@@ -7,7 +7,7 @@ Build-Depends: debhelper (>= 5), ant, openjdk-6-jdk, cdbs
 Build-Depends-Indep: libwoodstox-java,
  tex4ht, texlive-binaries | texlive-base-bin, ant-optional,
  texlive-latex-recommended, libcommons-cli-java, libmiglayout-java,
- libcortado-java, javahelper, ttf-liberation
+ libcortado-java, javahelper
 Standards-Version: 3.9.2
 Homepage: http://www.freecol.org
 Vcs-Svn: svn://svn.debian.org/svn/pkg-games/packages/trunk/freecol
@@ -16,7 +16,8 @@ Vcs-Browser: http://svn.debian.org/viewsvn/pkg-games/packages/trunk/freecol
 Package: freecol
 Architecture: all
 Depends: openjdk-6-jre | java6-runtime,
- java-wrappers (>= 0.1.13), ${misc:Depends}, ${java:Depends}
+ java-wrappers (>= 0.1.13), ${misc:Depends}, ${java:Depends},
+ fonts-liberation (>= 1.07.0-2~)
 Description: open source remake of the old Colonization
  freecol is a game in the spirit of Civilization but taking place in a
  colonial background. Colonize the new world, build towns, trade or
diff --git a/debian/rules b/debian/rules
index 2cdf718..45abaed 100755
--- a/debian/rules
+++ b/debian/rules
@@ -35,4 +35,4 @@ LIBERATION_FONTS     := LiberationSerif-Bold.ttf LiberationSerif-BoldItalic.ttf
 # Refrain from installing those files
 DEB_DH_INSTALL_ARGS  = $(patsubst %,-X%, $(LIBERATION_FONTS)) 
 
-DEB_DH_LINK_freecol  = $(foreach file, $(LIBERATION_FONTS), usr/share/fonts/truetype/ttf-liberation/$(file) usr/share/games/freecol/base/resources/fonts/$(file))
+DEB_DH_LINK_freecol  = $(foreach file, $(LIBERATION_FONTS), usr/share/fonts/truetype/liberation/$(file) usr/share/games/freecol/base/resources/fonts/$(file))

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