[Pkg-fonts-bugs] Ubuntu ttf-dejavu 2.33-3ubuntu2

[Ubuntu Merge-o-Matic]

This e-mail has been sent due to an upload to Ubuntu that contains Ubuntu
changes.  It contains the difference between the new version and the
previous version of the same source package in Ubuntu.
-------------- next part --------------
Format: 1.8
Date: Wed, 06 Feb 2013 11:21:03 +0000
Source: ttf-dejavu
Binary: ttf-dejavu ttf-dejavu-core ttf-dejavu-extra ttf-dejavu-udeb ttf-dejavu-mono-udeb
Architecture: source
Version: 2.33-3ubuntu2
Distribution: raring
Urgency: low
Maintainer: Ubuntu Developers <ubuntu-devel-discuss at lists.ubuntu.com>
Changed-By: Iain Lane <iain.lane at canonical.com>
Description: 
 ttf-dejavu - Metapackage to pull in ttf-dejavu-core and ttf-dejavu-extra
 ttf-dejavu-core - Vera font family derivate with additional characters
 ttf-dejavu-extra - Vera font family derivate with additional characters
 ttf-dejavu-mono-udeb - Monospace Vera font family derivate with additional characters (udeb)
 ttf-dejavu-udeb - Vera font family derivate with additional characters (udeb)
Changes: 
 ttf-dejavu (2.33-3ubuntu2) raring; urgency=low
 .
   * Install fontconfig files and symlink into /etc/fonts/conf.d/
Checksums-Sha1: 
 bbffd1f4f62c38337007caf9388250ad679b92f0 2469 ttf-dejavu_2.33-3ubuntu2.dsc
 1946229e094d1a586608cd25d9e9862e03e04f41 12355 ttf-dejavu_2.33-3ubuntu2.debian.tar.gz
Checksums-Sha256: 
 cddba327e0662249bbd739ea675e204136c283cecc847d400078cc344f78ddc2 2469 ttf-dejavu_2.33-3ubuntu2.dsc
 d0d2e494b380aba3a6b7adf8e74df7427fb8fa9176842ac6b7cb267e063187e0 12355 ttf-dejavu_2.33-3ubuntu2.debian.tar.gz
Files: 
 ab6cc21d43c26c266eb79129957c70c4 2469 fonts optional ttf-dejavu_2.33-3ubuntu2.dsc
 3126077107b03aaaff90fc062c315d69 12355 fonts optional ttf-dejavu_2.33-3ubuntu2.debian.tar.gz
Original-Maintainer: Debian Fonts Task Force <pkg-fonts-devel at lists.alioth.debian.org>
-------------- next part --------------
diff -pruN 2.33-3ubuntu1/debian/changelog 2.33-3ubuntu2/debian/changelog
--- 2.33-3ubuntu1/debian/changelog	2012-12-03 14:21:24.000000000 +0000
+++ 2.33-3ubuntu2/debian/changelog	2013-02-06 14:56:25.000000000 +0000
@@ -1,3 +1,9 @@
+ttf-dejavu (2.33-3ubuntu2) raring; urgency=low
+
+  * Install fontconfig files and symlink into /etc/fonts/conf.d/
+
+ -- Iain Lane <iain.lane at canonical.com>  Wed, 06 Feb 2013 11:21:03 +0000
+
 ttf-dejavu (2.33-3ubuntu1) raring; urgency=low
 
   * Merge from Debian unstable. Remaining changes:
diff -pruN 2.33-3ubuntu1/debian/compat 2.33-3ubuntu2/debian/compat
--- 2.33-3ubuntu1/debian/compat	2012-12-03 14:21:24.000000000 +0000
+++ 2.33-3ubuntu2/debian/compat	2013-01-24 13:00:59.000000000 +0000
@@ -1 +1 @@
-5
+9
diff -pruN 2.33-3ubuntu1/debian/control 2.33-3ubuntu2/debian/control
--- 2.33-3ubuntu1/debian/control	2012-12-03 14:21:24.000000000 +0000
+++ 2.33-3ubuntu2/debian/control	2013-01-24 13:01:09.000000000 +0000
@@ -3,7 +3,7 @@ Section: fonts
 Priority: optional
 Maintainer: Ubuntu Developers <ubuntu-devel-discuss at lists.ubuntu.com>
 XSBC-Original-Maintainer: Debian Fonts Task Force <pkg-fonts-devel at lists.alioth.debian.org>
-Build-Depends: cdbs (>= 0.4.46), debhelper (>= 5.0.42)
+Build-Depends: cdbs (>= 0.4.46), debhelper (>= 9)
 Build-Depends-Indep: fontforge-nox | fontforge, perl, libfont-ttf-perl (>= 0.35)
 Standards-Version: 3.9.1
 Uploaders: Davide Viti <zinosat at tiscali.it>, Christian Perrier <bubulle at debian.org>, Eugeniy Meshcheryakov <eugen at debian.org>
diff -pruN 2.33-3ubuntu1/debian/rules 2.33-3ubuntu2/debian/rules
--- 2.33-3ubuntu1/debian/rules	2012-12-03 14:21:24.000000000 +0000
+++ 2.33-3ubuntu2/debian/rules	2013-01-24 12:58:52.000000000 +0000
@@ -4,6 +4,8 @@ include /usr/share/cdbs/1/rules/debhelpe
 
 DEB_DH_BUILDDEB_ARGS = -- -Zxz
 
+DEB_DH_INSTALL_ARGS = -Xlgc
+
 clean::
 	rm -rf tmp/ build/ udeb-generated/ udeb-build/
 	rm -f debian/stamp-common-build
diff -pruN 2.33-3ubuntu1/debian/ttf-dejavu-core.install 2.33-3ubuntu2/debian/ttf-dejavu-core.install
--- 2.33-3ubuntu1/debian/ttf-dejavu-core.install	2012-12-03 14:21:24.000000000 +0000
+++ 2.33-3ubuntu2/debian/ttf-dejavu-core.install	2013-01-24 13:03:19.000000000 +0000
@@ -4,3 +4,4 @@ build/DejaVuSansMono.ttf usr/share/fonts
 build/DejaVuSansMono-Bold.ttf usr/share/fonts/truetype/ttf-dejavu
 build/DejaVuSerif.ttf usr/share/fonts/truetype/ttf-dejavu
 build/DejaVuSerif-Bold.ttf usr/share/fonts/truetype/ttf-dejavu
+fontconfig/*.conf etc/fonts/conf.avail
diff -pruN 2.33-3ubuntu1/debian/ttf-dejavu-core.links 2.33-3ubuntu2/debian/ttf-dejavu-core.links
--- 2.33-3ubuntu1/debian/ttf-dejavu-core.links	1970-01-01 00:00:00.000000000 +0000
+++ 2.33-3ubuntu2/debian/ttf-dejavu-core.links	2013-01-24 13:04:40.000000000 +0000
@@ -0,0 +1,8 @@
+#!/bin/sh
+
+for i in ./debian/ttf-dejavu-core/etc/fonts/conf.avail/*.conf; do
+    if [ -e $i ]; then
+        FILENAME=$(basename $i)
+        echo /etc/fonts/conf.avail/$FILENAME /etc/fonts/conf.d/$FILENAME
+    fi
+done