← Back to branch summary

~ubuntu-branches/ubuntu/saucy/atool/saucy

« back to all changes in this revision

Viewing changes to debian/patches/03-zip_file_recognition.patch

  • Committer: Bazaar Package Importer
  • Author(s): Francois Marier
  • Date: 2011-08-17 07:51:06 UTC
  • mfrom: (1.1.6 upstream)
  • Revision ID: james.westby@ubuntu.com-20110817075106-8gd3c7fczf342nif
Tags: 0.38.0-1
* New upstream release:
  - remove all Debian patches (they have been applied upstream)
* Add empty build-arch and build-indep targets in debian/rules

Show diffs side-by-side

added added

removed removed

Lines of Context:
debian/patches/03-zip_file_recognition.patch
1
 
Author: Francois Marier <francois@debian.org>
2
 
Description: Fix recognition of .xpi files as zip
3
 
Bug-Debian: http://bugs.debian.org/530812
4
 
Last-update: 2011-05-31
5
 
 
6
 
--- a/atool
7
 
+++ b/atool
8
 
@@ -1371,7 +1371,7 @@ sub findformat($$) {
9
 
     ['tar+bzip',       qr/^(GNU|POSIX) tar archive \(bzip compressed data(\W|$)/],
10
 
     ['tar+compress',   qr/^(GNU|POSIX) tar archive \(compress'd data(\W|$)/],
11
 
     ['tar',            qr/^(GNU|POSIX) tar archive(\W|$)/],
12
 
-    ['zip',            qr/ \(Zip archive data[^)]+\)$/],
13
 
+    ['zip',            qr/ \(Zip archive data[^)]*\)$/],
14
 
     ['zip',            qr/^Zip archive data(\W|$)/],
15
 
     ['zip',            qr/^MS-DOS executable (.*), ZIP self-extracting archive(\W|$)/],
16
 
     ['rar',            qr/^RAR archive data(\W|$)/],