Merge lp:~arnegoetje/ubuntu/lucid/ttf-kacst-one/ttf-kacst-one-lucid into lp:ubuntu/lucid/ttf-kacst-one

[Arne Goetje]

We don't have the 2.01 version to ttf-kacst in lucid or debian yet, so change the conflicts to 2.0+mry-2ubuntu1 and patch the ttf-kacst package instead.

=== modified file 'debian/changelog'
--- debian/changelog	2010-04-18 03:27:01 +0000
+++ debian/changelog	2010-04-18 06:51:16 +0000
@@ -1,3 +1,9 @@
+ttf-kacst-one (3.0-1ubuntu2) lucid; urgency=low
+
+  * Conflicts with ttf-kacst (<< 2.0+mry-2ubuntu1)
+
+ -- Arne Goetje <[e-mail]>  Sun, 18 Apr 2010 14:41:05 +0800
+
 ttf-kacst-one (3.0-1ubuntu1) lucid; urgency=low
 
   * Don't recommend ttf-kacst, we definitely *don't* want to pull that onto

=== modified file 'debian/control'
--- debian/control	2010-04-18 03:27:01 +0000
+++ debian/control	2010-04-18 06:51:16 +0000
@@ -13,7 +13,7 @@
 Package: ttf-kacst-one
 Architecture: all
 Depends: ${misc:Depends}
-Conflicts: ttf-kacst (<< 2.01+mry)
+Conflicts: ttf-kacst (<< 2.0+mry-2ubuntu1)
 Suggests: ttf-kacst
 Description: TrueType font designed for Arabic language
  This package provides an TrueType font designed for Arabic by the