[Pkg-privacy-commits] [mat] 21/22: Merge tag 'debian/mat_0.3.2-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 e8aa571b6a5b4e38fce739ad0e908d66c5a3c078
Merge: 8feae5f b7c99f5
Author: intrigeri <intrigeri at boum.org>
Date:   Wed May 30 19:53:57 2012 +0200

    Merge tag 'debian/mat_0.3.2-1' into squeeze-backports
    
    Releasing mat (0.3.2-1) to Debian unstable.
    
    Conflicts:
    	debian/README.Debian
    	debian/changelog
    	debian/gbp.conf

 CHANGELOG                                          |  24 ++
 FORMATS                                            |  11 +
 MANIFEST.in                                        |   2 +-
 README                                             |   5 +-
 RELEASE                                            |  14 +-
 TODO                                               |  26 +-
 debian/README.Debian                               |   4 +-
 debian/changelog                                   |  49 ++-
 debian/control                                     |   6 +-
 debian/copyright                                   |  25 +-
 debian/gbp.conf                                    |   3 +-
 debian/mat.manpages                                |   2 +-
 ...01-Fix-a-critical-bug-thanks-to-omaylorga.patch |  22 --
 debian/patches/series                              |   1 -
 debian/source/lintian-overrides                    |   2 -
 FORMATS => lib/FORMATS                             |  32 +-
 {mat => lib}/__init__.py                           |   0
 {mat => lib}/archive.py                            |  31 +-
 {mat => lib}/audio.py                              |   0
 {mat => lib}/bencode/__init__.py                   |   0
 {mat => lib}/bencode/bencode.py                    |   0
 {mat => lib}/exiftool.py                           |   0
 {mat => lib}/hachoir_editor/__init__.py            |   0
 {mat => lib}/hachoir_editor/field.py               |   0
 {mat => lib}/hachoir_editor/fieldset.py            |   0
 {mat => lib}/hachoir_editor/typed_field.py         |   0
 lib/images.py                                      |  41 +++
 {mat => lib}/mat.py                                |  20 +-
 {mat => lib}/misc.py                               |   0
 {mat => lib}/office.py                             |  88 ++---
 {mat => lib}/parser.py                             |  10 -
 {mat => lib}/strippers.py                          |  31 +-
 {mat => lib}/tarfile/__init__.py                   |   0
 {mat => lib}/tarfile/tarfile.py                    |   0
 locale/fr/LC_MESSAGES/gui.po                       | 180 ----------
 logo.png                                           | Bin 0 -> 31340 bytes
 mat-cli => mat                                     |  36 +-
 mat-gui                                            | 368 +++++++--------------
 mat-gui.1                                          |   2 +-
 mat-cli.1 => mat.1                                 |   9 +-
 mat.desktop                                        |   1 +
 mat/images.py                                      |  48 ---
 po/POTFILES.in                                     |   1 +
 po/fr.po                                           | 186 +++++++++++
 po/mat-gui.pot                                     | 169 ++++++++++
 setup.py                                           |  52 ++-
 test/clitest.py                                    |  28 +-
 test/libtest.py                                    |   8 +-
 test/test.py                                       |  11 +-
 49 files changed, 805 insertions(+), 743 deletions(-)

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

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