Merge lp:~cosmos-door/ubuntu/oneiric/ghostscript/fix-cidfmap-853768 into lp:ubuntu/oneiric/ghostscript

Proposed by Mitsuya Shibata
Status: Merged
Merged at revision: 104
Proposed branch: lp:~cosmos-door/ubuntu/oneiric/ghostscript/fix-cidfmap-853768
Merge into: lp:ubuntu/oneiric/ghostscript
Diff against target: 26 lines (+7/-1)
2 files modified
debian/changelog (+6/-0)
debian/rules (+1/-1)
To merge this branch: bzr merge lp:~cosmos-door/ubuntu/oneiric/ghostscript/fix-cidfmap-853768
Reviewer Review Type Date Requested Status
Till Kamppeter (community) Approve
Ubuntu branches Pending
Review via email: mp+76001@code.launchpad.net

Description of the change

1. Upstream cidfmap is empty, is not needed, therefore can remove.
2. binary-post-install/libgs9-common in debian/rules will exec after
   to call dh_install, thefore we should to remove cidfmap in
   debian/PACKAGE_NAME/ is not in debian/tmp.

For more details:
https://bugs.launchpad.net/ubuntu/+source/ghostscript/+bug/853768

To post a comment you must log in.
Revision history for this message
Till Kamppeter (till-kamppeter) wrote :

Patch is OK, I will apply it. Thank you very much.

review: Approve

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 2011-08-29 15:54:31 +0000
3+++ debian/changelog 2011-09-19 11:11:24 +0000
4@@ -1,3 +1,9 @@
5+ghostscript (9.04~dfsg-0ubuntu8) oneiric; urgency=low
6+
7+ * debian/rules: remove unneeded cidfmap correctly (LP: #853768)
8+
9+ -- Mitsuya Shibata <mty.shibata@gmail.com> Mon, 19 Sep 2011 19:58:46 +0900
10+
11 ghostscript (9.04~dfsg-0ubuntu7) oneiric; urgency=low
12
13 * debian/rules: Do not use the XCFLAGS variable of "make" for setting
14
15=== modified file 'debian/rules'
16--- debian/rules 2011-08-29 15:54:31 +0000
17+++ debian/rules 2011-09-19 11:11:24 +0000
18@@ -216,7 +216,7 @@
19 rm -f debian/stamp-local-shlibs-$(libname)
20
21 binary-post-install/$(datapkgname)::
22- file='$(DEB_DESTDIR)/usr/share/ghostscript/$(abi)/Resource/Init/cidfmap'; \
23+ file='debian/$(datapkgname)/usr/share/ghostscript/$(abi)/Resource/Init/cidfmap'; \
24 ! egrep -v '^(%([^%].*)?)?$$' "$$file" && rm "$$file" || ( \
25 echo; \
26 echo 'ERROR: cidfmap not virtually empty as expected,'; \

Subscribers

People subscribed via source and target branches