[Pkg-privacy-commits] [nautilus-wipe] 01/05: Merge branch 'master' into squeeze-backports

[Ulrike Uhlig]

This is an automated email from the git hooks/post-receive script.

u-guest pushed a commit to annotated tag debian/nautiluswipe_0.1.1-1_bpo60+1
in repository nautilus-wipe.

commit f98a24be05aaa16f41a670e6bffd31fbb234dc30
Merge: b79983c 6550cf6
Author: intrigeri <intrigeri at boum.org>
Date:   Fri Aug 19 15:34:26 2011 +0200

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

 NEWS                              |   8 ++
 aclocal.m4                        |  10 +-
 build/aux/config.guess            | 219 ++++++++++++++++++++------------------
 build/aux/config.sub              | 156 +++++++++++++++++----------
 build/aux/gnome-doc-utils.make    |   2 +-
 build/aux/ltmain.sh               |   4 +-
 configure                         | 105 ++++++++++++------
 configure.ac                      |  22 +++-
 debian/changelog                  |  10 +-
 debian/control                    |   9 +-
 debian/rules                      |   8 +-
 help/C/nautilus-wipe.xml          |  32 +++---
 help/Makefile.in                  |   2 +-
 nautilus-wipe/fill-operation.c    |   8 +-
 nautilus-wipe/nautilus-wipe.c     |   7 +-
 nautilus-wipe/operation-manager.c |   2 +-
 nautilus-wipe/progress-dialog.c   |  19 ++--
 17 files changed, 388 insertions(+), 235 deletions(-)

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