[Python-apps-commits] r8428 - in packages/wapiti/trunk/debian (15 files)
adejong at users.alioth.debian.org
adejong at users.alioth.debian.org
Fri Apr 6 11:23:08 UTC 2012
Date: Friday, April 6, 2012 @ 11:23:01
Author: adejong
Revision: 8428
[ Jari Aalto ]
* Remove deprecated dpatch and upgrade to packaging format "3.0 quilt"
(Closes: #664377).
* Update to Standards-Version to 3.9.3 and debhelper to 9.
Added:
packages/wapiti/trunk/debian/patches/lswww.py.patch
(from rev 8427, packages/wapiti/trunk/debian/patches/lswww.py.dpatch)
packages/wapiti/trunk/debian/patches/remove_hashbangs.patch
(from rev 8427, packages/wapiti/trunk/debian/patches/remove_hashbangs.dpatch)
packages/wapiti/trunk/debian/patches/series
(from rev 8427, packages/wapiti/trunk/debian/patches/00list)
packages/wapiti/trunk/debian/patches/setup.py.patch
(from rev 8427, packages/wapiti/trunk/debian/patches/setup.py.dpatch)
packages/wapiti/trunk/debian/patches/wapiti.py.patch
(from rev 8427, packages/wapiti/trunk/debian/patches/wapiti.py.dpatch)
Modified:
packages/wapiti/trunk/debian/changelog
packages/wapiti/trunk/debian/compat
packages/wapiti/trunk/debian/control
packages/wapiti/trunk/debian/rules
packages/wapiti/trunk/debian/source/format
Deleted:
packages/wapiti/trunk/debian/patches/00list
packages/wapiti/trunk/debian/patches/lswww.py.dpatch
packages/wapiti/trunk/debian/patches/remove_hashbangs.dpatch
packages/wapiti/trunk/debian/patches/setup.py.dpatch
packages/wapiti/trunk/debian/patches/wapiti.py.dpatch
Modified: packages/wapiti/trunk/debian/changelog
===================================================================
--- packages/wapiti/trunk/debian/changelog 2012-04-05 15:25:30 UTC (rev 8427)
+++ packages/wapiti/trunk/debian/changelog 2012-04-06 11:23:01 UTC (rev 8428)
@@ -7,10 +7,15 @@
[ Jakub Wilk ]
* Remove unused Provides field from debian/control.
- -- Jakub Wilk <jwilk at debian.org> Thu, 12 Jan 2012 18:56:35 +0100
+ [ Jari Aalto ]
+ * Remove deprecated dpatch and upgrade to packaging format "3.0 quilt"
+ (Closes: #664377).
+ * Update to Standards-Version to 3.9.3 and debhelper to 9.
+ -- Arthur de Jong <adejong at debian.org> Fri, 06 Apr 2012 13:20:58 +0200
+
wapiti (1.1.6-3) unstable; urgency=low
-
+
* Closes: #477034
-> restructured debian/rules
* changing some rules in debian/rules
@@ -33,4 +38,3 @@
* Initial release (Closes: #381418)
-- Thomas Bläsing <thomasbl at pool.math.tu-berlin.de> Thu, 28 Jun 2007 14:08:17 +0200
-
Modified: packages/wapiti/trunk/debian/compat
===================================================================
--- packages/wapiti/trunk/debian/compat 2012-04-05 15:25:30 UTC (rev 8427)
+++ packages/wapiti/trunk/debian/compat 2012-04-06 11:23:01 UTC (rev 8428)
@@ -1 +1 @@
-5
+9
Modified: packages/wapiti/trunk/debian/control
===================================================================
--- packages/wapiti/trunk/debian/control 2012-04-05 15:25:30 UTC (rev 8427)
+++ packages/wapiti/trunk/debian/control 2012-04-06 11:23:01 UTC (rev 8428)
@@ -4,8 +4,8 @@
Priority: optional
Maintainer: Thomas Bläsing <thomasbl at pool.math.tu-berlin.de>
Uploaders: Python Applications Packaging Team <python-apps-team at lists.alioth.debian.org>
-Build-Depends: python, python-central (>= 0.5), debhelper (>= 5.0.37.1), dpatch (>= 2.0.29)
-Standards-Version: 3.7.3
+Build-Depends: python, python-central (>= 0.5), debhelper (>= 9)
+Standards-Version: 3.9.3
Vcs-Svn: svn://svn.debian.org/python-apps/packages/wapiti
Vcs-Browser: http://svn.debian.org/viewsvn/python-apps/packages/wapiti/trunk/
Deleted: packages/wapiti/trunk/debian/patches/00list
===================================================================
--- packages/wapiti/trunk/debian/patches/00list 2012-04-05 15:25:30 UTC (rev 8427)
+++ packages/wapiti/trunk/debian/patches/00list 2012-04-06 11:23:01 UTC (rev 8428)
@@ -1,4 +0,0 @@
-lswww.py
-setup.py
-wapiti.py
-remove_hashbangs
Deleted: packages/wapiti/trunk/debian/patches/lswww.py.dpatch
===================================================================
--- packages/wapiti/trunk/debian/patches/lswww.py.dpatch 2012-04-05 15:25:30 UTC (rev 8427)
+++ packages/wapiti/trunk/debian/patches/lswww.py.dpatch 2012-04-06 11:23:01 UTC (rev 8428)
@@ -1,22 +0,0 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## lswww.py.dpatch by <thomasbl at frosty.local>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: fancy output for installing the recommend packages
-
- at DPATCH@
-diff -urNad wapiti-1.1.6~/lswww.py wapiti-1.1.6/lswww.py
---- wapiti-1.1.6~/lswww.py 2007-01-28 17:48:59.000000000 +0000
-+++ wapiti-1.1.6/lswww.py 2008-04-28 20:19:09.000000000 +0000
-@@ -31,9 +31,8 @@
- import tidy
- except ImportError:
- print "lswww will be far less effective without tidy"
-- print "please install libtidy ( http://tidy.sourceforge.net/ ),"
-- print "ctypes ( http://starship.python.net/crew/theller/ctypes/ )"
-- print "and uTidylib ( http://utidylib.berlios.de/ )"
-+ print "please install libtidy and ctypes:"
-+ print "\tapt-get install python-utidylib python-ctypes"
- tidyhere=0
- else:
- tidyhere=1
Copied: packages/wapiti/trunk/debian/patches/lswww.py.patch (from rev 8427, packages/wapiti/trunk/debian/patches/lswww.py.dpatch)
===================================================================
--- packages/wapiti/trunk/debian/patches/lswww.py.patch (rev 0)
+++ packages/wapiti/trunk/debian/patches/lswww.py.patch 2012-04-06 11:23:01 UTC (rev 8428)
@@ -0,0 +1,18 @@
+From: Thomas Bläsing <thomasbl at frosty.local>
+Subject: fancy output for installing the recommend packages
+
+diff -urNad wapiti-1.1.6~/lswww.py wapiti-1.1.6/lswww.py
+--- wapiti-1.1.6~/lswww.py 2007-01-28 17:48:59.000000000 +0000
++++ wapiti-1.1.6/lswww.py 2008-04-28 20:19:09.000000000 +0000
+@@ -31,9 +31,8 @@
+ import tidy
+ except ImportError:
+ print "lswww will be far less effective without tidy"
+- print "please install libtidy ( http://tidy.sourceforge.net/ ),"
+- print "ctypes ( http://starship.python.net/crew/theller/ctypes/ )"
+- print "and uTidylib ( http://utidylib.berlios.de/ )"
++ print "please install libtidy and ctypes:"
++ print "\tapt-get install python-utidylib python-ctypes"
+ tidyhere=0
+ else:
+ tidyhere=1
Deleted: packages/wapiti/trunk/debian/patches/remove_hashbangs.dpatch
===================================================================
--- packages/wapiti/trunk/debian/patches/remove_hashbangs.dpatch 2012-04-05 15:25:30 UTC (rev 8427)
+++ packages/wapiti/trunk/debian/patches/remove_hashbangs.dpatch 2012-04-06 11:23:01 UTC (rev 8428)
@@ -1,34 +0,0 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## remove_hashbangs.dpatch by <thomasbl at frosty.local>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: remove all uneeded hashbangs
-
- at DPATCH@
-diff -urNad wapiti-1.1.6~/cookie.py wapiti-1.1.6/cookie.py
---- wapiti-1.1.6~/cookie.py 2006-07-22 11:14:20.000000000 +0000
-+++ wapiti-1.1.6/cookie.py 2008-04-28 21:18:43.000000000 +0000
-@@ -1,5 +1,3 @@
--#!/usr/bin/env python
--
- # Copyright (C) 2006 Nicolas Surribas
- #
- # This file is part of Wapiti.
-diff -urNad wapiti-1.1.6~/getcookie.py wapiti-1.1.6/getcookie.py
---- wapiti-1.1.6~/getcookie.py 2006-10-07 17:29:27.000000000 +0000
-+++ wapiti-1.1.6/getcookie.py 2008-04-28 21:18:50.000000000 +0000
-@@ -1,5 +1,3 @@
--#!/usr/bin/env python
--
- # Copyright (C) 2006 Nicolas Surribas
- #
- # This file is part of Wapiti.
-diff -urNad wapiti-1.1.6~/lswww.py wapiti-1.1.6/lswww.py
---- wapiti-1.1.6~/lswww.py 2008-04-28 20:41:14.000000000 +0000
-+++ wapiti-1.1.6/lswww.py 2008-04-28 21:18:56.000000000 +0000
-@@ -1,5 +1,3 @@
--#!/usr/bin/env python
--
- # lswww v2.1.5 - A web spider library
- # Copyright (C) 2006 Nicolas Surribas
- #
Copied: packages/wapiti/trunk/debian/patches/remove_hashbangs.patch (from rev 8427, packages/wapiti/trunk/debian/patches/remove_hashbangs.dpatch)
===================================================================
--- packages/wapiti/trunk/debian/patches/remove_hashbangs.patch (rev 0)
+++ packages/wapiti/trunk/debian/patches/remove_hashbangs.patch 2012-04-06 11:23:01 UTC (rev 8428)
@@ -0,0 +1,30 @@
+From: Thomas Bläsing <thomasbl at frosty.local>
+Subject: remove all uneeded hashbangs
+
+diff -urNad wapiti-1.1.6~/cookie.py wapiti-1.1.6/cookie.py
+--- wapiti-1.1.6~/cookie.py 2006-07-22 11:14:20.000000000 +0000
++++ wapiti-1.1.6/cookie.py 2008-04-28 21:18:43.000000000 +0000
+@@ -1,5 +1,3 @@
+-#!/usr/bin/env python
+-
+ # Copyright (C) 2006 Nicolas Surribas
+ #
+ # This file is part of Wapiti.
+diff -urNad wapiti-1.1.6~/getcookie.py wapiti-1.1.6/getcookie.py
+--- wapiti-1.1.6~/getcookie.py 2006-10-07 17:29:27.000000000 +0000
++++ wapiti-1.1.6/getcookie.py 2008-04-28 21:18:50.000000000 +0000
+@@ -1,5 +1,3 @@
+-#!/usr/bin/env python
+-
+ # Copyright (C) 2006 Nicolas Surribas
+ #
+ # This file is part of Wapiti.
+diff -urNad wapiti-1.1.6~/lswww.py wapiti-1.1.6/lswww.py
+--- wapiti-1.1.6~/lswww.py 2008-04-28 20:41:14.000000000 +0000
++++ wapiti-1.1.6/lswww.py 2008-04-28 21:18:56.000000000 +0000
+@@ -1,5 +1,3 @@
+-#!/usr/bin/env python
+-
+ # lswww v2.1.5 - A web spider library
+ # Copyright (C) 2006 Nicolas Surribas
+ #
Copied: packages/wapiti/trunk/debian/patches/series (from rev 8427, packages/wapiti/trunk/debian/patches/00list)
===================================================================
--- packages/wapiti/trunk/debian/patches/series (rev 0)
+++ packages/wapiti/trunk/debian/patches/series 2012-04-06 11:23:01 UTC (rev 8428)
@@ -0,0 +1,4 @@
+lswww.py.patch
+setup.py.patch
+wapiti.py.patch
+remove_hashbangs.patch
Deleted: packages/wapiti/trunk/debian/patches/setup.py.dpatch
===================================================================
--- packages/wapiti/trunk/debian/patches/setup.py.dpatch 2012-04-05 15:25:30 UTC (rev 8427)
+++ packages/wapiti/trunk/debian/patches/setup.py.dpatch 2012-04-06 11:23:01 UTC (rev 8428)
@@ -1,25 +0,0 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## setup.py.dpatch by <thomasbl at frosty.local>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: file for adding programmers name and so...
-
- at DPATCH@
-diff -urNad wapiti-1.1.6~/setup.py wapiti-1.1.6/setup.py
---- wapiti-1.1.6~/setup.py 1970-01-01 00:00:00.000000000 +0000
-+++ wapiti-1.1.6/setup.py 2008-04-26 12:01:24.000000000 +0000
-@@ -0,0 +1,14 @@
-+#!/usr/bin/env python
-+
-+from distutils.core import setup
-+
-+setup(
-+ name='wapiti',
-+ py_modules=['cookie', 'getcookie', 'lswww'],
-+ version='1.1.6',
-+ description='Web application vulnerability scanner',
-+ author='Nicolas Surribas',
-+ author_email='nicolas.surribas at gmail.com',
-+ url='http://wapiti.sourceforge.net/'
-+
-+ )
Copied: packages/wapiti/trunk/debian/patches/setup.py.patch (from rev 8427, packages/wapiti/trunk/debian/patches/setup.py.dpatch)
===================================================================
--- packages/wapiti/trunk/debian/patches/setup.py.patch (rev 0)
+++ packages/wapiti/trunk/debian/patches/setup.py.patch 2012-04-06 11:23:01 UTC (rev 8428)
@@ -0,0 +1,21 @@
+From: Thomas Bläsing <thomasbl at frosty.local>
+Subject: file for adding programmers name and so...
+
+diff -urNad wapiti-1.1.6~/setup.py wapiti-1.1.6/setup.py
+--- wapiti-1.1.6~/setup.py 1970-01-01 00:00:00.000000000 +0000
++++ wapiti-1.1.6/setup.py 2008-04-26 12:01:24.000000000 +0000
+@@ -0,0 +1,14 @@
++#!/usr/bin/env python
++
++from distutils.core import setup
++
++setup(
++ name='wapiti',
++ py_modules=['cookie', 'getcookie', 'lswww'],
++ version='1.1.6',
++ description='Web application vulnerability scanner',
++ author='Nicolas Surribas',
++ author_email='nicolas.surribas at gmail.com',
++ url='http://wapiti.sourceforge.net/'
++
++ )
Deleted: packages/wapiti/trunk/debian/patches/wapiti.py.dpatch
===================================================================
--- packages/wapiti/trunk/debian/patches/wapiti.py.dpatch 2012-04-05 15:25:30 UTC (rev 8427)
+++ packages/wapiti/trunk/debian/patches/wapiti.py.dpatch 2012-04-06 11:23:01 UTC (rev 8428)
@@ -1,28 +0,0 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## wapiti.py.dpatch by <thomasbl at frosty.local>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: No description.
-
- at DPATCH@
-diff -urNad wapiti-1.1.6~/wapiti.py wapiti-1.1.6/wapiti.py
---- wapiti-1.1.6~/wapiti.py 2008-04-28 22:16:46.000000000 +0000
-+++ wapiti-1.1.6/wapiti.py 2008-04-28 22:18:12.000000000 +0000
-@@ -20,6 +20,8 @@
- import lswww,urllib,urllib2,urlparse,socket
- import sys,re,getopt,os
-
-+sys.path.append('/usr/share/wapiti') # added by thomasbl for debian
-+
- try:
- import cookielib
- except ImportError:
-@@ -30,7 +32,7 @@
- """
- Wapiti-1.1.6 - A web application vulnerability scanner
-
--Usage: python wapiti.py http://server.com/base/url/ [options]
-+Usage: wapiti http://server.com/base/url/ [options]
-
- Supported options are:
- -s <url>
Copied: packages/wapiti/trunk/debian/patches/wapiti.py.patch (from rev 8427, packages/wapiti/trunk/debian/patches/wapiti.py.dpatch)
===================================================================
--- packages/wapiti/trunk/debian/patches/wapiti.py.patch (rev 0)
+++ packages/wapiti/trunk/debian/patches/wapiti.py.patch 2012-04-06 11:23:01 UTC (rev 8428)
@@ -0,0 +1,24 @@
+From: Thomas Bläsing <thomasbl at frosty.local>
+Subject: Add search path and fix Usage
+
+diff -urNad wapiti-1.1.6~/wapiti.py wapiti-1.1.6/wapiti.py
+--- wapiti-1.1.6~/wapiti.py 2008-04-28 22:16:46.000000000 +0000
++++ wapiti-1.1.6/wapiti.py 2008-04-28 22:18:12.000000000 +0000
+@@ -20,6 +20,8 @@
+ import lswww,urllib,urllib2,urlparse,socket
+ import sys,re,getopt,os
+
++sys.path.append('/usr/share/wapiti') # added by thomasbl for debian
++
+ try:
+ import cookielib
+ except ImportError:
+@@ -30,7 +32,7 @@
+ """
+ Wapiti-1.1.6 - A web application vulnerability scanner
+
+-Usage: python wapiti.py http://server.com/base/url/ [options]
++Usage: wapiti http://server.com/base/url/ [options]
+
+ Supported options are:
+ -s <url>
Modified: packages/wapiti/trunk/debian/rules
===================================================================
--- packages/wapiti/trunk/debian/rules 2012-04-05 15:25:30 UTC (rev 8427)
+++ packages/wapiti/trunk/debian/rules 2012-04-06 11:23:01 UTC (rev 8428)
@@ -1,17 +1,16 @@
#!/usr/bin/make -f
-include /usr/share/dpatch/dpatch.make
build:
-clean: unpatch
+clean:
dh_testdir
dh_testroot
dh_clean
rm -rf build/
find . -name "*.pyc" | xargs rm -f
-install: patch
+install:
dh_testdir
dh_testroot
dh_clean -k
Modified: packages/wapiti/trunk/debian/source/format
===================================================================
--- packages/wapiti/trunk/debian/source/format 2012-04-05 15:25:30 UTC (rev 8427)
+++ packages/wapiti/trunk/debian/source/format 2012-04-06 11:23:01 UTC (rev 8428)
@@ -1 +1 @@
-1.0
+3.0 (quilt)
More information about the Python-apps-commits
mailing list