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

Proposed by Arne Goetje
Status: Merged
Merge reported by: Steve Langasek
Merged at revision: not available
Proposed branch: lp:~arnegoetje/ubuntu/lucid/ttf-kacst-one/ttf-kacst-one-lucid
Merge into: lp:ubuntu/lucid/ttf-kacst-one
Diff against target: 26 lines (+7/-1)
2 files modified
debian/changelog (+6/-0)
debian/control (+1/-1)
To merge this branch: bzr merge lp:~arnegoetje/ubuntu/lucid/ttf-kacst-one/ttf-kacst-one-lucid
Reviewer Review Type Date Requested Status
Ubuntu branches Pending
Review via email: mp+23624@code.launchpad.net

Description of the change

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.

To post a comment you must log in.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== 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 @@
1ttf-kacst-one (3.0-1ubuntu2) lucid; urgency=low
2
3 * Conflicts with ttf-kacst (<< 2.0+mry-2ubuntu1)
4
5 -- Arne Goetje <arne@ubuntu.com> Sun, 18 Apr 2010 14:41:05 +0800
6
1ttf-kacst-one (3.0-1ubuntu1) lucid; urgency=low7ttf-kacst-one (3.0-1ubuntu1) lucid; urgency=low
28
3 * Don't recommend ttf-kacst, we definitely *don't* want to pull that onto9 * Don't recommend ttf-kacst, we definitely *don't* want to pull that onto
410
=== 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 @@
13Package: ttf-kacst-one13Package: ttf-kacst-one
14Architecture: all14Architecture: all
15Depends: ${misc:Depends}15Depends: ${misc:Depends}
16Conflicts: ttf-kacst (<< 2.01+mry)16Conflicts: ttf-kacst (<< 2.0+mry-2ubuntu1)
17Suggests: ttf-kacst17Suggests: ttf-kacst
18Description: TrueType font designed for Arabic language18Description: TrueType font designed for Arabic language
19 This package provides an TrueType font designed for Arabic by the19 This package provides an TrueType font designed for Arabic by the

Subscribers

People subscribed via source and target branches

to all changes: