[Python-apps-commits] r8429 - in packages/wapiti/trunk/debian (8 files)

Fri Apr 6 13:46:28 UTC 2012

Date: Friday, April 6, 2012 @ 13:46:24
  Author: adejong
Revision: 8429

  * Switch to dh_python2 (Closes: #617144).
  * Switch to dh command sequencer and install file with dh_install instead
    of a custom setup.py.

Added:
  packages/wapiti/trunk/debian/wapiti.install
  packages/wapiti/trunk/debian/wapiti.links
  packages/wapiti/trunk/debian/wapiti.manpages
Modified:
  packages/wapiti/trunk/debian/changelog
  packages/wapiti/trunk/debian/control
  packages/wapiti/trunk/debian/patches/series
  packages/wapiti/trunk/debian/rules
Deleted:
  packages/wapiti/trunk/debian/patches/setup.py.patch

Modified: packages/wapiti/trunk/debian/changelog
===================================================================

--- packages/wapiti/trunk/debian/changelog	2012-04-06 11:23:01 UTC (rev 8428)
+++ packages/wapiti/trunk/debian/changelog	2012-04-06 13:46:24 UTC (rev 8429)
@@ -12,8 +12,13 @@
     (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
+  [ Arthur de Jong ]
+  * Switch to dh_python2 (Closes: #617144).
+  * Switch to dh command sequencer and install file with dh_install instead
+    of a custom setup.py.
 
+ -- Arthur de Jong <adejong at debian.org>  Fri, 06 Apr 2012 15:43:18 +0200
+
 wapiti (1.1.6-3) unstable; urgency=low
 
   * Closes: #477034

Modified: packages/wapiti/trunk/debian/control
===================================================================
--- packages/wapiti/trunk/debian/control	2012-04-06 11:23:01 UTC (rev 8428)
+++ packages/wapiti/trunk/debian/control	2012-04-06 13:46:24 UTC (rev 8429)
@@ -1,19 +1,18 @@
 Source: wapiti
 Section: python
-XS-Python-Version: >= 2.4
+X-Python-Version: >= 2.4
 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 (>= 9)
+Build-Depends: python (>= 2.6.6-3~), 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/
 
 Package: wapiti
 Architecture: all
-Depends: ${python:Depends}
+Depends: ${misc:Depends}, ${python:Depends}
 Recommends: python-utidylib (>= 0.2), python-ctypes (>= 1.0.1)
-XB-Python-Version: ${python:Versions}
 Homepage: http://wapiti.sourceforge.net/
 Description: Web application vulnerability scanner
  Wapiti allows you to audit the security of your web applications.

Modified: packages/wapiti/trunk/debian/patches/series
===================================================================
--- packages/wapiti/trunk/debian/patches/series	2012-04-06 11:23:01 UTC (rev 8428)
+++ packages/wapiti/trunk/debian/patches/series	2012-04-06 13:46:24 UTC (rev 8429)
@@ -1,4 +1,3 @@
 lswww.py.patch
-setup.py.patch
 wapiti.py.patch
 remove_hashbangs.patch

Deleted: packages/wapiti/trunk/debian/patches/setup.py.patch
===================================================================
--- packages/wapiti/trunk/debian/patches/setup.py.patch	2012-04-06 11:23:01 UTC (rev 8428)
+++ packages/wapiti/trunk/debian/patches/setup.py.patch	2012-04-06 13:46:24 UTC (rev 8429)
@@ -1,21 +0,0 @@
-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/'
-+	
-+      )

Modified: packages/wapiti/trunk/debian/rules
===================================================================
--- packages/wapiti/trunk/debian/rules	2012-04-06 11:23:01 UTC (rev 8428)
+++ packages/wapiti/trunk/debian/rules	2012-04-06 13:46:24 UTC (rev 8429)
@@ -1,40 +1,11 @@
 #!/usr/bin/make -f
 
+%:
+	dh $@ --with python2
 
-build:
+override_dh_install:
+	dh_install --exclude='BeautifulSoup.py'
+	chmod a+rx $(CURDIR)/debian/wapiti/usr/share/wapiti/wapiti.py
 
-clean:
-	dh_testdir
-	dh_testroot
-	dh_clean
-	rm -rf build/
-	find . -name "*.pyc" | xargs rm -f
-
-install:
-	dh_testdir
-	dh_testroot
-	dh_clean -k
-	dh_installdirs
-	
-	python setup.py install --no-compile --root=$(CURDIR)/debian/wapiti --install-lib=/usr/share/wapiti
-	install -m 755 wapiti.py $(CURDIR)/debian/wapiti/usr/share/wapiti
-	
-binary-indep: install
-	dh_testdir
-	dh_testroot
-	dh_pycentral
+override_dh_installchangelogs:
 	dh_installchangelogs ChangeLog_Wapiti
-	dh_installman debian/wapiti.1
-	dh_installdocs
-	dh_link /usr/share/wapiti/wapiti.py /usr/bin/wapiti
-	dh_compress
-	dh_fixperms
-	dh_installdeb
-	dh_gencontrol
-	dh_md5sums
-	dh_builddeb
-
-binary-arch:
-
-binary: binary-indep 
-.PHONY: build clean binary-indep binary install

Added: packages/wapiti/trunk/debian/wapiti.install
===================================================================
--- packages/wapiti/trunk/debian/wapiti.install	                        (rev 0)
+++ packages/wapiti/trunk/debian/wapiti.install	2012-04-06 13:46:24 UTC (rev 8429)
@@ -0,0 +1 @@
+*.py /usr/share/wapiti

Added: packages/wapiti/trunk/debian/wapiti.links
===================================================================
--- packages/wapiti/trunk/debian/wapiti.links	                        (rev 0)
+++ packages/wapiti/trunk/debian/wapiti.links	2012-04-06 13:46:24 UTC (rev 8429)
@@ -0,0 +1 @@
+/usr/share/wapiti/wapiti.py /usr/bin/wapiti

Added: packages/wapiti/trunk/debian/wapiti.manpages
===================================================================
--- packages/wapiti/trunk/debian/wapiti.manpages	                        (rev 0)
+++ packages/wapiti/trunk/debian/wapiti.manpages	2012-04-06 13:46:24 UTC (rev 8429)
@@ -0,0 +1 @@
+debian/wapiti.1


