[Pkg-privacy-commits] [mat] 03/22: Merge commit 'debian/mat_0.1_2.git54f665-1' 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 662c3a64c95ef537ac06dc3325de8ef4dd5199ce
Merge: 0aa908b 9f26693
Author: intrigeri <intrigeri at boum.org>
Date:   Sun Aug 21 16:45:37 2011 +0200

    Merge commit 'debian/mat_0.1_2.git54f665-1' into squeeze-backports
    
    Conflicts:
    	debian/changelog

 .gitignore                                         |   2 +
 README                                             |   4 +-
 debian/changelog                                   |  20 +++++-
 debian/control                                     |   6 +-
 debian/mat.manpages                                |   2 +
 ...less-and-repetitive-wording-in-the-manpag.patch |  22 ++++++
 debian/patches/0001-Install-.desktop-file.patch    |  23 ------
 ...Don-t-use-hyphen-as-minus-sign-in-manpage.patch |  45 ++++++++++++
 .../0003-Update-program-name-in-manpage.patch      |  26 +++++++
 ...e-deprecated-Encoding-key-in-desktop-file.patch |  34 +++++++++
 debian/patches/series                              |   5 +-
 manpage => mat-cli.1                               |   3 +-
 mat-gui                                            |  80 +++++++++++++++------
 mat-gui.1                                          |   1 +
 mat/bencode/bencode.py                             |   4 +-
 mat/parser.py                                      |   5 +-
 setup.py                                           |   5 +-
 test/clean.docx                                    | Bin 2619 -> 5842 bytes
 test/clean.odt                                     | Bin 32777 -> 33304 bytes
 test/clean.pdf                                     | Bin 11821 -> 11892 bytes
 test/clean.tar.gz                                  | Bin 5820 -> 5817 bytes
 test/clean.zip                                     | Bin 6041 -> 6041 bytes
 test/clitest.py                                    |  18 ++---
 23 files changed, 236 insertions(+), 69 deletions(-)

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