[freecol] 73/125: Switch from cdbs to dh sequencer. Use freecol.links for symlinking font files.

[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 51a7e5ec8916ea2cbfc43d3175e9b9fc232ba8a5
Author: Markus Koschany <apo at debian.org>
Date:   Sat Dec 19 20:59:32 2015 +0100

    Switch from cdbs to dh sequencer. Use freecol.links for symlinking font files.
---
 debian/control       |  1 -
 debian/freecol.links |  4 ++++
 debian/rules         | 41 +++++++++--------------------------------
 3 files changed, 13 insertions(+), 33 deletions(-)

diff --git a/debian/control b/debian/control
index ba1ce70..9b9ee04 100644
--- a/debian/control
+++ b/debian/control
@@ -6,7 +6,6 @@ Uploaders:
  Vincent Fourmond <fourmond at debian.org>
 Build-Depends:
  ant,
- cdbs,
  debhelper (>= 9),
  default-jdk
 Build-Depends-Indep:
diff --git a/debian/freecol.links b/debian/freecol.links
new file mode 100644
index 0000000..1f30300
--- /dev/null
+++ b/debian/freecol.links
@@ -0,0 +1,4 @@
+usr/share/fonts/truetype/liberation/LiberationSerif-Bold.ttf usr/share/games/freecol/base/resources/fonts/LiberationSerif-Bold.ttf
+usr/share/fonts/truetype/liberation/LiberationSerif-BoldItalic.ttf usr/share/games/freecol/base/resources/fonts/LiberationSerif-BoldItalic.ttf
+usr/share/fonts/truetype/liberation/LiberationSerif-Italic.ttf usr/share/games/freecol/base/resources/fonts/LiberationSerif-Italic.ttf
+usr/share/fonts/truetype/liberation/LiberationSerif-Regular.ttf usr/share/games/freecol/base/resources/fonts/LiberationSerif-Italic.ttf
diff --git a/debian/rules b/debian/rules
index 892f45c..06c450c 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,37 +1,14 @@
 #!/usr/bin/make -f
-
-# debian/rules file for building freecol
-
-# Uncomment this to turn on verbose mode.
 #export DH_VERBOSE=1
+export JAVA_HOME=/usr/lib/jvm/default-java
 
-VERSION = $(shell dpkg-parsechangelog | egrep '^Version' | \
-	sed -r 's/Version:\s*//' | sed -r 's/^[0-9]+://' | \
-	sed -r 's/(\.dfsg)?-[0-9.]+//')
-
-# export JITC_PROCESSOR_TYPE=6
-
-include /usr/share/cdbs/1/rules/debhelper.mk
-include /usr/share/cdbs/1/class/javahelper.mk
-include /usr/share/cdbs/1/class/ant.mk
-
-arch = $(shell dpkg-architecture -qDEB_HOST_ARCH)
-
-JAVA_HOME_DIRS       := /usr/lib/jvm/default-java
-ANT_HOME             := /usr/share/ant
-DEB_JARS             := ant-launcher ant-nodeps \
-	miglayout commons-cli cortado
-DEB_ANT_COMPILER     := modern
-DEB_ANT_BUILD_TARGET := package online-manual print-manual
-DEB_BUILDDIR         := .
-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
+%:
+	dh $@ --parallel --with javahelper --buildsystem=ant
 
-# Refrain from installing those files
-DEB_DH_INSTALL_ARGS  = $(patsubst %,-X%, $(LIBERATION_FONTS))
+override_dh_auto_build:
+	dh_auto_build -- \
+		-Dbuild.sysclasspath=only \
+		package \
+		online-manual \
+		print-manual
 
-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