[Pkg-privacy-commits] [parcimonie] 05/06: Merge commit 'debian/parcimonie_0.6-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 parcimonie.

commit 7f25ab6b4a3cb8070eff1ad804a619f423f28503
Merge: f500382 e4665f7
Author: intrigeri <intrigeri at boum.org>
Date:   Sun Oct 23 16:05:59 2011 +0200

    Merge commit 'debian/parcimonie_0.6-1' into squeeze-backports
    
    Conflicts:
    	debian/changelog

 Build.PL                                           | 123 +++----
 Changes                                            |   9 +
 MANIFEST                                           |   6 -
 META.json                                          |  23 +-
 META.yml                                           |  21 +-
 TODO                                               |  33 +-
 bin/parcimonie                                     | 103 ++----
 bin/parcimonie-applet                              |   2 +-
 debian/changelog                                   |  19 +-
 debian/control                                     |  36 +-
 design.mdwn                                        |  18 +-
 dist.ini                                           |  17 +-
 lib/App/Parcimonie.pm                              |   4 +-
 lib/App/Parcimonie/Applet.pm                       |  88 +++--
 lib/App/Parcimonie/DBus/Object.pm                  |   2 +-
 lib/App/Parcimonie/Daemon.pm                       | 368 +++++++++----------
 lib/App/Parcimonie/GnuPG/Interface.pm              |  25 +-
 .../Parcimonie/MooseX/Types/DurationInSeconds.pm   |  31 --
 lib/App/Parcimonie/MooseX/Types/PortNumber.pm      |  37 --
 lib/App/Parcimonie/Role/HasCodeset.pm              |  61 ++--
 lib/App/Parcimonie/Role/HasEncoding.pm             |  25 +-
 lib/Tor/Control.pm                                 | 406 ---------------------
 perlcritic.rc                                      |   2 +-
 po/de.mo                                           | Bin 396 -> 396 bytes
 po/de.po                                           |  18 +-
 po/fr.mo                                           | Bin 823 -> 855 bytes
 po/fr.po                                           |  20 +-
 po/parcimonie-applet.pot                           |  18 +-
 share/applications/parcimonie.desktop              |   2 +-
 t/20-tor_ctl_host.t                                |  11 -
 t/21-tor_ctl_port.t                                |  10 -
 t/32-keyserver_defined_on_command_line.t           |   6 +-
 t/lib/WithTorControl.pm                            |  10 -
 33 files changed, 496 insertions(+), 1058 deletions(-)

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