[Date Prev][Date Next] [Thread Prev][Thread Next] [Date Index] [Thread Index]

Bug#664379: marked as done ([PATCH] python-socksipy: Helping to update to packaging format 3.0)

Your message dated Mon, 13 Oct 2014 12:19:12 +0000
with message-id <E1Xdeam-0005OI-80@franck.debian.org>
and subject line Bug#664379: fixed in python-socksipy 1.02-1
has caused the Debian Bug report #664379,
regarding [PATCH] python-socksipy: Helping to update to packaging format 3.0
to be marked as done.

This means that you claim that the problem has been dealt with.
If this is not the case it is now your responsibility to reopen the
Bug report if necessary, and/or fix the problem forthwith.

(NB: If you are a system administrator and have no idea what this
message is talking about, this may indicate a serious mail system
misconfiguration somewhere. Please contact owner@bugs.debian.org
immediately.)


-- 
664379: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=664379
Debian Bug Tracking System
Contact owner@bugs.debian.org with problems
--- Begin Message --- 
Package: python-socksipy
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 0b726cc5e0d542e68bd2958244a3a89846b42615 Mon Sep 17 00:00:00 2001
From: Jari Aalto <jari.aalto@cante.net>
Date: Wed, 29 Feb 2012 09:17:33 -0500
Subject: [PATCH] format-3.0
Organization: Private
Content-Type: text/plain; charset="utf-8"
Content-Transfer-Encoding: 8bit

Signed-off-by: Jari Aalto <jari.aalto@cante.net>
---
 debian/README.source                               |    9 ---------
 debian/changelog                                   |    8 ++++++++
 debian/compat                                      |    2 +-
 debian/control                                     |    4 ++--
 debian/patches/00list                              |    2 --
 debian/patches/series                              |    2 ++
 debian/patches/{setup.py.dpatch => setup.py.patch} |    8 ++------
 debian/rules                                       |    5 ++---
 debian/source/format                               |    1 +
 9 files changed, 18 insertions(+), 23 deletions(-)
 delete mode 100644 debian/README.source
 delete mode 100644 debian/patches/00list
 create mode 100644 debian/patches/series
 rename debian/patches/{setup.py.dpatch => setup.py.patch} (74%)
 create mode 100644 debian/source/format

diff --git a/debian/README.source b/debian/README.source
deleted file mode 100644
index d264c73..0000000
--- a/debian/README.source
+++ /dev/null
@@ -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.
diff --git a/debian/changelog b/debian/changelog
index 99111c5..1eb80d2 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+python-socksipy (1.0-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.
+
+ -- Jari Aalto <jari.aalto@cante.net>  Wed, 29 Feb 2012 09:16:51 -0500
+
 python-socksipy (1.0-1) unstable; urgency=low
 
   * Initial release (Closes: #467222)
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 eefbe13..b4cfa8c 100644
--- a/debian/control
+++ b/debian/control
@@ -4,8 +4,8 @@ XS-Python-Version: all
 Priority: optional
 Maintainer: Thomas Bläsing <thomasbl@pool.math.tu-berlin.de>
 Uploaders: Debian Python Modules Team <python-modules-team@lists.alioth.debian.org>
-Standards-Version: 3.8.0
-Build-Depends: debhelper (>= 5), dpatch (>= 2.0.30)
+Standards-Version: 3.9.3
+Build-Depends: debhelper (>= 9)
 Build-Depends-Indep: python, python-central (>= 0.6)
 Homepage: http://socksipy.sourceforge.net/
 Vcs-Svn: svn://svn.debian.org/svn/python-modules/packages/python-socksipy/trunk
diff --git a/debian/patches/00list b/debian/patches/00list
deleted file mode 100644
index 6b9c2bd..0000000
--- a/debian/patches/00list
+++ /dev/null
@@ -1,2 +0,0 @@
-setup.py
-
diff --git a/debian/patches/series b/debian/patches/series
new file mode 100644
index 0000000..b16fc8f
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1,2 @@
+setup.py.patch
+
diff --git a/debian/patches/setup.py.dpatch b/debian/patches/setup.py.patch
similarity index 74%
rename from debian/patches/setup.py.dpatch
rename to debian/patches/setup.py.patch
index aa8bf15..3f97c77 100644
--- a/debian/patches/setup.py.dpatch
+++ b/debian/patches/setup.py.patch
@@ -1,10 +1,6 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## setup.py.dpatch by  <thomasbl@devel.thomasbl.de>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: setup.py for installing files the right way :)
+From: <thomasbl@devel.thomasbl.de>
+Subject: setup.py for installing files the right way :)
 
-@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
diff --git a/debian/rules b/debian/rules
index 5e9dd4c..79a005c 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,17 +1,16 @@
 #!/usr/bin/make -f
 
-include /usr/share/dpatch/dpatch.make
 
 build:
 
-clean: unpatch
+clean:
 	dh_testdir
 	dh_testroot
 	rm -rf build
 	find . -name '*\.pyc' -delete
 	dh_clean
 
-install: patch
+install:
 	dh_testdir
 	dh_testroot
 	dh_clean -k
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)
-- 
1.7.9

--- End Message ---
--- Begin Message --- 
Source: python-socksipy
Source-Version: 1.02-1

