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
=== removed file 'KacstOne.ttf'
0Binary files KacstOne.ttf 2008-07-04 14:42:12 +0000 and KacstOne.ttf 1970-01-01 00:00:00 +0000 differ0Binary files KacstOne.ttf 2008-07-04 14:42:12 +0000 and KacstOne.ttf 1970-01-01 00:00:00 +0000 differ
=== modified file 'debian/changelog'
--- debian/changelog 2009-12-06 22:03:17 +0000
+++ debian/changelog 2010-04-18 06:53:14 +0000
@@ -1,3 +1,10 @@
1ttf-kacst (2.0+mry-2ubuntu1) lucid; urgency=low
2
3 * split out KacstOne, as it is shipped in the separate ttf-kacst-one package
4 now.
5
6 -- Arne Goetje <arne@ubuntu.com> Sun, 18 Apr 2010 13:32:20 +0800
7
1ttf-kacst (2.0+mry-2) unstable; urgency=low8ttf-kacst (2.0+mry-2) unstable; urgency=low
29
3 * Switch to debhelper v710 * Switch to debhelper v7
411
=== modified file 'debian/control'
--- debian/control 2009-12-06 22:03:17 +0000
+++ debian/control 2010-04-18 06:53:14 +0000
@@ -1,7 +1,8 @@
1Source: ttf-kacst1Source: ttf-kacst
2Section: fonts2Section: fonts
3Priority: optional3Priority: optional
4Maintainer: Debian Fonts Task Force <pkg-fonts-devel@lists.alioth.debian.org>4Maintainer: Ubuntu Core Developers <ubuntu-devel@lists.ubuntu.com>
5XSBC-Original-Maintainer: Debian Fonts Task Force <pkg-fonts-devel@lists.alioth.debian.org>
5Uploaders: Mohammed Adnène Trojette <adn+deb@diwi.org>, Christian Perrier <bubulle@debian.org>6Uploaders: Mohammed Adnène Trojette <adn+deb@diwi.org>, Christian Perrier <bubulle@debian.org>
6Build-Depends: debhelper (>= 7.2.3)7Build-Depends: debhelper (>= 7.2.3)
7Standards-Version: 3.8.38Standards-Version: 3.8.3
@@ -9,6 +10,7 @@
9Package: ttf-kacst10Package: ttf-kacst
10Architecture: all11Architecture: all
11Depends: ${misc:Depends}12Depends: ${misc:Depends}
13Recommends: ttf-kacst-one
12Description: KACST free TrueType Arabic fonts14Description: KACST free TrueType Arabic fonts
13 This is a set of TrueType Arabic fonts released by the King Abdulaziz 15 This is a set of TrueType Arabic fonts released by the King Abdulaziz
14 City for Science and Technology (KACST).16 City for Science and Technology (KACST).

Subscribers

People subscribed via source and target branches

to all changes: