[DRE-commits] [redmine] 05/11: several packaging changes

[Antonio Terceiro]

This is an automated email from the git hooks/post-receive script.

terceiro pushed a commit to branch master
in repository redmine.

commit 985f9fb25cbfed153bb99f6cbbd3c4adebdd9a35
Author: Antonio Terceiro <terceiro at debian.org>
Date:   Tue Aug 25 17:37:50 2015 -0300

    several packaging changes
---
 debian/changelog |  3 +++
 debian/compat    |  2 +-
 debian/control   |  2 +-
 debian/rules     | 52 +++++-----------------------------------------------
 4 files changed, 10 insertions(+), 49 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 8f37180..085bd15 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,6 +2,9 @@ redmine (3.1.0-1) UNRELEASED; urgency=medium
 
   * New upstream release
   * debian/watch: point at github
+  * Bump debhelper compatibility level to 9
+  * Move from cdbs to dh
+  * Stop builing fonts, upstream redmine doesn't rely on them anymore
 
  -- Antonio Terceiro <terceiro at debian.org>  Tue, 25 Aug 2015 17:33:17 -0300
 
diff --git a/debian/compat b/debian/compat
index 7f8f011..ec63514 100644
--- a/debian/compat
+++ b/debian/compat
@@ -1 +1 @@
-7
+9
diff --git a/debian/control b/debian/control
index 9314337..719c849 100644
--- a/debian/control
+++ b/debian/control
@@ -4,7 +4,7 @@ Priority: extra
 Maintainer: Jérémy Lal <kapouer at melix.org>
 Uploaders: Debian Ruby Extras Maintainers <pkg-ruby-extras-maintainers at lists.alioth.debian.org>,
  Antonio Terceiro <terceiro at debian.org>
-Build-Depends: debhelper (>= 7), cdbs, ttf2ufm, ttf-dejavu, ttf-freefont, php5-cli
+Build-Depends: debhelper (>= 9)
 Build-Depends-Indep: po-debconf
 Standards-Version: 3.9.5
 Vcs-Browser: http://anonscm.debian.org/gitweb/?p=pkg-ruby-extras/redmine.git
diff --git a/debian/rules b/debian/rules
index 3ed2f39..18739e9 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,13 +1,10 @@
 #!/usr/bin/make -f
 # -*- makefile -*-
 
-include /usr/share/cdbs/1/rules/debhelper.mk
+%:
+	dh $@
 
-buildfontsdir = buildfonts
-ttf2ufmbin = LANG=en_EN.utf8 ttf2ufm -W 0 -a -F
-makefontunibin = cd $(buildfontsdir) && /usr/bin/php $(CURDIR)/lib/plugins/rfpdf/lib/fonts/ttf2ufm/makefontuni_ruby.php
-
-binary-install/redmine::
+override_dh_auto_install:
 	# Clean up the "extra" license files with typos :)
 	find debian/redmine/usr/share/redmine -name "*LICEN*E*" -exec rm -f '{}' \;
 	rm debian/redmine/usr/share/redmine/lib/SVG/GPL.txt
@@ -27,45 +24,6 @@ binary-install/redmine::
 	rm -f debian/redmine/usr/share/redmine/config/database.yml.example
 
 	# replace config/email.yml by /etc/redmine/<instance>/email.yml in all locales (Closes: #590846)
