← 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: Package Import Robot
  • Author(s): Andres Mejia
  • Date: 2012-02-23 19:29:24 UTC
  • mfrom: (8.1.10 sid)
  • Revision ID: package-import@ubuntu.com-20120223192924-73n4iedok5fwgsyr
Tags: 3.0.3-5
* Detect if locales or locales-all is installed for use with test suite.
* Bump Standards-Version to 3.9.3.

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
 
--- a/libarchive/archive_read_support_format_iso9660.c
13
 
+++ b/libarchive/archive_read_support_format_iso9660.c
14
 
@@ -1672,7 +1672,6 @@
15
 
                }
16
 
                *wp = L'\0';
17
 
 
18
 
-#if 0 /* untested code, is it at all useful on Joliet? */
19
 
                /* trim trailing first version and dot from filename.
20
 
                 *
21
 
                 * Remember we where in UTF-16BE land!
22
 
@@ -1692,7 +1691,6 @@
23
 
                /* Chop off trailing '.' from filenames. */
24
 
                if (*(wp-1) == '.')
25
 
                        *(--wp) = L'\0';
26
 
-#endif
27
 
 
28
 
                /* store the result in the file name field. */
29
 
                archive_strappend_w_utf8(&file->name, wbuff);