[Pkg-privacy-commits] [parcimonie] 02/06: Merge branch 'debian' 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 b694fda1fae5ee17f73de9b24f3d1f13ce8ef18f
Merge: cd5429a 7821fcc
Author: intrigeri <intrigeri at boum.org>
Date:   Sat Aug 20 17:21:00 2011 +0200

    Merge branch 'debian' into squeeze-backports

 Build.PL                                           |  4 +--
 Changes                                            |  8 +++++
 META.json                                          |  6 ++--
 META.yml                                           |  6 ++--
 bin/parcimonie                                     | 30 +++++++++++------
 bin/parcimonie-applet                              |  2 +-
 debian/changelog                                   | 15 +++++++++
 debian/control                                     |  2 +-
 ...permissions-on-GnuPG-test-home-directorie.patch | 38 ----------------------
 debian/patches/series                              |  1 -
 dist.ini                                           |  2 +-
 inc/My/Builder.pm                                  | 19 +++++++++++
 lib/App/Parcimonie.pm                              |  2 +-
 lib/App/Parcimonie/Applet.pm                       |  2 +-
 lib/App/Parcimonie/DBus/Object.pm                  |  2 +-
 lib/App/Parcimonie/Daemon.pm                       |  2 +-
 lib/App/Parcimonie/GnuPG/Interface.pm              | 14 ++++++--
 .../Parcimonie/MooseX/Types/DurationInSeconds.pm   |  2 +-
 lib/App/Parcimonie/MooseX/Types/PortNumber.pm      |  2 +-
 lib/App/Parcimonie/Role/HasCodeset.pm              |  2 +-
 lib/App/Parcimonie/Role/HasEncoding.pm             |  2 +-
 lib/Tor/Control.pm                                 |  2 +-
 22 files changed, 93 insertions(+), 72 deletions(-)

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