We believe that the bug you reported is fixed in the latest version of
python-socksipy, which is due to be installed in the Debian FTP archive.

A summary of the changes between this version and the previous one is
attached.

Thank you for reporting the bug, which will now be closed.  If you
have further comments please address them to 664379@bugs.debian.org,
and the maintainer will reopen the bug report if appropriate.

Debian distribution maintenance software
pp.
Dimitri John Ledkov <dimitri.j.ledkov@linux.intel.com> (supplier of updated python-socksipy package)

(This message was generated automatically at their request; if you
believe that there is a problem with it please contact the archive
administrators by mailing ftpmaster@ftp-master.debian.org)


-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1

Format: 1.8
Date: Mon, 13 Oct 2014 12:26:15 +0100
Source: python-socksipy
Binary: python-socksipy
Architecture: all source
Version: 1.02-1
Distribution: unstable
Urgency: medium
Maintainer: Debian QA Group <packages@qa.debian.org>
Changed-By: Dimitri John Ledkov <dimitri.j.ledkov@linux.intel.com>
Closes: 604836 664379
Description: 
 python-socksipy - Python SOCKS client module
Changes: 
 python-socksipy (1.02-1) unstable; urgency=medium
 .
   [ Jari Aalto ]
   * Remove deprecated dpatch and upgrade to packaging format "3.0
     quilt". (Closes: #664379)
 .
   [ Dimitri John Ledkov ]
   * QA upload.
   * New upstream release. (Closes: #604836)
   * Update upstream in watch file.
   * Drop setup.py patch.
   * New upstream release.
   * Rebuild tarball, with corrected file permissions.
Checksums-Sha1: 
 b844fe9574a2c4f724b378f1672fb80d08a109ca 1996 python-socksipy_1.02-1.dsc
 9d53e9e8545ebabe12e44688bfba415c56212f53 8056 python-socksipy_1.02.orig.tar.xz
 ef5688830bb5b6b0ce6ca40e84f7d8a79bb989b8 2483 python-socksipy_1.02-1.debian.tar.gz
 28b6c14bfd94dae8a7f0280a22591b2afdab0c80 11202 python-socksipy_1.02-1_all.deb
Checksums-Sha256: 
 b2cf1f77f50d022b75dd060af23ba744dcaf4876ed74cb77fa87f8d5543eb93b 1996 python-socksipy_1.02-1.dsc
 51cc052924b3cdc971a7a930e5ea56350d9eac4d0fe469d19713782d6fdb3c22 8056 python-socksipy_1.02.orig.tar.xz
 78db22a9ee633f3fd8f6c1644fec8ed89a701c305c7f9f3d3ff82e9d71e76dc2 2483 python-socksipy_1.02-1.debian.tar.gz
 dc38fa6c6be9e9c55781cc616bd065ce738bd3081e1fe50abdcb27bc5cca2fa7 11202 python-socksipy_1.02-1_all.deb
Files: 
 5605a5a30a327bd2e6f6f4d7a57e9899 1996 python optional python-socksipy_1.02-1.dsc
 1a795533658d250c2c98c4f4ebf5d849 8056 python optional python-socksipy_1.02.orig.tar.xz
 434358d06e4a887dd0dd1d31e301b9d0 2483 python optional python-socksipy_1.02-1.debian.tar.gz
 32b52fa249e7ac726610355bee366d82 11202 python optional python-socksipy_1.02-1_all.deb

-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1

iQIcBAEBAgAGBQJUO8EyAAoJEIh7YGGLPBau2qIP/0UEcdBafzXC8SegXNMztxiH
MoIo9PFVsvCVPyINy7LxtvEbH29i2JXJ/yN1uXf2JvxUz5s6nHRT/xTLctjwMLSs
HsbkzwFiZxe57nVTa7KZx8DTg9xH9oRFZKsdPsu9vKCIbsohO8GPvfwjUNKey+v9
djxRVuwUceSpXe0aaPdOO3xps3ciVyJ1vj9zYtEg75rnKYEo5bKCvl0noYoa4/VX
PDp92nRH8lbJCjseoJQTAZ6vR05vLZJVgzQ6H+/kjABQiyxQZUkseEoaB27uPEEG
+mYeGi1JXvnDRDzud6k+iaC1P2mIj4fFlCATiKVliVlN4W85gaD1MU499KT0GOpm
mqs3orRC66mJ4Z8OP9q8vWqJPMl1GFQoO0lN1MBHGFvjESyJIvbtH4laA8NC8QaR
UtxcIaXyBau9FBMGc+PiSAn+JGiNt1+KbJ005SxBzjAwqu08nbTEyb93nmHRX1WR
bCGQQuISuOy7iihCuJa5rhuMDkGi1S2WJSQX3tg7pTg0f1vF8WkFvviLe/lMaDDH
eVxQuO0xwGUZDjh+Rjd6l+8NQGN07YC9rIwGtPETFVZJ9tH/BqhgNDq65lowS7Wu
F6kGDEjFTCQlofc4nMoYOoulpm3zxHe2m2ldyzkEM9d5r8VnwZ4oygF4AGjoZ8u7
aGsxJj1lfvUmk7we6uy9
=AtIL
-----END PGP SIGNATURE-----

--- End Message ---
Reply to: