Merge lp://staging/~nobuto/ubuntu/vivid/unzip/fallback-encoding into lp://staging/ubuntu/vivid/unzip
Status: | Superseded |
---|---|
Proposed branch: | lp://staging/~nobuto/ubuntu/vivid/unzip/fallback-encoding |
Merge into: | lp://staging/ubuntu/vivid/unzip |
Diff against target: |
65 lines (+42/-0) 3 files modified
debian/changelog (+7/-0) debian/profile.unzip-default-charset.sh (+32/-0) debian/rules (+3/-0) |
To merge this branch: | bzr merge lp://staging/~nobuto/ubuntu/vivid/unzip/fallback-encoding |
Related bugs: |
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Mathieu Trudel-Lapierre | Needs Information | ||
Sebastien Bacher | Needs Information | ||
Aron Xu (community) | Approve | ||
Review via email: mp+249644@code.staging.launchpad.net |
Description of the change
This branch adds default charsets handling for Windows archives in CJKV+th locale, inspired by Ubuntu Kylin way.
As a result of bug #580961, two options have been added as Ubuntu patch.
> -O CHARSET specify a character encoding for DOS, Windows and OS/2 archives
> -I CHARSET specify a character encoding for UNIX and other archives
Then Ubuntu Kylin added default encoding as environment variables for their distribution.
http://
Now as Ubuntu, we can go further by a better way:
- per user settings by their locales instead of global settings
- don't interfere in other locales by locale guard
I only add "-O", so no behavior change for zip files created on Ubuntu or other Linux/UNIX systems. This branch just handles zip file created on localized Windows system seamlessly.
charsets list is taken from:
https:/
and
msdos/msdos.c in unzip package:
1682 case 932: /* Japanese */
1683 case 949: /* Korean */
1684 case 936: /* Chinese, simple */
1685 case 950: /* Chinese, traditional */
1686 case 874: /* Thai */
1687 case 1258: /* Vietnamese */
Unmerged revisions
- 35. By Nobuto Murata
-
add autopkgtest to make sure all of 3 types of zip files can be
extracted properly - 34. By Nobuto Murata
-
rebase
- 33. By Nobuto Murata
-
rebase
- 32. By Nobuto Murata
-
update changelog to refer lp bug number
- 31. By Nobuto Murata
-
name path properly
- 30. By Nobuto Murata
-
tweak variables' name
- 29. By Nobuto Murata
-
add default -O option to handle Windows' encoding for CJKV + th
locale, inspired by Ubuntu Kylin way
Works fine for me to extract zip file including files named with CP932.