Package: w3af
Severity: wishlist
Tags: patch
Hi,
The dpatch patch management system has been deprecated for some time. The
Lintian currently flags use of dpatch packages as an error. The new 3.0
packaging format is an improved version which, among other things, contains
patch management built-in. For more information, see:
http://wiki.debian.org/Projects/DebSrc3.0
I had some free time; see attached patch to migrate to new package
format. Note that all files in debian/patches/* are canocalized to
*.patch.
Let me know if there is anything that needs adjusting or if it is ok
to upload this version in a NMU in case you are working on other
issues needing attention.
Thanks,
Jari
>From 45e0b26ebd641ef5aca29557d13582974dc6961a Mon Sep 17 00:00:00 2001
From: Jari Aalto <[email protected]>
Date: Sun, 22 Apr 2012 09:49:37 +0300
Subject: [PATCH] format-3.0
Organization: Private
Content-Type: text/plain; charset="utf-8"
Content-Transfer-Encoding: 8bit
Signed-off-by: Jari Aalto <[email protected]>
---
debian/README.source | 4 ----
debian/changelog | 12 ++++++++++++
debian/compat | 2 +-
debian/control | 4 ++--
debian/copyright | 12 ++++++------
debian/patches/00list | 4 ----
...ebian.dpatch => 01-report-bugs-as-debian.patch} | 10 +++-------
...ndecies.dpatch => 02-disable-dependecies.patch} | 9 +++------
...t.dpatch => 03-webshell.pl-is-not-script.patch} | 7 ++-----
.../{10_json-fix.dpatch => 10-json-fix.patch} | 7 ++-----
debian/patches/series | 4 ++++
debian/rules | 11 ++++++-----
debian/source/format | 1 +
debian/watch | 2 ++
14 files changed, 44 insertions(+), 45 deletions(-)
delete mode 100644 debian/README.source
delete mode 100644 debian/patches/00list
rename debian/patches/{01_report_bugs_as_debian.dpatch => 01-report-bugs-as-debian.patch} (70%)
rename debian/patches/{02_disable_dependecies.dpatch => 02-disable-dependecies.patch} (81%)
rename debian/patches/{03_webshell.pl_is_not_script.dpatch => 03-webshell.pl-is-not-script.patch} (72%)
rename debian/patches/{10_json-fix.dpatch => 10-json-fix.patch} (96%)
create mode 100644 debian/patches/series
create mode 100644 debian/source/format
create mode 100644 debian/watch
diff --git a/debian/README.source b/debian/README.source
deleted file mode 100644
index 84fb8a2..0000000
--- a/debian/README.source
+++ /dev/null
@@ -1,4 +0,0 @@
-This package manages a few patches using dpatch.
-
-Please check /usr/share/doc/dpatch/README.source.gz for further
-information on how this works.
diff --git a/debian/changelog b/debian/changelog
index 052a935..f126a8b 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,15 @@
+w3af (1.0-rc3svn3489-1.1) unstable; urgency=low
+
+ * Non-maintainer upload.
+ * Remove deprecated dpatch and upgrade to packaging format "3.0 quilt".
+ * Update to Standards-Version to 3.9.3 and debhelper to 9.
+ * Add build-arch and build-indep targets; use dh_prep in rules file.
+ * Fix copyright-refers-to-symlink-license (Lintian).
+ * Fix copyright-with-old-dh-make-debian-copyright (Lintian).
+ * Fix debian-watch-file-is-missing (Lintian).
+
+ -- Jari Aalto <[email protected]> Sun, 22 Apr 2012 09:44:28 +0300
+
w3af (1.0-rc3svn3489-1) unstable; urgency=low
[ Luciano Bello ]
diff --git a/debian/compat b/debian/compat
index 7ed6ff8..ec63514 100644
--- a/debian/compat
+++ b/debian/compat
@@ -1 +1 @@
-5
+9
diff --git a/debian/control b/debian/control
index e5cdcd4..1dd4919 100644
--- a/debian/control
+++ b/debian/control
@@ -2,8 +2,8 @@ Source: w3af
Section: net
Priority: extra
Maintainer: Luciano Bello <[email protected]>
-Build-Depends: debhelper (>= 5), python-support, dpatch
-Standards-Version: 3.8.4
+Build-Depends: debhelper (>= 9), python-support
+Standards-Version: 3.9.3
Homepage: http://w3af.sourceforge.net/
XS-Python-Version: all
diff --git a/debian/copyright b/debian/copyright
index 9ec3e69..a2eca8f 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -28,10 +28,10 @@ License:
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'.
+Public License can be found in `/usr/share/common-licenses/GPL-2'.
-The Debian packaging is (C) 2008, Luciano Bello <[email protected]> and
-is licensed under the GPL, see above.
+The Debian packaging is Copyright (C) 2008, Luciano Bello
+<[email protected]> 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:
@@ -80,7 +80,7 @@ Natural Language Toolkit (nltk)
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'.
+ Public License can be found in `/usr/share/common-licenses/GPL-2'.
GHDB
----
@@ -110,7 +110,7 @@ ntlmaps
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'.
+ Public License Version can be found in `/usr/share/common-licenses/LGPL-2'.
gtkcodebuffer
-------------
@@ -119,7 +119,7 @@ gtkcodebuffer
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'.
+ Public License Version can be found in `/usr/share/common-licenses/LGPL-2'.
urlgrabber
----------
diff --git a/debian/patches/00list b/debian/patches/00list
deleted file mode 100644
index e0e7212..0000000
--- a/debian/patches/00list
+++ /dev/null
@@ -1,4 +0,0 @@
-01_report_bugs_as_debian.dpatch
-02_disable_dependecies.dpatch
-03_webshell.pl_is_not_script.dpatch
-10_json-fix.dpatch
diff --git a/debian/patches/01_report_bugs_as_debian.dpatch b/debian/patches/01-report-bugs-as-debian.patch
similarity index 70%
rename from debian/patches/01_report_bugs_as_debian.dpatch
rename to debian/patches/01-report-bugs-as-debian.patch
index caa5a57..6dd44b5 100644
--- a/debian/patches/01_report_bugs_as_debian.dpatch
+++ b/debian/patches/01-report-bugs-as-debian.patch
@@ -1,11 +1,7 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 01_report_bugs_as_debian.dpatch by Luciano Bello <[email protected]>
-##
-## 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
+From: Luciano Bello <[email protected]>
+Subject: Indicates that the version cames from a Debian Package
+ 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
diff --git a/debian/patches/02_disable_dependecies.dpatch b/debian/patches/02-disable-dependecies.patch
similarity index 81%
rename from debian/patches/02_disable_dependecies.dpatch
rename to debian/patches/02-disable-dependecies.patch
index 10599c6..a1c3557 100644
--- a/debian/patches/02_disable_dependecies.dpatch
+++ b/debian/patches/02-disable-dependecies.patch
@@ -1,10 +1,7 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 02_disable_dependecies.dpatch by Luciano Bello <[email protected]>
-##
-## 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.
+From: Luciano Bello <[email protected]>
+Subject: The pygoogle support is disable. There is some legal issues with it
+ (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
diff --git a/debian/patches/03_webshell.pl_is_not_script.dpatch b/debian/patches/03-webshell.pl-is-not-script.patch
similarity index 72%
rename from debian/patches/03_webshell.pl_is_not_script.dpatch
rename to debian/patches/03-webshell.pl-is-not-script.patch
index d163768..d190417 100644
--- a/debian/patches/03_webshell.pl_is_not_script.dpatch
+++ b/debian/patches/03-webshell.pl-is-not-script.patch
@@ -1,9 +1,6 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 03_webshell.pl_is_not_script.dpatch by Luciano Bello <[email protected]>
-##
-## DP: this script won't ever be running by hand.
+From: Luciano Bello <[email protected]>
+Subject: 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
diff --git a/debian/patches/10_json-fix.dpatch b/debian/patches/10-json-fix.patch
similarity index 96%
rename from debian/patches/10_json-fix.dpatch
rename to debian/patches/10-json-fix.patch
index 12d4cbc..b47e0fa 100644
--- a/debian/patches/10_json-fix.dpatch
+++ b/debian/patches/10-json-fix.patch
@@ -1,9 +1,6 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## json-fix.dpatch by Bernd Zeimetz <[email protected]>
-##
-## DP: python-json is not available in Python2.6
+From: Bernd Zeimetz <[email protected]>
+Subject: 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
diff --git a/debian/patches/series b/debian/patches/series
new file mode 100644
index 0000000..33df420
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1,4 @@
+01-report-bugs-as-debian.patch
+02-disable-dependecies.patch
+03-webshell.pl-is-not-script.patch
+10-json-fix.patch
diff --git a/debian/rules b/debian/rules
index 2fc96af..0b9971c 100755
--- a/debian/rules
+++ b/debian/rules
@@ -5,19 +5,17 @@
# Uncomment this to turn on verbose mode.
#export DH_VERBOSE=1
-include /usr/share/dpatch/dpatch.make
-
-clean: unpatch
+clean:
dh_testdir
dh_testroot
rm -rf build-stamp configure-stamp
dh_clean
-install: build patch-stamp
+install: build
dh_testdir
dh_testroot
- dh_clean -k
+ dh_prep
dh_installdirs
cp debian/desktop debian/w3af/usr/share/applications/w3af.desktop
@@ -32,6 +30,9 @@ install: build patch-stamp
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-arch: build
+build-indep: build
+
# Build architecture-independent files here.
binary-indep: install
dh_testdir
diff --git a/debian/source/format b/debian/source/format
new file mode 100644
index 0000000..163aaf8
--- /dev/null
+++ b/debian/source/format
@@ -0,0 +1 @@
+3.0 (quilt)
diff --git a/debian/watch b/debian/watch
new file mode 100644
index 0000000..0b071d1
--- /dev/null
+++ b/debian/watch
@@ -0,0 +1,2 @@
+version=3
+http://sf.net/w3af/w3af-(\d[\d.]+)\.tar\.bz2
--
1.7.9.5
