[DRE-commits] [SCM] ruby-ttfunk.git branch, master, updated. upstream/1.0.2-8-g497f949

[Cédric Boutillier]

The following commit has been merged in the master branch:
commit 497f9490a2bb36bdfaba49ec5c8e76a6129dd10a
Author: Cédric Boutillier <cedric.boutillier at gmail.com>
Date:   Thu Sep 8 14:31:47 2011 +0200

    remove non-free Comic Sans MS font from source

diff --git a/debian/changelog b/debian/changelog
index 47383ea..b7dfb60 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,5 +1,6 @@
-ruby-ttfunk (1.0.2-1) unstable; urgency=low
+ruby-ttfunk (1.0.2+dfsg-1) unstable; urgency=low
 
   * Initial release (Closes: #640885)
+  * Remove from upstream archive a copy of the non-free Comic Sans MS font.
 
  -- Cédric Boutillier <cedric.boutillier at gmail.com>  Tue, 06 Sep 2011 09:26:33 +0200
diff --git a/debian/rules b/debian/rules
index df92731..0367650 100755
--- a/debian/rules
+++ b/debian/rules
@@ -17,3 +17,15 @@
 override_dh_installexamples:
 	dh_installexamples
 	chmod 755 debian/ruby-ttfunk/usr/share/doc/ruby-ttfunk/examples/metrics.rb
+
+DEB_UPSTREAM_VERSION=$(shell dpkg-parsechangelog | sed -rne 's/^Version: ([^+]+).*/\1/p')
+get-orig-source:
+	uscan --noconf --force-download --rename --download-current-version --destdir=.
+	rm -rf ruby-ttfunk-$(DEB_UPSTREAM_VERSION)
+	tar -xf ruby-ttfunk_$(DEB_UPSTREAM_VERSION).orig.tar.gz
+	rm ruby-ttfunk_$(DEB_UPSTREAM_VERSION).orig.tar.gz
+	rm ttfunk-$(DEB_UPSTREAM_VERSION)/data/fonts/comicsans.ttf
+	mv ttfunk-$(DEB_UPSTREAM_VERSION) ruby-ttfunk-$(DEB_UPSTREAM_VERSION).orig
+	GZIP=--best tar -cz --owner root --group root --mode a+rX -f \
+	     ../ruby-ttfunk_$(DEB_UPSTREAM_VERSION)+dfsg.orig.tar.gz ruby-ttfunk-$(DEB_UPSTREAM_VERSION).orig
+	rm -r ruby-ttfunk-$(DEB_UPSTREAM_VERSION).orig
diff --git a/debian/watch b/debian/watch
index 8ded265..4909369 100644
--- a/debian/watch
+++ b/debian/watch
@@ -1,2 +1,3 @@
 version=3
+opts=dversionmangle=s/\+dfsg// \
 http://pkg-ruby-extras.alioth.debian.org/cgi-bin/gemwatch/ttfunk .*/ttfunk-(.*).tar.gz

-- 
ruby-ttfunk.git