[Pkg-privacy-commits] [mat] 05/22: Merge branch 'master' 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 b3cf028210e26671547182ddd1810f0db5322d79
Merge: 427ec30 35b11fb
Author: intrigeri <intrigeri at boum.org>
Date:   Thu Aug 25 11:40:27 2011 +0200

    Merge branch 'master' into squeeze-backports
    
    Conflicts:
    	debian/changelog

 FORMATS                                            |   20 +-
 README                                             |    9 +-
 TODO                                               |   10 +-
 debian/changelog                                   |   36 +-
 debian/control                                     |    1 +
 ...less-and-repetitive-wording-in-the-manpag.patch |   22 -
 .../0001-Use-relative-path-in-setup.py.patch       |   22 +
 ...Don-t-use-hyphen-as-minus-sign-in-manpage.patch |   45 -
 debian/patches/0002-Fix-ugly-typo.patch            |   22 +
 .../patches/0003-Remove-embedded-pdfrw-copy.patch  | 1034 ++++++++++++++++++++
 .../0003-Update-program-name-in-manpage.patch      |   26 -
 ...-t-install-FORMATS-file-in-a-stupid-place.patch |   20 +
 ...e-deprecated-Encoding-key-in-desktop-file.patch |   34 -
 debian/patches/series                              |    8 +-
 locale/fr/LC_MESSAGES/gui.mo                       |  Bin 2647 -> 0 bytes
 locale/fr/LC_MESSAGES/gui.po                       |  156 +--
 mat-cli                                            |   28 +-
 mat-cli.1                                          |    6 +-
 mat-gui                                            |   61 +-
 mat.desktop                                        |    1 -
 mat/images.py                                      |   19 +-
 setup.py                                           |    3 +-
 22 files changed, 1323 insertions(+), 260 deletions(-)

diff --cc debian/changelog
index eb21190,4609a47..57564d2
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,8 -1,37 +1,38 @@@
- mat (0.1~2.git54f665-1~bpo60+1) squeeze-backports; urgency=low
+ mat (0.1~4.git2c9182-2) unstable; urgency=low
  
-   * Rebuild for squeeze-backports.
+   * Fix dependencies: depend on pdfrw instead of recommending it.
  
-  -- intrigeri <intrigeri+debian at boum.org>  Sun, 21 Aug 2011 16:45:46 +0200
+  -- intrigeri <intrigeri+debian at boum.org>  Thu, 25 Aug 2011 11:07:55 +0200
+ 
+ mat (0.1~4.git2c9182-1) unstable; urgency=low
+ 
+   * New upstream Git snapshot at commit 2c9182.
+   * New patches:
+     - 0001-Use-relative-path-in-setup.py.patch
+     - 0002-Fix-ugly-typo.patch
+     - 0003-Remove-embedded-pdfrw-copy.patch
+     - 0004-Don-t-install-FORMATS-file-in-a-stupid-place.patch
+   * Recommend pdfrw since it's not embedded anymore.
+ 
+  -- intrigeri <intrigeri+debian at boum.org>  Thu, 25 Aug 2011 00:41:27 +0200
+ 
+ mat (0.1~3.gitf96246-1) unstable; urgency=low
+ 
+   * New upstream Git snasphot at commit f96246:
+     - Cleanup useless and repetitive wording in the manpage.
+     - Don't use hyphen as minus sign in manpage.
+     - Update program name in manpage.
+     - Remove deprecated Encoding key in desktop file.
+     - Improve --help message.
+     - Make it clear JPEG is only partially supported:
+       Canon Raw tags are not dealt with.
+     - Support Torrent files.
+     - Improved images support.
+     - User interface improvements.
+   * Drop all patches (integrated upstream).
+ 
+  -- intrigeri <intrigeri+debian at boum.org>  Mon, 22 Aug 2011 18:30:49 +0200
++>>>>>>> master
  
  mat (0.1~2.git54f665-1) unstable; urgency=low
  

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