[Pkg-fonts-bugs] Ubuntu fontforge 0.0.20061220-1ubuntu2

[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.7
Date: Tue, 13 Feb 2007 16:15:18 +0100
Source: fontforge
Binary: fontforge-doc fontforge
Architecture: source
Version: 0.0.20061220-1ubuntu2
Distribution: feisty
Urgency: low
Maintainer: Kęstutis Biliūnas <kebil at kaunas.init.lt>
Changed-By: Michael Vogt <michael.vogt at ubuntu.com>
Description: 
 fontforge  - Font Editor for PS, TrueType and OpenType fonts
 fontforge-doc - Documentation for FontForge
Changes: 
 fontforge (0.0.20061220-1ubuntu2) feisty; urgency=low
 .
   * fix file overwrite problem on edgy->feisty upgrade
Files: 
 8650b838a29af9c0b3bdd4071b60fd31 929 - optional fontforge_0.0.20061220-1ubuntu2.dsc
 1afb6e8a52ca8597bc70f1538a6d1fe6 13281 - optional fontforge_0.0.20061220-1ubuntu2.diff.gz
-------------- next part --------------
diff -pruN 0.0.20061220-1ubuntu1/debian/changelog 0.0.20061220-1ubuntu2/debian/changelog
--- 0.0.20061220-1ubuntu1/debian/changelog	2007-02-16 00:15:06.000000000 +0000
+++ 0.0.20061220-1ubuntu2/debian/changelog	2007-02-16 00:15:05.000000000 +0000
@@ -1,3 +1,9 @@
+fontforge (0.0.20061220-1ubuntu2) feisty; urgency=low
+
+  * fix file overwrite problem on edgy->feisty upgrade
+
+ -- Michael Vogt <michael.vogt at ubuntu.com>  Tue, 13 Feb 2007 16:15:18 +0100
+
 fontforge (0.0.20061220-1ubuntu1) feisty; urgency=low
 
   * Configure --with-regular-link. Closes: #78468.
diff -pruN 0.0.20061220-1ubuntu1/debian/control 0.0.20061220-1ubuntu2/debian/control
--- 0.0.20061220-1ubuntu1/debian/control	2007-02-16 00:15:06.000000000 +0000
+++ 0.0.20061220-1ubuntu2/debian/control	2007-02-16 00:15:05.000000000 +0000
@@ -33,6 +33,7 @@ Description: Font Editor for PS, TrueTyp
 Package: fontforge-doc
 Section: doc
 Architecture: all
+Replaces: fontforge (<< 0.0.20061220-1ubuntu2)
 Description: Documentation for FontForge
  FontForge allows you to create or edit outline and bitmap fonts.
  It is also a font format converter and can convert among PostScript
diff -pruN 0.0.20061220-1ubuntu1/debian/rules 0.0.20061220-1ubuntu2/debian/rules
--- 0.0.20061220-1ubuntu1/debian/rules	2007-02-16 00:15:06.000000000 +0000
+++ 0.0.20061220-1ubuntu2/debian/rules	2007-02-16 00:15:05.000000000 +0000
@@ -165,6 +165,9 @@ install-arch:
 
 	dh_install -s
 
+	dh_installman debian/showttf.1
+
+
 # Must not depend on anything. This is to be called by
 # binary-arch/binary-indep
 # in another 'make' thread.
@@ -175,7 +178,7 @@ binary-common:
 	dh_installdocs
 	dh_installmenu
 	dh_desktop
-	dh_installman debian/showttf.1
+	dh_installman
 	dh_link
 	dh_strip
 	dh_compress