[Python-modules-commits] r27341 - in packages/python-socksipy/trunk/debian (9 files)

Tue Jan 21 06:14:30 UTC 2014

Date: Tuesday, January 21, 2014 @ 06:14:29
  Author: noskcaj-guest
Revision: 27341

Remove deprecated dpatch. Closes: #664379

Added:
  packages/python-socksipy/trunk/debian/patches/series
  packages/python-socksipy/trunk/debian/patches/setup.py.patch
Modified:
  packages/python-socksipy/trunk/debian/changelog
  packages/python-socksipy/trunk/debian/control
  packages/python-socksipy/trunk/debian/rules
  packages/python-socksipy/trunk/debian/source/format
Deleted:
  packages/python-socksipy/trunk/debian/README.source
  packages/python-socksipy/trunk/debian/patches/00list
  packages/python-socksipy/trunk/debian/patches/setup.py.dpatch

Deleted: packages/python-socksipy/trunk/debian/README.source
===================================================================

--- packages/python-socksipy/trunk/debian/README.source	2014-01-20 22:34:55 UTC (rev 27340)
+++ packages/python-socksipy/trunk/debian/README.source	2014-01-21 06:14:29 UTC (rev 27341)
@@ -1,9 +0,0 @@
-This package is using dpatch patch system. 
-
-To patch the source:
- * debian/rules patch
-To add a new patch:
- * put it under debian/patches
- * add it to debian/patches/00list
-
-See /usr/share/doc/dpatch/README.source.gz for more information.

Modified: packages/python-socksipy/trunk/debian/changelog
===================================================================
--- packages/python-socksipy/trunk/debian/changelog	2014-01-20 22:34:55 UTC (rev 27340)
+++ packages/python-socksipy/trunk/debian/changelog	2014-01-21 06:14:29 UTC (rev 27341)
@@ -1,3 +1,10 @@
+python-socksipy (1.0-3) UNRELEASED; urgency=medium
+
+  [ Jari Aalto ]
+  * Remove deprecated dpatch. Closes: #664379
+
+ -- Jackson Doak <noskcaj at ubuntu.com>  Tue, 21 Jan 2014 17:06:15 +1100
+
 python-socksipy (1.0-2) unstable; urgency=low
 
   * Orphan package (cf. #700554).

Modified: packages/python-socksipy/trunk/debian/control
===================================================================
--- packages/python-socksipy/trunk/debian/control	2014-01-20 22:34:55 UTC (rev 27340)
+++ packages/python-socksipy/trunk/debian/control	2014-01-21 06:14:29 UTC (rev 27341)
@@ -3,7 +3,7 @@
 Priority: optional
 Maintainer: Debian QA Group <packages at qa.debian.org>
 Standards-Version: 3.9.4
-Build-Depends: debhelper (>= 9), dpatch (>= 2.0.32), python (>= 2.6.6-3~)
+Build-Depends: debhelper (>= 9), python (>= 2.6.6-3~)
 Homepage: http://socksipy.sourceforge.net/
 Vcs-Svn: svn://anonscm.debian.org/python-modules/packages/python-socksipy/trunk/
 Vcs-Browser: http://anonscm.debian.org/viewvc/python-modules/packages/python-socksipy/trunk/

Deleted: packages/python-socksipy/trunk/debian/patches/00list
===================================================================
--- packages/python-socksipy/trunk/debian/patches/00list	2014-01-20 22:34:55 UTC (rev 27340)
+++ packages/python-socksipy/trunk/debian/patches/00list	2014-01-21 06:14:29 UTC (rev 27341)
@@ -1,2 +0,0 @@
-setup.py
-

Added: packages/python-socksipy/trunk/debian/patches/series
===================================================================
--- packages/python-socksipy/trunk/debian/patches/series	                        (rev 0)
+++ packages/python-socksipy/trunk/debian/patches/series	2014-01-21 06:14:29 UTC (rev 27341)
@@ -0,0 +1 @@
+setup.py.patch

Deleted: packages/python-socksipy/trunk/debian/patches/setup.py.dpatch
===================================================================
--- packages/python-socksipy/trunk/debian/patches/setup.py.dpatch	2014-01-20 22:34:55 UTC (rev 27340)
+++ packages/python-socksipy/trunk/debian/patches/setup.py.dpatch	2014-01-21 06:14:29 UTC (rev 27341)
@@ -1,24 +0,0 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## setup.py.dpatch by  <thomasbl at devel.thomasbl.de>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: setup.py for installing files the right way :)
-
- at DPATCH@
-diff -urNad SocksiPy-1.0~/setup.py SocksiPy-1.0/setup.py
---- SocksiPy-1.0~/setup.py	1970-01-01 01:00:00.000000000 +0100
-+++ SocksiPy-1.0/setup.py	2008-10-14 00:30:56.000000000 +0200
-@@ -0,0 +1,13 @@
-+#!/usr/bin/env python
-+
-+from distutils.core import setup
-+
-+setup(
-+	name='python-socksipy',
-+	py_modules=['socks'],
-+	version='1.0',
-+	description='This module was designed to allow developers of Python software that uses the Internet or another TCP/IP-based network to add support for connection through a SOCKS proxy server with as much ease as possible.',
-+	author='Dan Haim',
-+	author_email='negativeiq at users.sourceforge.net',
-+	url='http://socksipy.sourceforge.net/'
-+)

Added: packages/python-socksipy/trunk/debian/patches/setup.py.patch
===================================================================
--- packages/python-socksipy/trunk/debian/patches/setup.py.patch	                        (rev 0)
+++ packages/python-socksipy/trunk/debian/patches/setup.py.patch	2014-01-21 06:14:29 UTC (rev 27341)
@@ -0,0 +1,20 @@
+From: <thomasbl at devel.thomasbl.de>
+Subject: setup.py for installing files the right way :)
+
+diff -urNad SocksiPy-1.0~/setup.py SocksiPy-1.0/setup.py
+--- SocksiPy-1.0~/setup.py	1970-01-01 01:00:00.000000000 +0100
++++ SocksiPy-1.0/setup.py	2008-10-14 00:30:56.000000000 +0200
+@@ -0,0 +1,13 @@
++#!/usr/bin/env python
++
++from distutils.core import setup
++
++setup(
++	name='python-socksipy',
++	py_modules=['socks'],
++	version='1.0',
++	description='This module was designed to allow developers of Python software that uses the Internet or another TCP/IP-based network to add support for connection through a SOCKS proxy server with as much ease as possible.',
++	author='Dan Haim',
++	author_email='negativeiq at users.sourceforge.net',
++	url='http://socksipy.sourceforge.net/'
++)


Property changes on: packages/python-socksipy/trunk/debian/patches/setup.py.patch
___________________________________________________________________
Added: svn:executable
   + *

Modified: packages/python-socksipy/trunk/debian/rules
===================================================================
--- packages/python-socksipy/trunk/debian/rules	2014-01-20 22:34:55 UTC (rev 27340)
+++ packages/python-socksipy/trunk/debian/rules	2014-01-21 06:14:29 UTC (rev 27341)
@@ -1,4 +1,4 @@
 #!/usr/bin/make -f
 
 %:
-	dh $@ --with python2,dpatch
+	dh $@ --with python2

Modified: packages/python-socksipy/trunk/debian/source/format
===================================================================
--- packages/python-socksipy/trunk/debian/source/format	2014-01-20 22:34:55 UTC (rev 27340)
+++ packages/python-socksipy/trunk/debian/source/format	2014-01-21 06:14:29 UTC (rev 27341)
@@ -1 +1 @@
-1.0
+3.0 (quilt)
\ No newline at end of file


