Ubuntu
mime-support package

Merge lp:~logan/ubuntu/quantal/mime-support/debian-merge into lp:ubuntu/quantal/mime-support

  1. Quantal (12.10)
  2. debian-merge
  3. Merge into quantal
Proposed by Logan Rosen
Status: Merged
Approved by: Martin Pitt
Approved revision: 12
Merge reported by: Martin Pitt
Merged at revision: not available
Proposed branch: lp:~logan/ubuntu/quantal/mime-support/debian-merge
Merge into: lp:ubuntu/quantal/mime-support
Diff against target: 316 lines (+76/-33)
8 files modified
debian/changelog (+20/-6)
debian/debhelper.log (+2/-0)
debian/postinst (+6/-3)
debian/rules (+1/-0)
debian/triggers (+1/-0)
mime.types (+24/-14)
run-mailcap (+9/-9)
update-mime (+13/-1)
To merge this branch: bzr merge lp:~logan/ubuntu/quantal/mime-support/debian-merge
Reviewer Review Type Date Requested Status
Martin Pitt Approve
Logan Rosen (community) Needs Resubmitting
Review via email: mp+114112@code.launchpad.net
To post a comment you must log in.
Revision history for this message
Sebastien Bacher (seb128) wrote :

Thank you for your work, could you summarize the remaining Ubuntu changes in your changelog entry as well (like it was done for the previous merge)?

lp:~logan/ubuntu/quantal/mime-support/debian-merge updated
12. By Logan Rosen

Add remaining changes to changelog.

Revision history for this message
Logan Rosen (logan) wrote :

Sorry about that!

review: Needs Resubmitting
Revision history for this message
Martin Pitt (pitti) wrote :

I must say, as a sponsor this is just about the least preferrable form for a merge. It is so much easier to have a bug with a debdiff between the current Debian sid and your merged version, as that is the bit that a sponsor actually wants to verify.

Anyway, I'll try to cobble it together.

Revision history for this message
Martin Pitt (pitti) wrote :

