[Pkg-privacy-commits] [nautilus-wipe] 01/02: Merge commit 'debian/nautiluswipe_0.1.1-2' 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-2_bpo60+1
in repository nautilus-wipe.

commit f653b48c792e5acab7387df2b08dc1b372c8cb14
Merge: d0b55d6 e908c78
Author: intrigeri <intrigeri at boum.org>
Date:   Sun Dec 4 09:52:49 2011 +0100

    Merge commit 'debian/nautiluswipe_0.1.1-2' into squeeze-backports
    
    Conflicts:
    	debian/changelog

 debian/changelog | 10 ++++++----
 debian/control   |  5 +++--
 2 files changed, 9 insertions(+), 6 deletions(-)

diff --cc debian/control
index 2333d15,d19c0e5..ffc28e0
--- a/debian/control
+++ b/debian/control
@@@ -11,11 -11,12 +11,12 @@@ Build-Depends
   intltool,
   libgconf2-dev,
   libgsecuredelete-dev (>= 0.1-1~),
 - libgtk-3-dev,
 - libnautilus-extension-dev (>= 3.0.0),
 + libgtk2.0-dev,
 + libnautilus-extension-dev,
   rarian-compat
  Homepage: http://wipetools.tuxfamily.org/nautilus-wipe.html
- Vcs-Git: git://webmasters.boum.org/nautiluswipe
+ Vcs-Git: git://git.debian.org/collab-maint/nautilus-wipe.git
+ Vcs-Browser: http://anonscm.debian.org/gitweb/?p=collab-maint/nautilus-wipe.git
  
  Package: nautilus-wipe
  Architecture: any

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