-	sed -i -e 's/config\/configuration\.yml/\/etc\/redmine\/\&lt\;instance\&gt\;\/configuration\.yml/g' debian/redmine/usr/share/redmine/config/locales/*.yml 
-
-	# Mark scripts as executable until upstream fixes their .tar.gz archive build
-	chmod a+x debian/redmine/usr/share/redmine/Rakefile
-	chmod a+x debian/redmine/usr/share/redmine/extra/mail_handler/rdm-mailhandler.rb
-	chmod a+x debian/redmine/usr/share/redmine/lib/plugins/rfpdf/lib/fpdf/makefont.rb
-	chmod a+x debian/redmine/usr/share/redmine/lib/plugins/rfpdf/test/test_helper.rb
-
-	# some files are marked executable, fix them
-	chmod a-x debian/redmine/usr/share/redmine/lib/plugins/rfpdf/logo_example.png
-	chmod a-x debian/redmine/usr/share/redmine/lib/plugins/rfpdf/utf8test.txt
-	chmod a-x debian/redmine/usr/share/redmine/lib/plugins/rfpdf/lib/tcpdf.rb
-	chmod a-x debian/redmine/usr/share/redmine/lib/plugins/rfpdf/lib/config/lang/eng.rb
-	chmod a-x debian/redmine/usr/share/redmine/lib/plugins/rfpdf/lib/fonts/ttf2ufm/makefontuni_ruby.php
-	chmod a-x debian/redmine/usr/share/redmine/lib/plugins/rfpdf/lib/fonts/ttf2ufm/README.TXT
-
-	# install font files
-	mv $(buildfontsdir)/*.z debian/redmine/usr/share/redmine/lib/plugins/rfpdf/lib/fonts/
-	mv $(buildfontsdir)/*.rb debian/redmine/usr/share/redmine/lib/plugins/rfpdf/lib/fonts/
-
-build:
-	# build fonts
-	mkdir -p $(buildfontsdir)
-	$(ttf2ufmbin) /usr/share/fonts/truetype/ttf-dejavu/DejaVuSans.ttf $(buildfontsdir)/dejavusans
-	$(ttf2ufmbin) /usr/share/fonts/truetype/ttf-dejavu/DejaVuSans-Bold.ttf $(buildfontsdir)/dejavusansb
-	$(ttf2ufmbin) /usr/share/fonts/truetype/ttf-dejavu/DejaVuSans-Oblique.ttf $(buildfontsdir)/dejavusansi
-	$(ttf2ufmbin) /usr/share/fonts/truetype/ttf-dejavu/DejaVuSans-BoldOblique.ttf $(buildfontsdir)/dejavusansbi
-	$(ttf2ufmbin) /usr/share/fonts/truetype/freefont/FreeSans.ttf $(buildfontsdir)/freesans
-	$(ttf2ufmbin) /usr/share/fonts/truetype/freefont/FreeSansBold.ttf $(buildfontsdir)/freesansb
-	$(ttf2ufmbin) /usr/share/fonts/truetype/freefont/FreeSansOblique.ttf $(buildfontsdir)/freesansi
-	$(ttf2ufmbin) /usr/share/fonts/truetype/freefont/FreeSansBoldOblique.ttf $(buildfontsdir)/freesansbi
-	$(makefontunibin) /usr/share/fonts/truetype/ttf-dejavu/DejaVuSans.ttf dejavusans.ufm
-	$(makefontunibin) /usr/share/fonts/truetype/ttf-dejavu/DejaVuSans-Bold.ttf dejavusansb.ufm
-	$(makefontunibin) /usr/share/fonts/truetype/ttf-dejavu/DejaVuSans-Oblique.ttf dejavusansi.ufm
-	$(makefontunibin) /usr/share/fonts/truetype/ttf-dejavu/DejaVuSans-BoldOblique.ttf dejavusansbi.ufm
-	$(makefontunibin) /usr/share/fonts/truetype/freefont/FreeSans.ttf freesans.ufm
-	$(makefontunibin) /usr/share/fonts/truetype/freefont/FreeSansBold.ttf freesansb.ufm
-	$(makefontunibin) /usr/share/fonts/truetype/freefont/FreeSansOblique.ttf freesansi.ufm
-	$(makefontunibin) /usr/share/fonts/truetype/freefont/FreeSansBoldOblique.ttf freesansbi.ufm
+	sed -i -e 's/config\/configuration\.yml/\/etc\/redmine\/\&lt\;instance\&gt\;\/configuration\.yml/g' debian/redmine/usr/share/redmine/config/locales/*.yml
 
-clean::
-	rm -rf $(buildfontsdir)
+	dh_auto_install

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-ruby-extras/redmine.git