I uploaded the merge now (but not using UDD, closing manually). Thanks!

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 2010-11-14 17:28:44 +0000
3+++ debian/changelog 2012-07-15 06:43:18 +0000
4@@ -1,3 +1,23 @@
5+mime-support (3.52-1ubuntu1) quantal; urgency=low
6+
7+ * Merge from Debian unstable. Remaining changes:
8+ - Add "cautious-launcher" for handling execution of files that are
9+ outside /usr and /opt (LP: #506702).
10+ - Fix typo in cautious-launcher dialog.
11+
12+ -- Logan Rosen <logatronico@gmail.com> Tue, 10 Jul 2012 03:07:10 -0400
13+
14+mime-support (3.52-1) unstable; urgency=low
15+
16+ * removed application/x-httpd-* types (closes: 589384)
17+ * added numerous new mime.types (closes: 652560, 624697, 627997, 619475, 639822)
18+ * fixed some bad mime.types (closes: 605250, 620372, 613810)
19+ * added dpkg trigger support (closes: 594915)
20+ * obsolete bugs (closes: 560118, 605254, 639580, 646462, 658073)
21+
22+ -- Brian White <bcwhite@pobox.com> Sun, 12 Feb 2012 21:06:40 +0100
23+
24+
25 mime-support (3.51-1ubuntu1) natty; urgency=low
26
27 * Merge from debian unstable (LP: #675225), remaining changes:
28@@ -23,9 +43,6 @@
29 * can generate local user .mailcap file (closes: 569738, 445267)
30 * pass --debug to sub-instances (closes: 533721)
31 * a little more documentation (closes: 402778)
32-
33- -- Brian White <bcwhite@pobox.com> (not uploaded due to key issues)
34-
35 mime-support (3.48-1ubuntu2) maverick; urgency=low
36
37 * Fix typo in cautious-launcher dialog.
38@@ -618,6 +635,3 @@
39 -- Brian White <bcwhite@pobox.com> Thu, 24 Sep 1996 12:01:22 +0400
40
41
42-# Local variables:
43-# mode: debian-changelog
44-# End:
45
46=== modified file 'debian/debhelper.log'
47--- debian/debhelper.log 2010-11-12 20:52:43 +0000
48+++ debian/debhelper.log 2012-07-15 06:43:18 +0000
49@@ -8,3 +8,5 @@
50 dh_md5sums
51 dh_md5sums
52 dh_md5sums
53+dh_md5sums
54+dh_md5sums
55
56=== modified file 'debian/postinst'
57--- debian/postinst 2008-06-05 14:43:44 +0000
58+++ debian/postinst 2012-07-15 06:43:18 +0000
59@@ -1,8 +1,11 @@
60 #! /bin/sh -e
61
62
63-#if [ "$1" = "configure" ]; then
64-#fi
65+# dpkg triggers support for update-mime
66+if [ "$1" = "triggered" ]; then
67+ test -x /usr/sbin/update-mime && /usr/sbin/update-mime --triggered
68+ exit 0
69+fi
70
71
72 # Remove the old status directory (and any orphaned install-mime program)
73@@ -18,5 +21,5 @@
74
75 # Run the update program
76 if [ -x /usr/sbin/update-mime ]; then
77- update-mime
78+ /usr/sbin/update-mime --triggered
79 fi
80
81=== modified file 'debian/rules'
82--- debian/rules 2010-11-14 17:28:44 +0000
83+++ debian/rules 2012-07-15 06:43:18 +0000
84@@ -48,6 +48,7 @@
85 install -m 755 debian/postinst debian/tmp/DEBIAN/postinst
86 install -m 755 debian/prerm debian/tmp/DEBIAN/prerm
87 install -m 644 debian/conffiles debian/tmp/DEBIAN/conffiles
88+ install -m 644 debian/triggers debian/tmp/DEBIAN/triggers
89 cd debian/tmp/usr/share/man; gzip -9fv */*
90 cd debian/tmp/usr/share/doc/$(package); gzip -9v *
91 cd debian/tmp/usr/share/doc/$(package); gunzip copyright.gz
92
93=== added file 'debian/triggers'
94--- debian/triggers 1970-01-01 00:00:00 +0000
95+++ debian/triggers 2012-07-15 06:43:18 +0000
96@@ -0,0 +1,1 @@
97+interest /usr/lib/mime/packages
98
99=== modified file 'mime.types'
100--- mime.types 2010-11-14 17:28:44 +0000
101+++ mime.types 2012-07-15 06:43:18 +0000
102@@ -41,13 +41,13 @@
103 application/bbolin lin
104 application/beep+xml
105 application/cals-1840
106-application/cap cap pcap
107 application/commonground
108 application/cu-seeme cu
109 application/cybercash
110 application/davmount+xml davmount
111 application/dca-rft
112 application/dec-dx
113+application/dicom dcm
114 application/docbook+xml
115 application/dsptype tsp
116 application/dvcs
117@@ -82,6 +82,7 @@
118 application/macwriteii
119 application/marc
120 application/mathematica nb nbp
121+application/mbox mbox
122 application/ms-tnef
123 application/msaccess mdb
124 application/msword doc dot
125@@ -96,9 +97,9 @@
126 application/onenote one onetoc2 onetmp onepkg
127 application/parityfec
128 application/pdf pdf
129-application/pgp-encrypted
130+application/pgp-encrypted pgp
131 application/pgp-keys key
132-application/pgp-signature pgp
133+application/pgp-signature sig
134 application/pics-rules prf
135 application/pkcs10
136 application/pkcs7-mime
137@@ -115,7 +116,6 @@
138 application/rdf+xml rdf
139 application/remote-printing
140 application/riscos
141-application/rss+xml rss
142 application/rtf rtf
143 application/sdp
144 application/set-payment
145@@ -268,6 +268,7 @@
146 application/vnd.ms-excel.sheet.binary.macroEnabled.12 xlsb
147 application/vnd.ms-excel.sheet.macroEnabled.12 xlsm
148 application/vnd.ms-excel.template.macroEnabled.12 xltm
149+application/vnd.ms-fontobject eot
150 application/vnd.ms-lrm
151 application/vnd.ms-officetheme thmx
152 application/vnd.ms-pki.seccat cat
153@@ -365,6 +366,7 @@
154 application/vnd.svd
155 application/vnd.swiftview-ics
156 application/vnd.symbian.install sis
157+application/vnd.tcpdump.pcap cap pcap
158 application/vnd.triscape.mxs
159 application/vnd.trueapp
160 application/vnd.truedoc
161@@ -424,6 +426,7 @@
162 application/x-dvi dvi
163 application/x-executable
164 application/x-font pfa pfb gsf pcf pcf.Z
165+application/x-font-woff woff
166 application/x-freemind mm
167 application/x-futuresplash spl
168 application/x-ganttproject gan
169@@ -433,13 +436,14 @@
170 application/x-gtar gtar
171 application/x-gtar-compressed tgz taz
172 application/x-hdf hdf
173-application/x-httpd-eruby rhtml
174-application/x-httpd-php phtml pht php
175-application/x-httpd-php-source phps
176-application/x-httpd-php3 php3
177-application/x-httpd-php3-preprocessed php3p
178-application/x-httpd-php4 php4
179-application/x-httpd-php5 php5
180+#application/x-httpd-eruby rhtml
181+#application/x-httpd-php phtml pht php
182+#application/x-httpd-php-source phps
183+#application/x-httpd-php3 php3
184+#application/x-httpd-php3-preprocessed php3p
185+#application/x-httpd-php4 php4
186+#application/x-httpd-php5 php5
187+application/x-hwp hwp
188 application/x-ica ica
189 application/x-info info
190 application/x-internet-signup ins isp
191@@ -463,6 +467,7 @@
192 application/x-lzh lzh
193 application/x-lzx lzx
194 application/x-maker frm maker frame fm fb book fbdoc
195+application/x-md5 md5
196 application/x-mif mif
197 application/x-mpegURL m3u8
198 application/x-ms-wmd wmd
199@@ -481,10 +486,13 @@
200 application/x-quicktimeplayer qtl
201 application/x-rdp rdp
202 application/x-redhat-package-manager rpm
203+application/x-rss+xml rss
204 application/x-ruby rb
205 application/x-rx
206 application/x-scilab sci sce
207+application/x-scilab-xcos xcos
208 application/x-sh sh
209+application/x-sha1 sha1
210 application/x-shar shar
211 application/x-shellscript
212 application/x-shockwave-flash swf swfl
213@@ -638,6 +646,7 @@
214 image/vnd.fst
215 image/vnd.fujixerox.edmics-mmr
216 image/vnd.fujixerox.edmics-rlc
217+image/vnd.microsoft.icon ico
218 image/vnd.mix
219 image/vnd.net-fpx
220 image/vnd.svf
221@@ -651,7 +660,7 @@
222 image/x-coreldrawtemplate cdt
223 image/x-corelphotopaint cpt
224 image/x-epson-erf erf
225-image/x-icon ico
226+image/x-icon
227 image/x-jg art
228 image/x-jng jng
229 image/x-ms-bmp bmp
230@@ -711,7 +720,7 @@
231 multipart/signed
232 multipart/voice-message
233
234-text/cache-manifest manifest
235+text/cache-manifest appcache
236 text/calendar ics icz
237 text/css css
238 text/csv csv
239@@ -723,7 +732,7 @@
240 text/iuls uls
241 text/mathml mml
242 text/parityfec
243-text/plain asc txt text pot brf
244+text/plain asc txt text pot brf srt
245 text/prs.lines.tag
246 text/rfc822-headers
247 text/richtext rtx
248@@ -764,6 +773,7 @@
249 text/x-diff diff patch
250 text/x-haskell hs
251 text/x-java java
252+text/x-lilypond ly
253 text/x-literate-haskell lhs
254 text/x-makefile
255 text/x-moc moc
256
257=== modified file 'run-mailcap'
258--- run-mailcap 2010-11-12 20:52:43 +0000
259+++ run-mailcap 2012-07-15 06:43:18 +0000
260@@ -361,15 +361,15 @@
261 $ENV{RUN_MAILCAP_DEBUG} = 1 if $debug;
262
263 unless ($action) {
264- if ($0 =~ m!(^|/)view$!) { $action="view"; }
265- elsif ($0 =~ m!(^|/)see$!) { $action="view"; }
266- elsif ($0 =~ m!(^|/)cat$!) { $action="cat"; }
267- elsif ($0 =~ m!(^|/)edit$!) { $action="edit"; }
268- elsif ($0 =~ m!(^|/)change$!) { $action="edit"; }
269- elsif ($0 =~ m!(^|/)compose$!) { $action="compose";}
270- elsif ($0 =~ m!(^|/)print$!) { $action="print"; }
271- elsif ($0 =~ m!(^|/)create$!) { $action="compose";}
272- else { $action="view"; }
273+ if ($0 =~ m!(^|/)(mime-)?view$!) { $action="view"; }
274+ elsif ($0 =~ m!(^|/)(mime-)?see$!) { $action="view"; }
275+ elsif ($0 =~ m!(^|/)(mime-)?cat$!) { $action="cat"; }
276+ elsif ($0 =~ m!(^|/)(mime-)?edit$!) { $action="edit"; }
277+ elsif ($0 =~ m!(^|/)(mime-)?change$!) { $action="edit"; }
278+ elsif ($0 =~ m!(^|/)(mime-)?compose$!) { $action="compose";}
279+ elsif ($0 =~ m!(^|/)(mime-)?print$!) { $action="print"; }
280+ elsif ($0 =~ m!(^|/)(mime-)?create$!) { $action="compose";}
281+ else { $action="view"; }
282 }
283
284
285
286=== modified file 'update-mime'
287--- update-mime 2010-11-12 20:52:43 +0000
288+++ update-mime 2012-07-15 06:43:18 +0000
289@@ -2,7 +2,7 @@
290 ###############################################################################
291 #
292 # Update-MIME: Install programs into "/etc/mailcap", resolve conflicts,
293-# auto-uninstall, make dinner, and wash dishes.
294+# auto-uninstall, make dinner, and wash dishes.
295 #
296 # Written by Brian White <bcwhite@pobox.com>.
297 #
298@@ -29,6 +29,18 @@
299 $localgen = 0;
300
301
302+# If the call comes from dpkg, only accept it if --triggered is passed
303+# This is so that we don't get useless calls from packages' postinsts
304+# that call update-mime due to dh_installmime adding that call for
305+# when there was no triggers support.
306+#
307+# When this 'hack' is removed, mime-support's postinst should be updated
308+# to not pass --triggered anymore in 'triggered'.
309+if ($ENV{"DPKG_RUNNING_VERSION"} ne "" && $ARGV[0] ne "--triggered") {
310+ exit (0);
311+}
312+
313+
314 # Allow local run
315 if ($ARGV[0] eq "--local") {
316 $conffile = "$ENV{HOME}/.update-mime.conf";

Subscribers

People subscribed via source and target branches

to all changes: