[Python-modules-commits] r20403 - in packages/pycurl/trunk/debian (8 files)

Sat Feb 11 14:08:57 UTC 2012

Date: Saturday, February 11, 2012 @ 14:08:54
  Author: morph
Revision: 20403

Convert to 3.0 (quilt) source format

Added:
  packages/pycurl/trunk/debian/patches/10_setup.py.patch
  packages/pycurl/trunk/debian/patches/series
Modified:
  packages/pycurl/trunk/debian/changelog
  packages/pycurl/trunk/debian/control
  packages/pycurl/trunk/debian/rules
  packages/pycurl/trunk/debian/source/format
Deleted:
  packages/pycurl/trunk/debian/patches/00list
  packages/pycurl/trunk/debian/patches/10_setup.py.dpatch

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

--- packages/pycurl/trunk/debian/changelog	2012-02-11 11:53:06 UTC (rev 20402)
+++ packages/pycurl/trunk/debian/changelog	2012-02-11 14:08:54 UTC (rev 20403)
@@ -9,8 +9,9 @@
     - removed Conflicts/Replaces/Provides, not needed
     - added libssh2-1-dev to build-depends; thanks to Jakub Wilk for the report;
       Closes: #658952
+  * Convert to 3.0 (quilt) source format
 
- -- Sandro Tosi <morph at debian.org>  Sat, 11 Feb 2012 12:40:03 +0100
+ -- Sandro Tosi <morph at debian.org>  Sat, 11 Feb 2012 15:03:13 +0100
 
 pycurl (7.19.0-4) unstable; urgency=low
 

Modified: packages/pycurl/trunk/debian/control
===================================================================
--- packages/pycurl/trunk/debian/control	2012-02-11 11:53:06 UTC (rev 20402)
+++ packages/pycurl/trunk/debian/control	2012-02-11 14:08:54 UTC (rev 20403)
@@ -3,7 +3,7 @@
 Priority: optional
 Maintainer: Debian Python Modules Team <python-modules-team at lists.alioth.debian.org>
 Uploaders: Sandro Tosi <morph at debian.org>, Bernd Zeimetz <bzed at debian.org>
-Build-Depends: debhelper (>= 5.0.37.1), python-all-dev (>= 2.3.5-9), python-all-dbg, python-support (>= 0.7.1), libcurl4-gnutls-dev (>= 7.19.0), dpatch, librtmp-dev, libssh2-1-dev
+Build-Depends: debhelper (>= 5.0.37.1), python-all-dev (>= 2.3.5-9), python-all-dbg, python-support (>= 0.7.1), libcurl4-gnutls-dev (>= 7.19.0), librtmp-dev, libssh2-1-dev
 Standards-Version: 3.9.2
 Homepage: http://pycurl.sourceforge.net
 Vcs-Svn: svn://svn.debian.org/python-modules/packages/pycurl/trunk/

Deleted: packages/pycurl/trunk/debian/patches/00list
===================================================================
--- packages/pycurl/trunk/debian/patches/00list	2012-02-11 11:53:06 UTC (rev 20402)
+++ packages/pycurl/trunk/debian/patches/00list	2012-02-11 14:08:54 UTC (rev 20403)
@@ -1 +0,0 @@
-10_setup.py

Deleted: packages/pycurl/trunk/debian/patches/10_setup.py.dpatch
===================================================================
--- packages/pycurl/trunk/debian/patches/10_setup.py.dpatch	2012-02-11 11:53:06 UTC (rev 20402)
+++ packages/pycurl/trunk/debian/patches/10_setup.py.dpatch	2012-02-11 14:08:54 UTC (rev 20403)
@@ -1,27 +0,0 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 10_setup.py.dpatch by Sandro Tosi <morph at debian.org>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: Adjust setup.py file for Debian architecture
-
- at DPATCH@
-diff -urNad pycurl~/setup.py pycurl/setup.py
---- pycurl~/setup.py	2008-04-22 16:00:45.000000000 +0200
-+++ pycurl/setup.py	2008-05-31 22:54:56.540671465 +0200
-@@ -17,7 +17,7 @@
- from distutils.version import LooseVersion
- 
- include_dirs = []
--define_macros = []
-+define_macros = [ ('HAVE_CURL_GNUTLS', 1) ]
- library_dirs = []
- libraries = []
- runtime_library_dirs = []
-@@ -188,7 +188,6 @@
-     maintainer_email="kjetilja at gmail.com, markus at oberhumer.com",
-     url="http://pycurl.sourceforge.net/",
-     license="LGPL/MIT",
--    data_files=get_data_files(),
-     ext_modules=[ext],
-     long_description="""
- This module provides Python bindings for the cURL library.""",

Added: packages/pycurl/trunk/debian/patches/10_setup.py.patch
===================================================================
--- packages/pycurl/trunk/debian/patches/10_setup.py.patch	                        (rev 0)
+++ packages/pycurl/trunk/debian/patches/10_setup.py.patch	2012-02-11 14:08:54 UTC (rev 20403)
@@ -0,0 +1,21 @@
+Author: Sandro Tosi <morph at debian.org>
+Description: Adjust setup.py file for Debian architecture
+--- pycurl-7.19.0.orig/setup.py
++++ pycurl-7.19.0/setup.py
+@@ -17,7 +17,7 @@
+ from distutils.version import LooseVersion
+ 
+ include_dirs = []
+-define_macros = []
++define_macros = [ ('HAVE_CURL_GNUTLS', 1) ]
+ library_dirs = []
+ libraries = []
+ runtime_library_dirs = []
+@@ -188,7 +188,6 @@
+     maintainer_email="kjetilja at gmail.com, markus at oberhumer.com",
+     url="http://pycurl.sourceforge.net/",
+     license="LGPL/MIT",
+-    data_files=get_data_files(),
+     ext_modules=[ext],
+     long_description="""
+ This module provides Python bindings for the cURL library.""",

Added: packages/pycurl/trunk/debian/patches/series
===================================================================
--- packages/pycurl/trunk/debian/patches/series	                        (rev 0)
+++ packages/pycurl/trunk/debian/patches/series	2012-02-11 14:08:54 UTC (rev 20403)
@@ -0,0 +1 @@
+10_setup.py.patch

Modified: packages/pycurl/trunk/debian/rules
===================================================================
--- packages/pycurl/trunk/debian/rules	2012-02-11 11:53:06 UTC (rev 20402)
+++ packages/pycurl/trunk/debian/rules	2012-02-11 14:08:54 UTC (rev 20403)
@@ -1,7 +1,5 @@
 #! /usr/bin/make -f
 
-include /usr/share/dpatch/dpatch.make
-
 # Uncomment this to turn on verbose mode.
 #export DH_VERBOSE=1
 
@@ -17,7 +15,7 @@
 
 build: build-stamp
 build-stamp: DH_OPTIONS=
-build-stamp: patch-stamp $(PYVERS:%=build-python%)
+build-stamp: $(PYVERS:%=build-python%)
 	touch build-stamp
 
 build-python%:
@@ -32,7 +30,7 @@
 	done
 	touch $@
 
-clean: unpatch
+clean:
 	dh_testdir
 	dh_testroot
 	rm -f build-*

Modified: packages/pycurl/trunk/debian/source/format
===================================================================
--- packages/pycurl/trunk/debian/source/format	2012-02-11 11:53:06 UTC (rev 20402)
+++ packages/pycurl/trunk/debian/source/format	2012-02-11 14:08:54 UTC (rev 20403)
@@ -1 +1 @@
-1.0
+3.0 (quilt)


