diff -Nru fonts-yanone-kaffeesatz-0.20100525/debian/changelog fonts-yanone-kaffeesatz-0.20100525/debian/changelog
--- fonts-yanone-kaffeesatz-0.20100525/debian/changelog	2011-11-15 20:55:45.000000000 +0000
+++ fonts-yanone-kaffeesatz-0.20100525/debian/changelog	2013-12-06 11:29:05.000000000 +0000
@@ -1,3 +1,19 @@
+fonts-yanone-kaffeesatz (0.20100525-5) unstable; urgency=low
+
+  * Drop transitional package ttf-yanone-kaffeesatz
+  * Bump Standards-Version to 3.9.5 (no changes)
+  * Fixes the following lintian warnings:
+    + font-package-not-multi-arch-foreign
+    + conflicts-with-version
+  * Apply wrap-and-sort
+  * More descriptive short description
+  * Bump debhelper compatibility to 9 to get rid of the dh_pysupport
+    deprecation warning
+    + Update versioned debhelper build-dependency accordingly.
+  * Add lintian override for warning no-upstream-changelog.
+
+ -- Axel Beckert <abe@debian.org>  Fri, 06 Dec 2013 11:59:39 +0100
+
 fonts-yanone-kaffeesatz (0.20100525-4) unstable; urgency=low
 
   * Team upload
diff -Nru fonts-yanone-kaffeesatz-0.20100525/debian/compat fonts-yanone-kaffeesatz-0.20100525/debian/compat
--- fonts-yanone-kaffeesatz-0.20100525/debian/compat	2011-11-12 07:53:38.000000000 +0000
+++ fonts-yanone-kaffeesatz-0.20100525/debian/compat	2013-12-06 11:18:16.000000000 +0000
@@ -1 +1 @@
-8
+9
diff -Nru fonts-yanone-kaffeesatz-0.20100525/debian/control fonts-yanone-kaffeesatz-0.20100525/debian/control
--- fonts-yanone-kaffeesatz-0.20100525/debian/control	2011-11-15 20:54:27.000000000 +0000
+++ fonts-yanone-kaffeesatz-0.20100525/debian/control	2013-12-06 11:26:37.000000000 +0000
@@ -2,18 +2,20 @@
 Section: fonts
 Priority: optional
 Maintainer: Debian Fonts Task Force <pkg-fonts-devel@lists.alioth.debian.org>
-Uploaders: Gürkan Sengün <gurkan@phys.ethz.ch>, Axel Beckert <abe@debian.org>
-Build-Depends: debhelper (>= 8)
-Standards-Version: 3.9.2
+Uploaders: Gürkan Sengün <gurkan@phys.ethz.ch>,
+           Axel Beckert <abe@debian.org>
+Build-Depends: debhelper (>= 9)
+Standards-Version: 3.9.5
 Homepage: http://www.yanone.de/typedesign/kaffeesatz/
 
 Package: fonts-yanone-kaffeesatz
 Architecture: all
 Depends: ${misc:Depends}
 Replaces: ttf-yanone-kaffeesatz (<< 0.20100525-3)
-Conflicts: ttf-yanone-kaffeesatz (<< 0.20100525-3)
+Breaks: ttf-yanone-kaffeesatz (<< 0.20100525-3)
 Provides: ttf-yanone-kaffeesatz
-Description: Font in four weights
+Multi-Arch: foreign
+Description: Font in four weights, reminiscent of 1920s coffee house typography
  Yanone Kaffeesatz was first published in 2004. Its Bold is reminiscent
  of 1920s coffee house typography, while the rather thin fonts bridge
  the gap to present times. You can witness Kaffeesatz use on German
@@ -24,10 +26,3 @@
  In 2010 it was decided to be re-released under the SIL Open Font
  License to make it possible to include in software bundles or web font
  services like Googles Font Directory.
-
-Package: ttf-yanone-kaffeesatz
-Depends: fonts-yanone-kaffeesatz, ${misc:Depends}
-Architecture: all
-Section: oldlibs
-Description: transitional dummy package
- This package is a dummy transitional package. It can be safely removed.
diff -Nru fonts-yanone-kaffeesatz-0.20100525/debian/copyright fonts-yanone-kaffeesatz-0.20100525/debian/copyright
--- fonts-yanone-kaffeesatz-0.20100525/debian/copyright	2011-11-12 07:53:38.000000000 +0000
+++ fonts-yanone-kaffeesatz-0.20100525/debian/copyright	2013-12-06 11:03:51.000000000 +0000
@@ -33,7 +33,7 @@
 
     The OFL allows the licensed fonts to be used, studied, modified and
     redistributed freely as long as they are not sold by themselves. The
-    fonts, including any derivative works, can be bundled, embedded, 
+    fonts, including any derivative works, can be bundled, embedded,
     redistributed and/or sold with any software provided that the font
     names of derivative works are changed. The fonts and derivatives,
     however, cannot be released under any other type of license. The
diff -Nru fonts-yanone-kaffeesatz-0.20100525/debian/install fonts-yanone-kaffeesatz-0.20100525/debian/install
--- fonts-yanone-kaffeesatz-0.20100525/debian/install	2011-11-12 07:53:38.000000000 +0000
+++ fonts-yanone-kaffeesatz-0.20100525/debian/install	2013-12-06 11:03:51.000000000 +0000
@@ -1,2 +1,2 @@
-*.ttf usr/share/fonts/truetype/yanone-kaffeesatz
 *.otf usr/share/fonts/truetype/yanone-kaffeesatz
+*.ttf usr/share/fonts/truetype/yanone-kaffeesatz
diff -Nru fonts-yanone-kaffeesatz-0.20100525/debian/lintian-overrides fonts-yanone-kaffeesatz-0.20100525/debian/lintian-overrides
--- fonts-yanone-kaffeesatz-0.20100525/debian/lintian-overrides	1970-01-01 00:00:00.000000000 +0000
+++ fonts-yanone-kaffeesatz-0.20100525/debian/lintian-overrides	2013-12-06 11:20:27.000000000 +0000
@@ -0,0 +1 @@
+fonts-yanone-kaffeesatz: no-upstream-changelog