[Pkg-privacy-commits] [mat] 07/22: Merge commit 'debian/mat_0.1-1_3.gbpf80227' into squeeze-backports

[Ximin Luo]

This is an automated email from the git hooks/post-receive script.

infinity0 pushed a commit to branch squeeze-backports
in repository mat.

commit 2060223dd1046d1da77aaab9f5fb3be8b726fc3c
Merge: bdf07bb 77cf145
Author: intrigeri <intrigeri at boum.org>
Date:   Sun Oct 30 18:04:27 2011 +0100

    Merge commit 'debian/mat_0.1-1_3.gbpf80227' into squeeze-backports
    
    Conflicts:
    	debian/changelog

 .gitignore                                         |    1 +
 FORMATS                                            |    5 +-
 MANIFEST.in                                        |    1 +
 README                                             |   12 +
 TODO                                               |   12 +-
 debian/changelog                                   |   28 +-
 debian/control                                     |   28 +-
 debian/copyright                                   |    7 +-
 debian/gbp.conf                                    |    1 +
 .../0001-Use-relative-path-in-setup.py.patch       |   22 -
 debian/patches/0002-Fix-ugly-typo.patch            |   22 -
 .../patches/0003-Remove-embedded-pdfrw-copy.patch  | 1034 --------------------
 ...-t-install-FORMATS-file-in-a-stupid-place.patch |   20 -
 debian/patches/series                              |    4 -
 debian/source/lintian-overrides                    |    2 +
 debian/watch                                       |    2 +
 mat-cli                                            |   11 +-
 mat-gui                                            |   61 +-
 mat/archive.py                                     |    6 +-
 mat/audio.py                                       |    2 +
 mat/bencode/bencode.py                             |   32 +-
 mat/exiftool.py                                    |   95 ++
 mat/hachoir_editor/fieldset.py                     |    5 +
 mat/mat.py                                         |   44 +-
 mat/misc.py                                        |    1 +
 mat/office.py                                      |   98 +-
 mat/parser.py                                      |   44 +-
 mat/pdfrw/__init__.py                              |   14 -
 mat/pdfrw/pdfcompress.py                           |   57 --
 mat/pdfrw/pdfobjects.py                            |  183 ----
 mat/pdfrw/pdfreader.py                             |  213 ----
 mat/pdfrw/pdftokens.py                             |  249 -----
 mat/pdfrw/pdfwriter.py                             |  234 -----
 mat/tarfile/tarfile.py                             |    1 -
 setup.py                                           |    8 +-
 test/{ => TODO}/clean.zip                          |  Bin 6041 -> 5885 bytes
 test/{ => TODO}/dirty.zip                          |  Bin
 test/clean.docx => "test/clean \303\251.docx"      |  Bin
 test/clean.jpg => "test/clean \303\251.jpg"        |  Bin
 test/clean.odt => "test/clean \303\251.odt"        |  Bin 33304 -> 33130 bytes
 test/clean.pdf => "test/clean \303\251.pdf"        |  Bin
 test/clean.png => "test/clean \303\251.png"        |  Bin 4469 -> 4331 bytes
 test/clean.tar => "test/clean \303\251.tar"        |  Bin 10240 -> 10240 bytes
 "test/clean \303\251.tar.bz2"                      |  Bin 0 -> 5976 bytes
 "test/clean \303\251.tar.gz"                       |  Bin 0 -> 5664 bytes
 .../clean.torrent => "test/clean \303\251.torrent" |  Bin
 test/clean.tar.bz2                                 |  Bin 6102 -> 0 bytes
 test/clean.tar.gz                                  |  Bin 5817 -> 0 bytes
 test/dirty.docx => "test/dirty \303\251.docx"      |  Bin
 test/dirty.jpg => "test/dirty \303\251.jpg"        |  Bin
 test/dirty.odt => "test/dirty \303\251.odt"        |  Bin
 test/dirty.pdf => "test/dirty \303\251.pdf"        |  Bin
 test/dirty.png => "test/dirty \303\251.png"        |  Bin
 test/dirty.tar => "test/dirty \303\251.tar"        |  Bin
 .../dirty.tar.bz2 => "test/dirty \303\251.tar.bz2" |  Bin
 test/dirty.tar.gz => "test/dirty \303\251.tar.gz"  |  Bin
 .../dirty.torrent => "test/dirty \303\251.torrent" |  Bin
 test/libtest.py                                    |    3 +-
 test/test.py                                       |    1 +
 59 files changed, 381 insertions(+), 2182 deletions(-)

diff --cc debian/gbp.conf
index f058299,6578ded..d637d88
--- a/debian/gbp.conf
+++ b/debian/gbp.conf
@@@ -1,4 -1,5 +1,5 @@@
  [DEFAULT]
 -debian-branch = master
 +debian-branch = squeeze-backports
  upstream-branch = upstream_master
  pristine-tar = False
+ upstream-tag = %(version)s

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-privacy/packages/mat.git