← Back to branch summary

~ubuntu-branches/ubuntu/quantal/libarchive/quantal

« back to all changes in this revision

Viewing changes to debian/patches/0003-Patch-from-upstream-rev-2514.patch

  • Committer: Bazaar Package Importer
  • Author(s): Andres Mejia
  • Date: 2011-09-18 10:25:34 UTC
  • mfrom: (8.1.5 sid)
  • Revision ID: james.westby@ubuntu.com-20110918102534-kmke53ir9v21ooxu
Tags: 2.8.5-3
http://bugs.debian.org/641978
* Fix upgrade breakage because of manpages being moved from libarchive1 to
  libarchive-dev. (Closes: #641978)
* Make short descriptions for packages unique.
* Explicitly set config options to be used during builds.

Show diffs side-by-side

added added

removed removed

Lines of Context:
debian/patches/0003-Patch-from-upstream-rev-2514.patch
 
1
From: Andreas Henriksson <andreas@fatal.se>
 
2
Date: Thu, 1 Jul 2010 18:12:22 +0200
 
3
Subject: Patch from upstream (rev 2514)
 
4
 
 
5
Enable version stripping code in joliet extension support for iso9660.
 
6
 
 
7
http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=587316
 
8
---
 
9
 libarchive/archive_read_support_format_iso9660.c |    2 --
 
10
 1 files changed, 0 insertions(+), 2 deletions(-)
 
11
 
 
12
diff --git a/libarchive/archive_read_support_format_iso9660.c b/libarchive/archive_read_support_format_iso9660.c
 
13
index 813df7a..595c333 100644
 
14
--- a/libarchive/archive_read_support_format_iso9660.c
 
15
+++ b/libarchive/archive_read_support_format_iso9660.c
 
16
@@ -1672,7 +1672,6 @@ parse_file_info(struct archive_read *a, struct file_info *parent,
 
17
                }
 
18
                *wp = L'\0';
 
19
 
 
20
-#if 0 /* untested code, is it at all useful on Joliet? */
 
21
                /* trim trailing first version and dot from filename.
 
22
                 *
 
23
                 * Remember we where in UTF-16BE land!
 
24
@@ -1692,7 +1691,6 @@ parse_file_info(struct archive_read *a, struct file_info *parent,
 
25
                /* Chop off trailing '.' from filenames. */
 
26
                if (*(wp-1) == '.')
 
27
                        *(--wp) = L'\0';
 
28
-#endif
 
29
 
 
30
                /* store the result in the file name field. */
 
31
                archive_strappend_w_utf8(&file->name, wbuff);
 
32
--