[freecol] 53/125: [freecol] Few more packaging improvements, including dropping already packaged fonts

[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 798c6691f26dffa5152b70ee25c6a599cb1c998b
Author: Vincent Fourmond <fourmond at debian.org>
Date:   Sat Jun 25 19:49:39 2011 +0000

    [freecol] Few more packaging improvements, including dropping already packaged fonts
---
 debian/changelog                    | 8 ++++++++
 debian/control                      | 5 ++---
 debian/{install => freecol.install} | 1 -
 debian/rules                        | 7 +++++++
 4 files changed, 17 insertions(+), 4 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 65e89bc..e9396b9 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+freecol (0.10.0+dfsg-2) unstable; urgency=low
+
+  * Refrain from installing the Liberation fonts, and symlink from those
+    in ttf-liberation
+  * Use javahelper for dependencies
+
+ -- Vincent Fourmond <fourmond at debian.org>  Sat, 25 Jun 2011 21:44:41 +0200
+
 freecol (0.10.0+dfsg-1) unstable; urgency=low
 
   * New upstream release (closes: #631611)
diff --git a/debian/control b/debian/control
index 4f6d976..06fb3b0 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
+ libcortado-java, javahelper, ttf-liberation
 Standards-Version: 3.9.2
 Homepage: http://www.freecol.org
 Vcs-Svn: svn://svn.debian.org/svn/pkg-games/packages/trunk/freecol
@@ -16,8 +16,7 @@ Vcs-Browser: http://svn.debian.org/viewsvn/pkg-games/packages/trunk/freecol
 Package: freecol
 Architecture: all
 Depends: openjdk-6-jre | java6-runtime,
- libwoodstox-java, java-wrappers (>= 0.1.13), ${misc:Depends},
- libcommons-cli-java, libmiglayout-java, libcortado-java
+ java-wrappers (>= 0.1.13), ${misc:Depends}, ${java:Depends}
 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/install b/debian/freecol.install
similarity index 83%
rename from debian/install
rename to debian/freecol.install
index a780262..ad2bd75 100644
--- a/debian/install
+++ b/debian/freecol.install
@@ -1,5 +1,4 @@
 data/* usr/share/games/freecol
-freecol*.jar usr/share/java
 debian/wrapper/freecol usr/games
 debian/freecol.desktop usr/share/applications
 freecol.xpm usr/share/pixmaps
diff --git a/debian/rules b/debian/rules
index c9d1636..c701506 100755
--- a/debian/rules
+++ b/debian/rules
@@ -26,3 +26,10 @@ DEB_ANT_BUILDFILE    := build.xml
 DEB_ANT_CLEAN_TARGET := clean
 # Override build classpath
 ANT_OPTS             := -Dbuild.sysclasspath=only
+
+LIBERATION_FONTS     := LiberationSerif-Bold.ttf LiberationSerif-BoldItalic.ttf LiberationSerif-Italic.ttf LiberationSerif-Regular.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))

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