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
1=== modified file 'debian/changelog'
2--- debian/changelog 2010-04-18 03:27:01 +0000
3+++ debian/changelog 2010-04-18 06:51:16 +0000
4@@ -1,3 +1,9 @@
5+ttf-kacst-one (3.0-1ubuntu2) lucid; urgency=low
6+
7+ * Conflicts with ttf-kacst (<< 2.0+mry-2ubuntu1)
8+
9+ -- Arne Goetje <arne@ubuntu.com> Sun, 18 Apr 2010 14:41:05 +0800
10+
11 ttf-kacst-one (3.0-1ubuntu1) lucid; urgency=low
12
13 * Don't recommend ttf-kacst, we definitely *don't* want to pull that onto
14
15=== modified file 'debian/control'
16--- debian/control 2010-04-18 03:27:01 +0000
17+++ debian/control 2010-04-18 06:51:16 +0000
18@@ -13,7 +13,7 @@
19 Package: ttf-kacst-one
20 Architecture: all
21 Depends: ${misc:Depends}
22-Conflicts: ttf-kacst (<< 2.01+mry)
23+Conflicts: ttf-kacst (<< 2.0+mry-2ubuntu1)
24 Suggests: ttf-kacst
25 Description: TrueType font designed for Arabic language
26 This package provides an TrueType font designed for Arabic by the

Subscribers

People subscribed via source and target branches

to all changes: