--- w3af-1.0-rc3svn3489.orig/debian/w3af_console.sh
+++ w3af-1.0-rc3svn3489/debian/w3af_console.sh
@@ -0,0 +1,4 @@
+#!/bin/sh
+if [ -r /usr/share/w3af/w3af_console ] ; then 
+   /usr/bin/python2.5 /usr/share/w3af/w3af_console $@
+fi
--- w3af-1.0-rc3svn3489.orig/debian/copyright
+++ w3af-1.0-rc3svn3489/debian/copyright
@@ -0,0 +1,132 @@
+This package was debianized by Luciano Bello <luciano@debian.org> on
+Fri, 09 May 2008 18:57:10 -0300.
+
+It was downloaded from http://w3af.sourceforge.net/
+
+Upstream Authors: 
+
+    Andres Riancho <andres.riancho@gmail.com>
+    and team <w3af-develop@lists.sourceforge.net>
+
+Copyright: 
+
+    Copyright © 2008 Andres Riancho
+
+License:
+
+    This package is free software; you can redistribute it and/or modify
+    it under the terms of the GNU General Public License as published by
+    the Free Software Foundation; either version 2 of the License.
+ 
+    This package is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU General Public License for more details.
+ 
+    You should have received a copy of the GNU General Public License
+    along with this package; if not, write to the Free Software
+    Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
+
+On Debian systems, the complete text of the GNU General
+Public License can be found in `/usr/share/common-licenses/GPL'.
+
+The Debian packaging is (C) 2008, Luciano Bello <luciano@debian.org> and
+is licensed under the GPL, see above.
+
+The following exceptions have a different copyright/license. They was 
+modificated by Andres Riancho under the tems of each license conditions:
+
+sqlmap
+------
+  Files: plugins/attack/db/*
+  Copyright: © 2008 Daniele Bellucci
+             © 2008 Bernardo Damele
+  HomePage: http://sqlmap.sourceforge.net/
+  License: GPL-2
+  On Debian systems, the complete text of the GNU General
+  Public License Version 2 can be found in `/usr/share/common-licenses/GPL-2'.
+
+halberd
+-------
+  Files: plugins/discovery/oHalberd/*
+  Copyright: © 2008 Juan M. Bello Rivas
+  HomePage: http://halberd.superadditive.com/
+  License: GPL-2
+  On Debian systems, the complete text of the GNU General
+  Public License Version 2 can be found in `/usr/share/common-licenses/GPL-2'.
+
+hmap
+----
+  Files: plugins/discovery/oHmap/*
+  Copyright: © 2003 Dustin Lee
+  HomePage: http://ujeni.murkyroc.com/hmap/
+  License: GPL-2
+  On Debian systems, the complete text of the GNU General
+  Public License Version 2 can be found in `/usr/share/common-licenses/GPL-2'.
+
+xdot.py
+-------
+  Files: extlib/xdot/xdot.py
+  Copyright: © 2008 Jose.R.Fonseca
+  HomePage: http://code.google.com/p/jrfonseca/wiki/XDot
+  License: GPL-3
+  On Debian systems, the complete text of the GNU General
+  Public License Version 3 can be found in `/usr/share/common-licenses/GPL-3'.
+    
+Natural Language Toolkit (nltk)
+-------------------------------
+  Files: extlib/nltk/*
+  Copyright: © 2001-2009 NLTK Project
+  HomePage: http://www.nltk.org 
+  License: GPL-2 or any later version
+  On Debian systems, the complete text of the GNU General
+  Public License can be found in `/usr/share/common-licenses/GPL'.
+
+GHDB
+----
+  Files: plugins/discovery/ghdb/GHDB.xml
+  Copyright: © 2006 Johnny Long
+  HomePage: http://johnny.ihackstuff.com/xml/schema.xml (it's not online anymore)
+  License: Public Domain 
+
+xml-data-file-of-online-valid-phishes-from-phishtank
+----------------------------------------------------
+  Files: plugins/discovery/phishtank/index.xml
+  Copyright: © 2006 OpenDNS, LLC
+  HomePage: http://www.phishtank.com/blog/2006/10/17/xml-data-file-of-online-valid-phishes-from-phishtank/
+  License: Creative Commons Attribution-ShareAlike 2.5 License
+
+DirBuster 
+---------
+  Files: plugins/discovery/dir_bruter/common_dirs_small.db
+  Copyright: © 2007 James Fisher
+  HomePage: http://www.owasp.org/index.php/Category:OWASP_DirBuster_Project
+  License: Creative Commons Attribution-ShareAlike 3.0 License
+
+ntlmaps 
+-------
+  Files: extlib/ntlm/*
+  Copyright: © 2001 Dmitry A. Rozmanov
+  HomePage: http://ntlmaps.sourceforge.net/
+  License: LGPL
+  On Debian systems, the complete text of the GNU Lesser General
+  Public License Version can be found in `/usr/share/common-licenses/LGPL'.
+
+gtkcodebuffer 
+-------------
+  Files: extlib/gtkcodebuffer/*
+  Copyright: © 2008 Hannes Matuschek
+  HomePage: http://code.google.com/p/pygtkcodebuffer/
+  License: LGPL
+  On Debian systems, the complete text of the GNU Lesser General
+  Public License Version can be found in `/usr/share/common-licenses/LGPL'.
+
+urlgrabber 
+----------
+  Files: core/data/url/handlers/keepalive.py
+  Copyright: © 2002-2006 Michael D. Stenner
+                         Ryan Tomayko
+  HomePage: http://code.google.com/p/pygtkcodebuffer/
+  License: LGPL-2.1
+  On Debian systems, the complete text of the GNU Lesser General
+  Public License Version can be found in `/usr/share/common-licenses/LGPL-2.1'.
--- w3af-1.0-rc3svn3489.orig/debian/w3af.sh
+++ w3af-1.0-rc3svn3489/debian/w3af.sh
@@ -0,0 +1,6 @@
+#!/bin/sh
+if [ ! -z "$DISPLAY" -a -r /usr/share/w3af/w3af_gui ] ; then 
+   /usr/bin/python /usr/share/w3af/w3af_gui $@
+else
+   /usr/bin/python /usr/share/w3af/w3af_console $@
+fi
--- w3af-1.0-rc3svn3489.orig/debian/desktop
+++ w3af-1.0-rc3svn3489/debian/desktop
@@ -0,0 +1,10 @@
+[Desktop Entry]
+Version=1.0-rc3svn3490
+Type=Application
+Exec=/usr/share/w3af/w3af_gui
+Icon=w3af
+Terminal=false
+Name=w3af
+Comment=Web Application Attack and Audit Framework
+Categories=Network;Security;
+StartupNotify=true
--- w3af-1.0-rc3svn3489.orig/debian/w3af.xpm
+++ w3af-1.0-rc3svn3489/debian/w3af.xpm
@@ -0,0 +1,37 @@
+/* XPM */
+static char * w3af_xpm[] = {
+"32 32 2 1",
+" 	c None",
+".	c #000000",
+"                                ",
+"            ........            ",
+"          ..       ...          ",
+"                      ..        ",
+" ..                     ..      ",
+" . .                      .     ",
+"  . .                      .    ",
+"  . ..                      .   ",
+"  .. ...                     .  ",
+"   .  ...                    .  ",
+"  .........                   . ",
+"  . ..........                . ",
+" . .................            ",
+"    ...  ........ .            .",
+"   ...    ........             .",
+"    ..    ........             .",
+".  ...   .  .....              .",
+".   ..       ....              .",
+"     ..  .   . ..              .",
+"     ...   .  ..               .",
+" .    ......   .              . ",
+" .     ....    ..             . ",
+"        ....   .              . ",
+"                             .  ",
+"   .                        ..  ",
+"   ..    ......             .   ",
+"    ..     ...            ..    ",
+"     ...    ..            .     ",
+"      ....  .           ..      ",
+"        ......        ..        ",
+"          ......  ....          ",
+"               ...              "};
--- w3af-1.0-rc3svn3489.orig/debian/control
+++ w3af-1.0-rc3svn3489/debian/control
@@ -0,0 +1,48 @@
+Source: w3af
+Section: net
+Priority: extra
+Maintainer: Luciano Bello <luciano@debian.org>
+Build-Depends: debhelper (>= 5), python-support, dpatch
+Standards-Version: 3.8.4
+Homepage: http://w3af.sourceforge.net/
+XS-Python-Version: all
+
+Package: w3af
+Architecture: all
+XB-Python-Version: ${python:Versions}
+Depends: ${python:Depends}, ${misc:Depends}, w3af-console (>= ${binary:Version}), python-gtk2 (>= 2.12), graphviz
+Description: framework to find and exploit web application vulnerabilities
+ w3af is a Web Application Attack and Audit Framework which aims
+ to identify and exploit all web application vulnerabilities. 
+ .
+ This package provides a graphical user interface (GUI) for the framework.  If 
+ you want a command-line application only, install w3af-console.
+ .
+ The framework has been called the "metasploit for the web", but it's actually
+ much more than that, because it also discovers the web application
+ vulnerabilities using black-box scanning techniques!
+ .
+ The w3af core and it's plugins are fully written in Python. The project has
+ more than 130 plugins, which identify and exploit SQL injection, cross site
+ scripting (XSS), remote file inclusion and more.
+
+Package: w3af-console
+Architecture: all
+XB-Python-Version: ${python:Versions}
+Depends: ${python:Depends}, ${misc:Depends}, python (>= 2.6) | python-simplejson, python-beautifulsoup, python-soappy, python-pypdf, python-openssl, python-pysqlite2
+Conflicts: python-json
+Description: framework to find and exploit web application vulnerabilities (CLI only)
+ w3af is a Web Application Attack and Audit Framework which aims
+ to identify and exploit all web application vulnerabilities.
+ .
+ This package provides a command line interface (CLI) only. The graphical user 
+ interface (GUI) is provided by the package w3af.
+ .
+ The framework has been called the "metasploit for the web", but it's actually
+ much more than that, because it also discovers the web application
+ vulnerabilities using black-box scanning techniques!
+ .
+ The w3af core and it's plugins are fully written in Python. The project has
+ more than 130 plugins, which identify and exploit SQL injection, cross site
+ scripting (XSS), remote file inclusion and more.
+ 
--- w3af-1.0-rc3svn3489.orig/debian/w3af-console.docs
+++ w3af-1.0-rc3svn3489/debian/w3af-console.docs
@@ -0,0 +1 @@
+readme
--- w3af-1.0-rc3svn3489.orig/debian/w3af.dirs
+++ w3af-1.0-rc3svn3489/debian/w3af.dirs
@@ -0,0 +1,5 @@
+usr/share/pixmaps/
+usr/share/applications/
+usr/share/w3af/core/ui/
+usr/share/w3af/extlib
+usr/bin/
--- w3af-1.0-rc3svn3489.orig/debian/w3af-console.dirs
+++ w3af-1.0-rc3svn3489/debian/w3af-console.dirs
@@ -0,0 +1,2 @@
+usr/share/w3af/
+usr/bin
--- w3af-1.0-rc3svn3489.orig/debian/changelog
+++ w3af-1.0-rc3svn3489/debian/changelog
@@ -0,0 +1,42 @@
+w3af (1.0-rc3svn3489-1) unstable; urgency=low
+
+  [ Luciano Bello ]
+  * New SVN export revision: 3489
+  * removed from the source
+    - nltk (closes: #571004, #555346)
+    - yalm
+  * Licenses added to the copyright file:
+    - dir_bruter/common_dirs_small.db: cc-by-sa 3.0
+    - extlib/ntlmaps: LGPL
+    - extlib/gtkcodebuffer: LGPL
+    - core/data/url/handlers/keepalive.py: LGPL-2.1
+
+  [ Bernd Zeimetz ]
+  * Replace python-json by python-simplejson. (Closes: #571110, #580645)
+  * Build for all Python versions and use the default Python version.
+
+
+ -- Luciano Bello <luciano@debian.org>  Wed, 12 May 2010 11:20:27 -0300
+
+w3af (1.0~rc2svn3429-1) unstable; urgency=low
+
+  * Now, only for python2.5.
+
+ -- Luciano Bello <luciano@debian.org>  Sat, 20 Mar 2010 13:54:58 -0300
+
+w3af (1.0~rc2svn3180-1) unstable; urgency=low
+
+  * No more dh_desktop.
+  * Added the recommended README file for packages which depend on dpatch.
+  * Ready for Python 2.6. (Closes: #534803)
+  * Removed the empty paragraph at the end of the package description, which
+    can be only spotted by Rhonda (Closes: #531026).
+
+ -- Luciano Bello <luciano@debian.org>  Sat, 14 Nov 2009 20:12:43 -0300
+
+w3af (1.0~rc2svn2845-1) unstable; urgency=low
+
+  * Initial release (Closes: #465120)
+
+ -- Luciano Bello <luciano@debian.org>  Tue, 28 Apr 2009 12:48:43 -0300
+
--- w3af-1.0-rc3svn3489.orig/debian/README.source
+++ w3af-1.0-rc3svn3489/debian/README.source
@@ -0,0 +1,4 @@
+This package manages a few patches using dpatch.
+
+Please check /usr/share/doc/dpatch/README.source.gz for further
+information on how this works.
--- w3af-1.0-rc3svn3489.orig/debian/rules
+++ w3af-1.0-rc3svn3489/debian/rules
@@ -0,0 +1,56 @@
+#!/usr/bin/make -f
+# Sample debian/rules that uses debhelper.
+# GNU copyright 1997 to 1999 by Joey Hess.
+
+# Uncomment this to turn on verbose mode.
+#export DH_VERBOSE=1
+
+include /usr/share/dpatch/dpatch.make
+
+clean: unpatch
+	dh_testdir
+	dh_testroot
+	rm -rf build-stamp configure-stamp
+
+	dh_clean
+
+install: build patch-stamp
+	dh_testdir
+	dh_testroot
+	dh_clean -k
+	dh_installdirs
+
+	cp debian/desktop debian/w3af/usr/share/applications/w3af.desktop
+	cp debian/w3af.xpm debian/w3af/usr/share/pixmaps/
+	cp -r core locales plugins profiles extlib debian/w3af-console/usr/share/w3af/
+	cp w3af_console debian/w3af-console/usr/share/w3af/
+	cp w3af_gui debian/w3af/usr/share/w3af/
+	chmod +x debian/w3af-console/usr/share/w3af/w3af_console debian/w3af/usr/share/w3af/w3af_gui
+	cp debian/w3af.sh debian/w3af-console/usr/bin/w3af
+	cp debian/w3af_console.sh debian/w3af-console/usr/bin/w3af_console
+	cp debian/w3af_gui.sh debian/w3af/usr/bin/w3af_gui
+	mv debian/w3af-console/usr/share/w3af/core/ui/gtkUi debian/w3af/usr/share/w3af/core/ui/gtkUi
+	mv debian/w3af-console/usr/share/w3af/extlib/xdot debian/w3af/usr/share/w3af/extlib/
+
+# Build architecture-independent files here.
+binary-indep: install
+	dh_testdir
+	dh_testroot
+	dh_pysupport
+	dh_installman
+	dh_installmenu
+	dh_installdocs
+	dh_installexamples
+	dh_installchangelogs
+	dh_compress
+	dh_fixperms
+	dh_installdeb
+	dh_gencontrol
+	dh_md5sums
+	dh_builddeb
+
+# Build architecture-dependent files here.
+binary-arch: install
+
+binary: binary-indep binary-arch
+.PHONY: clean build binary-indep binary-arch install
--- w3af-1.0-rc3svn3489.orig/debian/w3af_gui.sh
+++ w3af-1.0-rc3svn3489/debian/w3af_gui.sh
@@ -0,0 +1,4 @@
+#!/bin/sh
+if [ -r /usr/share/w3af/w3af_gui ] ; then 
+   /usr/bin/python /usr/share/w3af/w3af_gui $@
+fi
--- w3af-1.0-rc3svn3489.orig/debian/w3af-console.manpages
+++ w3af-1.0-rc3svn3489/debian/w3af-console.manpages
@@ -0,0 +1,2 @@
+manpage/w3af.1
+manpage/w3af_console.1
--- w3af-1.0-rc3svn3489.orig/debian/compat
+++ w3af-1.0-rc3svn3489/debian/compat
@@ -0,0 +1 @@
+5
--- w3af-1.0-rc3svn3489.orig/debian/w3af-console.examples
+++ w3af-1.0-rc3svn3489/debian/w3af-console.examples
@@ -0,0 +1 @@
+scripts/*
--- w3af-1.0-rc3svn3489.orig/debian/w3af.manpages
+++ w3af-1.0-rc3svn3489/debian/w3af.manpages
@@ -0,0 +1 @@
+manpage/w3af_gui.1
--- w3af-1.0-rc3svn3489.orig/debian/menu
+++ w3af-1.0-rc3svn3489/debian/menu
@@ -0,0 +1,6 @@
+?package(w3af):\
+        needs="X11" \
+	section="Applications/Network/Web Browsing" \
+	title="w3af" \
+	command="/usr/share/w3af/w3af_gui" \
+	icon="w3af.xpm"
--- w3af-1.0-rc3svn3489.orig/debian/patches/10_json-fix.dpatch
+++ w3af-1.0-rc3svn3489/debian/patches/10_json-fix.dpatch
@@ -0,0 +1,113 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## json-fix.dpatch by Bernd Zeimetz <bzed@debian.org>
+##
+## DP: python-json is not available in Python2.6
+
+@DPATCH@
+diff -urNad '--exclude=CVS' '--exclude=.svn' '--exclude=.git' '--exclude=.arch' '--exclude=.hg' '--exclude=_darcs' '--exclude=.bzr' w3af-1.0~rc2svn3429~/core/controllers/misc/dependencyCheck.py w3af-1.0~rc2svn3429/core/controllers/misc/dependencyCheck.py
+--- w3af-1.0~rc2svn3429~/core/controllers/misc/dependencyCheck.py      2010-03-06 16:14:46.000000000 +0100
++++ w3af-1.0~rc2svn3429/core/controllers/misc/dependencyCheck.py       2010-05-10 22:48:57.191003428 +0200
+@@ -97,10 +97,10 @@
+             sys.exit( 1 )
+     
+     try:
+-        from extlib.jsonpy import json as json
+-    except:
++        import json
++    except ImportError:
+         try:
+-            import json
++            import simplejson as json
+         except:
+             print 'You have to install python-json lib. Debian based distributions: apt-get install python-json'
+             sys.exit( 1 )
+diff -urNad '--exclude=CVS' '--exclude=.svn' '--exclude=.git' '--exclude=.arch' '--exclude=.hg' '--exclude=_darcs' '--exclude=.bzr' w3af-1.0~rc2svn3429~/core/data/fuzzer/fuzzer.py w3af-1.0~rc2svn3429/core/data/fuzzer/fuzzer.py
+--- w3af-1.0~rc2svn3429~/core/data/fuzzer/fuzzer.py    2010-03-06 16:14:48.000000000 +0100
++++ w3af-1.0~rc2svn3429/core/data/fuzzer/fuzzer.py     2010-05-10 22:48:57.192000714 +0200
+@@ -38,9 +38,9 @@
+ from core.data.dc.cookie import cookie as cookie
+ from core.data.dc.dataContainer import dataContainer as dc
+ try:
+-    from extlib.jsonpy import json as json
+-except:
+     import json
++except ImportError:
++    import simplejson as json
+ from core.data.request.httpPostDataRequest import httpPostDataRequest
+ from core.data.request.httpQsRequest import httpQsRequest
+ 
+@@ -210,7 +210,7 @@
+     
+     # Now, fuzz the parsed JSON data...
+     postdata = freq.getData()
+-    jsonPostData = json.read( postdata )
++    jsonPostData = json.loads( postdata )
+     return _makeMutants( freq, mutantClass, mutant_str_list, fuzzableParamList , append, jsonPostData )
+ 
+ def isJSON( freq ):
+@@ -222,7 +222,7 @@
+         # We have something that's not URL encoded in the postdata, it could be something
+         # like JSON, XML, or multipart encoding. Let's try with JSON
+         try:
+-            jsonPostData = json.read( postdata )
++            jsonPostData = json.loads( postdata )
+         except:
+             # It's not json, maybe XML or multipart, I don't really care ( at least not in this section of the code )
+             return False
+diff -urNad '--exclude=CVS' '--exclude=.svn' '--exclude=.git' '--exclude=.arch' '--exclude=.hg' '--exclude=_darcs' '--exclude=.bzr' w3af-1.0~rc2svn3429~/core/data/request/frFactory.py w3af-1.0~rc2svn3429/core/data/request/frFactory.py
+--- w3af-1.0~rc2svn3429~/core/data/request/frFactory.py        2010-03-06 16:14:48.000000000 +0100
++++ w3af-1.0~rc2svn3429/core/data/request/frFactory.py 2010-05-10 22:48:57.192000714 +0200
+@@ -37,9 +37,9 @@
+ 
+ # for json
+ try:
+-    from extlib.jsonpy import json as json
+-except:
+     import json
++except ImportError:
++    import simplejson as json
+ 
+ from core.controllers.w3afException import w3afException
+ import core.controllers.outputManager as om
+@@ -200,7 +200,7 @@
+         #   Case #2, JSON request
+         #
+         try:
+-            dc = json.read( postData )
++            dc = json.loads( postData )
+         except:
+             pass
+         else:
+diff -urNad '--exclude=CVS' '--exclude=.svn' '--exclude=.git' '--exclude=.arch' '--exclude=.hg' '--exclude=_darcs' '--exclude=.bzr' w3af-1.0~rc2svn3429~/core/data/request/jsonPostDataRequest.py w3af-1.0~rc2svn3429/core/data/request/jsonPostDataRequest.py
+--- w3af-1.0~rc2svn3429~/core/data/request/jsonPostDataRequest.py      2009-11-26 00:09:09.000000000 +0100
++++ w3af-1.0~rc2svn3429/core/data/request/jsonPostDataRequest.py       2010-05-10 22:48:57.193000724 +0200
+@@ -25,9 +25,9 @@
+ from core.data.request.httpPostDataRequest import httpPostDataRequest
+ import core.data.dc.dataContainer as dc
+ try:
+-    from extlib.jsonpy import json as json
+-except:
+     import json
++except ImportError:
++    import simplejson as json
+ 
+ class jsonPostDataRequest(httpPostDataRequest):
+     '''
+@@ -43,7 +43,7 @@
+         '''
+         @return: A string that represents the JSON data saved in the dc.
+         '''
+-        res = json.write(self._dc)
++        res = json.dumps(self._dc)
+         return res
+         
+     def __str__( self ):
+@@ -54,7 +54,7 @@
+         strRes += self._url
+         strRes += ' | Method: ' + self._method
+         strRes += ' | JSON: ('
+-        strRes += json.write(self._dc)
++        strRes += json.dumps(self._dc)
+         strRes += ')'
+         return strRes
+     
--- w3af-1.0-rc3svn3489.orig/debian/patches/02_disable_dependecies.dpatch
+++ w3af-1.0-rc3svn3489/debian/patches/02_disable_dependecies.dpatch
@@ -0,0 +1,35 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 02_disable_dependecies.dpatch by Luciano Bello <luciano@debian.org>
+##
+## DP: The pygoogle support is disable. There is some legal issues with it
+## DP: (see http://bugs.debian.org/282313) and w3af works anyway without it.
+
+@DPATCH@
+diff -urNad trunk~/core/controllers/misc/dependencyCheck.py trunk/core/controllers/misc/dependencyCheck.py
+--- trunk~/core/controllers/misc/dependencyCheck.py	2010-05-10 20:39:58.000000000 -0300
++++ trunk/core/controllers/misc/dependencyCheck.py	2010-05-12 19:37:15.000000000 -0300
+@@ -64,9 +64,7 @@
+         try:
+             import google as pygoogle
+         except Exception, e:
+-            print 'You have to install pygoogle and fpconst libs. Please read the users guide.'
+-            print 'Error: ' + str(e)
+-            sys.exit( 1 )
++	    pass
+ 
+     try:
+         import extlib.BeautifulSoup as BeautifulSoup
+diff -urNad trunk~/core/ui/consoleUi/help.py trunk/core/ui/consoleUi/help.py
+--- trunk~/core/ui/consoleUi/help.py	2010-05-10 20:39:59.000000000 -0300
++++ trunk/core/ui/consoleUi/help.py	2010-05-12 19:38:12.000000000 -0300
+@@ -27,10 +27,6 @@
+ try:
+     import xml.etree.ElementTree as ET
+ except ImportError:
+-    try:
+-        # we're using Python 2.4
+-        import elementtree.ElementTree as ET
+-    except ImportError:
+         import sys
+         print 'It seems that your python installation doesn\'t have element tree installed. Please install it and run w3af again.'
+         sys.exit(-9)
--- w3af-1.0-rc3svn3489.orig/debian/patches/01_report_bugs_as_debian.dpatch
+++ w3af-1.0-rc3svn3489/debian/patches/01_report_bugs_as_debian.dpatch
@@ -0,0 +1,21 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 01_report_bugs_as_debian.dpatch by Luciano Bello <luciano@debian.org>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: Indicates that the version cames from a Debian Package 
+## DP: TODO: include the Debian Package Version
+
+@DPATCH@
+diff -urNad w3af-0.0.0svn2722~/core/controllers/misc/get_w3af_version.py w3af-0.0.0svn2722/core/controllers/misc/get_w3af_version.py
+--- w3af-0.0.0svn2722~/core/controllers/misc/get_w3af_version.py	2009-03-02 15:37:47.000000000 -0200
++++ w3af-0.0.0svn2722/core/controllers/misc/get_w3af_version.py	2009-03-02 16:02:16.000000000 -0200
+@@ -47,6 +47,8 @@
+         res += ' (from SVN server)'
+         res += '\nRevision: ' + str(revision)
+     else:
+-        res += ' (from tgz)'
++        res += ' (from Debian Package '
++        import commands
++        res += commands.getstatusoutput('dpkg -p w3af-console | grep "Version:"')[1][9:] + ')'
+     res += '\nAuthor: Andres Riancho and the w3af team.'
+     return res
--- w3af-1.0-rc3svn3489.orig/debian/patches/00list
+++ w3af-1.0-rc3svn3489/debian/patches/00list
@@ -0,0 +1,4 @@
+01_report_bugs_as_debian.dpatch
+02_disable_dependecies.dpatch
+03_webshell.pl_is_not_script.dpatch
+10_json-fix.dpatch
--- w3af-1.0-rc3svn3489.orig/debian/patches/03_webshell.pl_is_not_script.dpatch
+++ w3af-1.0-rc3svn3489/debian/patches/03_webshell.pl_is_not_script.dpatch
@@ -0,0 +1,14 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 03_webshell.pl_is_not_script.dpatch by Luciano Bello <luciano@debian.org>
+##
+## DP: this script won't ever be running by hand.
+
+@DPATCH@
+diff -urNad w3af-1.0~rc2svn3180~/plugins/attack/payloads/webshell/webshell.pl w3af-1.0~rc2svn3180/plugins/attack/payloads/webshell/webshell.pl
+--- w3af-1.0~rc2svn3180~/plugins/attack/payloads/webshell/webshell.pl	2009-11-10 09:29:31.000000000 -0300
++++ w3af-1.0~rc2svn3180/plugins/attack/payloads/webshell/webshell.pl	2009-11-14 20:00:30.000000000 -0300
+@@ -1,4 +1,3 @@
+-#!/usr/bin/perl
+ 
+ if (length ($ENV{'QUERY_STRING'}) > 0){
+     $buffer = $ENV{'QUERY_STRING'};
