r12482 - packages/trunk/freecol/debian

[Vincent Fourmond]

Author: fourmond
Date: 2011-06-25 19:49:39 +0000 (Sat, 25 Jun 2011)
New Revision: 12482

Added:
   packages/trunk/freecol/debian/freecol.install
Removed:
   packages/trunk/freecol/debian/install
Modified:
   packages/trunk/freecol/debian/changelog
   packages/trunk/freecol/debian/control
   packages/trunk/freecol/debian/rules
Log:
[freecol] Few more packaging improvements, including dropping already packaged fonts

Modified: packages/trunk/freecol/debian/changelog
===================================================================
--- packages/trunk/freecol/debian/changelog	2011-06-25 17:53:21 UTC (rev 12481)
+++ packages/trunk/freecol/debian/changelog	2011-06-25 19:49:39 UTC (rev 12482)
@@ -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)

Modified: packages/trunk/freecol/debian/control
===================================================================
--- packages/trunk/freecol/debian/control	2011-06-25 17:53:21 UTC (rev 12481)
+++ packages/trunk/freecol/debian/control	2011-06-25 19:49:39 UTC (rev 12482)
@@ -7,7 +7,7 @@
 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 @@
 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

Copied: packages/trunk/freecol/debian/freecol.install (from rev 11775, packages/trunk/freecol/debian/install)
===================================================================
--- packages/trunk/freecol/debian/freecol.install	                        (rev 0)
+++ packages/trunk/freecol/debian/freecol.install	2011-06-25 19:49:39 UTC (rev 12482)
@@ -0,0 +1,6 @@
+data/* usr/share/games/freecol
+debian/wrapper/freecol usr/games
+debian/freecol.desktop usr/share/applications
+freecol.xpm usr/share/pixmaps
+
+

Deleted: packages/trunk/freecol/debian/install
===================================================================
--- packages/trunk/freecol/debian/install	2011-06-25 17:53:21 UTC (rev 12481)
+++ packages/trunk/freecol/debian/install	2011-06-25 19:49:39 UTC (rev 12482)
@@ -1,7 +0,0 @@
-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
-
-

Modified: packages/trunk/freecol/debian/rules
===================================================================
--- packages/trunk/freecol/debian/rules	2011-06-25 17:53:21 UTC (rev 12481)
+++ packages/trunk/freecol/debian/rules	2011-06-25 19:49:39 UTC (rev 12482)
@@ -26,3 +26,10 @@
 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))