--- squashfs-3.3.orig/debian/doc/po/po4a.cfg
+++ squashfs-3.3/debian/doc/po/po4a.cfg
@@ -0,0 +1,6 @@
+[po4a_langs] fr
+[po4a_paths] mksquashfs.pot fr:mksquashfs.fr.po
+
+[type:docbook] ../en/mksquashfs.dbk \
+               fr:../fr/mksquashfs.fr.dbk add_fr:mksquashfs.fr.add \
+               opt:"-o inline=<option> -M UTF-8"
--- squashfs-3.3.orig/debian/doc/po/mksquashfs.pot
+++ squashfs-3.3/debian/doc/po/mksquashfs.pot
@@ -0,0 +1,796 @@
+# SOME DESCRIPTIVE TITLE
+# Copyright (C) YEAR Free Software Foundation, Inc.
+# This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
+# 
+#, fuzzy
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"POT-Creation-Date: 2007-12-09 01:40+0000\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: LANGUAGE <LL@li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=utf-8\n"
+"Content-Transfer-Encoding: ENCODING"
+
+# type: Content of the dhfirstname entity
+#: ../en/mksquashfs.dbk:30
+msgid "<firstname>Frédéric</firstname>"
+msgstr ""
+
+# type: Content of the dhsurname entity
+#: ../en/mksquashfs.dbk:31
+msgid "<surname>Boiteux</surname>"
+msgstr ""
+
+# type: Content of the dhdate entity
+#: ../en/mksquashfs.dbk:34
+msgid "<date>december 20, 2004</date>"
+msgstr ""
+
+# type: Content of the dhsection entity
+#: ../en/mksquashfs.dbk:38
+msgid "<manvolnum>1</manvolnum>"
+msgstr ""
+
+# type: Content of the dhemail entity
+#: ../en/mksquashfs.dbk:39
+msgid "<email>fboiteux@calistel.com</email>"
+msgstr ""
+
+# type: Content of the dhusername entity
+#: ../en/mksquashfs.dbk:40
+msgid "Frédéric Boiteux"
+msgstr ""
+
+# type: Content of the dhucpackage entity
+#: ../en/mksquashfs.dbk:41
+msgid "<refentrytitle>MKSQUASHFS</refentrytitle>"
+msgstr ""
+
+# type: Content of the dhpackage entity
+#: ../en/mksquashfs.dbk:42
+msgid "mksquashfs"
+msgstr ""
+
+# type: Content of the debian entity
+#: ../en/mksquashfs.dbk:44
+msgid "<productname>Debian</productname>"
+msgstr ""
+
+# type: Content of the gnu entity
+#: ../en/mksquashfs.dbk:45
+msgid "<acronym>GNU</acronym>"
+msgstr ""
+
+# type: Content of the gpl entity
+#: ../en/mksquashfs.dbk:46
+msgid "&gnu; <acronym>GPL</acronym>"
+msgstr ""
+
+# type: Attribute 'lang' of: <refentry>
+#: ../en/mksquashfs.dbk:50
+msgid "fr"
+msgstr ""
+
+# type: Content of: <refentry><refentryinfo><copyright><holder>
+#: ../en/mksquashfs.dbk:61
+msgid "&dhusername;"
+msgstr ""
+
+# type: Content of: <refentry><refnamediv><refname>
+#: ../en/mksquashfs.dbk:75
+msgid "&dhpackage;"
+msgstr ""
+
+# type: Content of: <refentry><refnamediv><refpurpose>
+#: ../en/mksquashfs.dbk:77
+msgid "Create or modify a Squash file system"
+msgstr ""
+
+# type: Content of: <refentry><refsynopsisdiv><cmdsynopsis>
+#: ../en/mksquashfs.dbk:83
+msgid "<command>&dhpackage;</command> <arg><option>-version</option></arg>"
+msgstr ""
+
+# type: Content of: <refentry><refsynopsisdiv><cmdsynopsis>
+#: ../en/mksquashfs.dbk:88
+msgid ""
+"<command>&dhpackage;</command> <arg choice=\"plain\" "
+"rep=\"repeat\"><replaceable>source</replaceable></arg> <arg "
+"choice=\"plain\"><replaceable>dest</replaceable></arg> "
+"<arg><option>options</option></arg> <arg><option>-e <replaceable>list of "
+"exclude dirs/files</replaceable></option></arg> <arg><option>-ef "
+"<replaceable>exclude_file</replaceable></option></arg>"
+msgstr ""
+
+# type: Content of: <refentry><refsect1><title>
+#: ../en/mksquashfs.dbk:101
+msgid "DESCRIPTION"
+msgstr ""
+
+# type: Content of: <refentry><refsect1><para>
+#: ../en/mksquashfs.dbk:103
+msgid ""
+"A squashfs is a compressed read-only file system. Use the "
+"<command>&dhpackage;</command> program to create a new squashed file system, "
+"and to append new data to an existing squashed file system."
+msgstr ""
+
+# type: Content of: <refentry><refsect1><para>
+#: ../en/mksquashfs.dbk:108
+msgid ""
+"If a single source directory is specified (i.e. <userinput>mksquashfs "
+"<replaceable>source</replaceable> "
+"<replaceable>output_fs</replaceable></userinput>), the squashfs filesystem "
+"will consist of that directory, with the top-level root directory "
+"corresponding to the source directory."
+msgstr ""
+
+# type: Content of: <refentry><refsect1><para>
+#: ../en/mksquashfs.dbk:115
+msgid ""
+"If multiple source directories or files are specified, "
+"<command>&dhpackage;</command> will merge the specified sources into a "
+"single filesystem, with the root directory containing each of the source "
+"files/directories.  The name of each directory entry will be the basename of "
+"the source path.  If more than one source entry maps to the same name, the "
+"conflicts are named <replaceable>xxx</replaceable>_1, "
+"<replaceable>xxx</replaceable>_2, etc. where <replaceable>xxx</replaceable> "
+"is the original name."
+msgstr ""
+
+# type: Content of: <refentry><refsect1><para>
+#: ../en/mksquashfs.dbk:125
+msgid ""
+"The <replaceable>dest</replaceable> argument can either be a conventional "
+"file or a block device. If the file doesn't exist it will be created, if it "
+"does exist and a squashfs filesystem exists on it, "
+"<command>&dhpackage;</command> will append.  The <option>-noappend "
+"</option>option will write a new filesystem irrespective of whether an "
+"existing filesystem is present."
+msgstr ""
+
+# type: Content of: <refentry><refsect1><para>
+#: ../en/mksquashfs.dbk:133
+msgid ""
+"There are a large number of options that can be used to control the "
+"compression in <command>&dhpackage;</command>.  By and large the defaults "
+"are the most optimum settings and should only be changed in exceptional "
+"circumstances !"
+msgstr ""
+
+# type: Content of: <refentry><refsect1><para>
+#: ../en/mksquashfs.dbk:138
+msgid ""
+"The <option>-noI</option>, <option>-noD</option> and <option>-noF</option> "
+"options (also <option>-noInodeCompression</option>, "
+"<option>-noDataCompression</option> and "
+"<option>-noFragmentCompression</option>) can be used to force "
+"<command>&dhpackage;</command> to not compress inodes/directories, data and "
+"fragments respectively.  Giving all options generates an uncompressed "
+"filesystem."
+msgstr ""
+
+# type: Content of: <refentry><refsect1><para>
+#: ../en/mksquashfs.dbk:148
+msgid ""
+"By default files in the generated filesystem inherit the UID and GID "
+"ownership of the original file.  However, <command>&dhpackage;</command> "
+"provides a number of options which can be used to override the ownership:"
+msgstr ""
+
+# type: Content of: <refentry><refsect1><itemizedlist><listitem><para>
+#: ../en/mksquashfs.dbk:157
+msgid ""
+"The options <option>-all-root</option> and <option>-root-owned</option> "
+"(both do exactly the same thing) force all file uids/gids in the generated "
+"Squashfs filesystem to be <literal>root</literal>.  This allows root owned "
+"filesystems to be built without root access on the host machine."
+msgstr ""
+
+# type: Content of: <refentry><refsect1><itemizedlist><listitem><para>
+#: ../en/mksquashfs.dbk:164
+msgid ""
+"The <option>-force-uid <replaceable>uid</replaceable></option> option forces "
+"all files in the generated Squashfs filesystem to be owned by the specified "
+"<replaceable>uid</replaceable>.  The uid can be specified either by name "
+"(i.e. <literal>root</literal>) or by number."
+msgstr ""
+
+# type: Content of: <refentry><refsect1><itemizedlist><listitem><para>
+#: ../en/mksquashfs.dbk:172
+msgid ""
+"The <option>-force-gid <replaceable>gid</replaceable></option> option forces "
+"all files in the generated Squashfs filesystem to be group owned by the "
+"specified <replaceable>gid</replaceable>.  The gid can be specified either "
+"by name (i.e. <literal>root</literal>) or by number."
+msgstr ""
+
+# type: Content of: <refentry><refsect1><para>
+#: ../en/mksquashfs.dbk:181
+msgid ""
+"The <option>-e</option> and <option>-ef</option> options allow "
+"files/directories to be specified which are excluded from the output "
+"filesystem.  The <option>-e</option> option takes the exclude "
+"files/directories from the command line, the <option>-ef</option> option "
+"takes the exlude files/directories from the specified exclude file, one "
+"file/directory per line. If an exclude file/directory is absolute "
+"(i.e. prefixed with <filename>/</filename>, <filename>../</filename>, or "
+"<filename>./</filename>) the entry is treated as absolute, however, if an "
+"exclude file/directory is relative, it is treated as being relative to each "
+"of the sources in turn, i.e.  <userinput>mksquashfs /tmp/source1 source2 "
+"output_fs -e ex1 /tmp/source1/ex2 out/ex3</userinput> Will generate exclude "
+"files <filename>/tmp/source1/ex2</filename>, "
+"<filename>/tmp/source1/ex1</filename>, <filename>source2/ex1</filename>, "
+"<filename>/tmp/source1/out/ex3</filename> and "
+"<filename>source2/out/ex3</filename>."
+msgstr ""
+
+# type: Content of: <refentry><refsect1><para>
+#: ../en/mksquashfs.dbk:201
+msgid ""
+"The <option>-e</option> and <option>-ef</option> exclude options are "
+"usefully used in archiving the entire filesystem, where it is wished to "
+"avoid archiving <filename>/proc</filename>, and the filesystem being "
+"generated, i.e.  <userinput>mksquashfs / /tmp/root.sqsh -e proc "
+"/tmp/root.sqsh</userinput>"
+msgstr ""
+
+# type: Content of: <refentry><refsect1><para>
+#: ../en/mksquashfs.dbk:208
+msgid ""
+"Multiple <option>-ef</option> options can be specified on the command line, "
+"and the <option>-ef</option> option can be used in conjuction with the "
+"<option>-e</option> option."
+msgstr ""
+
+# type: Content of: <refentry><refsect1><para>
+#: ../en/mksquashfs.dbk:213
+msgid ""
+"The <option>-info</option> option displays the files/directories as they are "
+"compressed and added to the filesystem.  The original uncompressed size of "
+"each file is printed, along with <literal>DUPLICATE</literal> if the file is "
+"a duplicate of a file in the filesystem."
+msgstr ""
+
+# type: Content of: <refentry><refsect1><para>
+#: ../en/mksquashfs.dbk:219
+msgid ""
+"The <option>-no-exports</option> option doesn't make the filesystem "
+"exportable via NFS."
+msgstr ""
+
+# type: Content of: <refentry><refsect1><para>
+#: ../en/mksquashfs.dbk:222
+msgid "The <option>-no-progress</option> option doesn't display the progress bar."
+msgstr ""
+
+# type: Content of: <refentry><refsect1><para>
+#: ../en/mksquashfs.dbk:225
+msgid ""
+"The <option>-le</option> and <option>-be</option> options can be used to "
+"force <command>&dhpackage;</command> to generate a little endian or big "
+"endian filesystem.  Normally <command>&dhpackage;</command> will generate a "
+"filesystem in the host byte order.  Squashfs, for portability, will mount "
+"different ordered filesystems (i.e. it can mount big endian filesystems "
+"running on a little endian machine), but these options can be used for "
+"greater optimisation."
+msgstr ""
+
+# type: Content of: <refentry><refsect1><title>
+#: ../en/mksquashfs.dbk:237
+msgid "OPTIONS"
+msgstr ""
+
+# type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
+#: ../en/mksquashfs.dbk:242
+msgid "<option>-version</option>"
+msgstr ""
+
+# type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
+#: ../en/mksquashfs.dbk:245
+msgid "print version, licence and copyright message."
+msgstr ""
+
+# type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
+#: ../en/mksquashfs.dbk:250
+msgid "<option>-recover <replaceable>name</replaceable></option>"
+msgstr ""
+
+# type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
+#: ../en/mksquashfs.dbk:253
+msgid ""
+"Allows the original filesystem to be recovered if Mksquashfs aborts "
+"unexpectedly (i.e.  power failure)  using recovery file "
+"<replaceable>name</replaceable>.  Recovery files are now created when "
+"appending to existing Squashfs filesystems."
+msgstr ""
+
+# type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
+#: ../en/mksquashfs.dbk:262
+msgid "<option>-no-recovery</option>"
+msgstr ""
+
+# type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
+#: ../en/mksquashfs.dbk:263
+msgid "don't generate a recovery file"
+msgstr ""
+
+# type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
+#: ../en/mksquashfs.dbk:268
+msgid "<option>-info</option>"
+msgstr ""
+
+# type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
+#: ../en/mksquashfs.dbk:269
+msgid "print files written to filesystem"
+msgstr ""
+
+# type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
+#: ../en/mksquashfs.dbk:274
+msgid "<option>-nolzma</option>"
+msgstr ""
+
+# type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
+#: ../en/mksquashfs.dbk:275
+msgid ""
+"use ZLIB compression method instead of LZMA. The former is the default "
+"compression library of the squashfs official distribution, whereas the "
+"latter can compress much better."
+msgstr ""
+
+# type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
+#: ../en/mksquashfs.dbk:283
+msgid "<option>-no-exports</option>"
+msgstr ""
+
+# type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
+#: ../en/mksquashfs.dbk:284
+msgid "don't make the filesystem exportable via NFS"
+msgstr ""
+
+# type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
+#: ../en/mksquashfs.dbk:290
+msgid "<option>-no-progress</option>"
+msgstr ""
+
+# type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
+#: ../en/mksquashfs.dbk:291
+msgid "don't display the progress bar"
+msgstr ""
+
+# type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
+#: ../en/mksquashfs.dbk:296
+msgid "<option>-no-sparse</option>"
+msgstr ""
+
+# type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
+#: ../en/mksquashfs.dbk:297
+msgid "don't detect sparse files"
+msgstr ""
+
+# type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
+#: ../en/mksquashfs.dbk:302
+msgid "<option>-b <replaceable>block_size</replaceable></option>"
+msgstr ""
+
+# type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
+#: ../en/mksquashfs.dbk:304
+msgid ""
+"set data block to <replaceable>block_size</replaceable>. Default is 131072 "
+"bytes"
+msgstr ""
+
+# type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
+#: ../en/mksquashfs.dbk:311
+msgid "<option>-processors <replaceable>number</replaceable></option>"
+msgstr ""
+
+# type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
+#: ../en/mksquashfs.dbk:313
+msgid ""
+"Use <replaceable>number</replaceable> processors.  By default will use "
+"number of processors available"
+msgstr ""
+
+# type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
+#: ../en/mksquashfs.dbk:320
+msgid "<option>-read-queue <replaceable>size</replaceable></option>"
+msgstr ""
+
+# type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
+#: ../en/mksquashfs.dbk:322
+msgid ""
+"Set input queue to <replaceable>size</replaceable> Mbytes. Default 64 "
+"Mbytes."
+msgstr ""
+
+# type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
+#: ../en/mksquashfs.dbk:329
+msgid "<option>-write-queue <replaceable>size</replaceable></option>"
+msgstr ""
+
+# type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
+#: ../en/mksquashfs.dbk:331
+msgid ""
+"Set output queue to <replaceable>size</replaceable> Mbytes. Default 512 "
+"Mbytes."
+msgstr ""
+
+# type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
+#: ../en/mksquashfs.dbk:338
+msgid "<option>-noI</option> or <option>-noInodeCompression</option>"
+msgstr ""
+
+# type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
+#: ../en/mksquashfs.dbk:340
+msgid "do not compress inode table"
+msgstr ""
+
+# type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
+#: ../en/mksquashfs.dbk:345
+msgid "<option>-noD</option>or <option>-noDataCompression</option>"
+msgstr ""
+
+# type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
+#: ../en/mksquashfs.dbk:347
+msgid "do not compress data blocks"
+msgstr ""
+
+# type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
+#: ../en/mksquashfs.dbk:352
+msgid "<option>-noF</option> or <option>-noFragmentCompression</option>"
+msgstr ""
+
+# type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
+#: ../en/mksquashfs.dbk:354
+msgid "do not compress fragment blocks"
+msgstr ""
+
+# type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
+#: ../en/mksquashfs.dbk:359
+msgid "<option>-no-fragments</option>"
+msgstr ""
+
+# type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
+#: ../en/mksquashfs.dbk:360
+msgid ""
+"do not use fragments: tells <command>&dhpackage;</command> to not generate "
+"fragment blocks, and rather generate a filesystem similar to a Squashfs 1.x "
+"filesystem. It will of course still be a Squashfs 2.0 filesystem but without "
+"fragments, and so it won't be mountable on a Squashfs 1.x system."
+msgstr ""
+
+# type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
+#: ../en/mksquashfs.dbk:370
+msgid "<option>-always-use-fragments</option>"
+msgstr ""
+
+# type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
+#: ../en/mksquashfs.dbk:371
+msgid ""
+"use fragment blocks for files larger than block size: tells "
+"<command>&dhpackage;</command> to always generate fragments for files "
+"irrespective of the file length.  By default only small files less than the "
+"block size are packed into fragment blocks.  The ends of files which do not "
+"fit fully into a block, are <emphasis>NOT</emphasis> by default packed into "
+"fragments.  To illustrate this, a 100K file has an initial 64K block and a "
+"36K remainder.  This 36K remainder is not packed into a fragment by "
+"default.  This is because to do so leads to a 10 - 20% drop in sequential "
+"I/O performance, as a disk head seek is needed to seek to the initial file "
+"data and another disk seek is need to seek to the fragment block. Specify "
+"this option if you want file remainders to be packed into fragment "
+"blocks. Doing so may increase the compression obtained "
+"<emphasis>BUT</emphasis> at the expense of I/O speed."
+msgstr ""
+
+# type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
+#: ../en/mksquashfs.dbk:393
+msgid "<option>-no-duplicates</option>"
+msgstr ""
+
+# type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
+#: ../en/mksquashfs.dbk:394
+msgid ""
+"do not perform duplicate checking: tells <command>&dhpackage;</command> to "
+"not check the files being added to the filesystem for duplicates.  This can "
+"result in quicker filesystem generation and appending although obviously "
+"compression will suffer badly if there is a lot of duplicate files."
+msgstr ""
+
+# type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
+#: ../en/mksquashfs.dbk:404
+msgid "<option>-noappend</option>"
+msgstr ""
+
+# type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
+#: ../en/mksquashfs.dbk:405
+msgid "do not append to existing filesystem"
+msgstr ""
+
+# type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
+#: ../en/mksquashfs.dbk:411
+msgid "<option>-keep-as-directory</option>"
+msgstr ""
+
+# type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
+#: ../en/mksquashfs.dbk:412
+msgid ""
+"if one source directory is specified, create a root directory containing "
+"that directory, rather than the contents of the directory"
+msgstr ""
+
+# type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
+#: ../en/mksquashfs.dbk:419
+msgid "<option>-root-becomes <replaceable>name</replaceable></option>"
+msgstr ""
+
+# type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
+#: ../en/mksquashfs.dbk:421
+msgid ""
+"when appending source files/directories, make the original root become a "
+"subdirectory in the new root called <replaceable>name</replaceable>, rather "
+"than adding the new source items to the original root"
+msgstr ""
+
+# type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
+#: ../en/mksquashfs.dbk:429
+msgid "<option>-all-root</option> or <option>-root-owned</option>"
+msgstr ""
+
+# type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
+#: ../en/mksquashfs.dbk:431
+msgid "make all files owned by root"
+msgstr ""
+
+# type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
+#: ../en/mksquashfs.dbk:436
+msgid "<option>-force-uid <replaceable>uid</replaceable></option>"
+msgstr ""
+
+# type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
+#: ../en/mksquashfs.dbk:438
+msgid "set all file uids to <replaceable>uid</replaceable>"
+msgstr ""
+
+# type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
+#: ../en/mksquashfs.dbk:444
+msgid "<option>-force-gid <replaceable>gid</replaceable></option>"
+msgstr ""
+
+# type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
+#: ../en/mksquashfs.dbk:446
+msgid "set all file gids to <replaceable>gid</replaceable>"
+msgstr ""
+
+# type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
+#: ../en/mksquashfs.dbk:452
+msgid "<option>-le</option>"
+msgstr ""
+
+# type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
+#: ../en/mksquashfs.dbk:453
+msgid "create a little endian filesystem"
+msgstr ""
+
+# type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
+#: ../en/mksquashfs.dbk:458
+msgid "<option>-be</option>"
+msgstr ""
+
+# type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
+#: ../en/mksquashfs.dbk:459
+msgid "create a big endian filesystem"
+msgstr ""
+
+# type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
+#: ../en/mksquashfs.dbk:464
+msgid "<option>-nopad</option>"
+msgstr ""
+
+# type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
+#: ../en/mksquashfs.dbk:465
+msgid ""
+"do not pad filesystem to a multiple of 4Ko.  This is performed by default to "
+"enable the output filesystem file to be mounted by loopback, which requires "
+"files to be a 4K multiple.  If the filesystem is being written to a block "
+"device, or is to be stored in a bootimage, the extra pad bytes are not "
+"needed."
+msgstr ""
+
+# type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
+#: ../en/mksquashfs.dbk:475
+msgid "<option>-check_data</option>"
+msgstr ""
+
+# type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
+#: ../en/mksquashfs.dbk:476
+msgid "add checkdata for greater filesystem checks"
+msgstr ""
+
+# type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
+#: ../en/mksquashfs.dbk:482
+msgid "<option>-sort <replaceable>sort_file</replaceable></option>"
+msgstr ""
+
+# type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
+#: ../en/mksquashfs.dbk:484
+msgid ""
+"sort files according to priorities in <replaceable>sort_file</replaceable>.  "
+"One file or dir with priority per line.  Priority -32768 to 32767, default "
+"priority 0"
+msgstr ""
+
+# type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
+#: ../en/mksquashfs.dbk:492
+msgid "<option>-e <replaceable>list of exclude dirs/files</replaceable></option>"
+msgstr ""
+
+# type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
+#: ../en/mksquashfs.dbk:494
+msgid "inline list of files / directories to exclude"
+msgstr ""
+
+# type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
+#: ../en/mksquashfs.dbk:500
+msgid "<option>-ef <replaceable>exclude_file</replaceable></option>"
+msgstr ""
+
+# type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
+#: ../en/mksquashfs.dbk:502
+msgid "file containing a list of files / directories to exclude, one per line"
+msgstr ""
+
+# type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
+#: ../en/mksquashfs.dbk:508
+msgid "<option>-wildcards</option>"
+msgstr ""
+
+# type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
+#: ../en/mksquashfs.dbk:509
+msgid "Allow extended shell wildcards (globbing) to be used in exclude dirs/files"
+msgstr ""
+
+# type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
+#: ../en/mksquashfs.dbk:514
+msgid "<option>-regex</option>"
+msgstr ""
+
+# type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
+#: ../en/mksquashfs.dbk:515
+msgid "Allow POSIX regular expressions to be used in exclude dirs/files"
+msgstr ""
+
+# type: Content of: <refentry><refsect1><title>
+#: ../en/mksquashfs.dbk:523
+msgid "EXAMPLES"
+msgstr ""
+
+# type: Content of: <refentry><refsect1><para>
+#: ../en/mksquashfs.dbk:525
+msgid "For following examples, take two example directories:"
+msgstr ""
+
+# type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para>
+#: ../en/mksquashfs.dbk:528
+msgid ""
+"Source directory <filename>/home/phillip/test</filename> contains "
+"<filename>file1</filename>, <filename>file2</filename> and "
+"<filename>dir1</filename>."
+msgstr ""
+
+# type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para>
+#: ../en/mksquashfs.dbk:534
+msgid ""
+"Source directory <filename>goodies</filename> contains "
+"<filename>goodies1</filename>, <filename>goodies2</filename> and "
+"<filename>goodies3</filename>."
+msgstr ""
+
+# type: Content of: <refentry><refsect1><refsect2><example><screen>
+#: ../en/mksquashfs.dbk:546
+#, no-wrap
+msgid "<userinput>mksquashfs /home/phillip/test output_fs</userinput>"
+msgstr ""
+
+# type: Content of: <refentry><refsect1><refsect2><example><para>
+#: ../en/mksquashfs.dbk:547
+msgid ""
+"This will generate a squashfs filesystem with root entries "
+"<filename>file1</filename>, <filename>file2</filename> and "
+"<filename>dir1</filename>."
+msgstr ""
+
+# type: Content of: <refentry><refsect1><refsect2><example><screen>
+#: ../en/mksquashfs.dbk:556
+#, no-wrap
+msgid "<userinput>mksquashfs /home/phillip/test goodies output_fs</userinput>"
+msgstr ""
+
+# type: Content of: <refentry><refsect1><refsect2><example><para>
+#: ../en/mksquashfs.dbk:557
+msgid ""
+"This will create a squashfs filesystem with the root containing entries "
+"<filename>test</filename> and <filename>goodies</filename> corresponding to "
+"the source directories <filename>/home/phillip/test</filename> and "
+"<filename>goodies</filename>."
+msgstr ""
+
+# type: Content of: <refentry><refsect1><refsect2><example><screen>
+#: ../en/mksquashfs.dbk:568
+#, no-wrap
+msgid "<userinput>mksquashfs /home/phillip/test goodies test output_fs</userinput>"
+msgstr ""
+
+# type: Content of: <refentry><refsect1><refsect2><example><para>
+#: ../en/mksquashfs.dbk:570
+msgid ""
+"This is the same as the previous example, except a third source directory "
+"<filename>test</filename> has been specified. This conflicts with the first "
+"directory named <filename>test</filename> and will be renamed "
+"<filename>test_1</filename>."
+msgstr ""
+
+# type: Content of: <refentry><refsect1><refsect2><example><para>
+#: ../en/mksquashfs.dbk:575
+msgid ""
+"Multiple sources allow filesystems to be generated without needing to copy "
+"all source files into a common directory.  This simplifies creating "
+"filesystems."
+msgstr ""
+
+# type: Content of: <refentry><refsect1><refsect2><example><screen>
+#: ../en/mksquashfs.dbk:584
+#, no-wrap
+msgid ""
+"<userinput>mksquashfs /home/phillip/test output_fs "
+"-keep-as-directory</userinput>"
+msgstr ""
+
+# type: Content of: <refentry><refsect1><refsect2><example><para>
+#: ../en/mksquashfs.dbk:586
+msgid ""
+"This is the same as the first example, except for "
+"<option>-keep-as-directory</option>. This will generate a root directory "
+"containing directory <filename>test</filename>, rather than the "
+"<filename>test</filename> directory contents <filename>file1</filename>, "
+"<filename>file2</filename> and <filename>dir1</filename>."
+msgstr ""
+
+# type: Content of: <refentry><refsect1><title>
+#: ../en/mksquashfs.dbk:599
+msgid "AUTHORS"
+msgstr ""
+
+# type: Content of: <refentry><refsect1><para>
+#: ../en/mksquashfs.dbk:601
+msgid ""
+"Squashfs was written by <personname> <firstname>Phillip</firstname> "
+"<surname>Lougher</surname> </personname> "
+"<email>plougher@users.sourceforge.net</email>, in Chepstow, Wales, UK. If "
+"you like the program, or have any problems, then please email me, as it's "
+"nice to get feedback !"
+msgstr ""
+
+# type: Content of: <refentry><refsect1><para>
+#: ../en/mksquashfs.dbk:609
+msgid ""
+"This manual page was written by &dhusername; &dhemail; for the &debian; "
+"system (but may be used by others) using the <citetitle>SquashFS "
+"HOWTO</citetitle> from <author> <firstname>Artemiy I.</firstname> "
+"<surname>Pavlov</surname> </author> and squashfs's "
+"<filename>README</filename> file.  Permission is granted to copy, distribute "
+"and/or modify this document under the terms of the &gnu; General Public "
+"License, Version 2 any later version published by the Free Software "
+"Foundation."
+msgstr ""
+
+# type: Content of: <refentry><refsect1><para>
+#: ../en/mksquashfs.dbk:622
+msgid ""
+"On Debian systems, the complete text of the &gnu; General Public License can "
+"be found in <filename>/usr/share/common-licenses/GPL</filename>."
+msgstr ""
--- squashfs-3.3.orig/debian/doc/po/mksquashfs.fr.po
+++ squashfs-3.3/debian/doc/po/mksquashfs.fr.po
@@ -0,0 +1,993 @@
+# mksquashfs's manpages translation to French
+# Copyright (C) 2005 Free Software Foundation, Inc.
+# Frédéric Boiteux <fboiteux@calistel.com>, 2005.
+msgid ""
+msgstr ""
+"Project-Id-Version: squashfs\n"
+"POT-Creation-Date: 2007-12-09 01:26+0000\n"
+"PO-Revision-Date: 2007-08-08 17:23+0100\n"
+"Last-Translator: Arnaud Fontaine <arnau@debian.org>\n"
+"Language-Team: \n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+
+# type: Content of the dhfirstname entity
+#: ../en/mksquashfs.dbk:30
+msgid "<firstname>Frédéric</firstname>"
+msgstr "<firstname>Frédéric</firstname>"
+
+# type: Content of the dhsurname entity
+#: ../en/mksquashfs.dbk:31
+msgid "<surname>Boiteux</surname>"
+msgstr "<surname>Boiteux</surname>"
+
+# type: Content of the dhdate entity
+#: ../en/mksquashfs.dbk:34
+msgid "<date>december 20, 2004</date>"
+msgstr "<date>december 20, 2004</date>"
+
+# type: Content of the dhsection entity
+#: ../en/mksquashfs.dbk:38
+msgid "<manvolnum>1</manvolnum>"
+msgstr "<manvolnum>1</manvolnum>"
+
+# type: Content of the dhemail entity
+#: ../en/mksquashfs.dbk:39
+msgid "<email>fboiteux@calistel.com</email>"
+msgstr "<email>fboiteux@calistel.com</email>"
+
+# type: Content of the dhusername entity
+#: ../en/mksquashfs.dbk:40
+msgid "Frédéric Boiteux"
+msgstr "Frédéric Boiteux"
+
+# type: Content of the dhucpackage entity
+#: ../en/mksquashfs.dbk:41
+msgid "<refentrytitle>MKSQUASHFS</refentrytitle>"
+msgstr "<refentrytitle>MKSQUASHFS</refentrytitle>"
+
+# type: Content of the dhpackage entity
+#: ../en/mksquashfs.dbk:42
+msgid "mksquashfs"
+msgstr "mksquashfs"
+
+# type: Content of the debian entity
+#: ../en/mksquashfs.dbk:44
+msgid "<productname>Debian</productname>"
+msgstr "<productname>Debian</productname>"
+
+# type: Content of the gnu entity
+#: ../en/mksquashfs.dbk:45
+msgid "<acronym>GNU</acronym>"
+msgstr "<acronym>GNU</acronym>"
+
+# type: Content of the gpl entity
+#: ../en/mksquashfs.dbk:46
+msgid "&gnu; <acronym>GPL</acronym>"
+msgstr "&gnu; <acronym>GPL</acronym>"
+
+# type: Attribute 'lang' of: <refentry>
+#: ../en/mksquashfs.dbk:50
+msgid "fr"
+msgstr "fr"
+
+# type: Content of: <refentry><refentryinfo><copyright><holder>
+#: ../en/mksquashfs.dbk:61
+msgid "&dhusername;"
+msgstr "&dhusername;"
+
+# type: Content of: <refentry><refnamediv><refname>
+#: ../en/mksquashfs.dbk:75
+msgid "&dhpackage;"
+msgstr "&dhpackage;"
+
+# type: Content of: <refentry><refnamediv><refpurpose>
+#: ../en/mksquashfs.dbk:77
+msgid "Create or modify a Squash file system"
+msgstr ""
+"Crée ou modifie un système de fichiers compressé <literal>Squash</literal>"
+
+# type: Content of: <refentry><refsynopsisdiv><cmdsynopsis>
+#: ../en/mksquashfs.dbk:83
+msgid "<command>&dhpackage;</command> <arg><option>-version</option></arg>"
+msgstr "<command>&dhpackage;</command> <arg><option>-version</option></arg>"
+
+# type: Content of: <refentry><refsynopsisdiv><cmdsynopsis>
+#: ../en/mksquashfs.dbk:88
+msgid ""
+"<command>&dhpackage;</command> <arg choice=\"plain\" rep=\"repeat"
+"\"><replaceable>source</replaceable></arg> <arg choice=\"plain"
+"\"><replaceable>dest</replaceable></arg> <arg><option>options</option></arg> "
+"<arg><option>-e <replaceable>list of exclude dirs/files</replaceable></"
+"option></arg> <arg><option>-ef <replaceable>exclude_file</replaceable></"
+"option></arg>"
+msgstr ""
+"<command>&dhpackage;</command> <arg choice=\"plain\" rep=\"repeat"
+"\"><replaceable>source</replaceable></arg> <arg choice=\"plain"
+"\"><replaceable>dest</replaceable></arg> <arg><option>options</option></arg> "
+"<arg><option>-e <replaceable>list of exclude dirs/files</replaceable></"
+"option></arg> <arg><option>-ef <replaceable>exclude_file</replaceable></"
+"option></arg>"
+
+# type: Content of: <refentry><refsect1><title>
+#: ../en/mksquashfs.dbk:101
+msgid "DESCRIPTION"
+msgstr "DESCRIPTION"
+
+# type: Content of: <refentry><refsect1><simpara>
+#: ../en/mksquashfs.dbk:103
+msgid ""
+"A squashfs is a compressed read-only file system. Use the "
+"<command>&dhpackage;</command> program to create a new squashed file system, "
+"and to append new data to an existing squashed file system."
+msgstr ""
+"Squashfs est un système de fichiers compressé, accessible en lecture "
+"seulement. Utilisez la commande <command>&dhpackage;</command> pour créer un "
+"nouveau système de fichiers de ce type ou pour ajouter des données à un "
+"système existant."
+
+# type: Content of: <refentry><refsect1><simpara>
+#: ../en/mksquashfs.dbk:108
+msgid ""
+"If a single source directory is specified (i.e. <userinput>mksquashfs "
+"<replaceable>source</replaceable> <replaceable>output_fs</replaceable></"
+"userinput>), the squashfs filesystem will consist of that directory, with "
+"the top-level root directory corresponding to the source directory."
+msgstr ""
+"Si on ne donne qu'un seul répertoire source (i.e. <userinput>mksquashfs "
+"<replaceable>source</replaceable> <replaceable>sf_résultant</replaceable></"
+"userinput>), on obtiendra un système de fichiers constitué du contenu de ce "
+"répertoire source."
+
+# type: Content of: <refentry><refsect1><simpara>
+#: ../en/mksquashfs.dbk:115
+msgid ""
+"If multiple source directories or files are specified, <command>&dhpackage;</"
+"command> will merge the specified sources into a single filesystem, with the "
+"root directory containing each of the source files/directories.  The name of "
+"each directory entry will be the basename of the source path.  If more than "
+"one source entry maps to the same name, the conflicts are named "
+"<replaceable>xxx</replaceable>_1, <replaceable>xxx</replaceable>_2, etc. "
+"where <replaceable>xxx</replaceable> is the original name."
+msgstr ""
+"Si on fournit plusieurs fichier(s) ou répertoire(s)  sources, "
+"<command>&dhpackage;</command> créera un seul système de fichiers qui "
+"contiendra tous les répertoires et fichiers source. Le nom de chaque "
+"répertoire obtenu sera le nom <emphasis>sans chemin d'accès</emphasis> de "
+"chaque répertoire source ; En cas de noms identiques, les doublons seront "
+"renommés en <replaceable>xxx</replaceable>_1, <replaceable>xxx</"
+"replaceable>_2, etc."
+
+# type: Content of: <refentry><refsect1><simpara>
+#: ../en/mksquashfs.dbk:125
+msgid ""
+"The <replaceable>dest</replaceable> argument can either be a conventional "
+"file or a block device. If the file doesn't exist it will be created, if it "
+"does exist and a squashfs filesystem exists on it, <command>&dhpackage;</"
+"command> will append.  The <option>-noappend </option>option will write a "
+"new filesystem irrespective of whether an existing filesystem is present."
+msgstr ""
+"L'argument <replaceable>dest</replaceable> peut être soit un fichier "
+"classique, soit un périphérique de type bloc (comme un disque ou une "
+"partition). Si le fichier n'existe pas, il sera créé ; s'il existe déjà et "
+"contient un système de fichiers Squashfs, <command>&dhpackage;</command> "
+"rajoutera les sources données à son contenu actuel, sauf si l'option "
+"<option>-noappend</option> est précisée."
+
+# type: Content of: <refentry><refsect1><simpara>
+#: ../en/mksquashfs.dbk:133
+msgid ""
+"There are a large number of options that can be used to control the "
+"compression in <command>&dhpackage;</command>.  By and large the defaults "
+"are the most optimum settings and should only be changed in exceptional "
+"circumstances !"
+msgstr ""
+"Il existe un grand nombre d'options qui permettent de contrôler la "
+"compression de <command>&dhpackage;</command>. Les valeurs par défaut sont "
+"de loin les optimales et ne devraient être modifiées qu'exceptionnellement !"
+
+# type: Content of: <refentry><refsect1><simpara>
+#: ../en/mksquashfs.dbk:138
+msgid ""
+"The <option>-noI</option>, <option>-noD</option> and <option>-noF</option> "
+"options (also <option>-noInodeCompression</option>, <option>-"
+"noDataCompression</option> and <option>-noFragmentCompression</option>) can "
+"be used to force <command>&dhpackage;</command> to not compress inodes/"
+"directories, data and fragments respectively.  Giving all options generates "
+"an uncompressed filesystem."
+msgstr ""
+"Les options <option>-noI</option>, <option>-noD</option> et <option>-noF</"
+"option> (équivalentes à <option>-noInodeCompression</option>, <option>-"
+"noDataCompression</option> et <option>-noFragmentCompression</option>) "
+"peuvent être utilisées pour obliger <command>&dhpackage;</command> à ne pas "
+"comprimer respectivement les i-noeuds et répertoires, les blocs de données "
+"et les blocs de données fragmentés. Si l'on utilise ces trois options, on "
+"obtient un système de fichiers non comprimé."
+
+# type: Content of: <refentry><refsect1><para>
+#: ../en/mksquashfs.dbk:148
+msgid ""
+"By default files in the generated filesystem inherit the UID and GID "
+"ownership of the original file.  However, <command>&dhpackage;</command> "
+"provides a number of options which can be used to override the ownership:"
+msgstr ""
+"Par défaut, les fichiers contenus dans le système de fichiers résultat ont "
+"le même propriétaire et groupe que les fichiers sources. Toutefois, "
+"<command>&dhpackage;</command> propose certaines options pour modifier ce "
+"comportement :"
+
+# type: Content of: <refentry><refsect1><para><itemizedlist><listitem><simpara>
+#: ../en/mksquashfs.dbk:157
+msgid ""
+"The options <option>-all-root</option> and <option>-root-owned</option> "
+"(both do exactly the same thing) force all file uids/gids in the generated "
+"Squashfs filesystem to be <literal>root</literal>.  This allows root owned "
+"filesystems to be built without root access on the host machine."
+msgstr ""
+"Les options <option>-all-root</option> et <option>-root-owned</option> "
+"(synonymes) forcent tous les fichiers du système de fichiers Squashfs généré "
+"à appartenir à <literal>root</literal> (utilisateur et groupe). Elle permet "
+"de construire un système de fichiers appartenant à <literal>root</literal> "
+"sans avoir un accès à ce compte sur la machine où on le construit."
+
+# type: Content of: <refentry><refsect1><para><itemizedlist><listitem><simpara>
+#: ../en/mksquashfs.dbk:164
+msgid ""
+"The <option>-force-uid <replaceable>uid</replaceable></option> option forces "
+"all files in the generated Squashfs filesystem to be owned by the specified "
+"<replaceable>uid</replaceable>.  The uid can be specified either by name (i."
+"e. <literal>root</literal>) or by number."
+msgstr ""
+"L'option <option>-force-uid <replaceable>uid</replaceable></option> force "
+"tous les fichiers du système de fichiers Squashfs généré à appartenir à "
+"l'utilisateur d'identifiant <replaceable>uid</replaceable> donné. Cet "
+"identifiant peut être soit un nom (par exemple <literal>root</literal>), "
+"soit un nombre."
+
+# type: Content of: <refentry><refsect1><para><itemizedlist><listitem><simpara>
+#: ../en/mksquashfs.dbk:172
+msgid ""
+"The <option>-force-gid <replaceable>gid</replaceable></option> option forces "
+"all files in the generated Squashfs filesystem to be group owned by the "
+"specified <replaceable>gid</replaceable>.  The gid can be specified either "
+"by name (i.e. <literal>root</literal>) or by number."
+msgstr ""
+"L'option <option>-force-gid <replaceable>gid</replaceable></option> force "
+"tous les fichiers du système de fichiers Squashfs généré à appartenir au "
+"groupe d'identifiant <replaceable>gid</replaceable> donné. Cet identifiant "
+"peut être soit un nom (par exemple <literal>root</literal>), soit un nombre."
+
+# type: Content of: <refentry><refsect1><simpara>
+#: ../en/mksquashfs.dbk:181
+msgid ""
+"The <option>-e</option> and <option>-ef</option> options allow files/"
+"directories to be specified which are excluded from the output filesystem.  "
+"The <option>-e</option> option takes the exclude files/directories from the "
+"command line, the <option>-ef</option> option takes the exlude files/"
+"directories from the specified exclude file, one file/directory per line. If "
+"an exclude file/directory is absolute (i.e. prefixed with <filename>/</"
+"filename>, <filename>../</filename>, or <filename>./</filename>) the entry "
+"is treated as absolute, however, if an exclude file/directory is relative, "
+"it is treated as being relative to each of the sources in turn, i.e.  "
+"<userinput>mksquashfs /tmp/source1 source2 output_fs -e ex1 /tmp/source1/ex2 "
+"out/ex3</userinput> Will generate exclude files <filename>/tmp/source1/ex2</"
+"filename>, <filename>/tmp/source1/ex1</filename>, <filename>source2/ex1</"
+"filename>, <filename>/tmp/source1/out/ex3</filename> and <filename>source2/"
+"out/ex3</filename>."
+msgstr ""
+"Les options <option>-e</option> et <option>-ef</option> permettent de "
+"déclarer des fichiers ou répertoires à exclure du système de fichiers "
+"résultat. L'option <option>-e</option> lit les fichiers/répertoires à "
+"exclure sur la ligne de commande, tandis que l'option <option>-ef</option> "
+"les trouve dans le fichier d'exclusions spécifié contenant un fichier ou "
+"répertoire par ligne. Si le chemin d'un fichier ou répertoire à exclure est "
+"absolu (c'est-à-dire débutant par <filename>/</filename>, <filename>../</"
+"filename> ou <filename>./</filename>), il est considéré indépendamment des "
+"sources ; en revanche, s'il est relatif, il s'appliquera pour chaque "
+"répertoire source ; par exemple, <userinput>mksquashfs /tmp/source1 source2 "
+"sf_résultant -e ex1 /tmp/source1/ex2 out/ex3</userinput> exclura les "
+"fichiers <filename>/tmp/source1/ex2</filename>, <filename>/tmp/source1/ex1</"
+"filename>, <filename>source2/ex1</filename>, <filename>/tmp/source1/out/ex3</"
+"filename> et <filename>source2/out/ex3</filename>."
+
+# type: Content of: <refentry><refsect1><simpara>
+#: ../en/mksquashfs.dbk:201
+msgid ""
+"The <option>-e</option> and <option>-ef</option> exclude options are "
+"usefully used in archiving the entire filesystem, where it is wished to "
+"avoid archiving <filename>/proc</filename>, and the filesystem being "
+"generated, i.e.  <userinput>mksquashfs / /tmp/root.sqsh -e proc /tmp/root."
+"sqsh</userinput>"
+msgstr ""
+"Ces options <option>-e</option> et <option>-ef</option> sont pratiques pour, "
+"par exemple, archiver un système de fichier complet en évitant le répertoire "
+"<filename>/proc</filename> et le système de fichiers résultat : "
+"<userinput>mksquashfs / /tmp/root.sqsh -e proc /tmp/root.sqsh</userinput>"
+
+# type: Content of: <refentry><refsect1><simpara>
+#: ../en/mksquashfs.dbk:208
+msgid ""
+"Multiple <option>-ef</option> options can be specified on the command line, "
+"and the <option>-ef</option> option can be used in conjuction with the "
+"<option>-e</option> option."
+msgstr ""
+"On peut utiliser plusieurs fois l'option <option>-ef</option> dans une même "
+"commande, et on peut également l'utiliser en même temps que l'option "
+"<option>-e</option>."
+
+# type: Content of: <refentry><refsect1><simpara>
+#: ../en/mksquashfs.dbk:213
+msgid ""
+"The <option>-info</option> option displays the files/directories as they are "
+"compressed and added to the filesystem.  The original uncompressed size of "
+"each file is printed, along with <literal>DUPLICATE</literal> if the file is "
+"a duplicate of a file in the filesystem."
+msgstr ""
+"L'option <option>-info</option> affiche les fichiers et répertoires ajoutés "
+"au système de fichiers, avec leur taille originelle et éventuellement le mot "
+"<literal>DUPLICATE</literal> si un fichier avec un contenu identique y est "
+"déjà présent."
+
+# type: Content of: <refentry><refsect1><para>
+#: ../en/mksquashfs.dbk:219
+msgid ""
+"The <option>-no-exports</option> option doesn't make the filesystem "
+"exportable via NFS."
+msgstr ""
+"L'option <option>-no-exports</option> permet d'éviter le partage du système "
+"de fichiers par NFS"
+
+# type: Content of: <refentry><refsect1><para>
+#: ../en/mksquashfs.dbk:222
+msgid ""
+"The <option>-no-progress</option> option doesn't display the progress bar."
+msgstr ""
+"L'option <option>-no-progress</option> n'affiche pas la barre de progression"
+
+# type: Content of: <refentry><refsect1><simpara>
+#: ../en/mksquashfs.dbk:225
+msgid ""
+"The <option>-le</option> and <option>-be</option> options can be used to "
+"force <command>&dhpackage;</command> to generate a little endian or big "
+"endian filesystem.  Normally <command>&dhpackage;</command> will generate a "
+"filesystem in the host byte order.  Squashfs, for portability, will mount "
+"different ordered filesystems (i.e. it can mount big endian filesystems "
+"running on a little endian machine), but these options can be used for "
+"greater optimisation."
+msgstr ""
+"Les options <option>-le</option> et <option>-be</option> peuvent servir à "
+"forcer <command>&dhpackage;</command> à générer un système de fichiers "
+"<foreignphrase>little endian</foreignphrase> ou <foreignphrase>big endian</"
+"foreignphrase>. Par défaut, <command>&dhpackage;</command> génère un système "
+"de fichiers avec le boutisme de la machine hôte. Le pilote Squashfs "
+"permettant, par souci de portabilité, de monter les deux types de systèmes "
+"de fichiers (c'est-à-dire qu'il peut monter un système <foreignphrase>big "
+"endian</foreignphrase> sur une machine <foreignphrase>little endian</"
+"foreignphrase>), ces options peuvent servir à améliorer l'efficacité d'un "
+"système de fichiers généré pour une architecture différente."
+
+# type: Content of: <refentry><refsect1><title>
+#: ../en/mksquashfs.dbk:237
+msgid "OPTIONS"
+msgstr "OPTIONS"
+
+# type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
+#: ../en/mksquashfs.dbk:242
+msgid "<option>-version</option>"
+msgstr "<option>-version</option>"
+
+# type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><simpara>
+#: ../en/mksquashfs.dbk:245
+msgid "print version, licence and copyright message."
+msgstr "affiche la version, la licence et un message de copyright."
+
+# type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
+#: ../en/mksquashfs.dbk:250
+msgid "<option>-recover <replaceable>name</replaceable></option>"
+msgstr "<option>-recover <replaceable>nom</replaceable></option>"
+
+# type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
+#: ../en/mksquashfs.dbk:253
+msgid ""
+"Allows the original filesystem to be recovered if Mksquashfs aborts "
+"unexpectedly (i.e.  power failure)  using recovery file <replaceable>name</"
+"replaceable>.  Recovery files are now created when appending to existing "
+"Squashfs filesystems."
+msgstr ""
+"Permet au système de fichier original d'être restauré si Mksquashfs se "
+"termine de façon inattendu (par exemple alimentation défaillante) en "
+"utilisant le fichier de restauration <replaceable>nom</replaceable>. "
+"Les fichiers de restauration sont désormais créés lors de l'ajout à un "
+"système de fichier Squashfs existant."
+
+# type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
+#: ../en/mksquashfs.dbk:262
+msgid "<option>-no-recovery</option>"
+msgstr "<option>-no-recovery</option>"
+
+# type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
+#: ../en/mksquashfs.dbk:263
+msgid "don't generate a recovery file"
+msgstr "ne pas générer un fichier de restauration"
+
+# type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
+#: ../en/mksquashfs.dbk:268
+msgid "<option>-info</option>"
+msgstr "<option>-info</option>"
+
+# type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><simpara>
+#: ../en/mksquashfs.dbk:269
+msgid "print files written to filesystem"
+msgstr "affiche les fichiers ajoutés au système de fichiers."
+
+# type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
+#: ../en/mksquashfs.dbk:274
+msgid "<option>-nolzma</option>"
+msgstr "<option>-nolzma</option>"
+
+# type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
+#: ../en/mksquashfs.dbk:275
+msgid ""
+"use ZLIB compression method instead of LZMA. The former is the default "
+"compression library of the squashfs official distribution, whereas the "
+"latter can compress much better."
+msgstr ""
+"utilise l'algorithme de compression ZLIB à la place de LZMA. Le premier est "
+"celui utilisé dans la distribution officielle de squashfs, alors que le "
+"second permet d'obtenir une meilleure compression."
+
+# type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
+#: ../en/mksquashfs.dbk:283
+msgid "<option>-no-exports</option>"
+msgstr "<option>-no-exports</option>"
+
+# type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
+#: ../en/mksquashfs.dbk:284
+msgid "don't make the filesystem exportable via NFS"
+msgstr "permet d'éviter le partage du système de fichier par NFS"
+
+# type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
+#: ../en/mksquashfs.dbk:290
+msgid "<option>-no-progress</option>"
+msgstr "<option>-no-progress</option>"
+
+# type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
+#: ../en/mksquashfs.dbk:291
+msgid "don't display the progress bar"
+msgstr "n'affiche pas la barre de progression"
+
+# type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
+#: ../en/mksquashfs.dbk:296
+msgid "<option>-no-sparse</option>"
+msgstr "<option>-no-sparse</option>"
+
+# type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
+#: ../en/mksquashfs.dbk:297
+msgid "don't detect sparse files"
+msgstr "ne pas détecter les fichiers vides"
+
+# type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
+#: ../en/mksquashfs.dbk:302
+msgid "<option>-b <replaceable>block_size</replaceable></option>"
+msgstr "<option>-b <replaceable>taille_bloc</replaceable></option>"
+
+# type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><simpara>
+#: ../en/mksquashfs.dbk:304
+msgid ""
+"set data block to <replaceable>block_size</replaceable>. Default is 131072 "
+"bytes"
+msgstr ""
+"fixe la taille des blocs de données à <replaceable>block_size</replaceable>. "
+"Par défaut, elle vaut 65536 octets."
+
+# type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
+#: ../en/mksquashfs.dbk:311
+msgid "<option>-processors <replaceable>number</replaceable></option>"
+msgstr "<option>-processors <replaceable>nombre</replaceable></option>"
+
+# type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
+#: ../en/mksquashfs.dbk:313
+msgid ""
+"Use <replaceable>number</replaceable> processors.  By default will use "
+"number of processors available"
+msgstr ""
+"Utilise <replaceable>nombre</replaceable> processeurs. Utilise par défaut le "
+"nombre de processeurs disponibles"
+
+# type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
+#: ../en/mksquashfs.dbk:320
+msgid "<option>-read-queue <replaceable>size</replaceable></option>"
+msgstr "<option>-read-queue <replaceable>taille</replaceable></option>"
+
+# type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
+#: ../en/mksquashfs.dbk:322
+msgid ""
+"Set input queue to <replaceable>size</replaceable> Mbytes. Default 64 Mbytes."
+msgstr ""
+"Initialise la file d'entrée à <replaceable>taille</replaceable> Mo. "
+"La valeur par défaut est 64Mo."
+
+# type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
+#: ../en/mksquashfs.dbk:329
+msgid "<option>-write-queue <replaceable>size</replaceable></option>"
+msgstr "<option>-write-queue <replaceable>taille</replaceable></option>"
+
+# type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
+#: ../en/mksquashfs.dbk:331
+msgid ""
+"Set output queue to <replaceable>size</replaceable> Mbytes. Default 512 "
+"Mbytes."
+msgstr ""
+"Initialise la file de sortie à <replaceable>taille</replaceable> Mo. "
+"La valeur par défaut est 512Mo."
+
+# type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
+#: ../en/mksquashfs.dbk:338
+msgid "<option>-noI</option> or <option>-noInodeCompression</option>"
+msgstr "<option>-noI</option> ou <option>-noInodeCompression</option>"
+
+# type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><simpara>
+#: ../en/mksquashfs.dbk:340
+msgid "do not compress inode table"
+msgstr "ne comprime pas la table des i-noeuds."
+
+# type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
+#: ../en/mksquashfs.dbk:345
+msgid "<option>-noD</option>or <option>-noDataCompression</option>"
+msgstr "<option>-noD</option> ou <option>-noDataCompression</option>"
+
+# type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><simpara>
+#: ../en/mksquashfs.dbk:347
+msgid "do not compress data blocks"
+msgstr "ne comprime pas les blocs de données."
+
+# type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
+#: ../en/mksquashfs.dbk:352
+msgid "<option>-noF</option> or <option>-noFragmentCompression</option>"
+msgstr "<option>-noF</option> ou <option>-noFragmentCompression</option>"
+
+# type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><simpara>
+#: ../en/mksquashfs.dbk:354
+msgid "do not compress fragment blocks"
+msgstr "ne comprime pas les blocs fragmentés."
+
+# type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
+#: ../en/mksquashfs.dbk:359
+msgid "<option>-no-fragments</option>"
+msgstr "<option>-no-fragments</option>"
+
+# type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><simpara>
+#: ../en/mksquashfs.dbk:360
+msgid ""
+"do not use fragments: tells <command>&dhpackage;</command> to not generate "
+"fragment blocks, and rather generate a filesystem similar to a Squashfs 1.x "
+"filesystem. It will of course still be a Squashfs 2.0 filesystem but without "
+"fragments, and so it won't be mountable on a Squashfs 1.x system."
+msgstr ""
+"n'utilise pas de blocs fragmentés : indique à <command>&dhpackage;</command> "
+"de ne pas créer de blocs fragmentés, mais plutôt un système de fichiers du "
+"même genre que ceux des versions 1.x de Squashfs. Ce sera quand même un "
+"système de fichiers Squashfs 2.0 (mais sans fragments), donc il ne pourra "
+"être monté par un système Squashfs en version 1.x."
+
+# type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
+#: ../en/mksquashfs.dbk:370
+msgid "<option>-always-use-fragments</option>"
+msgstr "<option>-always-use-fragments</option>"
+
+# type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><simpara>
+#: ../en/mksquashfs.dbk:371
+msgid ""
+"use fragment blocks for files larger than block size: tells "
+"<command>&dhpackage;</command> to always generate fragments for files "
+"irrespective of the file length.  By default only small files less than the "
+"block size are packed into fragment blocks.  The ends of files which do not "
+"fit fully into a block, are <emphasis>NOT</emphasis> by default packed into "
+"fragments.  To illustrate this, a 100K file has an initial 64K block and a "
+"36K remainder.  This 36K remainder is not packed into a fragment by "
+"default.  This is because to do so leads to a 10 - 20% drop in sequential I/"
+"O performance, as a disk head seek is needed to seek to the initial file "
+"data and another disk seek is need to seek to the fragment block. Specify "
+"this option if you want file remainders to be packed into fragment blocks. "
+"Doing so may increase the compression obtained <emphasis>BUT</emphasis> at "
+"the expense of I/O speed."
+msgstr ""
+"utilise des blocs fragmentés pour les fichiers plus gros que la taille d'un "
+"bloc : indique à <command>&dhpackage;</command> d'utiliser des blocs "
+"fragmentés quelle que soit la longueur des fichiers. Par défaut, seuls les "
+"petits fichiers (dont la taille est inférieure à celle d'un bloc) sont "
+"assemblés dans des blocs fragmentés. La fin des fichiers qui remplisse plus "
+"d'un bloc ne sont <emphasis>pas</emphasis>, par défaut, assemblés dans des "
+"fragments.  Par exemple, un fichier de 100 ko est découpé en un bloc de "
+"64 ko et un reste de 36 ko, qui par défaut n'est pas placé dans un bloc "
+"fragmenté. Ce choix est fait pour éviter une perte de performance de 10 à "
+"20% en accès séquentiel à ce genre de fichiers, car il faudrait sinon "
+"déplacer la tête de lecture d'un disque pour accéder au(x) bloc(s) entier(s) "
+"et un autre pour le fragment (qui ne sera sans doute pas consécutif). "
+"Utilisez cette option pour forcer ces fins de fichiers à être rassemblées "
+"dans les blocs fragmentés ; cela améliore le taux de compression obtenu "
+"<emphasis>mais</emphasis> au dépens de la vitesse d'accès."
+
+# type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
+#: ../en/mksquashfs.dbk:393
+msgid "<option>-no-duplicates</option>"
+msgstr "<option>-no-duplicates</option>"
+
+# type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><simpara>
+#: ../en/mksquashfs.dbk:394
+msgid ""
+"do not perform duplicate checking: tells <command>&dhpackage;</command> to "
+"not check the files being added to the filesystem for duplicates.  This can "
+"result in quicker filesystem generation and appending although obviously "
+"compression will suffer badly if there is a lot of duplicate files."
+msgstr ""
+"ne vérifie pas s'il y a des doublons : indique à <command>&dhpackage;</"
+"command> de ne pas vérifier dans les fichiers ajoutés s'il y en a avec des "
+"contenus identiques. Ceci permet une génération/modification du système de "
+"fichiers résultant plus rapide, mais bien sûr le taux de compression sera "
+"nettement moins bon s'il y a beaucoup de fichiers aux contenus identiques."
+
+# type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
+#: ../en/mksquashfs.dbk:404
+msgid "<option>-noappend</option>"
+msgstr "<option>-noappend</option>"
+
+# type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><simpara>
+#: ../en/mksquashfs.dbk:405
+msgid "do not append to existing filesystem"
+msgstr "ne pas ajouter en fin d'un système de fichiers existant."
+
+# type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
+#: ../en/mksquashfs.dbk:411
+msgid "<option>-keep-as-directory</option>"
+msgstr "<option>-keep-as-directory</option>"
+
+# type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><simpara>
+#: ../en/mksquashfs.dbk:412
+msgid ""
+"if one source directory is specified, create a root directory containing "
+"that directory, rather than the contents of the directory"
+msgstr ""
+"si un répertoire source est donné, crée un système de fichiers contenant ce "
+"répertoire plutôt que simplement son contenu."
+
+# type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
+#: ../en/mksquashfs.dbk:419
+msgid "<option>-root-becomes <replaceable>name</replaceable></option>"
+msgstr "<option>-root-becomes <replaceable>nom</replaceable></option>"
+
+# type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><simpara>
+#: ../en/mksquashfs.dbk:421
+msgid ""
+"when appending source files/directories, make the original root become a "
+"subdirectory in the new root called <replaceable>name</replaceable>, rather "
+"than adding the new source items to the original root"
+msgstr ""
+"lorsqu'on ajoute des fichiers ou répertoires à un système existant, le "
+"contenu de l'ancien système sera placé dans un répertoire de "
+"<replaceable>nom</replaceable> donné, plutôt que de mélanger les anciens "
+"fichiers et les nouveaux."
+
+# type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
+#: ../en/mksquashfs.dbk:429
+msgid "<option>-all-root</option> or <option>-root-owned</option>"
+msgstr "<option>-all-root</option> ou <option>-root-owned</option>"
+
+# type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><simpara>
+#: ../en/mksquashfs.dbk:431
+msgid "make all files owned by root"
+msgstr ""
+"tous les fichiers ajoutés au système appartiendront à <literal>root</"
+"literal>."
+
+# type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
+#: ../en/mksquashfs.dbk:436
+msgid "<option>-force-uid <replaceable>uid</replaceable></option>"
+msgstr "<option>-force-uid <replaceable>uid</replaceable></option>"
+
+# type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><simpara>
+#: ../en/mksquashfs.dbk:438
+msgid "set all file uids to <replaceable>uid</replaceable>"
+msgstr ""
+"tous les fichiers ajoutés au système appartiendront à l'utilisateur "
+"d'identifiant <replaceable>uid</replaceable> (un nom ou un nombre)."
+
+# type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
+#: ../en/mksquashfs.dbk:444
+msgid "<option>-force-gid <replaceable>gid</replaceable></option>"
+msgstr "<option>-force-gid <replaceable>gid</replaceable></option>"
+
+# type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><simpara>
+#: ../en/mksquashfs.dbk:446
+msgid "set all file gids to <replaceable>gid</replaceable>"
+msgstr ""
+"tous les fichiers ajoutés au système appartiendront au groupe d'identifiant "
+"<replaceable>gid</replaceable> (un nom ou un nombre)."
+
+# type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
+#: ../en/mksquashfs.dbk:452
+msgid "<option>-le</option>"
+msgstr "<option>-le</option>"
+
+# type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><simpara>
+#: ../en/mksquashfs.dbk:453
+msgid "create a little endian filesystem"
+msgstr ""
+"crée un système de fichiers au format petit boutiens (<foreignphrase>little "
+"endian</foreignphrase> en anglais)."
+
+# type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
+#: ../en/mksquashfs.dbk:458
+msgid "<option>-be</option>"
+msgstr "<option>-be</option>"
+
+# type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><simpara>
+#: ../en/mksquashfs.dbk:459
+msgid "create a big endian filesystem"
+msgstr ""
+"crée un système de fichiers au format gros boutiens (<foreignphrase>big "
+"endian</foreignphrase> en anglais)."
+
+# type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
+#: ../en/mksquashfs.dbk:464
+msgid "<option>-nopad</option>"
+msgstr "<option>-nopad</option>"
+
+# type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><simpara>
+#: ../en/mksquashfs.dbk:465
+msgid ""
+"do not pad filesystem to a multiple of 4Ko.  This is performed by default to "
+"enable the output filesystem file to be mounted by loopback, which requires "
+"files to be a 4K multiple.  If the filesystem is being written to a block "
+"device, or is to be stored in a bootimage, the extra pad bytes are not "
+"needed."
+msgstr ""
+"Ne pas arrondir le système de fichiers au multiple de 4 ko [supérieur] : cet "
+"arrondi, effectué par défaut, permet au système de fichiers d'être monté par "
+"l'interface <literal>loopback</literal> qui ne fonctionne qu'avec des "
+"fichiers multiples de 4 ko. Si le système de fichiers est destiné à être "
+"écrit sur un périphérique de type bloc (un disque ou une partition par "
+"exemple) ou être placé dans une image de démarrage, cet arrondi est inutile."
+
+# type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
+#: ../en/mksquashfs.dbk:475
+msgid "<option>-check_data</option>"
+msgstr "<option>-check_data</option>"
+
+# type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><simpara>
+#: ../en/mksquashfs.dbk:476
+msgid "add checkdata for greater filesystem checks"
+msgstr ""
+"positionne un drapeau dans le système de fichiers créé pour plus de "
+"vérifications de ce système lorsqu'il est monté."
+
+# type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
+#: ../en/mksquashfs.dbk:482
+msgid "<option>-sort <replaceable>sort_file</replaceable></option>"
+msgstr "<option>-sort <replaceable>ordre</replaceable></option>"
+
+# type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><simpara>
+#: ../en/mksquashfs.dbk:484
+msgid ""
+"sort files according to priorities in <replaceable>sort_file</replaceable>.  "
+"One file or dir with priority per line.  Priority -32768 to 32767, default "
+"priority 0"
+msgstr ""
+"trie les fichiers suivant les priorités décrites dans le fichier "
+"<replaceable>ordre</replaceable>, qui doit contenir un nom de fichier ou "
+"répertoire par ligne avec sa priorité associée (nombre entre -32768 et "
+"32767, 0 par défaut)."
+
+# type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
+#: ../en/mksquashfs.dbk:492
+msgid ""
+"<option>-e <replaceable>list of exclude dirs/files</replaceable></option>"
+msgstr ""
+"<option>-e <replaceable>liste des répertoires/fichiers exclus</replaceable></"
+"option>"
+
+# type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><simpara>
+#: ../en/mksquashfs.dbk:494
+msgid "inline list of files / directories to exclude"
+msgstr "liste (en ligne) des fichiers et répertoires à exclure."
+
+# type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
+#: ../en/mksquashfs.dbk:500
+msgid "<option>-ef <replaceable>exclude_file</replaceable></option>"
+msgstr "<option>-ef <replaceable>fichier_exclus</replaceable></option>"
+
+# type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><simpara>
+#: ../en/mksquashfs.dbk:502
+msgid "file containing a list of files / directories to exclude, one per line"
+msgstr ""
+"le fichier <replaceable>fichier_exclus</replaceable> contient la liste des "
+"fichiers ou répertoires à exclure, un par ligne."
+
+# type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
+#: ../en/mksquashfs.dbk:508
+msgid "<option>-wildcards</option>"
+msgstr "<option>-wildcards</option>"
+
+# type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
+#: ../en/mksquashfs.dbk:509
+msgid ""
+"Allow extended shell wildcards (globbing) to be used in exclude dirs/files"
+msgstr ""
+"Permet l'utilisation des caractères spéciaux de l'interpréteur de commande "
+"afin d'exclure des répertoires ou fichiers"
+
+# type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
+#: ../en/mksquashfs.dbk:514
+msgid "<option>-regex</option>"
+msgstr "<option>-regex</option>"
+
+# type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
+#: ../en/mksquashfs.dbk:515
+msgid "Allow POSIX regular expressions to be used in exclude dirs/files"
+msgstr "Permet l'utilisation des expressions rationnelle POSIX pour "
+"l'exclusion de fichiers ou répertoires"
+
+# type: Content of: <refentry><refsect1><title>
+#: ../en/mksquashfs.dbk:523
+msgid "EXAMPLES"
+msgstr "EXEMPLES"
+
+# type: Content of: <refentry><refsect1><para>
+#: ../en/mksquashfs.dbk:525
+msgid "For following examples, take two example directories:"
+msgstr "Pour les exemples suivants, on utilise deux répertoires :"
+
+# type: Content of: <refentry><refsect1><para><itemizedlist><listitem><simpara>
+#: ../en/mksquashfs.dbk:528
+msgid ""
+"Source directory <filename>/home/phillip/test</filename> contains "
+"<filename>file1</filename>, <filename>file2</filename> and <filename>dir1</"
+"filename>."
+msgstr ""
+"le répertoire source <filename>/home/phillip/test</filename> contient "
+"<filename>fichier1</filename>, <filename>fichier2</filename> et "
+"<filename>rep1</filename>."
+
+# type: Content of: <refentry><refsect1><para><itemizedlist><listitem><simpara>
+#: ../en/mksquashfs.dbk:534
+msgid ""
+"Source directory <filename>goodies</filename> contains <filename>goodies1</"
+"filename>, <filename>goodies2</filename> and <filename>goodies3</filename>."
+msgstr ""
+"le répertoire source <filename>outils</filename> contient <filename>outils1</"
+"filename>, <filename>outils2</filename> et <filename>outils3</filename>."
+
+# type: Content of: <refentry><refsect1><refsect2><example><screen>
+#: ../en/mksquashfs.dbk:546
+#, no-wrap
+msgid "<userinput>mksquashfs /home/phillip/test output_fs</userinput>"
+msgstr "<userinput>mksquashfs /home/phillip/test sf_resultat</userinput>"
+
+# type: Content of: <refentry><refsect1><refsect2><example><simpara>
+#: ../en/mksquashfs.dbk:547
+msgid ""
+"This will generate a squashfs filesystem with root entries <filename>file1</"
+"filename>, <filename>file2</filename> and <filename>dir1</filename>."
+msgstr ""
+"va créer un système de fichiers Squashfs contenant dans sa racine les items "
+"<filename>fichier1</filename>, <filename>fichier2</filename> et "
+"<filename>rep1</filename>."
+
+# type: Content of: <refentry><refsect1><refsect2><example><screen>
+#: ../en/mksquashfs.dbk:556
+#, no-wrap
+msgid "<userinput>mksquashfs /home/phillip/test goodies output_fs</userinput>"
+msgstr "<userinput>mksquashfs /home/phillip/test outils sf_resultat</userinput>"
+
+# type: Content of: <refentry><refsect1><refsect2><example><simpara>
+#: ../en/mksquashfs.dbk:557
+msgid ""
+"This will create a squashfs filesystem with the root containing entries "
+"<filename>test</filename> and <filename>goodies</filename> corresponding to "
+"the source directories <filename>/home/phillip/test</filename> and "
+"<filename>goodies</filename>."
+msgstr ""
+"va créer un système de fichiers Squashfs contenant dans sa racine les "
+"répertoires <filename>test</filename> et <filename>outils</filename>, "
+"correspondant aux répertoires source <filename>/home/phillip/test</filename> "
+"et <filename>outils</filename>."
+
+# type: Content of: <refentry><refsect1><refsect2><example><screen>
+#: ../en/mksquashfs.dbk:568
+#, no-wrap
+msgid "<userinput>mksquashfs /home/phillip/test goodies test output_fs</userinput>"
+msgstr "<userinput>mksquashfs /home/phillip/test outils test sf_resultat</userinput>"
+
+# type: Content of: <refentry><refsect1><refsect2><example><simpara>
+#: ../en/mksquashfs.dbk:570
+msgid ""
+"This is the same as the previous example, except a third source directory "
+"<filename>test</filename> has been specified. This conflicts with the first "
+"directory named <filename>test</filename> and will be renamed "
+"<filename>test_1</filename>."
+msgstr ""
+"commande identique à l'exemple précédent, sauf qu'un troisième répertoire "
+"source <filename>test</filename> a été donné, d'où un conflit avec le "
+"premier répertoire <filename>test</filename>. Ce troisième répertoire sera "
+"donc renommé <filename>test_1</filename>."
+
+# type: Content of: <refentry><refsect1><refsect2><example><simpara>
+#: ../en/mksquashfs.dbk:575
+msgid ""
+"Multiple sources allow filesystems to be generated without needing to copy "
+"all source files into a common directory.  This simplifies creating "
+"filesystems."
+msgstr ""
+"Donner plusieurs répertoires source permet de générer des systèmes de "
+"fichiers sans préalablement copier tous les fichiers nécessaires dans un "
+"répertoire commun, ce qui simplifie le processus."
+
+# type: Content of: <refentry><refsect1><refsect2><example><screen>
+#: ../en/mksquashfs.dbk:584
+#, no-wrap
+msgid "<userinput>mksquashfs /home/phillip/test output_fs -keep-as-directory</userinput>"
+msgstr "<userinput>mksquashfs /home/phillip/test sf_resultat -keep-as-directory</userinput>"
+
+# type: Content of: <refentry><refsect1><refsect2><example><simpara>
+#: ../en/mksquashfs.dbk:586
+msgid ""
+"This is the same as the first example, except for <option>-keep-as-"
+"directory</option>. This will generate a root directory containing directory "
+"<filename>test</filename>, rather than the <filename>test</filename> "
+"directory contents <filename>file1</filename>, <filename>file2</filename> "
+"and <filename>dir1</filename>."
+msgstr ""
+"commande identique au premier exemple, sauf que l'option <option>-keep-as-"
+"directory</option> va donner un système de fichiers dont la racine "
+"contiendra un répertoire <filename>test</filename>, au lieu de n'avoir que "
+"son contenu <filename>fichier1</filename>, <filename>fichier2</filename> et "
+"<filename>rep1</filename>."
+
+# type: Content of: <refentry><refsect1><title>
+#: ../en/mksquashfs.dbk:599
+msgid "AUTHORS"
+msgstr "AUTEURS"
+
+# type: Content of: <refentry><refsect1><para>
+#: ../en/mksquashfs.dbk:601
+msgid ""
+"Squashfs was written by <personname> <firstname>Phillip</firstname> "
+"<surname>Lougher</surname> </personname> <email>plougher@users.sourceforge."
+"net</email>, in Chepstow, Wales, UK. If you like the program, or have any "
+"problems, then please email me, as it's nice to get feedback !"
+msgstr ""
+"Squashfs a été écrit par <personname> <firstname>Phillip</firstname> "
+"<surname>Lougher</surname> </personname> <email>plougher@users.sourceforge."
+"net</email>, à Chepstow, Pays de Galles, Royaume-Uni. Si vous appréciez ce "
+"programme ou rencontrez des problèmes en l'utilisant, contactez-le, il est "
+"intéressé par des retours d'expérience."
+
+# type: Content of: <refentry><refsect1><para>
+#: ../en/mksquashfs.dbk:609
+msgid ""
+"This manual page was written by &dhusername; &dhemail; for the &debian; "
+"system (but may be used by others) using the <citetitle>SquashFS HOWTO</"
+"citetitle> from <author> <firstname>Artemiy I.</firstname> <surname>Pavlov</"
+"surname> </author> and squashfs's <filename>README</filename> file.  "
+"Permission is granted to copy, distribute and/or modify this document under "
+"the terms of the &gnu; General Public License, Version 2 any later version "
+"published by the Free Software Foundation."
+msgstr ""
+"Cette page de manuel a été écrit par &dhusername; &dhemail; pour le système "
+"&debian; (mais peut être utilisé par d'autres) à partir du document "
+"<citetitle>SquashFS HOWTO</citetitle> de <author> <firstname>Artemiy I.</"
+"firstname> <surname>Pavlov</surname> </author> et du fichier "
+"<filename>README</filename> des sources de SquashFS. Il est permis de "
+"copier, distribuer et/ou modifier ce document en vertu de la licence GPL "
+"version 2 ou postérieure, telle que publiée par la Free Software Foundation."
+
+# type: Content of: <refentry><refsect1><para>
+#: ../en/mksquashfs.dbk:622
+msgid ""
+"On Debian systems, the complete text of the &gnu; General Public License can "
+"be found in <filename>/usr/share/common-licenses/GPL</filename>."
+msgstr ""
+"Sur les systèmes Debian, le texte complet de la licence &gpl; (Licence "
+"Public Générale &gnu;) se trouve dans le fichier <filename>/usr/share/common-"
+"licenses/GPL</filename>."
--- squashfs-3.3.orig/debian/doc/po/mksquashfs.fr.add
+++ squashfs-3.3/debian/doc/po/mksquashfs.fr.add
@@ -0,0 +1,3 @@
+PO4A-HEADER:position=AUTEURS;mode=after;beginboundary=</refsect1>
+
+    <para>Traduction française : &dhusername; &dhemail;.</para>
--- squashfs-3.3.orig/debian/doc/en/mksquashfs.dbk
+++ squashfs-3.3/debian/doc/en/mksquashfs.dbk
@@ -0,0 +1,627 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook XML V4.2//EN"
+"http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd" [
+
+<!--
+
+Process this file with an XSLT processor: `xsltproc \
+-''-nonet /usr/share/sgml/docbook/stylesheet/xsl/nwalsh/\
+manpages/docbook.xsl manpage.dbk'.  A manual page
+<package>.<section> will be generated.  You may view the
+manual page with: nroff -man <package>.<section> | less'.  A
+typical entry in a Makefile or Makefile.am is:
+
+DB2MAN=/usr/share/sgml/docbook/stylesheet/xsl/nwalsh/\
+manpages/docbook.xsl
+XP=xsltproc -''-nonet
+
+manpage.1: manpage.dbk
+        $(XP) $(DB2MAN) $<
+
+The xsltproc binary is found in the xsltproc package.  The
+XSL files are in docbook-xsl.  Please remember that if you
+create the nroff version in one of the debian/rules file
+targets (such as build), you will need to include xsltproc
+and docbook-xsl in your Build-Depends control field.
+
+-->
+
+  <!-- Fill in your name for FIRSTNAME and SURNAME. -->
+  <!ENTITY dhfirstname "<firstname>Frédéric</firstname>">
+  <!ENTITY dhsurname   "<surname>Boiteux</surname>">
+
+  <!-- Please adjust the date whenever revising the manpage. -->
+  <!ENTITY dhdate      "<date>december 20, 2004</date>">
+
+  <!-- SECTION should be 1-8, maybe w/ subsection other parameters are
+       allowed: see man(7), man(1). -->
+  <!ENTITY dhsection   "<manvolnum>1</manvolnum>">
+  <!ENTITY dhemail     "<email>fboiteux@calistel.com</email>">
+  <!ENTITY dhusername  "Frédéric Boiteux">
+  <!ENTITY dhucpackage "<refentrytitle>MKSQUASHFS</refentrytitle>">
+  <!ENTITY dhpackage   "mksquashfs">
+
+  <!ENTITY debian      "<productname>Debian</productname>">
+  <!ENTITY gnu         "<acronym>GNU</acronym>">
+  <!ENTITY gpl         "&gnu; <acronym>GPL</acronym>">
+]>
+
+<!-- ====================================================================== -->
+<refentry lang="fr">
+  <refentryinfo>
+    <address>
+      &dhemail;
+    </address>
+    <!-- <author> -->
+<!--       &dhfirstname; -->
+<!--       &dhsurname; -->
+<!--     </author> -->
+    <copyright>
+      <year>2005</year>
+      <holder>&dhusername;</holder>
+    </copyright>
+    &dhdate;
+  </refentryinfo>
+
+  <!-- ============================================================ -->
+  <refmeta>
+    &dhucpackage;
+
+    &dhsection;
+  </refmeta>
+
+  <!-- ============================================================ -->
+  <refnamediv>
+    <refname>&dhpackage;</refname>
+
+    <refpurpose>Create or modify a Squash file system</refpurpose>
+  </refnamediv>
+
+  <!-- ============================================================ -->
+  <refsynopsisdiv>
+    <cmdsynopsis>
+      <command>&dhpackage;</command>
+      <arg><option>-version</option></arg>
+    </cmdsynopsis>
+
+    <cmdsynopsis>
+      <command>&dhpackage;</command>
+      <arg choice="plain"
+        rep="repeat"><replaceable>source</replaceable></arg>
+      <arg choice="plain"><replaceable>dest</replaceable></arg>
+      <arg><option>options</option></arg>
+      <arg><option>-e  <replaceable>list of exclude
+            dirs/files</replaceable></option></arg>
+      <arg><option>-ef <replaceable>exclude_file</replaceable></option></arg>
+    </cmdsynopsis>
+  </refsynopsisdiv>
+
+  <!-- ============================================================ -->
+  <refsect1>
+    <title>DESCRIPTION</title>
+
+    <para>A squashfs is a compressed read-only file system. Use the
+      <command>&dhpackage;</command> program to create a new
+      squashed file system, and to append new data to an existing
+      squashed file system.</para>
+
+    <para>If a single source directory is specified
+      (i.e. <userinput>mksquashfs <replaceable>source</replaceable>
+        <replaceable>output_fs</replaceable></userinput>), the
+      squashfs filesystem will consist of that directory, with the
+      top-level root directory corresponding to the source
+      directory.</para>
+
+    <para>If multiple source directories or files are specified,
+      <command>&dhpackage;</command> will merge the specified sources
+      into a single filesystem, with the root directory containing each
+      of the source files/directories.  The name of each directory entry
+      will be the basename of the source path.   If more than one source
+      entry maps to the same name, the conflicts are named
+      <replaceable>xxx</replaceable>_1, <replaceable>xxx</replaceable>_2,
+      etc. where <replaceable>xxx</replaceable> is the original
+      name. </para>
+
+    <para>The <replaceable>dest</replaceable> argument can either
+      be a conventional file or a block device. If the file doesn't
+      exist it will be created, if it does exist and a squashfs
+      filesystem exists on it, <command>&dhpackage;</command> will
+      append.  The <option>-noappend </option>option will write a new
+      filesystem irrespective of whether an existing filesystem is
+      present.</para>
+
+    <para>There are a large number of options that can be used to
+      control the compression in <command>&dhpackage;</command>.  By
+      and large the defaults are the most optimum settings and should
+      only be changed in exceptional circumstances !</para>
+
+    <para>The <option>-noI</option>, <option>-noD</option> and
+      <option>-noF</option> options (also
+      <option>-noInodeCompression</option>,
+      <option>-noDataCompression</option> and
+      <option>-noFragmentCompression</option>) can be used to force
+      <command>&dhpackage;</command> to not compress
+      inodes/directories, data and fragments respectively.  Giving all
+      options generates an uncompressed filesystem.</para>
+
+
+    <para>By default files in the generated filesystem inherit the UID
+      and GID ownership of the original file.  However,
+      <command>&dhpackage;</command> provides a number of options
+      which can be used to override the ownership:
+    </para>
+
+      <itemizedlist>
+        <listitem>
+	<para>
+	 The options <option>-all-root</option> and
+            <option>-root-owned</option> (both do exactly the same
+            thing) force all file uids/gids in the generated Squashfs
+            filesystem to be <literal>root</literal>.  This allows
+            root owned filesystems to be built without root access on
+            the host machine.</para></listitem>
+        <listitem>
+          <para>The <option>-force-uid
+              <replaceable>uid</replaceable></option> option forces
+            all files in the generated Squashfs filesystem to be owned
+            by the specified <replaceable>uid</replaceable>.  The uid
+            can be specified either by name
+            (i.e. <literal>root</literal>) or by
+            number.</para></listitem>
+        <listitem>
+          <para>The <option>-force-gid
+              <replaceable>gid</replaceable></option> option forces
+            all files in the generated Squashfs filesystem to be group
+            owned by the specified <replaceable>gid</replaceable>.
+            The gid can be specified either by name
+            (i.e. <literal>root</literal>) or by
+            number.</para></listitem>
+      </itemizedlist>
+
+    <para>The <option>-e</option> and <option>-ef</option> options
+      allow files/directories to be specified which are
+      excluded from the output filesystem.  The <option>-e</option>
+      option takes the exclude files/directories from the command
+      line, the <option>-ef</option> option takes the exlude
+      files/directories from the specified exclude file, one
+      file/directory per line. If an exclude file/directory is
+      absolute (i.e. prefixed with <filename>/</filename>,
+      <filename>../</filename>, or <filename>./</filename>) the entry
+      is treated as absolute, however, if an exclude file/directory
+      is relative, it is treated as being relative to each of the
+      sources in turn, i.e.
+      <userinput>mksquashfs /tmp/source1 source2 output_fs -e ex1 /tmp/source1/ex2 out/ex3</userinput>
+      Will generate exclude files
+      <filename>/tmp/source1/ex2</filename>,
+      <filename>/tmp/source1/ex1</filename>,
+      <filename>source2/ex1</filename>,
+      <filename>/tmp/source1/out/ex3</filename> and
+      <filename>source2/out/ex3</filename>.</para>
+
+    <para>The <option>-e</option> and <option>-ef</option> exclude
+      options are usefully used in archiving the entire filesystem,
+      where it is wished to avoid archiving
+      <filename>/proc</filename>, and the filesystem being generated,
+      i.e.
+      <userinput>mksquashfs / /tmp/root.sqsh -e proc /tmp/root.sqsh</userinput></para>
+
+    <para>Multiple <option>-ef</option> options can be specified on
+      the command line, and the <option>-ef</option>
+      option can be used in conjuction with the <option>-e</option>
+      option.</para>
+
+    <para>The <option>-info</option> option displays the
+      files/directories as they are compressed and added to the
+      filesystem.  The original uncompressed size of each file is
+      printed, along with <literal>DUPLICATE</literal> if the file is
+      a duplicate of a file in the filesystem.</para>
+
+    <para>The <option>-no-exports</option> option doesn't make the
+      filesystem exportable via NFS.</para>
+
+    <para>The <option>-no-progress</option> option doesn't display the
+      progress bar.</para>
+
+    <para>The <option>-le</option> and <option>-be</option> options
+      can be used to force <command>&dhpackage;</command> to generate
+      a little endian or big endian filesystem.  Normally
+      <command>&dhpackage;</command> will generate a filesystem in the
+      host byte order.  Squashfs, for portability, will mount
+      different ordered filesystems (i.e. it can mount big endian
+      filesystems running on a little endian machine), but these
+      options can be used for greater optimisation.</para>
+  </refsect1>
+
+  <!-- ============================================================ -->
+  <refsect1>
+    <title>OPTIONS</title>
+
+    <variablelist>
+      <varlistentry>
+        <term>
+          <option>-version</option>
+        </term>
+        <listitem>
+          <para>print version, licence and copyright message.</para>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry>
+        <term><option>-recover
+            <replaceable>name</replaceable></option></term>
+
+        <listitem><para>Allows the original filesystem to be recovered
+            if Mksquashfs aborts unexpectedly (i.e.  power failure)
+            using recovery file <replaceable>name</replaceable>.
+            Recovery files are now created when appending to existing
+            Squashfs filesystems.</para>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry>
+        <term><option>-no-recovery</option></term>
+        <listitem><para>don't generate a recovery file</para>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry>
+        <term><option>-info</option></term>
+        <listitem><para>print files written to filesystem</para>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry>
+        <term><option>-nolzma</option></term>
+        <listitem><para>use ZLIB compression method instead of
+            LZMA. The former is the default compression library of the
+            squashfs official distribution, whereas the latter can
+            compress much better.</para>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry>
+        <term><option>-no-exports</option></term>
+        <listitem><para>don't make the filesystem exportable via
+        NFS</para>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry>
+        <term><option>-no-progress</option></term>
+        <listitem><para>don't display the progress bar</para>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry>
+        <term><option>-no-sparse</option></term>
+        <listitem><para>don't detect sparse files</para>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry>
+        <term><option>-b
+            <replaceable>block_size</replaceable></option></term>
+        <listitem><para>set data block to
+            <replaceable>block_size</replaceable>. Default is
+            131072 bytes</para>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry>
+        <term><option>-processors
+            <replaceable>number</replaceable></option></term>
+        <listitem><para>Use <replaceable>number</replaceable>
+	processors.  By default will use number of processors
+	available</para>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry>
+        <term><option>-read-queue
+            <replaceable>size</replaceable></option></term>
+        <listitem><para>Set input queue to
+	<replaceable>size</replaceable> Mbytes. Default 64
+	Mbytes.</para>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry>
+        <term><option>-write-queue
+            <replaceable>size</replaceable></option></term>
+        <listitem><para>Set output queue to
+	<replaceable>size</replaceable> Mbytes. Default 512
+	Mbytes.</para>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry>
+        <term><option>-noI</option> or
+          <option>-noInodeCompression</option></term>
+        <listitem><para>do not compress inode table</para>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry>
+        <term><option>-noD</option>or
+          <option>-noDataCompression</option></term>
+        <listitem><para>do not compress data blocks</para>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry>
+        <term><option>-noF</option> or
+          <option>-noFragmentCompression</option></term>
+        <listitem><para>do not compress fragment blocks</para>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry>
+        <term><option>-no-fragments</option></term>
+        <listitem><para>do not use fragments: tells
+            <command>&dhpackage;</command> to not generate fragment
+            blocks, and rather generate a filesystem similar to a
+            Squashfs 1.x filesystem. It will of course still be a
+            Squashfs 2.0 filesystem but without fragments, and so it
+            won't be mountable on a Squashfs 1.x system.</para>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry>
+        <term><option>-always-use-fragments</option></term>
+        <listitem><para>use fragment blocks for files larger than
+            block size: tells <command>&dhpackage;</command> to
+            always generate fragments for files irrespective of the
+            file length.  By default only small files less than the
+            block size are packed into fragment blocks.  The ends of
+            files which do not fit fully into a block, are
+            <emphasis>NOT</emphasis> by
+            default packed into fragments.  To illustrate this, a 100K
+            file has an initial 64K block and a 36K remainder.  This
+            36K remainder is not packed into a fragment by default.
+            This is because to do so leads to a 10 - 20% drop in
+            sequential I/O performance, as a disk head seek is needed
+            to seek to the initial file data and another disk seek is
+            need to seek to the fragment block. Specify this option if
+            you want file remainders to be packed into fragment
+            blocks. Doing so may increase the compression obtained
+            <emphasis>BUT</emphasis> at the expense of I/O
+            speed.</para>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry>
+        <term><option>-no-duplicates</option></term>
+        <listitem><para>do not perform duplicate checking: tells
+            <command>&dhpackage;</command> to not check the files
+            being added to the filesystem for duplicates.  This can
+            result in quicker filesystem generation and appending
+            although obviously compression will suffer badly if there
+            is a lot of duplicate files.</para>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry>
+        <term><option>-noappend</option></term>
+        <listitem><para>do not append to existing
+            filesystem</para>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry>
+        <term><option>-keep-as-directory</option></term>
+        <listitem><para>if one source directory is specified,
+            create a root directory containing that directory, rather
+            than the contents of the directory</para>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry>
+        <term><option>-root-becomes
+            <replaceable>name</replaceable></option></term>
+        <listitem><para>when appending source files/directories,
+            make the original root become a subdirectory in the new
+            root called <replaceable>name</replaceable>, rather than
+            adding the new source items to the original root</para>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry>
+        <term><option>-all-root</option> or
+          <option>-root-owned</option></term>
+        <listitem><para>make all files owned by root</para>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry>
+        <term><option>-force-uid
+            <replaceable>uid</replaceable></option></term>
+        <listitem><para>set all file uids to
+            <replaceable>uid</replaceable></para>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry>
+        <term><option>-force-gid
+            <replaceable>gid</replaceable></option></term>
+        <listitem><para>set all file gids to
+            <replaceable>gid</replaceable></para>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry>
+        <term><option>-le</option></term>
+        <listitem><para>create a little endian filesystem</para>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry>
+        <term><option>-be</option></term>
+        <listitem><para>create a big endian filesystem</para>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry>
+        <term><option>-nopad</option></term>
+        <listitem><para>do not pad filesystem to a multiple of 4Ko.
+            This is performed by default to enable the output
+            filesystem file to be mounted by loopback, which requires
+            files to be a 4K multiple.  If the filesystem is being
+            written to a block device, or is to be stored in a
+            bootimage, the extra pad bytes are not needed.</para>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry>
+        <term><option>-check_data</option></term>
+        <listitem><para>add checkdata for greater filesystem
+            checks</para>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry>
+        <term><option>-sort
+            <replaceable>sort_file</replaceable></option></term>
+        <listitem><para>sort files according to priorities in
+            <replaceable>sort_file</replaceable>.  One file or dir
+            with priority per line.  Priority -32768 to 32767, default
+            priority 0</para>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry>
+        <term><option>-e <replaceable>list of exclude
+              dirs/files</replaceable></option></term>
+        <listitem><para>inline list of files / directories to
+            exclude</para>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry>
+        <term><option>-ef
+            <replaceable>exclude_file</replaceable></option></term>
+        <listitem><para>file containing a list of files /
+            directories to exclude, one per line</para>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry>
+        <term><option>-wildcards</option></term>
+        <listitem><para>Allow extended shell wildcards (globbing) to
+  	be used in exclude dirs/files</para></listitem>
+      </varlistentry>
+
+      <varlistentry>
+        <term><option>-regex</option></term>
+        <listitem><para>Allow POSIX regular expressions to be used in
+	exclude dirs/files</para></listitem>
+      </varlistentry>
+    </variablelist>
+  </refsect1>
+
+  <!-- ============================================================ -->
+  <refsect1>
+    <title>EXAMPLES</title>
+
+    <para>For following examples, take two example directories:
+      <itemizedlist>
+        <listitem>
+          <para>Source directory
+            <filename>/home/phillip/test</filename> contains
+            <filename>file1</filename>, <filename>file2</filename> and
+            <filename>dir1</filename>.</para>
+        </listitem>
+        <listitem>
+          <para> Source directory
+            <filename>goodies</filename> contains
+            <filename>goodies1</filename>,
+            <filename>goodies2</filename> and
+            <filename>goodies3</filename>.</para>
+        </listitem>
+      </itemizedlist>
+    </para>
+
+    <refsect2>
+      <example id="exemple_1">
+        <title></title>
+        <screen><userinput>mksquashfs /home/phillip/test output_fs</userinput></screen>
+        <para>This will generate a squashfs filesystem with root
+          entries <filename>file1</filename>, <filename>file2</filename>
+          and <filename>dir1</filename>.</para>
+      </example>
+    </refsect2>
+
+    <refsect2>
+      <example>
+        <title></title>
+        <screen><userinput>mksquashfs /home/phillip/test goodies output_fs</userinput></screen>
+        <para>This will create a squashfs filesystem with the root
+          containing entries <filename>test</filename> and
+          <filename>goodies</filename> corresponding to the source
+          directories <filename>/home/phillip/test</filename> and
+          <filename>goodies</filename>.</para>
+      </example>
+    </refsect2>
+
+    <refsect2>
+      <example>
+        <title></title>
+        <screen><userinput>mksquashfs /home/phillip/test goodies test output_fs</userinput></screen>
+
+        <para>This is the same as the previous example, except a third
+          source directory <filename>test</filename> has been
+          specified. This conflicts with the first directory named
+          <filename>test</filename> and will be renamed
+          <filename>test_1</filename>.</para>
+        <para>Multiple sources allow filesystems to be generated
+          without needing to copy all source files into a common
+          directory.  This simplifies creating filesystems.</para>
+      </example>
+    </refsect2>
+
+    <refsect2>
+      <example>
+        <title></title>
+        <screen><userinput>mksquashfs /home/phillip/test output_fs -keep-as-directory</userinput></screen>
+
+        <para>This is the same as the first example,
+          except for <option>-keep-as-directory</option>. This will
+          generate a root directory containing directory
+          <filename>test</filename>, rather than the
+          <filename>test</filename> directory contents
+          <filename>file1</filename>, <filename>file2</filename> and
+          <filename>dir1</filename>.</para>
+      </example>
+    </refsect2>
+  </refsect1>
+
+  <!-- ============================================================ -->
+  <refsect1>
+    <title>AUTHORS</title>
+
+    <para>Squashfs was written by <personname>
+        <firstname>Phillip</firstname>
+        <surname>Lougher</surname>
+      </personname>
+      <email>plougher@users.sourceforge.net</email>, in Chepstow,
+      Wales, UK. If you like the program, or have any problems, then
+      please email me, as it's nice to get feedback !</para>
+
+    <para>This manual page was written by &dhusername; &dhemail; for
+      the &debian; system (but may be used by others) using the
+      <citetitle>SquashFS HOWTO</citetitle> from <author>
+        <firstname>Artemiy I.</firstname>
+        <surname>Pavlov</surname>
+      </author> and squashfs's <filename>README</filename> file.
+      Permission is granted to copy, distribute and/or
+      modify this document under the terms of the &gnu; General Public
+      License, Version 2 any later version published by the Free
+      Software Foundation.
+    </para>
+
+    <para>
+      On Debian systems, the complete text of the &gnu;
+      General Public License can be found in
+      <filename>/usr/share/common-licenses/GPL</filename>.
+    </para>
+  </refsect1>
+</refentry>
--- squashfs-3.3.orig/debian/doc/en/unsquashfs.dbk
+++ squashfs-3.3/debian/doc/en/unsquashfs.dbk
@@ -0,0 +1,217 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook XML V4.2//EN"
+"http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd" [
+
+<!--
+
+Process this file with an XSLT processor: `xsltproc \
+-''-nonet /usr/share/sgml/docbook/stylesheet/xsl/nwalsh/\
+manpages/docbook.xsl manpage.dbk'.  A manual page
+<package>.<section> will be generated.  You may view the
+manual page with: nroff -man <package>.<section> | less'.  A
+typical entry in a Makefile or Makefile.am is:
+
+DB2MAN=/usr/share/sgml/docbook/stylesheet/xsl/nwalsh/\
+manpages/docbook.xsl
+XP=xsltproc -''-nonet
+
+manpage.1: manpage.dbk
+        $(XP) $(DB2MAN) $<
+
+The xsltproc binary is found in the xsltproc package.  The
+XSL files are in docbook-xsl.  Please remember that if you
+create the nroff version in one of the debian/rules file
+targets (such as build), you will need to include xsltproc
+and docbook-xsl in your Build-Depends control field.
+
+-->
+
+  <!-- Fill in your name for FIRSTNAME and SURNAME. -->
+  <!ENTITY dhfirstname "<firstname>Arnaud</firstname>">
+  <!ENTITY dhsurname   "<surname>Fontaine</surname>">
+
+  <!-- Please adjust the date whenever revising the manpage. -->
+  <!ENTITY dhdate      "<date>november 02, 2006</date>">
+
+  <!-- SECTION should be 1-8, maybe w/ subsection other parameters are
+       allowed: see man(7), man(1). -->
+  <!ENTITY dhsection   "<manvolnum>1</manvolnum>">
+  <!ENTITY dhemail     "<email>arnau@debian.org</email>">
+  <!ENTITY dhusername  "Arnaud Fontaine">
+  <!ENTITY dhucpackage "<refentrytitle>UNSQUASHFS</refentrytitle>">
+  <!ENTITY dhpackage   "unsquashfs">
+
+  <!ENTITY debian      "<productname>Debian</productname>">
+  <!ENTITY gnu         "<acronym>GNU</acronym>">
+  <!ENTITY gpl         "&gnu; <acronym>GPL</acronym>">
+]>
+
+<!-- ====================================================================== -->
+<refentry lang="fr">
+  <refentryinfo>
+    <address>
+      &dhemail;
+    </address>
+    <copyright>
+      <year>2006</year>
+      <holder>&dhusername;</holder>
+    </copyright>
+    &dhdate;
+  </refentryinfo>
+
+  <!-- ============================================================ -->
+  <refmeta>
+    &dhucpackage;
+
+    &dhsection;
+  </refmeta>
+
+  <!-- ============================================================ -->
+  <refnamediv>
+    <refname>&dhpackage;</refname>
+
+    <refpurpose>Decompress and extract a Squash file system</refpurpose>
+  </refnamediv>
+
+  <!-- ============================================================ -->
+  <refsynopsisdiv>
+    <cmdsynopsis>
+      <command>&dhpackage;</command>
+      <arg><option>-v[ersion]</option></arg>
+    </cmdsynopsis>
+
+    <cmdsynopsis>
+      <command>&dhpackage;</command>
+      <arg><option>-l[s] <replaceable>list filesystem only</replaceable></option></arg>
+      <arg><option>-ll[s] <replaceable>list filesystem only with file attributes</replaceable></option></arg>
+    </cmdsynopsis>
+
+    <cmdsynopsis>
+      <command>&dhpackage;</command>
+      <arg choice="plain"><replaceable>filesystem</replaceable></arg>
+      <arg choice="plain"><replaceable>to_extract</replaceable></arg>
+      <arg><option>options</option></arg>
+      <arg><option>-i[nfo]</option></arg>
+      <arg><option>-li[nfo]</option></arg>
+      <arg><option>-d[est] <replaceable>target</replaceable></option></arg>
+      <arg><option>-e[f] <replaceable>extract file</replaceable></option></arg>
+      <arg><option>-r[egex] </option></arg>
+      <arg><option>-f[force] </option></arg>
+    </cmdsynopsis>
+  </refsynopsisdiv>
+
+  <!-- ============================================================ -->
+  <refsect1>
+    <title>DESCRIPTION</title>
+
+    <para>A squashfs is a compressed read-only file system.  Use the
+      <command>&dhpackage;</command> program to decompress and extract
+      a Squash file system without mounting
+      it. <command>&dhpackage;</command> is able to extract the entire
+      file system or a specific file or directory.</para>
+  </refsect1>
+
+  <!-- ============================================================ -->
+  <refsect1>
+    <title>OPTIONS</title>
+
+    <variablelist>
+      <varlistentry>
+        <term>
+          <option>-v[ersion]</option>
+        </term>
+        <listitem>
+          <para>print version, licence and copyright message.</para>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry>
+        <term><option>-i[nfo]</option></term>
+        <listitem><para>print files as they are unsquashed.</para>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry>
+        <term><option>-li[info]</option></term>
+        <listitem><para>print files as they are unsquashed with file
+        attributes (like ls -l output).</para>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry>
+        <term><option>-l[s]</option></term>
+        <listitem><para>list filesystem only, doesn't decompress anything.</para>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry>
+        <term><option>-ll[s]</option></term>
+        <listitem><para>list filesystem only with file attributes,
+        doesn't decompress anything.</para>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry>
+        <term><option>-d[est]
+            <replaceable>pathname</replaceable></option></term>
+            <listitem><para>decompress to
+            <replaceable>pathname</replaceable>. This default to
+            <replaceable>squashfs-root</replaceable>.</para>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry>
+        <term><option>-f[orce]</option></term>
+        <listitem><para>if file already exists then overwrite.</para>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry>
+        <term><option>-s[tat]</option></term>
+        <listitem><para>display filesystem superblock information.</para></listitem>
+      </varlistentry>
+
+      <varlistentry>
+        <term><option>-e[f]
+            <replaceable>extract file</replaceable></option></term>
+            <listitem><para>list of directories or files to
+            extract. One per line.</para>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry>
+        <term><option>-r[egex]</option></term>
+        <listitem><para>treat extract names as POSIX regular
+        expressions rather than use the default shell wildcard
+        expansion (globbing).</para>
+        </listitem>
+      </varlistentry>
+    </variablelist>
+  </refsect1>
+
+  <!-- ============================================================ -->
+  <refsect1>
+    <title>AUTHORS</title>
+
+    <para>Squashfs was written by <personname>
+        <firstname>Phillip</firstname>
+        <surname>Lougher</surname>
+      </personname>
+      <email>plougher@users.sourceforge.net</email>, in Chepstow,
+      Wales, UK. If you like the program, or have any problems, then
+      please email me, as it's nice to get feedback !</para>
+
+    <para>This manual page was written by &dhusername; &dhemail; for
+      the &debian; system (but may be used by others).  Permission is
+      granted to copy, distribute and/or modify this document under
+      the terms of the &gnu; General Public License, Version 2 any
+      later version published by the Free Software Foundation.
+    </para>
+
+    <para>
+      On Debian systems, the complete text of the &gnu;
+      General Public License can be found in
+      <filename>/usr/share/common-licenses/GPL</filename>.
+    </para>
+  </refsect1>
+</refentry>
--- squashfs-3.3.orig/debian/patches/01-kernel-fix-makefile.patch
+++ squashfs-3.3/debian/patches/01-kernel-fix-makefile.patch
@@ -0,0 +1,14 @@
+Index: squashfs/linux-2.6/Makefile
+===================================================================
+--- squashfs.orig/linux-2.6/Makefile	2007-12-09 03:46:30.000000000 +0000
++++ squashfs/linux-2.6/Makefile	2007-12-09 03:48:05.000000000 +0000
+@@ -7,3 +7,9 @@
+ obj-$(CONFIG_SQUASHFS) += squashfs.o
+ squashfs-y += inode.o
+ squashfs-y += squashfs2_0.o
++
++all:
++	$(MAKE) -C /lib/modules/$(shell uname -r)/build M=$(PWD) modules
++
++clean:
++	$(MAKE) -C /lib/modules/$(shell uname -r)/build M=$(PWD) clean
--- squashfs-3.3.orig/debian/patches/01-kernel-fix-includes.patch
+++ squashfs-3.3/debian/patches/01-kernel-fix-includes.patch
@@ -0,0 +1,53 @@
+Index: squashfs/linux-2.6/inode.c
+===================================================================
+--- squashfs.orig/linux-2.6/inode.c	2007-12-08 23:31:29.000000000 +0000
++++ squashfs/linux-2.6/inode.c	2007-12-08 23:32:04.000000000 +0000
+@@ -21,12 +21,12 @@
+  * inode.c
+  */
+ 
+-#include <linux/squashfs_fs.h>
++#include "squashfs_fs.h"
+ #include <linux/module.h>
+ #include <linux/zlib.h>
+ #include <linux/fs.h>
+-#include <linux/squashfs_fs_sb.h>
+-#include <linux/squashfs_fs_i.h>
++#include "squashfs_fs_sb.h"
++#include "squashfs_fs_i.h"
+ #include <linux/buffer_head.h>
+ #include <linux/vfs.h>
+ #include <linux/vmalloc.h>
+Index: squashfs/linux-2.6/squashfs2_0.c
+===================================================================
+--- squashfs.orig/linux-2.6/squashfs2_0.c	2007-12-08 23:32:59.000000000 +0000
++++ squashfs/linux-2.6/squashfs2_0.c	2007-12-08 23:33:11.000000000 +0000
+@@ -21,12 +21,12 @@
+  * squashfs2_0.c
+  */
+ 
+-#include <linux/squashfs_fs.h>
++#include "squashfs_fs.h"
+ #include <linux/module.h>
+ #include <linux/zlib.h>
+ #include <linux/fs.h>
+-#include <linux/squashfs_fs_sb.h>
+-#include <linux/squashfs_fs_i.h>
++#include "squashfs_fs_sb.h"
++#include "squashfs_fs_i.h"
+ 
+ #include "squashfs.h"
+ static int squashfs_readdir_2(struct file *file, void *dirent, filldir_t filldir);
+Index: squashfs/linux-2.6/squashfs_fs_sb.h
+===================================================================
+--- squashfs.orig/linux-2.6/squashfs_fs_sb.h	2007-12-09 00:19:24.000000000 +0000
++++ squashfs/linux-2.6/squashfs_fs_sb.h	2007-12-09 00:19:29.000000000 +0000
+@@ -23,7 +23,7 @@
+  * squashfs_fs_sb.h
+  */
+ 
+-#include <linux/squashfs_fs.h>
++#include "squashfs_fs.h"
+ #include "sqlzma.h"
+ 
+ struct squashfs_cache {
--- squashfs-3.3.orig/debian/patches/01-kernel-compat.patch
+++ squashfs-3.3/debian/patches/01-kernel-compat.patch
@@ -0,0 +1,41 @@
+Index: squashfs/linux-2.6/inode.c
+===================================================================
+--- squashfs.orig/linux-2.6/inode.c	2007-12-09 00:18:42.000000000 +0000
++++ squashfs/linux-2.6/inode.c	2007-12-09 00:18:43.000000000 +0000
+@@ -31,7 +31,11 @@
+ #include <linux/vfs.h>
+ #include <linux/vmalloc.h>
+ #include <linux/smp_lock.h>
++#include <linux/version.h>
++
++#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,23))
+ #include <linux/exportfs.h>
++#endif
+ 
+ #include "squashfs.h"
+ #include "sqlzma.h"
+@@ -2279,8 +2283,11 @@
+ 	kmem_cache_free(squashfs_inode_cachep, SQUASHFS_I(inode));
+ }
+ 
+-
++#if (LINUX_VERSION_CODE < KERNEL_VERSION(2,6,24))
++static void init_once(void * foo, struct kmem_cache * cachep, unsigned long flags)
++#else
+ static void init_once(struct kmem_cache *cachep, void *foo)
++#endif
+ {
+ 	struct squashfs_inode_info *ei = foo;
+ 
+@@ -2292,7 +2299,11 @@
+ {
+ 	squashfs_inode_cachep = kmem_cache_create("squashfs_inode_cache",
+ 	    sizeof(struct squashfs_inode_info), 0,
++#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,23))
+ 		SLAB_HWCACHE_ALIGN|SLAB_RECLAIM_ACCOUNT, init_once);
++#else
++		SLAB_HWCACHE_ALIGN|SLAB_RECLAIM_ACCOUNT, init_once, NULL);
++#endif
+ 	if (squashfs_inode_cachep == NULL)
+ 		return -ENOMEM;
+ 	return 0;
--- squashfs-3.3.orig/debian/patches/01-kernel-fix-missing-include.patch
+++ squashfs-3.3/debian/patches/01-kernel-fix-missing-include.patch
@@ -0,0 +1,12 @@
+Index: squashfs/linux-2.6/inode.c
+===================================================================
+--- squashfs.orig/linux-2.6/inode.c	2007-12-09 00:03:13.000000000 +0000
++++ squashfs/linux-2.6/inode.c	2007-12-09 00:03:21.000000000 +0000
+@@ -27,6 +27,7 @@
+ #include <linux/fs.h>
+ #include "squashfs_fs_sb.h"
+ #include "squashfs_fs_i.h"
++#include <linux/sched.h>
+ #include <linux/buffer_head.h>
+ #include <linux/vfs.h>
+ #include <linux/vmalloc.h>
--- squashfs-3.3.orig/debian/patches/00-sqlzma-kernel.patch
+++ squashfs-3.3/debian/patches/00-sqlzma-kernel.patch
@@ -0,0 +1,739 @@
+Index: squashfs/linux-2.6/Makefile
+===================================================================
+RCS file: squashfs/linux-2.6/Makefile,v
+retrieving revision 1.1
+retrieving revision 1.2
+diff -u -p -r1.1 -r1.2
+--- squashfs/linux-2.6/Makefile	4 Nov 2007 13:21:40 -0000	1.1
++++ squashfs/linux-2.6/Makefile	5 Nov 2007 05:43:36 -0000	1.2
+@@ -2,6 +2,8 @@
+ # Makefile for the linux squashfs routines.
+ #
+ 
++-include /tmp/sqvars.mk
++
+ obj-$(CONFIG_SQUASHFS) += squashfs.o
+ squashfs-y += inode.o
+ squashfs-y += squashfs2_0.o
+Index: squashfs/linux-2.6/inode.c
+===================================================================
+RCS file: squashfs/linux-2.6/inode.c,v
+retrieving revision 1.1
+retrieving revision 1.2
+diff -u -p -r1.1 -r1.2
+--- squashfs/linux-2.6/inode.c	4 Nov 2007 13:21:40 -0000	1.1
++++ squashfs/linux-2.6/inode.c	5 Nov 2007 05:43:36 -0000	1.2
+@@ -34,8 +34,30 @@
+ #include <linux/exportfs.h>
+ 
+ #include "squashfs.h"
++#include "sqlzma.h"
++#include "sqmagic.h"
+ 
+-int squashfs_cached_blks;
++#undef KeepPreemptive
++#if defined(CONFIG_PREEMPT) && !defined(UnsquashNoPreempt)
++#define KeepPreemptive
++#endif
++
++struct sqlzma {
++#ifdef KeepPreemptive
++	struct mutex mtx;
++#endif
++	unsigned char read_data[SQUASHFS_FILE_MAX_SIZE];
++	struct sqlzma_un un;
++};
++static DEFINE_PER_CPU(struct sqlzma *, sqlzma);
++
++#define dpri(fmt, args...) /* printk("%s:%d: " fmt, __func__, __LINE__, ##args) */
++#define dpri_un(un)	dpri("un{%d, {%d %p}, {%d %p}, {%d %p}}\n", \
++			     (un)->un_lzma, (un)->un_a[0].sz, (un)->un_a[0].buf, \
++			     (un)->un_a[1].sz, (un)->un_a[1].buf, \
++			     (un)->un_a[2].sz, (un)->un_a[2].buf)
++
++static int squashfs_cached_blks;
+ 
+ static void vfs_read_inode(struct inode *i);
+ static struct dentry *squashfs_get_parent(struct dentry *child);
+@@ -219,7 +241,8 @@ SQSH_EXTERN unsigned int squashfs_read_d
+ 		if (index < 0 || (index + 2) > sblk->bytes_used)
+ 			goto read_failure;
+ 
+-		bh[0] = get_block_length(s, &cur_index, &offset, &c_byte);
++		bh[0] = get_block_length(s, (int *)&cur_index, (int *)&offset,
++					 (int *)&c_byte);
+ 		if (bh[0] == NULL)
+ 			goto read_failure;
+ 
+@@ -243,66 +266,75 @@ SQSH_EXTERN unsigned int squashfs_read_d
+ 	}
+ 
+ 	if (compressed) {
+-		int zlib_err = 0;
++		int zlib_err = Z_STREAM_END;
++		int rest, start;
++		enum {Src, Dst};
++		struct sized_buf sbuf[2];
++		struct sqlzma *percpu;
+ 
+ 		/*
+ 	 	* uncompress block
+ 	 	*/
+ 
+-		mutex_lock(&msblk->read_data_mutex);
+-
+-		msblk->stream.next_out = buffer;
+-		msblk->stream.avail_out = srclength;
+-
+-		for (bytes = 0; k < b; k++) {
+-			avail_bytes = min(c_byte - bytes, msblk->devblksize - offset);
+-
++		for (k = 0; k < b; k++) {
+ 			wait_on_buffer(bh[k]);
+ 			if (!buffer_uptodate(bh[k]))
+-				goto release_mutex;
+-
+-			msblk->stream.next_in = bh[k]->b_data + offset;
+-			msblk->stream.avail_in = avail_bytes;
+-
+-			if (k == 0) {
+-				zlib_err = zlib_inflateInit(&msblk->stream);
+-				if (zlib_err != Z_OK) {
+-					ERROR("zlib_inflateInit returned unexpected result 0x%x,"
+-						" srclength %d\n", zlib_err, srclength);
+-					goto release_mutex;
+-				}
+-
+-				if (avail_bytes == 0) {
+-					offset = 0;
+-					brelse(bh[k]);
+-					continue;
+-				}
+-			}
+-
+-			zlib_err = zlib_inflate(&msblk->stream, Z_NO_FLUSH);
+-			if (zlib_err != Z_OK && zlib_err != Z_STREAM_END) {
+-				ERROR("zlib_inflate returned unexpected result 0x%x,"
+-					" srclength %d, avail_in %d, avail_out %d\n", zlib_err,
+-					srclength, msblk->stream.avail_in, msblk->stream.avail_out);
+-				goto release_mutex;
+-			}
++				goto block_release;
++		}
+ 
+-			bytes += avail_bytes;
++		avail_bytes = 0;
++		for (k = 0; !avail_bytes && k < b; k++) {
++			avail_bytes = msblk->devblksize - offset;
++			if (c_byte < avail_bytes)
++				avail_bytes = c_byte;
++			if (avail_bytes)
++				break;
+ 			offset = 0;
+ 			brelse(bh[k]);
+ 		}
++		bytes = 0;
++		if (!avail_bytes)
++			goto block_release; // nothing to be process
+ 
+-		if (zlib_err != Z_STREAM_END)
+-			goto release_mutex;
+-
+-		zlib_err = zlib_inflateEnd(&msblk->stream);
+-		if (zlib_err != Z_OK) {
+-			ERROR("zlib_inflateEnd returned unexpected result 0x%x,"
+-				" srclength %d\n", zlib_err, srclength);
++		start = k;
++		/* it disables preemption */
++		percpu = get_cpu_var(sqlzma);
++#ifdef KeepPreemptive
++		put_cpu_var(sqlzma);
++		mutex_lock(&percpu->mtx);
++#endif
++
++		for (; k < b; k++) {
++			memcpy(percpu->read_data + bytes, bh[k]->b_data + offset,
++			       avail_bytes);
++			bytes += avail_bytes;
++			offset = 0;
++			brelse(bh[k]);
++			avail_bytes = msblk->devblksize - offset;
++			rest = c_byte - bytes;
++			if (rest < avail_bytes)
++				avail_bytes = rest;
++		}
++
++		sbuf[Src].buf = percpu->read_data;
++		sbuf[Src].sz = bytes;
++		sbuf[Dst].buf = buffer;
++		sbuf[Dst].sz = srclength;
++		dpri_un(&percpu->un);
++		dpri("src %d %p, dst %d %p\n", sbuf[Src].sz, sbuf[Src].buf,
++		     sbuf[Dst].sz, sbuf[Dst].buf);
++		zlib_err = sqlzma_un(&percpu->un, sbuf + Src, sbuf + Dst);
++		bytes = percpu->un.un_reslen;
++
++#ifdef KeepPreemptive
++		mutex_unlock(&percpu->mtx);
++#else
++		put_cpu_var(sqlzma);
++#endif
++		if (unlikely(zlib_err)) {
++			dpri("zlib_err %d\n", zlib_err);
+ 			goto release_mutex;
+ 		}
+-		bytes = msblk->stream.total_out;
+-		mutex_unlock(&msblk->read_data_mutex);
+ 	} else {
+ 		int i;
+ 
+@@ -330,7 +362,7 @@ SQSH_EXTERN unsigned int squashfs_read_d
+ 	return bytes;
+ 
+ release_mutex:
+-	mutex_unlock(&msblk->read_data_mutex);
++	//mutex_unlock(&msblk->read_data_mutex);
+ 
+ block_release:
+ 	for (; k < b; k++)
+@@ -471,12 +503,14 @@ static int get_fragment_location(struct 
+ 		struct squashfs_fragment_entry sfragment_entry;
+ 
+ 		if (!squashfs_get_cached_block(s, &sfragment_entry, start_block, offset,
+-					 sizeof(sfragment_entry), &start_block, &offset))
++					 sizeof(sfragment_entry), &start_block,
++					       (unsigned int *)&offset))
+ 			goto out;
+ 		SQUASHFS_SWAP_FRAGMENT_ENTRY(&fragment_entry, &sfragment_entry);
+ 	} else
+ 		if (!squashfs_get_cached_block(s, &fragment_entry, start_block, offset,
+-					 sizeof(fragment_entry), &start_block, &offset))
++					 sizeof(fragment_entry), &start_block,
++					       (unsigned int *)&offset))
+ 			goto out;
+ 
+ 	*fragment_start_block = fragment_entry.start_block;
+@@ -616,11 +650,11 @@ static squashfs_inode_t squashfs_inode_l
+ 		squashfs_inode_t sinode;
+ 
+ 		if (!squashfs_get_cached_block(s, &sinode, start, offset,
+-					sizeof(sinode), &start, &offset))
++					sizeof(sinode), &start, (unsigned int *)&offset))
+ 			goto out;
+ 		SQUASHFS_SWAP_INODE_T((&inode), &sinode);
+ 	} else if (!squashfs_get_cached_block(s, &inode, start, offset,
+-					sizeof(inode), &start, &offset))
++					sizeof(inode), &start, (unsigned int *)&offset))
+ 			goto out;
+ 
+ 	TRACE("squashfs_inode_lookup, inode = 0x%llx\n", inode);
+@@ -1089,12 +1123,13 @@ static int squashfs_fill_super(struct su
+ {
+ 	struct squashfs_sb_info *msblk;
+ 	struct squashfs_super_block *sblk;
+-	int i;
++	int i, err;
+ 	char b[BDEVNAME_SIZE];
+ 	struct inode *root;
+ 
+ 	TRACE("Entered squashfs_fill_superblock\n");
+ 
++	err = -ENOMEM;
+ 	s->s_fs_info = kzalloc(sizeof(struct squashfs_sb_info), GFP_KERNEL);
+ 	if (s->s_fs_info == NULL) {
+ 		ERROR("Failed to allocate superblock\n");
+@@ -1102,17 +1137,12 @@ static int squashfs_fill_super(struct su
+ 	}
+ 	msblk = s->s_fs_info;
+ 
+-	msblk->stream.workspace = vmalloc(zlib_inflate_workspacesize());
+-	if (msblk->stream.workspace == NULL) {
+-		ERROR("Failed to allocate zlib workspace\n");
+-		goto failure;
+-	}
+ 	sblk = &msblk->sblk;
+ 	
+ 	msblk->devblksize = sb_min_blocksize(s, BLOCK_SIZE);
+ 	msblk->devblksize_log2 = ffz(~msblk->devblksize);
+ 
+-	mutex_init(&msblk->read_data_mutex);
++	//mutex_init(&msblk->read_data_mutex);
+ 	mutex_init(&msblk->read_page_mutex);
+ 	mutex_init(&msblk->block_cache_mutex);
+ 	mutex_init(&msblk->fragment_mutex);
+@@ -1124,6 +1154,7 @@ static int squashfs_fill_super(struct su
+ 	/* sblk->bytes_used is checked in squashfs_read_data to ensure reads are not
+  	 * beyond filesystem end.  As we're using squashfs_read_data to read sblk here,
+  	 * first set sblk->bytes_used to a useful value */
++	err = -EINVAL;
+ 	sblk->bytes_used = sizeof(struct squashfs_super_block);
+ 	if (!squashfs_read_data(s, (char *) sblk, SQUASHFS_START,
+ 					sizeof(struct squashfs_super_block) |
+@@ -1133,21 +1164,35 @@ static int squashfs_fill_super(struct su
+ 	}
+ 
+ 	/* Check it is a SQUASHFS superblock */
+-	if ((s->s_magic = sblk->s_magic) != SQUASHFS_MAGIC) {
+-		if (sblk->s_magic == SQUASHFS_MAGIC_SWAP) {
+-			struct squashfs_super_block ssblk;
+-
+-			WARNING("Mounting a different endian SQUASHFS filesystem on %s\n",
+-				bdevname(s->s_bdev, b));
+-
+-			SQUASHFS_SWAP_SUPER_BLOCK(&ssblk, sblk);
+-			memcpy(sblk, &ssblk, sizeof(struct squashfs_super_block));
+-			msblk->swap = 1;
+-		} else  {
+-			SERROR("Can't find a SQUASHFS superblock on %s\n",
+-							bdevname(s->s_bdev, b));
+-			goto failed_mount;
+-		}
++	s->s_magic = sblk->s_magic;
++	msblk->swap = 0;
++	dpri("magic 0x%x\n", sblk->s_magic);
++	switch (sblk->s_magic) {
++		struct squashfs_super_block ssblk;
++
++	case SQUASHFS_MAGIC_SWAP:
++		/*FALLTHROUGH*/
++	case SQUASHFS_MAGIC_LZMA_SWAP:
++		WARNING("Mounting a different endian SQUASHFS "
++			"filesystem on %s\n", bdevname(s->s_bdev, b));
++
++		SQUASHFS_SWAP_SUPER_BLOCK(&ssblk, sblk);
++		memcpy(sblk, &ssblk, sizeof(struct squashfs_super_block));
++		msblk->swap = 1;
++		/*FALLTHROUGH*/
++	case SQUASHFS_MAGIC:
++	case SQUASHFS_MAGIC_LZMA:
++		break;
++	default:
++		SERROR("Can't find a SQUASHFS superblock on %s\n",
++		       bdevname(s->s_bdev, b));
++		goto failed_mount;
++	}
++
++	{
++		struct sqlzma *p;
++		dpri("block_size %d\n", sblk->block_size);
++		BUG_ON(sblk->block_size > sizeof(p->read_data));
+ 	}
+ 
+ 	/* Check the MAJOR & MINOR versions */
+@@ -1191,6 +1236,7 @@ static int squashfs_fill_super(struct su
+ 		goto failed_mount;
+ 
+ 	/* Allocate read_page block */
++	err = -ENOMEM;
+ 	msblk->read_page = vmalloc(sblk->block_size);
+ 	if (msblk->read_page == NULL) {
+ 		ERROR("Failed to allocate read_page block\n");
+@@ -1206,19 +1252,30 @@ static int squashfs_fill_super(struct su
+ 	}
+ 	msblk->guid = msblk->uid + sblk->no_uids;
+    
++	dpri("swap %d\n", msblk->swap);
++	err = -EINVAL;
+ 	if (msblk->swap) {
+-		unsigned int suid[sblk->no_uids + sblk->no_guids];
++		unsigned int *suid;
++
++		err = -ENOMEM;
++		suid = kmalloc(sizeof(*suid) * (sblk->no_uids + sblk->no_guids),
++			       GFP_KERNEL);
++		if (unlikely(!suid))
++			goto failed_mount;
+ 
+-		if (!squashfs_read_data(s, (char *) &suid, sblk->uid_start,
++		err = -EINVAL;
++		if (!squashfs_read_data(s, (char *)suid, sblk->uid_start,
+ 					((sblk->no_uids + sblk->no_guids) *
+ 					 sizeof(unsigned int)) |
+ 					SQUASHFS_COMPRESSED_BIT_BLOCK, NULL, (sblk->no_uids + sblk->no_guids) * sizeof(unsigned int))) {
+ 			ERROR("unable to read uid/gid table\n");
++			kfree(suid);
+ 			goto failed_mount;
+ 		}
+ 
+ 		SQUASHFS_SWAP_DATA(msblk->uid, suid, (sblk->no_uids +
+ 			sblk->no_guids), (sizeof(unsigned int) * 8));
++		kfree(suid);
+ 	} else
+ 		if (!squashfs_read_data(s, (char *) msblk->uid, sblk->uid_start,
+ 					((sblk->no_uids + sblk->no_guids) *
+@@ -1232,6 +1289,7 @@ static int squashfs_fill_super(struct su
+ 	if (sblk->s_major == 1 && squashfs_1_0_supported(msblk))
+ 		goto allocate_root;
+ 
++	err = -ENOMEM;
+ 	msblk->fragment = kzalloc(sizeof(struct squashfs_fragment_cache) *
+ 				SQUASHFS_CACHED_FRAGMENTS, GFP_KERNEL);
+ 	if (msblk->fragment == NULL) {
+@@ -1261,9 +1319,12 @@ static int squashfs_fill_super(struct su
+ 	s->s_export_op = &squashfs_export_ops;
+ 
+ allocate_root:
++	dpri("alloate_root\n");
+ 	root = new_inode(s);
+-	if ((msblk->read_inode)(root, sblk->root_inode) == 0)
++	if ((msblk->read_inode)(root, sblk->root_inode) == 0) {
++		iput(root);
+ 		goto failed_mount;
++	}
+ 	insert_inode_hash(root);
+ 
+ 	s->s_root = d_alloc_root(root);
+@@ -1284,13 +1345,10 @@ failed_mount:
+ 	vfree(msblk->read_page);
+ 	kfree(msblk->block_cache);
+ 	kfree(msblk->fragment_index_2);
+-	vfree(msblk->stream.workspace);
+ 	kfree(s->s_fs_info);
+ 	s->s_fs_info = NULL;
+-	return -EINVAL;
+-
+-failure:
+-	return -ENOMEM;
++ failure:
++	return err;
+ }
+ 
+ 
+@@ -1301,7 +1359,7 @@ static int squashfs_statfs(struct dentry
+ 
+ 	TRACE("Entered squashfs_statfs\n");
+ 
+-	buf->f_type = SQUASHFS_MAGIC;
++	buf->f_type = sblk->s_magic;
+ 	buf->f_bsize = sblk->block_size;
+ 	buf->f_blocks = ((sblk->bytes_used - 1) >> sblk->block_log) + 1;
+ 	buf->f_bfree = buf->f_bavail = 0;
+@@ -1328,7 +1386,8 @@ static int squashfs_symlink_readpage(str
+ 
+ 	for (length = 0; length < index; length += bytes) {
+ 		bytes = squashfs_get_cached_block(inode->i_sb, NULL, block,
+-				offset, PAGE_CACHE_SIZE, &block, &offset);
++				offset, PAGE_CACHE_SIZE, &block,
++						  (unsigned int *)&offset);
+ 		if (bytes == 0) {
+ 			ERROR("Unable to read symbolic link [%llx:%x]\n", block, offset);
+ 			goto skip_read;
+@@ -1344,7 +1403,7 @@ static int squashfs_symlink_readpage(str
+ 	avail_bytes = min_t(int, i_size_read(inode) - length, PAGE_CACHE_SIZE);
+ 
+ 	bytes = squashfs_get_cached_block(inode->i_sb, pageaddr, block, offset,
+-		avail_bytes, &block, &offset);
++		avail_bytes, &block, (unsigned int *)&offset);
+ 	if (bytes == 0)
+ 		ERROR("Unable to read symbolic link [%llx:%x]\n", block, offset);
+ 
+@@ -1359,7 +1418,7 @@ skip_read:
+ }
+ 
+ 
+-struct meta_index *locate_meta_index(struct inode *inode, int index, int offset)
++static struct meta_index *locate_meta_index(struct inode *inode, int index, int offset)
+ {
+ 	struct meta_index *meta = NULL;
+ 	struct squashfs_sb_info *msblk = inode->i_sb->s_fs_info;
+@@ -1394,7 +1453,7 @@ not_allocated:
+ }
+ 
+ 
+-struct meta_index *empty_meta_index(struct inode *inode, int offset, int skip)
++static struct meta_index *empty_meta_index(struct inode *inode, int offset, int skip)
+ {
+ 	struct squashfs_sb_info *msblk = inode->i_sb->s_fs_info;
+ 	struct meta_index *meta = NULL;
+@@ -1448,7 +1507,7 @@ failed:
+ }
+ 
+ 
+-void release_meta_index(struct inode *inode, struct meta_index *meta)
++static void release_meta_index(struct inode *inode, struct meta_index *meta)
+ {
+ 	meta->locked = 0;
+ 	smp_mb();
+@@ -1463,18 +1522,24 @@ static int read_block_index(struct super
+ 	int block = 0;
+ 	
+ 	if (msblk->swap) {
+-		char sblock_list[blocks << 2];
++		char *sblock_list;
++
++		sblock_list = kmalloc(blocks << 2, GFP_KERNEL);
++		if (unlikely(!sblock_list))
++			goto failure;
+ 
+ 		if (!squashfs_get_cached_block(s, sblock_list, *start_block,
+-				*offset, blocks << 2, start_block, offset)) {
++				*offset, blocks << 2, start_block, (unsigned int *)offset)) {
+ 			ERROR("Fail reading block list [%llx:%x]\n", *start_block, *offset);
++			kfree(sblock_list);
+ 			goto failure;
+ 		}
+ 		SQUASHFS_SWAP_INTS(((unsigned int *)block_list),
+ 				((unsigned int *)sblock_list), blocks);
++		kfree(sblock_list);
+ 	} else {
+ 		if (!squashfs_get_cached_block(s, block_list, *start_block,
+-				*offset, blocks << 2, start_block, offset)) {
++				*offset, blocks << 2, start_block, (unsigned int *)offset)) {
+ 			ERROR("Fail reading block list [%llx:%x]\n", *start_block, *offset);
+ 			goto failure;
+ 		}
+@@ -1890,7 +1955,8 @@ static int squashfs_readdir(struct file 
+ 		file->f_pos += size;
+ 	}
+ 
+-	length = get_dir_index_using_offset(i->i_sb, &next_block, &next_offset,
++	length = get_dir_index_using_offset(i->i_sb, &next_block,
++					    (unsigned int *)&next_offset,
+ 				SQUASHFS_I(i)->u.s2.directory_index_start,
+ 				SQUASHFS_I(i)->u.s2.directory_index_offset,
+ 				SQUASHFS_I(i)->u.s2.directory_index_count, file->f_pos);
+@@ -1901,14 +1967,16 @@ static int squashfs_readdir(struct file 
+ 			struct squashfs_dir_header sdirh;
+ 			
+ 			if (!squashfs_get_cached_block(i->i_sb, &sdirh, next_block,
+-					 next_offset, sizeof(sdirh), &next_block, &next_offset))
++					 next_offset, sizeof(sdirh), &next_block,
++						       (unsigned int *)&next_offset))
+ 				goto failed_read;
+ 
+ 			length += sizeof(sdirh);
+ 			SQUASHFS_SWAP_DIR_HEADER(&dirh, &sdirh);
+ 		} else {
+ 			if (!squashfs_get_cached_block(i->i_sb, &dirh, next_block,
+-					next_offset, sizeof(dirh), &next_block, &next_offset))
++					next_offset, sizeof(dirh), &next_block,
++						       (unsigned int *)&next_offset))
+ 				goto failed_read;
+ 
+ 			length += sizeof(dirh);
+@@ -1919,21 +1987,24 @@ static int squashfs_readdir(struct file 
+ 			if (msblk->swap) {
+ 				struct squashfs_dir_entry sdire;
+ 				if (!squashfs_get_cached_block(i->i_sb, &sdire, next_block,
+-						next_offset, sizeof(sdire), &next_block, &next_offset))
++						next_offset, sizeof(sdire), &next_block,
++							       (unsigned int *)&next_offset))
+ 					goto failed_read;
+ 				
+ 				length += sizeof(sdire);
+ 				SQUASHFS_SWAP_DIR_ENTRY(dire, &sdire);
+ 			} else {
+ 				if (!squashfs_get_cached_block(i->i_sb, dire, next_block,
+-						next_offset, sizeof(*dire), &next_block, &next_offset))
++						next_offset, sizeof(*dire), &next_block,
++							       (unsigned int *)&next_offset))
+ 					goto failed_read;
+ 
+ 				length += sizeof(*dire);
+ 			}
+ 
+ 			if (!squashfs_get_cached_block(i->i_sb, dire->name, next_block,
+-						next_offset, dire->size + 1, &next_block, &next_offset))
++						next_offset, dire->size + 1, &next_block,
++						       (unsigned int *)&next_offset))
+ 				goto failed_read;
+ 
+ 			length += dire->size + 1;
+@@ -1997,7 +2068,7 @@ static struct dentry *squashfs_lookup(st
+ 	if (len > SQUASHFS_NAME_LEN)
+ 		goto exit_lookup;
+ 
+-	length = get_dir_index_using_name(i->i_sb, &next_block, &next_offset,
++	length = get_dir_index_using_name(i->i_sb, &next_block, (unsigned int *)&next_offset,
+ 				SQUASHFS_I(i)->u.s2.directory_index_start,
+ 				SQUASHFS_I(i)->u.s2.directory_index_offset,
+ 				SQUASHFS_I(i)->u.s2.directory_index_count, name, len);
+@@ -2007,14 +2078,16 @@ static struct dentry *squashfs_lookup(st
+ 		if (msblk->swap) {
+ 			struct squashfs_dir_header sdirh;
+ 			if (!squashfs_get_cached_block(i->i_sb, &sdirh, next_block,
+-					 next_offset, sizeof(sdirh), &next_block, &next_offset))
++					 next_offset, sizeof(sdirh), &next_block,
++						       (unsigned int *)&next_offset))
+ 				goto failed_read;
+ 
+ 			length += sizeof(sdirh);
+ 			SQUASHFS_SWAP_DIR_HEADER(&dirh, &sdirh);
+ 		} else {
+ 			if (!squashfs_get_cached_block(i->i_sb, &dirh, next_block,
+-					next_offset, sizeof(dirh), &next_block, &next_offset))
++					next_offset, sizeof(dirh), &next_block,
++						       (unsigned int *)&next_offset))
+ 				goto failed_read;
+ 
+ 			length += sizeof(dirh);
+@@ -2025,21 +2098,24 @@ static struct dentry *squashfs_lookup(st
+ 			if (msblk->swap) {
+ 				struct squashfs_dir_entry sdire;
+ 				if (!squashfs_get_cached_block(i->i_sb, &sdire, next_block,
+-						next_offset, sizeof(sdire), &next_block, &next_offset))
++						next_offset, sizeof(sdire), &next_block,
++							       (unsigned int *)&next_offset))
+ 					goto failed_read;
+ 				
+ 				length += sizeof(sdire);
+ 				SQUASHFS_SWAP_DIR_ENTRY(dire, &sdire);
+ 			} else {
+ 				if (!squashfs_get_cached_block(i->i_sb, dire, next_block,
+-						next_offset, sizeof(*dire), &next_block, &next_offset))
++						next_offset, sizeof(*dire), &next_block,
++							       (unsigned int *)&next_offset))
+ 					goto failed_read;
+ 
+ 				length += sizeof(*dire);
+ 			}
+ 
+ 			if (!squashfs_get_cached_block(i->i_sb, dire->name, next_block,
+-					next_offset, dire->size + 1, &next_block, &next_offset))
++					next_offset, dire->size + 1, &next_block,
++						       (unsigned int *)&next_offset))
+ 				goto failed_read;
+ 
+ 			length += dire->size + 1;
+@@ -2103,7 +2179,6 @@ static void squashfs_put_super(struct su
+ 		kfree(sbi->fragment_index);
+ 		kfree(sbi->fragment_index_2);
+ 		kfree(sbi->meta_index);
+-		vfree(sbi->stream.workspace);
+ 		kfree(s->s_fs_info);
+ 		s->s_fs_info = NULL;
+ 	}
+@@ -2117,19 +2192,63 @@ static int squashfs_get_sb(struct file_s
+ 				mnt);
+ }
+ 
++static void free_sqlzma(void)
++{
++	int cpu;
++	struct sqlzma *p;
++
++	for_each_online_cpu(cpu) {
++		p = per_cpu(sqlzma, cpu);
++		if (p) {
++#ifdef KeepPreemptive
++			mutex_destroy(&p->mtx);
++#endif
++			sqlzma_fin(&p->un);
++			kfree(p);
++		}
++	}
++}
+ 
+ static int __init init_squashfs_fs(void)
+ {
++	struct sqlzma *p;
++	int cpu;
+ 	int err = init_inodecache();
+ 	if (err)
+ 		goto out;
+ 
++	for_each_online_cpu(cpu) {
++		dpri("%d: %p\n", cpu, per_cpu(sqlzma, cpu));
++		err = -ENOMEM;
++		p = kmalloc(sizeof(struct sqlzma), GFP_KERNEL);
++		if (p) {
++#ifdef KeepPreemptive
++			mutex_init(&p->mtx);
++#endif
++			err = sqlzma_init(&p->un, 1, 0);
++			if (unlikely(err)) {
++				ERROR("Failed to intialize uncompress workspace\n");
++				break;
++			}
++			per_cpu(sqlzma, cpu) = p;
++			err = 0;
++		} else
++			break;
++	}
++	if (unlikely(err)) {
++		free_sqlzma();
++		goto out;
++	}
++
+ 	printk(KERN_INFO "squashfs: version 3.3 (2007/10/31) "
+-		"Phillip Lougher\n");
++		"Phillip Lougher\n"
++		"squashfs: LZMA suppport for slax.org by jro\n");
+ 
+ 	err = register_filesystem(&squashfs_fs_type);
+-	if (err)
++	if (err) {
++		free_sqlzma();
+ 		destroy_inodecache();
++	}
+ 
+ out:
+ 	return err;
+@@ -2139,6 +2258,7 @@ out:
+ static void __exit exit_squashfs_fs(void)
+ {
+ 	unregister_filesystem(&squashfs_fs_type);
++	free_sqlzma();
+ 	destroy_inodecache();
+ }
+ 
+@@ -2187,6 +2307,6 @@ static void destroy_inodecache(void)
+ 
+ module_init(init_squashfs_fs);
+ module_exit(exit_squashfs_fs);
+-MODULE_DESCRIPTION("squashfs 3.2-r2-CVS, a compressed read-only filesystem");
+-MODULE_AUTHOR("Phillip Lougher <phillip@lougher.demon.co.uk>");
++MODULE_DESCRIPTION("squashfs 3.2-r2-CVS, a compressed read-only filesystem, and LZMA suppport for slax.org");
++MODULE_AUTHOR("Phillip Lougher <phillip@lougher.demon.co.uk>, and LZMA suppport for slax.org by jro");
+ MODULE_LICENSE("GPL");
+Index: squashfs/linux-2.6/squashfs_fs.h
+===================================================================
+RCS file: squashfs/linux-2.6/squashfs_fs.h,v
+retrieving revision 1.1
+retrieving revision 1.2
+diff -u -p -r1.1 -r1.2
+--- squashfs/linux-2.6/squashfs_fs.h	4 Nov 2007 13:21:40 -0000	1.1
++++ squashfs/linux-2.6/squashfs_fs.h	5 Nov 2007 05:43:36 -0000	1.2
+@@ -341,7 +341,7 @@ struct squashfs_dir_entry {
+ 	unsigned int		offset:13;
+ 	unsigned int		type:3;
+ 	unsigned int		size:8;
+-	int			inode_number:16;
++	unsigned int		inode_number:16;
+ 	char			name[0];
+ } __attribute__ ((packed));
+ 
+Index: squashfs/linux-2.6/squashfs_fs_sb.h
+===================================================================
+RCS file: squashfs/linux-2.6/squashfs_fs_sb.h,v
+retrieving revision 1.1
+retrieving revision 1.2
+diff -u -p -r1.1 -r1.2
+--- squashfs/linux-2.6/squashfs_fs_sb.h	4 Nov 2007 13:21:40 -0000	1.1
++++ squashfs/linux-2.6/squashfs_fs_sb.h	5 Nov 2007 05:43:36 -0000	1.2
+@@ -24,6 +24,7 @@
+  */
+ 
+ #include <linux/squashfs_fs.h>
++#include "sqlzma.h"
+ 
+ struct squashfs_cache {
+ 	long long	block;
+@@ -54,7 +55,7 @@ struct squashfs_sb_info {
+ 	long long		*fragment_index;
+ 	unsigned int		*fragment_index_2;
+ 	char			*read_page;
+-	struct mutex		read_data_mutex;
++	//struct mutex		read_data_mutex;
+ 	struct mutex		read_page_mutex;
+ 	struct mutex		block_cache_mutex;
+ 	struct mutex		fragment_mutex;
+@@ -62,7 +63,7 @@ struct squashfs_sb_info {
+ 	wait_queue_head_t	waitq;
+ 	wait_queue_head_t	fragment_wait_queue;
+ 	struct meta_index	*meta_index;
+-	z_stream		stream;
++	//z_stream		stream;
+ 	long long		*inode_lookup_table;
+ 	int			unused_cache_blks;
+ 	int			unused_frag_blks;
--- squashfs-3.3.orig/debian/patches/00-sqlzma-tools-fix-sqmagic-path.patch
+++ squashfs-3.3/debian/patches/00-sqlzma-tools-fix-sqmagic-path.patch
@@ -0,0 +1,27 @@
+Index: squashfs/squashfs-tools/Makefile
+===================================================================
+--- squashfs.orig/squashfs-tools/Makefile	2007-12-08 15:19:26.000000000 +0000
++++ squashfs/squashfs-tools/Makefile	2007-12-08 15:19:59.000000000 +0000
+@@ -16,19 +16,19 @@
+ all: ${Tgt}
+ 
+ read_fs.o: read_fs.c squashfs_fs.h read_fs.h global.h \
+-	${Sqlzma}/sqlzma.h ${Sqlzma}/sqmagic.h
++	${Sqlzma}/sqlzma.h sqmagic.h
+ 
+ sort.o: sort.c squashfs_fs.h global.h sort.h
+ 
+ mksquashfs.o: mksquashfs.c squashfs_fs.h mksquashfs.h global.h sort.h \
+-	${Sqlzma}/sqlzma.h ${Sqlzma}/sqmagic.h \
++	${Sqlzma}/sqlzma.h sqmagic.h \
+ 	${LzmaAlone}/liblzma_r.a ${LzmaC}/libunlzma_r.a
+ mksquashfs: LDLIBS += -lpthread -lunlzma_r -llzma_r -lstdc++
+ mksquashfs: mksquashfs.o read_fs.o sort.o
+ 
+ unsquashfs.o: CFLAGS += -U_REENTRANT
+ unsquashfs.o: unsquashfs.c squashfs_fs.h read_fs.h global.h \
+-	${Sqlzma}/sqlzma.h ${Sqlzma}/sqmagic.h ${LzmaC}/libunlzma.a
++	${Sqlzma}/sqlzma.h sqmagic.h ${LzmaC}/libunlzma.a
+ unsquashfs: LDLIBS += -lunlzma
+ unsquashfs: unsquashfs.o
+ 
--- squashfs-3.3.orig/debian/patches/00-sqlzma-tools.patch
+++ squashfs-3.3/debian/patches/00-sqlzma-tools.patch
@@ -0,0 +1,761 @@
+Index: squashfs3.3/squashfs-tools/Makefile
+===================================================================
+RCS file: squashfs3.3/squashfs-tools/Makefile,v
+retrieving revision 1.1
+retrieving revision 1.2
+diff -u -p -r1.1 -r1.2
+--- squashfs3.3/squashfs-tools/Makefile	4 Nov 2007 13:19:11 -0000	1.1
++++ squashfs3.3/squashfs-tools/Makefile	5 Nov 2007 05:43:36 -0000	1.2
+@@ -1,19 +1,42 @@
+-INCLUDEDIR = .
+ 
+-CFLAGS := -I$(INCLUDEDIR) -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE -D_GNU_SOURCE -O2
++ifndef Sqlzma
++$(error Sqlzma is not defined)
++endif
+ 
+-all: mksquashfs unsquashfs
++INCLUDEDIR = .
+ 
+-mksquashfs: mksquashfs.o read_fs.o sort.o
+-	$(CC) mksquashfs.o read_fs.o sort.o -lz -lpthread -lm -o $@
++CFLAGS := -I$(INCLUDEDIR) -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE -D_GNU_SOURCE -O2
++ifdef UseDebugFlags
++DebugFlags = -g -Wall -Wno-unused-variable -O0 -UNDEBUG
++endif
++CFLAGS += -I${Sqlzma} -D_REENTRANT -DNDEBUG ${DebugFlags}
++LDLIBS += -lz -L${LzmaAlone} -L${LzmaC}
++Tgt = mksquashfs unsquashfs
+ 
+-mksquashfs.o: mksquashfs.c squashfs_fs.h mksquashfs.h global.h sort.h
++all: ${Tgt}
+ 
+-read_fs.o: read_fs.c squashfs_fs.h read_fs.h global.h
++read_fs.o: read_fs.c squashfs_fs.h read_fs.h global.h \
++	${Sqlzma}/sqlzma.h ${Sqlzma}/sqmagic.h
+ 
+ sort.o: sort.c squashfs_fs.h global.h sort.h
+ 
++mksquashfs.o: mksquashfs.c squashfs_fs.h mksquashfs.h global.h sort.h \
++	${Sqlzma}/sqlzma.h ${Sqlzma}/sqmagic.h \
++	${LzmaAlone}/liblzma_r.a ${LzmaC}/libunlzma_r.a
++mksquashfs: LDLIBS += -lpthread -lunlzma_r -llzma_r -lstdc++
++mksquashfs: mksquashfs.o read_fs.o sort.o
++
++unsquashfs.o: CFLAGS += -U_REENTRANT
++unsquashfs.o: unsquashfs.c squashfs_fs.h read_fs.h global.h \
++	${Sqlzma}/sqlzma.h ${Sqlzma}/sqmagic.h ${LzmaC}/libunlzma.a
++unsquashfs: LDLIBS += -lunlzma
+ unsquashfs: unsquashfs.o
+-	$(CC) unsquashfs.o -lz -o $@
+ 
+-unsquashfs.o: unsquashfs.c squashfs_fs.h read_fs.h global.h
++clean:
++	${RM} *~ *.o ${Tgt}
++
++-include test.mk
++
++# Local variables: ;
++# compile-command: (concat "make Sqlzma=../.. -f " (file-name-nondirectory (buffer-file-name)));
++# End: ;
+Index: squashfs3.3/squashfs-tools/mksquashfs.c
+===================================================================
+RCS file: squashfs3.3/squashfs-tools/mksquashfs.c,v
+retrieving revision 1.1
+retrieving revision 1.4
+diff -u -p -r1.1 -r1.4
+--- squashfs3.3/squashfs-tools/mksquashfs.c	4 Nov 2007 13:19:11 -0000	1.1
++++ squashfs3.3/squashfs-tools/mksquashfs.c	13 Nov 2007 13:27:23 -0000	1.4
+@@ -61,6 +61,8 @@
+ #include "mksquashfs.h"
+ #include "global.h"
+ #include "sort.h"
++#include "sqlzma.h"
++#include "sqmagic.h"
+ 
+ #ifdef SQUASHFS_TRACE
+ #define TRACE(s, args...)	do { \
+@@ -112,6 +114,11 @@ unsigned short uid_count = 0, guid_count
+ squashfs_uid uids[SQUASHFS_UIDS], guids[SQUASHFS_GUIDS];
+ int block_offset;
+ int file_count = 0, sym_count = 0, dev_count = 0, dir_count = 0, fifo_count = 0, sock_count = 0;
++struct sqlzma_un un;
++struct sqlzma_opts sqlzma_opts = {
++	.try_lzma	= 0,
++	.dicsize	= SQUASHFS_FILE_SIZE
++};
+ 
+ /* write position within data section */
+ long long bytes = 0, total_bytes = 0;
+@@ -626,21 +633,8 @@ unsigned int mangle2(z_stream **strm, ch
+ 			BAD_ERROR("zlib::compress failed, unknown error %d\n", res);
+ 	}
+ 
+-	stream->next_in = (unsigned char *) s;
+-	stream->avail_in = size;
+-	stream->next_out = (unsigned char *) d;
+-	stream->avail_out = block_size;
+-
+-	res = deflate(stream, Z_FINISH);
+-	if(res != Z_STREAM_END && res != Z_OK) {
+-		if(res == Z_STREAM_ERROR)
+-			BAD_ERROR("zlib::compress failed, stream state inconsistent\n");
+-		else if(res == Z_BUF_ERROR)
+-			BAD_ERROR("zlib::compress failed, no progress possible\n");
+-		else
+-			BAD_ERROR("zlib::compress failed, unknown error %d\n", res);
+-	}
+-
++	res = sqlzma_cm(&sqlzma_opts, stream, (void *)s, size, (void *)d,
++			block_size);
+ 	c_byte = stream->total_out;
+ 
+ 	if(res != Z_STREAM_END || c_byte >= size) {
+@@ -739,6 +733,7 @@ void write_bytes(int fd, long long byte,
+ 		EXIT_MKSQUASHFS();
+ 	}
+ 
++	//printf("%d bytes at %Ld\n", bytes, off);
+ 	if(write(fd, buff, bytes) == -1) {
+ 		perror("Write on destination failed");
+ 		EXIT_MKSQUASHFS();
+@@ -991,12 +986,12 @@ int create_inode(squashfs_inode *i_no, s
+ 		char buff[65536];
+ 
+ 		if((byte = readlink(filename, buff, 65536)) == -1) {
+-			ERROR("Failed to read symlink %d, creating empty symlink\n", filename);
++			ERROR("Failed to read symlink %s, creating empty symlink\n", filename);
+ 			byte = 0;
+ 		}
+ 
+ 		if(byte == 65536) {
+-			ERROR("Symlink %d is greater than 65536 bytes! Creating empty symlink\n", filename);
++			ERROR("Symlink %s is greater than 65536 bytes! Creating empty symlink\n", filename);
+ 			byte = 0;
+ 		}
+ 
+@@ -1022,7 +1017,7 @@ int create_inode(squashfs_inode *i_no, s
+ 			SQUASHFS_SWAP_IPC_INODE_HEADER(ipc, inode);
+ 		TRACE("ipc inode, type %s, nlink %d\n", type == SQUASHFS_FIFO_TYPE ? "fifo" : "socket", nlink);
+ 	} else
+-		BAD_ERROR("Unrecognised inode %d in create_inode\n");
++		BAD_ERROR("Unrecognised inode %d in create_inode\n", type);
+ 
+ 	*i_no = MKINODE(inode);
+ 	inode_count ++;
+@@ -1250,17 +1245,17 @@ char *get_fragment(char *buffer, struct 
+ 		int res;
+ 		unsigned long bytes = block_size;
+ 		char cbuffer[block_size];
++		enum {Src, Dst};
++		struct sized_buf sbuf[] = {
++			{.buf = (void *)cbuffer, .sz = size},
++			{.buf = (void *)buffer, .sz = bytes}
++		};
+ 
+ 		read_bytes(fd, disk_fragment->start_block, size, cbuffer);
+ 
+-		if((res = uncompress((unsigned char *) buffer, &bytes, (const unsigned char *) cbuffer, size)) != Z_OK) {
+-			if(res == Z_MEM_ERROR)
+-				BAD_ERROR("zlib::uncompress failed, not enough memory\n");
+-			else if(res == Z_BUF_ERROR)
+-				BAD_ERROR("zlib::uncompress failed, not enough room in output buffer\n");
+-			else
+-				BAD_ERROR("zlib::uncompress failed, unknown error %d\n", res);
+-		}
++		res = sqlzma_un(&un, sbuf + Src, sbuf + Dst);
++		if (res)
++			BAD_ERROR("%s:%d: res %d\n", __func__, __LINE__, res);
+ 	} else
+ 		read_bytes(fd, disk_fragment->start_block, size, buffer);
+ 
+@@ -1687,7 +1682,8 @@ again:
+ 			goto restat;
+ 	}
+ 
+-	if(file_buffer->fragment = file_buffer->block == frag_block)
++	file_buffer->fragment = (file_buffer->block == frag_block);
++	if(file_buffer->fragment)
+ 		queue_put(from_deflate, file_buffer);
+ 	else
+ 		queue_put(from_reader, file_buffer);
+@@ -1755,6 +1751,7 @@ void *reader(void *arg)
+ 			for(entry = priority_list[i]; entry; entry = entry->next)
+ 				reader_read_file(entry->dir);
+ 	}
++	return NULL;
+ }
+ 
+ 
+@@ -1784,6 +1781,7 @@ void *writer(void *arg)
+ 			write_error = TRUE;
+ 		}
+ 
++		//printf("%d bytes at %Ld\n", file_buffer->size, off);
+ 		if(!write_error && write(fd, file_buffer->data, file_buffer->size) == -1) {
+ 			perror("Write on destination failed");
+ 			write_error = TRUE;
+@@ -1926,7 +1924,7 @@ int progress_bar(long long current, long
+ 	int spaces = columns - used - hashes;
+ 
+ 	if(!progress || columns - used < 0)
+-		return;
++		return 0;
+ 
+ 	printf("\r[");
+ 
+@@ -1939,6 +1937,7 @@ int progress_bar(long long current, long
+ 	printf("] %*lld/%*lld", max_digits, current, max_digits, max);
+ 	printf(" %3lld%%", current * 100 / max);
+ 	fflush(stdout);
++	return 0;
+ }
+ 
+ 
+@@ -2243,7 +2242,8 @@ void write_file(squashfs_inode *inode, s
+ 
+ again:
+ 	read_buffer = get_file_buffer(from_deflate);
+-	if(status = read_buffer->error) {
++	status = read_buffer->error;
++	if(status) {
+ 		alloc_free(read_buffer);
+ 		goto file_err;
+ 	}
+@@ -2635,7 +2635,7 @@ error:
+ 
+ void dir_scan2(squashfs_inode *inode, struct dir_info *dir_info)
+ {
+-	int squashfs_type;
++	int squashfs_type = -1;
+ 	int duplicate_file;
+ 	char *pathname = dir_info->pathname;
+ 	struct directory dir;
+@@ -2918,7 +2918,7 @@ skip_inode_hash_table:
+ char *get_component(char *target, char *targname)
+ {
+ 	while(*target == '/')
+-		*target ++;
++		target ++;
+ 
+ 	while(*target != '/' && *target!= '\0')
+ 		*targname ++ = *target ++;
+@@ -2974,7 +2974,8 @@ struct pathname *add_path(struct pathnam
+ 		paths->name[i].paths = NULL;
+ 		if(use_regex) {
+ 			paths->name[i].preg = malloc(sizeof(regex_t));
+-			if(error = regcomp(paths->name[i].preg, targname, REG_EXTENDED|REG_NOSUB)) {
++			error = regcomp(paths->name[i].preg, targname, REG_EXTENDED|REG_NOSUB);
++			if(error) {
+ 				char str[1024];
+ 
+ 				regerror(error, paths->name[i].preg, str, 1024);
+@@ -3242,7 +3243,8 @@ void read_recovery_data(char *recovery_f
+ 	printf("This program is distributed in the hope that it will be useful,\n");\
+ 	printf("but WITHOUT ANY WARRANTY; without even the implied warranty of\n");\
+ 	printf("MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the\n");\
+-	printf("GNU General Public License for more details.\n");
++	printf("GNU General Public License for more details.\n");\
++	printf("and LZMA support for slax.org by jro.\n");
+ int main(int argc, char *argv[])
+ {
+ 	struct winsize winsize;
+@@ -3261,6 +3263,7 @@ int main(int argc, char *argv[])
+ 	be = FALSE;
+ #endif
+ 
++	un.un_lzma = 0;
+ 	block_log = slog(block_size);
+ 	if(argc > 1 && strcmp(argv[1], "-version") == 0) {
+ 		VERSION();
+@@ -3319,24 +3322,33 @@ int main(int argc, char *argv[])
+ 				ERROR("%s: -write-queue should be 1 megabyte or larger\n", argv[0]);
+ 				exit(1);
+ 			}
+-		} else if(strcmp(argv[i], "-b") == 0) {
++		} else if(strcmp(argv[i], "-b") == 0
++			|| strcmp(argv[i], "-lzmadic") == 0) {
++			long bs;
++			unsigned int bl;
+ 			if(++i == argc) {
+-				ERROR("%s: -b missing block size\n", argv[0]);
++				ERROR("%s: -b|-lzmadic missing block size\n", argv[0]);
+ 				exit(1);
+ 			}
+-			block_size = strtol(argv[i], &b, 10);
++			bs = strtol(argv[i], &b, 10);
+ 			if(*b == 'm' || *b == 'M')
+-				block_size *= 1048576;
++				bs *= 1048576;
+ 			else if(*b == 'k' || *b == 'K')
+-				block_size *= 1024;
++				bs *= 1024;
+ 			else if(*b != '\0') {
+-				ERROR("%s: -b invalid block size\n", argv[0]);
++				ERROR("%s: -b|-lzmadic invalid size\n", argv[0]);
+ 				exit(1);
+ 			}
+-			if((block_log = slog(block_size)) == 0) {
+-				ERROR("%s: -b block size not power of two or not between 4096 and 1Mbyte\n", argv[0]);
++			bl = slog(bs);
++			if(bl == 0) {
++				ERROR("%s: -b|-lzmadic size not power of two or not between 4096 and 1Mbyte\n", argv[0]);
+ 				exit(1);
+ 			}
++			if (!strcmp(argv[i - 1], "-b")) {
++				block_size = bs;
++				block_log = bl;
++			}
++			sqlzma_opts.dicsize = bs;
+ 		} else if(strcmp(argv[i], "-ef") == 0) {
+ 			if(++i == argc) {
+ 				ERROR("%s: -ef missing filename\n", argv[0]);
+@@ -3440,6 +3452,12 @@ int main(int argc, char *argv[])
+ 				exit(1);
+ 			}	
+ 			root_name = argv[i];
++		} else if(strcmp(argv[i], "-nolzma") == 0) {
++			un.un_lzma = 0;
++			sqlzma_opts.try_lzma = 0;
++		} else if(strcmp(argv[i], "-lzma") == 0) {
++			un.un_lzma = 1;
++			sqlzma_opts.try_lzma = 1;
+ 		} else if(strcmp(argv[i], "-version") == 0) {
+ 			VERSION();
+ 		} else {
+@@ -3489,6 +3504,13 @@ printOptions:
+ 			ERROR("-ef <exclude_file>\tlist of exclude dirs/files.  One per line\n");
+ 			ERROR("-wildcards\t\tAllow extended shell wildcards (globbing) to be used in\n\t\t\texclude dirs/files\n");
+ 			ERROR("-regex\t\t\tAllow POSIX regular expressions to be used in exclude\n\t\t\tdirs/files\n");
++			ERROR("-lzmadic <dic_size>\tset the LZMA dictionary"
++			      " size to <dic_size>\n"
++			      "\t\t\tDefault value always follow the block"
++			      " size\n"
++			      "\t\t\tUse this alone or AFTER -b option\n");
++			ERROR("-nolzma\t\t\tnever try LZMA compression\n");
++			ERROR("-lzma\t\t\tuse LZMA compression\n");
+ 			exit(1);
+ 		}
+ 	}
+@@ -3595,6 +3616,7 @@ printOptions:
+ 
+ 		be = orig_be;
+ 		block_log = slog(block_size = sBlk.block_size);
++		//sqlzma_opts.dicsize = block_size;
+ 		s_minor = sBlk.s_minor;
+ 		noI = SQUASHFS_UNCOMPRESSED_INODES(sBlk.flags);
+ 		noD = SQUASHFS_UNCOMPRESSED_DATA(sBlk.flags);
+@@ -3608,10 +3630,18 @@ printOptions:
+ 
+ 	initialise_threads();
+ 
++	i = sqlzma_init(&un, un.un_lzma, 0);
++	if (i != Z_OK) {
++		ERROR("%s:%d: %d\n", __func__, __LINE__, i);
++		EXIT_MKSQUASHFS();
++	}
++
+ 	if(delete) {
+ 		printf("Creating %s %d.%d filesystem on %s, block size %d.\n",
+ 				be ? "big endian" : "little endian", SQUASHFS_MAJOR, s_minor, argv[source + 1], block_size);
+ 		bytes = sizeof(squashfs_super_block);
++		if (sqlzma_opts.try_lzma)
++			printf("lzmadic %u\n", sqlzma_opts.dicsize);
+ 	} else {
+ 		unsigned int last_directory_block, inode_dir_offset, inode_dir_file_size, root_inode_size,
+ 		inode_dir_start_block, uncompressed_data, compressed_data, inode_dir_inode_number,
+@@ -3635,11 +3665,13 @@ printOptions:
+ 
+ 		printf("Appending to existing %s %d.%d filesystem on %s, block size %d\n", be ? "big endian" :
+ 			"little endian", SQUASHFS_MAJOR, s_minor, argv[source + 1], block_size);
++		if (sqlzma_opts.try_lzma)
++			printf("lzmadic %u\n", sqlzma_opts.dicsize);
+ 		printf("All -be, -le, -b, -noI, -noD, -noF, -check_data, no-duplicates, no-fragments, -always-use-fragments and -exportable options ignored\n");
+ 		printf("\nIf appending is not wanted, please re-run with -noappend specified!\n\n");
+ 
+-		compressed_data = inode_dir_offset + inode_dir_file_size & ~(SQUASHFS_METADATA_SIZE - 1);
+-		uncompressed_data = inode_dir_offset + inode_dir_file_size & (SQUASHFS_METADATA_SIZE - 1);
++		compressed_data = inode_dir_offset + (inode_dir_file_size & ~(SQUASHFS_METADATA_SIZE - 1)); //??
++		uncompressed_data = inode_dir_offset + (inode_dir_file_size & (SQUASHFS_METADATA_SIZE - 1)); //??
+ 		
+ 		/* save original filesystem state for restoring ... */
+ 		sfragments = fragments;
+@@ -3733,7 +3765,9 @@ printOptions:
+ 		dir_scan(&inode, "", scan1_encomp_readdir);
+ 	sBlk.root_inode = inode;
+ 	sBlk.inodes = inode_count;
+-	sBlk.s_magic = SQUASHFS_MAGIC;
++	sBlk.s_magic = SQUASHFS_MAGIC_LZMA;
++	if (!un.un_lzma)
++		sBlk.s_magic = SQUASHFS_MAGIC;
+ 	sBlk.s_major = SQUASHFS_MAJOR;
+ 	sBlk.s_minor = s_minor;
+ 	sBlk.block_size = block_size;
+@@ -3762,7 +3796,8 @@ restore_filesystem:
+ 	if(exportable)
+ 		TRACE("sBlk->lookup_table_start 0x%llx\n", sBlk.lookup_table_start);
+ 
+-	if(sBlk.no_uids = uid_count) {
++	sBlk.no_uids = uid_count;
++	if(sBlk.no_uids) {
+ 		if(!swap)
+ 			write_bytes(fd, bytes, uid_count * sizeof(squashfs_uid), (char *) uids);
+ 		else {
+@@ -3776,7 +3811,8 @@ restore_filesystem:
+ 	} else
+ 		sBlk.uid_start = 0;
+ 
+-	if(sBlk.no_guids = guid_count) {
++	sBlk.no_guids = guid_count;
++	if(sBlk.no_guids) {
+ 		if(!swap)
+ 			write_bytes(fd, bytes, guid_count * sizeof(squashfs_uid), (char *) guids);
+ 		else {
+@@ -3819,6 +3855,8 @@ restore_filesystem:
+ 		exportable ? "Exportable " : "", be ?  "Big endian" : "Little endian", block_size,
+ 		noD ? "uncompressed" : "compressed", noI ?  "uncompressed" : "compressed",
+ 		no_fragments ? "no" : noF ? "uncompressed" : "compressed", duplicate_checking ? "" : "not ");
++	if (sqlzma_opts.try_lzma)
++		printf("lzmadic %u\n", sqlzma_opts.dicsize);
+ 	printf("Filesystem size %.2f Kbytes (%.2f Mbytes)\n", bytes / 1024.0, bytes / (1024.0 * 1024.0));
+ 	printf("\t%.2f%% of uncompressed filesystem size (%.2f Kbytes)\n",
+ 		((float) bytes / total_bytes) * 100.0, total_bytes / 1024.0);
+Index: squashfs3.3/squashfs-tools/read_fs.c
+===================================================================
+RCS file: squashfs3.3/squashfs-tools/read_fs.c,v
+retrieving revision 1.1
+retrieving revision 1.2
+diff -u -p -r1.1 -r1.2
+--- squashfs3.3/squashfs-tools/read_fs.c	4 Nov 2007 13:19:11 -0000	1.1
++++ squashfs3.3/squashfs-tools/read_fs.c	5 Nov 2007 05:43:36 -0000	1.2
+@@ -46,6 +46,8 @@ extern int add_file(long long, long long
+ #include <squashfs_fs.h>
+ #include "read_fs.h"
+ #include "global.h"
++#include "sqlzma.h"
++#include "sqmagic.h"
+ 
+ #include <stdlib.h>
+ 
+@@ -62,6 +64,7 @@ extern int add_file(long long, long long
+ 					} while(0)
+ 
+ int swap;
++extern struct sqlzma_un un;
+ 
+ int read_block(int fd, long long start, long long *next, unsigned char *block, squashfs_super_block *sBlk)
+ {
+@@ -81,19 +84,20 @@ int read_block(int fd, long long start, 
+ 		char buffer[SQUASHFS_METADATA_SIZE];
+ 		int res;
+ 		unsigned long bytes = SQUASHFS_METADATA_SIZE;
++		enum {Src, Dst};
++		struct sized_buf sbuf[] = {
++			{.buf = (void *)buffer},
++			{.buf = (void *)block, .sz = bytes}
++		};
+ 
+ 		c_byte = SQUASHFS_COMPRESSED_SIZE(c_byte);
+ 		read_bytes(fd, start + offset, c_byte, buffer);
+ 
+-		if((res = uncompress(block, &bytes, (const unsigned char *) buffer, c_byte)) != Z_OK) {
+-			if(res == Z_MEM_ERROR)
+-				ERROR("zlib::uncompress failed, not enough memory\n");
+-			else if(res == Z_BUF_ERROR)
+-				ERROR("zlib::uncompress failed, not enough room in output buffer\n");
+-			else
+-				ERROR("zlib::uncompress failed, unknown error %d\n", res);
+-			return 0;
+-		}
++		sbuf[Src].sz = c_byte;
++		res = sqlzma_un(&un, sbuf + Src, sbuf + Dst);
++		if (res)
++			abort();
++		bytes = un.un_reslen;
+ 		if(next)
+ 			*next = start + offset + c_byte;
+ 		return bytes;
+@@ -351,18 +355,30 @@ int read_super(int fd, squashfs_super_bl
+ 
+ 	/* Check it is a SQUASHFS superblock */
+ 	swap = 0;
+-	if(sBlk->s_magic != SQUASHFS_MAGIC) {
+-		if(sBlk->s_magic == SQUASHFS_MAGIC_SWAP) {
+-			squashfs_super_block sblk;
+-			ERROR("Reading a different endian SQUASHFS filesystem on %s - ignoring -le/-be options\n", source);
+-			SQUASHFS_SWAP_SUPER_BLOCK(&sblk, sBlk);
+-			memcpy(sBlk, &sblk, sizeof(squashfs_super_block));
+-			swap = 1;
+-		} else  {
+-			ERROR("Can't find a SQUASHFS superblock on %s\n", source);
+-			goto failed_mount;
+-		}
+-	}
++	switch (sBlk->s_magic) {
++		squashfs_super_block sblk;
++
++	case SQUASHFS_MAGIC_LZMA:
++		if (!un.un_lzma)
++			goto bad;
++		break;
++	case SQUASHFS_MAGIC:
++		break;
++	case SQUASHFS_MAGIC_LZMA_SWAP:
++		if (!un.un_lzma)
++			goto bad;
++		/*FALLTHROUGH*/
++	case SQUASHFS_MAGIC_SWAP:
++		ERROR("Reading a different endian SQUASHFS filesystem on %s - ignoring -le/-be options\n", source);
++		SQUASHFS_SWAP_SUPER_BLOCK(&sblk, sBlk);
++		memcpy(sBlk, &sblk, sizeof(squashfs_super_block));
++		swap = 1;
++		break;
++	bad:
++	default:
++		ERROR("Can't find a SQUASHFS superblock on %s\n", source);
++		goto failed_mount;
++ 	}
+ 
+ 	/* Check the MAJOR & MINOR versions */
+ 	if(sBlk->s_major != SQUASHFS_MAJOR || sBlk->s_minor > SQUASHFS_MINOR) {
+@@ -416,7 +432,7 @@ unsigned char *squashfs_readdir(int fd, 
+ 	squashfs_dir_entry *dire = (squashfs_dir_entry *) buffer;
+ 	unsigned char *directory_table = NULL;
+ 	int byte, bytes = 0, dir_count;
+-	long long start = sBlk->directory_table_start + directory_start_block, last_start_block; 
++	long long start = sBlk->directory_table_start + directory_start_block, last_start_block = -1; 
+ 
+ 	size += offset;
+ 	if((directory_table = malloc((size + SQUASHFS_METADATA_SIZE * 2 - 1) & ~(SQUASHFS_METADATA_SIZE - 1))) == NULL)
+Index: squashfs3.3/squashfs-tools/sort.c
+===================================================================
+RCS file: squashfs3.3/squashfs-tools/sort.c,v
+retrieving revision 1.1
+retrieving revision 1.2
+diff -u -p -r1.1 -r1.2
+--- squashfs3.3/squashfs-tools/sort.c	4 Nov 2007 13:19:11 -0000	1.1
++++ squashfs3.3/squashfs-tools/sort.c	5 Nov 2007 05:43:36 -0000	1.2
+@@ -74,7 +74,7 @@ struct sort_info *sort_info_list[65536];
+ struct priority_entry *priority_list[65536];
+ 
+ extern int silent;
+-extern write_file(squashfs_inode *inode, struct dir_ent *dir_ent, int *c_size);
++extern void write_file(squashfs_inode *inode, struct dir_ent *dir_ent, int *c_size);
+ 
+ 
+ int add_priority_list(struct dir_ent *dir, int priority)
+Index: squashfs3.3/squashfs-tools/unsquashfs.c
+===================================================================
+RCS file: squashfs3.3/squashfs-tools/unsquashfs.c,v
+retrieving revision 1.1
+retrieving revision 1.2
+diff -u -p -r1.1 -r1.2
+--- squashfs3.3/squashfs-tools/unsquashfs.c	4 Nov 2007 13:19:11 -0000	1.1
++++ squashfs3.3/squashfs-tools/unsquashfs.c	5 Nov 2007 05:43:36 -0000	1.2
+@@ -52,6 +52,8 @@
+ #include <squashfs_fs.h>
+ #include "read_fs.h"
+ #include "global.h"
++#include "sqlzma.h"
++#include "sqmagic.h"
+ 
+ #include <stdlib.h>
+ #include <time.h>
+@@ -131,6 +133,7 @@ unsigned int block_size;
+ int lsonly = FALSE, info = FALSE, force = FALSE, short_ls = TRUE, use_regex = FALSE;
+ char **created_inode;
+ int root_process;
++struct sqlzma_un un;
+ 
+ int lookup_type[] = {
+ 	0,
+@@ -287,6 +290,7 @@ int read_bytes(long long byte, int bytes
+ 		return FALSE;
+ 	}
+ 
++	/* printf("%d bytes at %Ld\n", bytes, off); */
+ 	if(read(fd, buff, bytes) == -1) {
+ 		ERROR("Read on destination failed because %s\n", strerror(errno));
+ 		return FALSE;
+@@ -318,21 +322,21 @@ int read_block(long long start, long lon
+ 		char buffer[SQUASHFS_METADATA_SIZE];
+ 		int res;
+ 		unsigned long bytes = SQUASHFS_METADATA_SIZE;
++		enum {Src, Dst};
++		struct sized_buf sbuf[] = {
++			{.buf = (void *)buffer},
++			{.buf = (void *)block, .sz = bytes}
++		};
+ 
+ 		c_byte = SQUASHFS_COMPRESSED_SIZE(c_byte);
+ 		if(read_bytes(start + offset, c_byte, buffer) == FALSE)
+ 			goto failed;
+ 
+-		if((res = uncompress((unsigned char *) block, &bytes,
+-		(const unsigned char *) buffer, c_byte)) != Z_OK) {
+-			if(res == Z_MEM_ERROR)
+-				ERROR("zlib::uncompress failed, not enough memory\n");
+-			else if(res == Z_BUF_ERROR)
+-				ERROR("zlib::uncompress failed, not enough room in output buffer\n");
+-			else
+-				ERROR("zlib::uncompress failed, unknown error %d\n", res);
+-			goto failed;
+-		}
++		sbuf[Src].sz = c_byte;
++		res = sqlzma_un(&un, sbuf + Src, sbuf + Dst);
++		if (res)
++			abort();
++		bytes = un.un_reslen;
+ 		if(next)
+ 			*next = start + offset + c_byte;
+ 		return bytes;
+@@ -359,20 +363,19 @@ int read_data_block(long long start, uns
+ 	TRACE("read_data_block: block @0x%llx, %d %s bytes\n", start, SQUASHFS_COMPRESSED_SIZE_BLOCK(c_byte), SQUASHFS_COMPRESSED_BLOCK(c_byte) ? "compressed" : "uncompressed");
+ 
+ 	if(SQUASHFS_COMPRESSED_BLOCK(size)) {
+-		if(read_bytes(start, c_byte, data) == FALSE)
+-			return 0;
++		enum {Src, Dst};
++		struct sized_buf sbuf[] = {
++			{.buf = (void *)data, .sz = c_byte},
++			{.buf = (void *)block, .sz = bytes}
++		};
+ 
+-		if((res = uncompress((unsigned char *) block, &bytes,
+-		(const unsigned char *) data, c_byte)) != Z_OK) {
+-			if(res == Z_MEM_ERROR)
+-				ERROR("zlib::uncompress failed, not enough memory\n");
+-			else if(res == Z_BUF_ERROR)
+-				ERROR("zlib::uncompress failed, not enough room in output buffer\n");
+-			else
+-				ERROR("zlib::uncompress failed, unknown error %d\n", res);
++		if(read_bytes(start, c_byte, data) == FALSE)
+ 			return 0;
+-		}
+ 
++		res = sqlzma_un(&un, sbuf + Src, sbuf + Dst);
++		if (res)
++			abort();
++		bytes = un.un_reslen;
+ 		return bytes;
+ 	} else {
+ 		if(read_bytes(start, c_byte, block) == FALSE)
+@@ -653,7 +656,7 @@ unsigned int mode)
+ 		return FALSE;
+ 	}
+ 
+-	s_ops.read_block_list(block_list, block_ptr, blocks);
++	s_ops.read_block_list(block_list, (void *)block_ptr, blocks);
+ 
+ 	if((file_fd = open(pathname, O_CREAT | O_WRONLY | (force ? O_TRUNC : 0), (mode_t) mode & 0777)) == -1) {
+ 		ERROR("write_file: failed to create file %s, because %s\n", pathname,
+@@ -921,7 +924,7 @@ int create_inode(char *pathname, struct 
+ 				set_attributes(pathname, i->mode, i->uid, i->gid, i->time, TRUE);
+ 				dev_count ++;
+ 			} else
+-				ERROR("create_inode: could not create %s device %s, because you're not superuser!\n",
++				ERROR("create_inode: could not create %s device %s, because you're not superuser! %s\n",
+ 					chrdev ? "character" : "block", pathname, strerror(errno));
+ 			break;
+ 		}
+@@ -1456,7 +1459,7 @@ void squashfs_closedir(struct dir *dir)
+ char *get_component(char *target, char *targname)
+ {
+ 	while(*target == '/')
+-		*target ++;
++		target ++;
+ 
+ 	while(*target != '/' && *target!= '\0')
+ 		*targname ++ = *target ++;
+@@ -1529,7 +1532,8 @@ struct pathname *add_path(struct pathnam
+ 		paths->name[i].paths = NULL;
+ 		if(use_regex) {
+ 			paths->name[i].preg = malloc(sizeof(regex_t));
+-			if(error = regcomp(paths->name[i].preg, targname, REG_EXTENDED|REG_NOSUB)) {
++			error = regcomp(paths->name[i].preg, targname, REG_EXTENDED|REG_NOSUB);
++			if(error) {
+ 				char str[1024];
+ 
+ 				regerror(error, paths->name[i].preg, str, 1024);
+@@ -1717,7 +1721,8 @@ int dir_scan(char *parent_name, unsigned
+ 		free_subdir(new);
+ 	}
+ 
+-	!lsonly && set_attributes(parent_name, dir->mode, dir->uid, dir->guid, dir->mtime, force);
++	if (!lsonly) //??
++		set_attributes(parent_name, dir->mode, dir->uid, dir->guid, dir->mtime, force);
+ 
+ 	squashfs_closedir(dir);
+ 	dir_count ++;
+@@ -1775,19 +1780,27 @@ int read_super(char *source)
+ 	read_bytes(SQUASHFS_START, sizeof(squashfs_super_block), (char *) &sBlk);
+ 
+ 	/* Check it is a SQUASHFS superblock */
++	un.un_lzma = 1;
+ 	swap = 0;
+-	if(sBlk.s_magic != SQUASHFS_MAGIC) {
+-		if(sBlk.s_magic == SQUASHFS_MAGIC_SWAP) {
+-			squashfs_super_block sblk;
+-			ERROR("Reading a different endian SQUASHFS filesystem on %s\n", source);
+-			SQUASHFS_SWAP_SUPER_BLOCK(&sblk, &sBlk);
+-			memcpy(&sBlk, &sblk, sizeof(squashfs_super_block));
+-			swap = 1;
+-		} else  {
+-			ERROR("Can't find a SQUASHFS superblock on %s\n", source);
+-			goto failed_mount;
+-		}
+-	}
++	switch (sBlk.s_magic) {
++		squashfs_super_block sblk;
++	case SQUASHFS_MAGIC:
++		un.un_lzma = 0;
++		/*FALLTHROUGH*/
++	case SQUASHFS_MAGIC_LZMA:
++		break;
++	case SQUASHFS_MAGIC_SWAP:
++		un.un_lzma = 0;
++		/*FALLTHROUGH*/
++	case SQUASHFS_MAGIC_LZMA_SWAP:
++		ERROR("Reading a different endian SQUASHFS filesystem on %s\n", source);
++		SQUASHFS_SWAP_SUPER_BLOCK(&sblk, &sBlk);
++		memcpy(&sBlk, &sblk, sizeof(squashfs_super_block));
++		swap = 1;
++	default:
++		ERROR("Can't find a SQUASHFS superblock on %s\n", source);
++		goto failed_mount;
++ 	}
+ 
+ 	/* Check the MAJOR & MINOR versions */
+ 	if(sBlk.s_major == 1 || sBlk.s_major == 2) {
+@@ -1857,7 +1870,8 @@ struct pathname *process_extract_files(s
+ 	printf("This program is distributed in the hope that it will be useful,\n");\
+ 	printf("but WITHOUT ANY WARRANTY; without even the implied warranty of\n");\
+ 	printf("MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the\n");\
+-	printf("GNU General Public License for more details.\n");
++	printf("GNU General Public License for more details.\n");\
++	printf("and LZMA support for slax.org by jro.\n");
+ int main(int argc, char *argv[])
+ {
+ 	char *dest = "squashfs-root";
+@@ -1867,7 +1881,8 @@ int main(int argc, char *argv[])
+ 	struct pathnames *paths = NULL;
+ 	struct pathname *path = NULL;
+ 
+-	if(root_process = geteuid() == 0)
++	root_process = geteuid() == 0;
++	if(root_process)
+ 		umask(0);
+ 	
+ 	for(i = 1; i < argc; i++) {
+@@ -1957,6 +1972,11 @@ options:
+ 		EXIT_UNSQUASH("failed to allocate created_inode\n");
+ 
+ 	memset(created_inode, 0, sBlk.inodes * sizeof(char *));
++	i = sqlzma_init(&un, un.un_lzma, 0);
++	if (i != Z_OK) {
++		fputs("sqlzma_init failed", stderr);
++		abort();
++	}
+ 
+ 	read_uids_guids();
+ 
--- squashfs-3.3.orig/debian/patches/series
+++ squashfs-3.3/debian/patches/series
@@ -0,0 +1,9 @@
+00-sqlzma-tools.patch
+00-sqlzma-tools-fix-sqmagic-path.patch
+00-sqlzma-tools-header-sqmagic.patch
+00-sqlzma-kernel.patch
+00-sqlzma-kernel-cleanup.patch
+01-kernel-compat.patch
+01-kernel-fix-includes.patch
+01-kernel-fix-makefile.patch
+01-kernel-fix-missing-include.patch
--- squashfs-3.3.orig/debian/patches/00-sqlzma-tools-header-sqmagic.patch
+++ squashfs-3.3/debian/patches/00-sqlzma-tools-header-sqmagic.patch
@@ -0,0 +1,22 @@
+Index: squashfs/squashfs-tools/sqmagic.h
+===================================================================
+--- /dev/null	1970-01-01 00:00:00.000000000 +0000
++++ squashfs3.3/squashfs-tools/sqmagic.h	2007-12-08 14:39:52.000000000 +0000
+@@ -0,0 +1,17 @@
++/*
++ * Copyright (C) 2006 Junjiro Okajima
++ * Copyright (C) 2006 Tomas Matejicek, slax.org
++ *
++ * LICENSE must follow the one in squashfs.
++ */
++
++/* $Id: sqmagic.h,v 1.2 2006/11/27 03:54:58 jro Exp $ */
++
++#ifndef __sqmagic_h__
++#define __sqmagic_h__
++
++/* see SQUASHFS_MAGIC in squashfs_fs.h */
++#define SQUASHFS_MAGIC_LZMA		0x71736873
++#define SQUASHFS_MAGIC_LZMA_SWAP	0x73687371
++
++#endif
--- squashfs-3.3.orig/debian/patches/00-sqlzma-kernel-cleanup.patch
+++ squashfs-3.3/debian/patches/00-sqlzma-kernel-cleanup.patch
@@ -0,0 +1,13 @@
+Index: squashfs/linux-2.6/Makefile
+===================================================================
+--- squashfs.orig/linux-2.6/Makefile	2007-12-09 00:22:27.000000000 +0000
++++ squashfs/linux-2.6/Makefile	2007-12-09 00:22:30.000000000 +0000
+@@ -2,8 +2,6 @@
+ # Makefile for the linux squashfs routines.
+ #
+ 
+--include /tmp/sqvars.mk
+-
+ obj-$(CONFIG_SQUASHFS) += squashfs.o
+ squashfs-y += inode.o
+ squashfs-y += squashfs2_0.o
--- squashfs-3.3.orig/debian/compat
+++ squashfs-3.3/debian/compat
@@ -0,0 +1 @@
+4
--- squashfs-3.3.orig/debian/squashfs-tools.install
+++ squashfs-3.3/debian/squashfs-tools.install
@@ -0,0 +1,2 @@
+squashfs-tools/mksquashfs	/usr/bin
+squashfs-tools/unsquashfs	/usr/bin
--- squashfs-3.3.orig/debian/docs
+++ squashfs-3.3/debian/docs
@@ -0,0 +1,4 @@
+ACKNOWLEDGEMENTS
+PERFORMANCE.README
+README
+README-3.3
--- squashfs-3.3.orig/debian/watch
+++ squashfs-3.3/debian/watch
@@ -0,0 +1,7 @@
+# watch control file for uscan
+version=3
+
+opts="uversionmangle=s/-r/r/" \
+ftp://heanet.dl.sourceforge.net/s/sq/squashfs/squashfs(.*)\.tar\.gz \
+	debian  git-import-orig
+
--- squashfs-3.3.orig/debian/squashfs-tools.dirs
+++ squashfs-3.3/debian/squashfs-tools.dirs
@@ -0,0 +1 @@
+usr/bin
--- squashfs-3.3.orig/debian/changelog
+++ squashfs-3.3/debian/changelog
@@ -0,0 +1,410 @@
+squashfs (1:3.3-1ubuntu2) hardy; urgency=low
+
+  * Replace gcc-4.1-hppa by gcc-4.2-hppa in Build-Depends.
+
+ -- Matthias Klose <doko@ubuntu.com>  Wed, 16 Jan 2008 16:47:39 +0000
+
+squashfs (1:3.3-1ubuntu1) hardy; urgency=low
+
+  * Add -lzma switch to enable lzma support.
+  * Don't use lzma by default, since the Ubuntu kernels doesn't support
+    that (yet).
+
+ -- Tollef Fog Heen <tfheen@ubuntu.com>  Tue, 15 Jan 2008 11:27:25 +0100
+
+squashfs (1:3.3-1) unstable; urgency=low
+
+  * New upstream release.
+  * New email address.
+  * Use quilt patch system instead of dpatch and reorganized patches.
+  * debian/docs:
+    + Remove README-3.2 in favor of README-3.3.
+  * debian/patches:
+    + Remove deprecated 03-remove-slab.
+    + 01-kernel-compat now allows to build for both 2.6.22 and 2.6.23.
+  * debian/copyright:
+    + Update GPL path.
+  * debian/rules:
+    + Update CFLAGS from squashfs-tools/Makefile.
+  * debian/control*:
+    + Add Build-Depends against zlib1g-dev.
+    + Add Depends against zlib1g-dev for squashfs-source.
+    + Update Standards-Version to 3.7.3. No changes needed.
+
+ -- Arnaud Fontaine <arnau@debian.org>  Sat, 08 Dec 2007 16:45:08 +0000
+
+squashfs (1:3.2r2-9exp1) experimental; urgency=low
+
+  * debian/NEWS:
+    + Add informations about LZMA support.
+  * debian/copyright:
+    + Update GPL path.
+  * debian/control:
+    + Remove useless depends of squashfs-source on dpatch.
+  * Add lzma support. Closes: #414563.
+    + Add lzma-source to squashfs-tools Suggests field in debian/control.
+    + Add squashfs lzma headers.
+    + Add lzma support to kernel module.
+    + Add lzma support for squashfs tools.
+    + Add ``-nolzma'' options to mksquashfs help and also in its manpage.
+
+ -- Arnaud Fontaine <arnaud@andesi.org>  Thu, 18 Oct 2007 13:11:35 +0100
+
+squashfs (1:3.2r2-9) unstable; urgency=low
+
+  * Add 04-kcompat-2.6.23.dpatch for building the kernel module on kernel
+    2.6.23. Thanks to Stefan Lippers-Hollmann <s.L-H@gmx.de>. Closes: #445417.
+
+ -- Arnaud Fontaine <arnaud@andesi.org>  Thu, 18 Oct 2007 13:03:25 +0100
+
+squashfs (1:3.2r2-8) unstable; urgency=low
+
+  [ Arnaud Fontaine ]
+  * Fix FTBFS with linux-modules-extra by removing linux-2.6/ directory in
+    squashfs-source package. Closes: #442906.
+  * Add debian/patches/01-module-makefile which allows to build the
+    kernel module by hand.
+  * Move Homepage field from binaries to source package in debian/control*.
+  * debian/changelog:
+    + Fix doubly-encoded utf8 garbage.
+  * debian/control:
+    + Policy doesn't permit Uploaders field on several lines.
+  * debian/control.modules.in:
+    + Update Standards-Version to 3.7.2.
+    + Add XS-VCS-* fields.
+
+ -- Arnaud Fontaine <arnaud@andesi.org>  Wed, 26 Sep 2007 00:33:16 +0100
+
+squashfs (1:3.2r2-7) unstable; urgency=low
+
+  [ Arnaud Fontaine ]
+  * debian/patches/01-includes.dpatch:
+    + Add missing include against ``sched.h'' kernel header.
+      Closes: #442906.
+  * debian/doc/mksquashfs.dbk:
+    + Remove ``-2.0'' option as it doesn't exist anymore. Closes: #443128.
+
+  [ Otavio Salvador ]
+  * debian/rules:
+    + Remove $(DOC_DIR)/*.1 files on clean.
+  * debian/control:
+    + Fix typo in extended description of squashfs-source package.
+      Closes: #439110.
+
+ -- Arnaud Fontaine <arnaud@andesi.org>  Wed, 19 Sep 2007 11:39:20 +0100
+
+squashfs (1:3.2r2-6) unstable; urgency=low
+
+  * debian/patches/03-remove-slab.patch:
+    + Fix target of the patch. Closes: #433805.
+
+ -- Arnaud Fontaine <arnaud@andesi.org>  Thu, 09 Aug 2007 21:39:18 +0200
+
+squashfs (1:3.2r2-5) unstable; urgency=low
+
+  [ Arnaud Fontaine ]
+  * Fix manpage section from 8 to 1. Closes: #433858.
+  * debian/doc/en/mksquashfs.dbk:
+    + Add ``-no-progress'' and ``-no-exports'' options.
+      Closes: #420159.
+  * debian/patches/03-remove-slab.dpatch:
+    + Improve the patch which makes it compatible with kernel version
+      < 2.6.22.
+
+  [ Otavio Salvador ]
+  * debian/control:
+    + Add myself as uploader.
+    + Add XS-VCS-{Git,Browser} control's fields.
+    + Wrap build-depends.
+  * debian/control.in: removed.
+  * debian/watch:
+    + Use git-import-orig instead of uupdate so it integrates better with
+      our git repository.
+    + Fix upstream version handling to remove the dash from it.
+
+ -- Otavio Salvador <otavio@ossystems.com.br>  Wed, 08 Aug 2007 15:02:05 -0300
+
+squashfs (1:3.2r2-4) unstable; urgency=low
+
+  * Fix FTBFS with 2.6.22 due SLAB removal. Thanks to Mario Izquierdo
+    <mariodebian@gmail.com> for the patch. Closes: #433805.
+
+ -- Otavio Salvador <otavio@ossystems.com.br>  Tue, 07 Aug 2007 21:44:02 -0300
+
+squashfs (1:3.2r2-3) unstable; urgency=low
+
+  * Move squashfs-tools binaries to /usr/bin since they can be used by
+    normal users and are useful to embedded systems. Closes: #422041.
+
+ -- Otavio Salvador <otavio@ossystems.com.br>  Wed, 11 Jul 2007 10:33:15 -0300
+
+squashfs (1:3.2r2-2) unstable; urgency=low
+
+  * Upload to unstable.
+    + squashfs module 3.2 now build on kernel >= 2.6.20. Closes:
+      #418762.
+  * Acknowledge NMU. Closes: #416773.
+
+ -- Arnaud Fontaine <arnaud@andesi.org>  Sun, 15 Apr 2007 11:44:35 +0200
+
+squashfs (1:3.2r2-1) experimental; urgency=low
+
+  * New upstream release.
+    + Remove 03-progress-mksquashfs patch included upstream.
+    + Update 01-includes patch.
+  * debian/rules:
+    + Update the kernel patch path for squashfs-module and use 2.6.20
+      kernel patch.
+  * debian/control.modules.in:
+    + Add depends against linux-modules or linux-image.
+      Closes: #408863.
+
+ -- Arnaud Fontaine <arnaud@andesi.org>  Sat, 20 Jan 2007 15:52:31 +0100
+
+squashfs (1:3.1r2-6.1) unstable; urgency=high
+  
+  * Non-maintainer upload.
+  * Added patch from upstream to linux-2.6.18/squashfs3.1-patch to fix kernel
+    crash on special crafted squashfs file systems CVE-2006-5701
+    (Closes: #415530).
+
+ -- Daniel Baumann <daniel@debian.org>  Fri, 30 Mar 2007 08:52:00 +0200
+
+squashfs (1:3.1r2-6) unstable; urgency=low
+
+  * Add manpage for unsquashfs command.
+  * Re-add the progress patch. Thanks to Tollef Fog Heen
+    <tfheen@ubuntu.com>. Closes: #389487.
+
+ -- Arnaud Fontaine <arnaud@andesi.org>  Sat,  2 Dec 2006 12:11:02 +0100
+
+squashfs (1:3.1r2-5) unstable; urgency=low
+
+  * debian/changelog:
+    + Convert changelog to UTF-8.
+  * debian/control.in:
+    + Remove zlibg1-dev because it is automatically handled by cdbs
+      for debian/control.
+  * debian/rules:
+    + Remove bashisms. Closes: #400753.
+
+ -- Arnaud Fontaine <arnaud@andesi.org>  Tue, 28 Nov 2006 18:33:53 +0100
+
+squashfs (1:3.1r2-4) unstable; urgency=low
+
+  * debian/rules:
+    +  Fix  manpages by  adding  'man.charmap.use.subset' to  xsltproc
+       parameter. Closes: #395412.
+
+ -- Arnaud Fontaine <arnaud@andesi.org>  Sun, 29 Oct 2006 09:10:21 +0100
+
+squashfs (1:3.1r2-3) unstable; urgency=low
+
+  * Replace gcc-4.0-hppa by gcc-4.1-hppa in Depends. Closes: #391274.
+
+ -- Arnaud Fontaine <arnaud@andesi.org>  Fri,  6 Oct 2006 01:41:06 +0200
+
+squashfs (1:3.1r2-2) unstable; urgency=low
+
+  * Update the squashfs-source package for kernel 2.6.18.
+
+ -- Arnaud Fontaine <arnaud@andesi.org>  Thu, 21 Sep 2006 16:53:29 +0200
+
+squashfs (1:3.1r2-1) unstable; urgency=low
+
+  * New upstream relase.
+
+ -- Arnaud Fontaine <arnaud@andesi.org>  Tue,  5 Sep 2006 15:49:53 +0200
+
+squashfs (1:3.1-1) unstable; urgency=low
+
+  * New upstream release. Closes: #384414.
+  * Remove  the squashfs-modules-*  packages which  is now  handled by
+    linux-modules-extra-2.6. Closes: #384440.
+
+ -- Arnaud Fontaine <arnaud@andesi.org>  Mon, 28 Aug 2006 16:23:44 +0200
+
+squashfs (1:3.0-8) unstable; urgency=low
+
+  * Bumped kernel-abi to 2.6.17-2. Closes: #383137.
+  * Fix progress information patch when generating a FS > 4GB. Thanks
+    to Mike Kasick <mkasick@club.cc.cmu.edu>. Closes: #382714.
+
+ -- Arnaud Fontaine <arnaud@andesi.org>  Tue, 15 Aug 2006 10:51:16 +0200
+
+squashfs (1:3.0-7) unstable; urgency=low
+
+  * Patch for  appending files to  an existing filesystem  larger than
+    2GB.  Thanks  to Pierre  Renié  <archlinuxien@gmail.com> and  Ming
+    Zhang. Closes: #378615.
+
+ -- Arnaud Fontaine <arnaud@andesi.org>  Sun,  6 Aug 2006 18:20:04 +0200
+
+squashfs (1:3.0-6) unstable; urgency=low
+
+  * Acknowledge NMU. Closes: #377831.
+  * debian/control.in:
+    + Add a minimum version on po4a (0.21) in Build-Depends. Closes: #377797.
+    + Remove s390-tape flavour which has no kernel headers.
+
+ -- Arnaud Fontaine <arnaud@andesi.org>  Sun, 16 Jul 2006 14:44:56 +0200
+
+squashfs (1:3.0-5.1) unstable; urgency=low
+
+  * NMU in agreement with Arnaud.
+  * Bumped kernel-abi.
+  * Updated flavours as of 2.6.17-2.
+
+ -- Daniel Baumann <daniel@debian.org>  Sun,  9 Jul 2006 16:22:00 +0200
+
+squashfs (1:3.0-5) unstable; urgency=low
+
+  * debian/control* and debian/rules:
+    + Bumped linux kernel version number to 2.6.16-2.
+      Closes: #369522.
+
+  * debian/patches/03-mksquashfs.dpatch:
+    + Fix rounding error which causes generation of invalid
+      filesystems.  Thanks to Scott James Remnant
+      <scott@ubuntu.com>. Closes: #368969.
+
+ -- Arnaud Fontaine <arnaud@andesi.org>  Wed, 31 May 2006 18:16:18 +0200
+
+squashfs (1:3.0-4) unstable; urgency=low
+
+  * debian/rules:
+    + Fix FTBFS on powerpc64.  Thanks to Julien Louis
+      <ptitlouis@sysif.net>.
+
+  * debian/control*:
+    + Update Standards-Version to 3.7.2.
+
+ -- Arnaud Fontaine <arnaud@andesi.org>  Sun,  7 May 2006 09:59:10 +0200
+
+squashfs (1:3.0-3) unstable; urgency=low
+
+  * debian/control*:
+    + Fix incorrect package name for module
+      squashfs-modules-2.6*-powerpc64.
+
+ -- Arnaud Fontaine <arnaud@andesi.org>  Sat, 29 Apr 2006 12:27:06 +0200
+
+squashfs (1:3.0-2) unstable; urgency=low
+
+  * debian/patches/03-mksquashfs.dpatch:
+    + Add patch showing the progress of mksquashfs. Thanks to Tollef
+      Fog Heen <tfheen@ubuntu.com>. Closes: #364089.
+
+  * debian/control*:
+    + Add complete description for every squashfs-* packages.  Thanks
+      to Tomas Pospisek <tpo_deb@sourcepole.ch>. Closes: #364743.
+    + Add Homepage to the descriptions.
+    + Suggests on squashfs-source instead of kernel-patch-squashfs for
+      squashfs-tools.
+    + Conflicts and Replaces on kernel-patch-squashfs concerning
+      squashfs-source. Thanks to Bastian Kleineidam
+      <calvin@debian.org>. Closes: #364768.
+    + Add docbook-xml to Build-Depends for manpages.
+    + Add binutils-hppa64 and gcc-4.0-hppa64 Build-Depends for hppa.
+
+  * debian/control.modules.in:
+    + Remove Daniel Baumann from Uploaders.
+
+  * debian/docs:
+    + Add README-3.0.
+
+  * debian/rules:
+    + Add unsquashfs to build program.
+    + Add upstream changelog to the packages (CHANGES).
+    + Fix  FTBFS for hppa64*  and sparc64* by  specifying respectively
+      CROSS_COMPILE and ARCH for building the modules.
+
+ -- Arnaud Fontaine <arnaud@andesi.org>  Wed, 26 Apr 2006 18:38:20 +0200
+
+squashfs (1:3.0-1) unstable; urgency=low
+  
+  * New upstream release.
+  * Building module out-of-tree, thanks to Daniel Baumann
+   <daniel.baumann@panthera-systems.net>. Closes: #355554.
+	
+ -- Arnaud Fontaine <arnaud@andesi.org>  Sun,  2 Apr 2006 11:47:00 +0200
+
+squashfs (1:2.2r2-3) unstable; urgency=low
+  
+  * debian/kernel-patch-squashfs.kpatches and 
+    debian/kernel-patch-squashfs.k_patches.commented updated to support
+    Linux 2.6.14 and later.
+   
+ -- Arnaud Fontaine <arnaud@andesi.org>  Tue, 31 Jan 2006 12:52:18 +0100
+	
+squashfs (1:2.2r2-2) unstable; urgency=low
+  
+  * Removed source root debian Makefile (not upstream) in favor of 
+    CDBS (so modified debian/rules), added debian/control.in.
+  * Added debian/cdbs/1/class/makefile.mk in order to fix bug #338625.
+  * Added french translation by Frédéric Boiteux and Olivier Trichet.
+    Moved mksquashfs.dbk from debian/ to debian/doc/en/.
+  * Switch to po4a. Thanks to Nicolas François.
+  * Updated debian/watch.
+	
+ -- Arnaud Fontaine <arnaud@andesi.org>  Thu, 10 Nov 2005 15:22:28 +0100
+
+squashfs (1:2.2r2-1) unstable; urgency=low
+
+  * New upstream release. Closes: #317795.
+  * Suggested 'kernel-source | linux-source' instead of 'kernel-source' 
+    in debian/control. Thanks to Marco Bodrato. Closes: #329623.
+  * Updated debian/kernel-patch-squashfs.kpatches and 
+    debian/kernel-patch-squashfs.k_patches.commented due to new 
+    upstream patches. Closes: #303032.
+  * Updated FSF address in debian/copyright.
+  * Updated Standards-Version to 3.6.2.1 (no changes needed).
+
+ -- Arnaud Fontaine <arnaud@andesi.org>  Tue, 11 Oct 2005 20:12:55 +0200
+
+squashfs (1:2.1r2-0.1) unstable; urgency=low
+
+  * NMU: build also a kernel-patch-squashfs module.
+  * New upstream release. Closes: #287919.
+  * Change Debian helper from yada to Debhelper.
+  * change mksquashfs install directory from /usr/bin/ to /usr/sbin/.
+
+ -- Frédéric Boiteux <fboiteux@calistel.com>  Mon, 20 Dec 2004 12:47:46 +0100
+
+squashfs (1:2.0-1) unstable; urgency=low
+
+  * New upstream release.
+  * Fixes for build script. It can be called debian/rules build after
+    interrupt.
+
+ -- Piotr Roszatycki <dexter@debian.org>  Thu,  5 Aug 2004 18:57:15 +0200
+
+squashfs (2.0-ALPHA-1) unstable; urgency=low
+
+  * New upstream release. Closes: #255470.
+
+ -- Piotr Roszatycki <dexter@debian.org>  Mon, 21 Jun 2004 13:06:46 +0200
+
+squashfs (1.3r3-1) unstable; urgency=low
+
+  * New upstream release.
+
+ -- Piotr Roszatycki <dexter@debian.org>  Thu, 11 Mar 2004 21:29:32 +0100
+
+squashfs (1.3r2-1) unstable; urgency=low
+
+  * New upstream release.
+
+ -- Piotr Roszatycki <dexter@debian.org>  Tue, 18 Nov 2003 12:48:13 +0100
+
+squashfs (1.3-2) unstable; urgency=low
+
+  * Fixed missing build-depends on libz-dev, closes: #215338.
+
+ -- Piotr Roszatycki <dexter@debian.org>  Mon, 13 Oct 2003 12:35:38 +0200
+
+squashfs (1.3-1) unstable; urgency=low
+
+  * Initial release.
+
+ -- Piotr Roszatycki <dexter@debian.org>  Wed,  1 Oct 2003 14:28:30 +0200
--- squashfs-3.3.orig/debian/copyright
+++ squashfs-3.3/debian/copyright
@@ -0,0 +1,28 @@
+This package was debianized by Frédéric Boiteux <fboiteux@calistel.com> on
+Mon, 20 Dec 2004 10:22:09 +0100.
+
+It was downloaded from http://sourceforge.net/project/showfiles.php?group_id=63835
+
+Copyright:
+
+Upstream Author: Phillip Lougher (plougher@users.sourceforge.net)
+
+License:
+
+   This  package is  free  software; you  can  redistribute it  and/or
+   modify  it under the  terms of  the GNU  General Public  License as
+   published by  the Free Software  Foundation; version 2  dated June,
+   1991.
+
+   This package is distributed in the hope that it will be useful, but
+   WITHOUT  ANY  WARRANTY;  without   even  the  implied  warranty  of
+   MERCHANTABILITY or  FITNESS FOR A PARTICULAR PURPOSE.   See the GNU
+   General Public License for more details.
+
+   You should have  received a copy of the  GNU General Public License
+   along  with  this package;  if  not,  write  to the  Free  Software
+   Foundation,  Inc.,   51  Franklin  St,  Fifth   Floor,  Boston,  MA
+   02110-1301, USA.
+
+On Debian systems, the complete text of the GNU General Public License
+can be found in `/usr/share/common-licenses/GPL-2'.
--- squashfs-3.3.orig/debian/rules.modules
+++ squashfs-3.3/debian/rules.modules
@@ -0,0 +1,55 @@
+#!/usr/bin/make -f
+# -*- mode: makefile; coding: utf-8 -*-
+
+# prefix of the target package name
+PACKAGE=squashfs-modules
+# modifieable for experiments or debugging m-a
+MA_DIR ?= /usr/share/modass
+# load generic variable handling
+-include $(MA_DIR)/include/generic.make
+# load default rules, including kdist, kdist_image, ...
+-include $(MA_DIR)/include/common-rules.make
+
+EXTRA_CFLAGS := -DCONFIG_SQUASHFS_FRAGMENT_CACHE_SIZE=3 -I/usr/include \
+	-DUnsquashNoPreempt
+
+# module assistant calculates all needed things for us and sets
+# following variables:
+# KSRC (kernel source directory), KVERS (kernel version string), KDREV
+# (revision of the Debian kernel-image package), CC (the correct
+# compiler), VERSION (the final package version string), PKGNAME (full
+# package name with KVERS included), DEB_DESTDIR (path to store DEBs)
+
+# The kdist_configure target is called by make-kpkg modules_config and
+# by kdist* rules by dependency. It should configure the module so it is
+# ready for compilation (mostly useful for calling configure).
+# prep-deb-files from module-assistant creates the neccessary debian/ files 
+kdist_config: prep-deb-files
+
+# the kdist_clean target is called by make-kpkg modules_clean and from
+# kdist* rules. It is responsible for cleaning up any changes that have
+# been made by the other kdist_commands (except for the .deb files created)
+kdist_clean:
+	$(MAKE) -C $(KSRC) M=$(PWD) clean
+
+binary-modules:
+	dh_testroot
+	dh_clean -k
+	dh_installdirs
+
+	CONFIG_SQUASHFS=m $(MAKE) -C $(KSRC) M=$(PWD) modules EXTRA_CFLAGS="$(EXTRA_CFLAGS)"
+
+	# Install the module
+	mkdir -p debian/$(PACKAGE)-$(KVERS)/lib/modules/$(KVERS)/kernel/fs/squashfs
+	cp squashfs.ko debian/$(PACKAGE)-$(KVERS)/lib/modules/$(KVERS)/kernel/fs/squashfs
+
+	dh_installdocs
+	dh_installchangelogs
+	dh_installmodules
+	dh_compress
+	dh_fixperms
+	dh_installdeb
+	dh_gencontrol -- -v$(VERSION)
+	dh_md5sums
+	dh_builddeb --destdir=$(DEB_DESTDIR)
+	dh_clean -k
--- squashfs-3.3.orig/debian/NEWS
+++ squashfs-3.3/debian/NEWS
@@ -0,0 +1,21 @@
+squashfs (1:3.2r2-9exp1) experimental; urgency=low
+
+  This version introduces LZMA compression in addition of ZLIB.
+
+  WARNING!  The  new  squashfs  image file  (generated  without  '-nolzma'
+    option) has no backward  compatibility, while the patched squashfs and
+    its tools can handle the old squashfs image generated by the unpatched
+    squashfs-tools.
+
+ -- Arnaud Fontaine <arnaud@andesi.org>  Mon, 29 Oct 2007 20:06:05 +0000
+
+squashfs (2.0-ALPHA-1) unstable; urgency=low
+
+  WARNING! Images prepared by new mksquashfs 2.0 aren't readable by kernel with
+  old squashfs 1.3 driver. You'll get the following kernel message:
+
+  SQUASHFS error: Major/Minor mismatch, filesystem is (2:0), I support (1: <= 0)
+
+  The new driver reads old images without problem.
+
+ -- Piotr Roszatycki <dexter@debian.org>  Mon, 21 Jun 2004 13:06:46 +0200
--- squashfs-3.3.orig/debian/README.Debian
+++ squashfs-3.3/debian/README.Debian
@@ -0,0 +1,10 @@
+squashfs for Debian
+-------------------
+
+The  Squash  filesystem driver  isn't  [currently]  integrated in  the
+official Linux  kernel, so to  be able to  use such a  filesystem, you
+need  to use  the 'squashfs-modules-*'  package if  you are  using the
+official Debian kernel, or the 'squashfs-source' package otherwise (by
+using 'module-assistant': '# m-a install squashfs').
+
+ -- Arnaud Fontaine <arnau@debian.org>, Sun,  2 Apr 2006 11:47:00 +0200
--- squashfs-3.3.orig/debian/rules
+++ squashfs-3.3/debian/rules
@@ -0,0 +1,93 @@
+#!/usr/bin/make -f
+# -*- mode: makefile; coding: utf-8 -*-
+
+# Common include files
+include /usr/share/cdbs/1/rules/patchsys-quilt.mk
+include /usr/share/cdbs/1/rules/debhelper.mk
+include /usr/share/cdbs/1/class/makefile.mk
+
+# Path to squashfs-tools
+DEB_STOOLS  = $(CURDIR)/squashfs-tools
+
+# Manpages stuff
+DOC_DIR	       = debian/doc
+PO_DIR	       = $(DOC_DIR)/po
+MAN_TMP_DIR    = $(DOC_DIR)/manpages
+
+MANPAGES       = $(addprefix $(DOC_DIR)/,en/mksquashfs.1 fr/mksquashfs.fr.1 en/unsquashfs.1)
+XSLT_CMD       = xsltproc -''-nonet  -''-param man.charmap.use.subset "0"
+DB2MAN         = /usr/share/sgml/docbook/stylesheet/xsl/nwalsh/manpages/docbook.xsl
+
+# Initialize variable needed for lzma support for squashfs-tools, it
+# avoids modifying the lzma patch or added a patch  
+DEB_MAKE_ENVVARS += Sqlzma=/usr/include LzmaAlone=/usr/lib LzmaC=/usr/lib
+
+# Flags to GCC
+CFLAGS        += -I$(DEB_STOOLS) -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE -D_GNU_SOURCE
+
+# The build directory is squashfs-tools
+DEB_MAKE_INVOKE := cd $(DEB_STOOLS) && $(DEB_MAKE_INVOKE)
+
+DEB_MAKE_BUILD_TARGET := all
+DEB_MAKE_CHECK_TARGET :=
+DEB_MAKE_CLEAN_TARGET :=
+
+# Squashfs-tools manpages targets
+install/squashfs-tools:: po $(MANPAGES)
+
+po:
+	mkdir -p $(dir $(MANPAGES))
+	cd $(PO_DIR) && po4a -v po4a.cfg
+
+%.1: %.dbk
+	cd $(<D) && $(XSLT_CMD) $(DB2MAN) $(<F)
+	mv $(@D)/*.1 $(DOC_DIR)/$(@F)
+
+## Squashfs-modules packages
+STAMP_CONFIG = $(CURDIR)/debian/stamp-configure
+
+# Version of the Linux Kernel
+DIR_MOD  = linux-2.6
+SNAME    = squashfs
+PSOURCE  = $(SNAME)-source
+MNAME    = $(SNAME)-modules
+LZMA_H	 = $(DEB_STOOLS)/sqmagic.h
+
+pre-build::
+	# Create the 'linux-2.6' directory using last patch of squashfs, it is
+	# needed for out-of-tree compilation
+	if ! test -f $(STAMP_CONFIG); then \
+	  mkdir -p $(DIR_MOD); \
+	  patch -d $(DIR_MOD) -Np1 -f -i ../kernel-patches/linux-2.6.24/squashfs3.3-patch; \
+	  mv $(DIR_MOD)/fs/squashfs/* $(DIR_MOD); \
+	  mv $(DIR_MOD)/include/linux/* $(DIR_MOD); \
+	  rm -rf $(DIR_MOD)/fs $(DIR_MOD)/include; \
+	  touch $(STAMP_CONFIG); \
+	fi 
+
+# For creating correctly the 'squashfs-source' package which will be
+# used for building module package with custom kernel
+install/squashfs-source::
+	# Create the needed directories
+	mkdir -p debian/modules/$(SNAME)/debian \
+		 debian/$(PSOURCE)/usr/src
+
+	# Copy the source and header files
+	cp $(DIR_MOD)/*.h $(DIR_MOD)/*.c $(DIR_MOD)/Makefile $(LZMA_H) \
+		debian/modules/$(SNAME)
+
+	# Copy the debian specific files
+	cp debian/changelog debian/compat debian/copyright debian/*.modules.in \
+		debian/modules/$(SNAME)/debian
+
+	# This rules file is specific to m-a
+	install -m755 debian/rules.modules \
+		debian/modules/$(SNAME)/debian/rules
+
+	# Finally create the tarball which contains the modules directory
+	cd debian && tar jcf $(PSOURCE)/usr/src/$(SNAME).tar.bz2 modules
+
+# Common targets
+clean::
+	rm -rf $(DOC_DIR)/fr $(DOC_DIR)/*.8 $(DOC_DIR)/*.1 $(DOC_DIR)/en/*.8 $(DIR_MOD) debian/modules
+	rm -f $(DEB_STOOLS)/*.o $(DEB_STOOLS)/mksquashfs $(DEB_STOOLS)/unsquashfs $(STAMP_CONFIG)
--- squashfs-3.3.orig/debian/control
+++ squashfs-3.3/debian/control
@@ -0,0 +1,66 @@
+Source: squashfs
+Section: admin
+Priority: optional
+Maintainer: Ubuntu Core developers <ubuntu-devel-discuss@lists.ubuntu.com>
+XSBC-Original-Maintainer: Arnaud Fontaine <arnau@debian.org>
+Uploaders: Roland Stigge <stigge@antcom.de>, Otavio Salvador <otavio@debian.org>
+Build-Depends: cdbs (>= 0.4.23-1.1),
+               quilt,
+               patchutils (>= 0.2.25),
+               debhelper (>= 4.2.0),
+               zlib1g-dev,
+	       lzma-dev (>= 4.43-12),
+               po4a (>= 0.21),
+               xsltproc,
+               docbook-xsl,
+               bzip2,
+               binutils-hppa64 [hppa],
+               gcc-4.2-hppa64 [hppa],
+               docbook-xml,
+               zlib1g-dev	       
+Standards-Version: 3.7.3
+XS-VCS-Git: git://git.debian.org/git/collab-maint/squashfs.git
+XS-VCS-Browser: http://git.debian.org/?p=collab-maint/squashfs.git
+Homepage: http://squashfs.sourceforge.net/
+
+Package: squashfs-tools
+Architecture: any
+Depends: ${shlibs:Depends}, ${misc:Depends}
+Suggests: squashfs-source, lzma-source
+Description: Tool to create and append to squashfs filesystems
+ Squashfs is a highly compressed read-only filesystem for Linux. It uses zlib
+ compression to compress both files, inodes and directories. Inodes in the
+ system are very small and all blocks are packed to minimise data overhead.
+ Block sizes greater than 4K are supported up to a maximum of 64K.
+ .
+ Squashfs is intended for general read-only filesystem use, for archival
+ use (i.e. in cases where a .tar.gz file may be used), and in constrained
+ block device/memory systems (e.g. embedded systems) where low overhead is
+ needed.
+
+Package: squashfs-source
+Architecture: all
+Depends: module-assistant,
+	 debhelper (>> 4.0.0),
+	 make,
+	 bzip2,	
+	 zlib1g-dev,
+	 lzma-dev (>= 4.43-12)
+Recommends: squashfs-tools
+Conflicts: kernel-patch-squashfs
+Replaces: kernel-patch-squashfs
+Description: Source for the squash filesystem
+ Squashfs is a highly compressed read-only filesystem for Linux. It uses zlib
+ compression to compress both files, inodes and directories. Inodes in the
+ system are very small and all blocks are packed to minimise data overhead.
+ Block sizes greater than 4K are supported up to a maximum of 64K.
+ .
+ Squashfs is intended for general read-only filesystem use, for archival
+ use (i.e. in cases where a .tar.gz file may be used), and in constrained
+ block device/memory systems (e.g. embedded systems) where low overhead is
+ needed.
+ .
+ This package provides the source code for the squashfs kernel modules.
+ The squashfs-tools package is also required in order to make use of these
+ modules. Kernel source or headers are required to compile these modules.
+
--- squashfs-3.3.orig/debian/squashfs-tools.manpages
+++ squashfs-3.3/debian/squashfs-tools.manpages
@@ -0,0 +1,3 @@
+debian/doc/mksquashfs.1
+debian/doc/mksquashfs.fr.1
+debian/doc/unsquashfs.1
--- squashfs-3.3.orig/debian/control.modules.in
+++ squashfs-3.3/debian/control.modules.in
@@ -0,0 +1,26 @@
+Source: squashfs
+Section: misc
+Priority: optional
+Maintainer: Arnaud Fontaine <arnau@debian.org>
+Uploaders: Roland Stigge <stigge@antcom.de>, Otavio Salvador <otavio@debian.org>
+Build-Depends: debhelper (>> 4.0.0), linux-headers-_KVERS_, zlib1g-dev
+Standards-Version: 3.7.3
+XS-VCS-Git: git://git.debian.org/git/collab-maint/squashfs.git
+XS-VCS-Browser: http://git.debian.org/?p=collab-maint/squashfs.git
+Homepage: http://squashfs.sourceforge.net/
+
+Package: squashfs-modules-_KVERS_
+Architecture: any
+Provides: squashfs-modules
+Depends: linux-modules-_KVERS_ | linux-image-_KVERS_, lzma-modules-_KVERS_
+Description: Squash filesystem support for Debian Linux kernels
+ Squashfs is a highly compressed read-only filesystem for Linux. It uses zlib
+ compression to compress both files, inodes and directories. Inodes in the
+ system are very small and all blocks are packed to minimise data overhead.
+ Block sizes greater than 4K are supported up to a maximum of 64K.
+ .
+ Squashfs is intended for general read-only filesystem use, for archival use
+ (e.g. in cases where a .tar.gz file may be used), and in constrained block
+ device/memory systems (e.g. embedded systems) where low overhead is needed.
+ .
+ This package contains the compiled kernel module for _KVERS_