Ubuntu
ttf-kacst package

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

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

Description of the change

fix conflict with ttf-kacst-one

To post a comment you must log in.
Revision history for this message
Steve Langasek (vorlon) wrote :

This merge relies on removing KacstOne.ttf from the source package in order to prevent its installation on the system, but you can't remove upstream files in a Debian diff. The packaging itself needs changed to exclude the file from installation.

review: Disapprove
Revision history for this message
Steve Langasek (vorlon) wrote :

merged, with the aforementioned change.

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== removed file 'KacstOne.ttf'
2Binary files KacstOne.ttf 2008-07-04 14:42:12 +0000 and KacstOne.ttf 1970-01-01 00:00:00 +0000 differ
3=== modified file 'debian/changelog'
4--- debian/changelog 2009-12-06 22:03:17 +0000
5+++ debian/changelog 2010-04-18 06:53:14 +0000
6@@ -1,3 +1,10 @@
7+ttf-kacst (2.0+mry-2ubuntu1) lucid; urgency=low
8+
9+ * split out KacstOne, as it is shipped in the separate ttf-kacst-one package
10+ now.
11+
12+ -- Arne Goetje <arne@ubuntu.com> Sun, 18 Apr 2010 13:32:20 +0800
13+
14 ttf-kacst (2.0+mry-2) unstable; urgency=low
15
16 * Switch to debhelper v7
17
18=== modified file 'debian/control'
19--- debian/control 2009-12-06 22:03:17 +0000
20+++ debian/control 2010-04-18 06:53:14 +0000
21@@ -1,7 +1,8 @@
22 Source: ttf-kacst
23 Section: fonts
24 Priority: optional
25-Maintainer: Debian Fonts Task Force <pkg-fonts-devel@lists.alioth.debian.org>
26+Maintainer: Ubuntu Core Developers <ubuntu-devel@lists.ubuntu.com>
27+XSBC-Original-Maintainer: Debian Fonts Task Force <pkg-fonts-devel@lists.alioth.debian.org>
28 Uploaders: Mohammed Adnène Trojette <adn+deb@diwi.org>, Christian Perrier <bubulle@debian.org>
29 Build-Depends: debhelper (>= 7.2.3)
30 Standards-Version: 3.8.3
31@@ -9,6 +10,7 @@
32 Package: ttf-kacst
33 Architecture: all
34 Depends: ${misc:Depends}
35+Recommends: ttf-kacst-one
36 Description: KACST free TrueType Arabic fonts
37 This is a set of TrueType Arabic fonts released by the King Abdulaziz
38 City for Science and Technology (KACST).

Subscribers

People subscribed via source and target branches

to all changes: