[Python-modules-commits] r5475 - in packages/pycurl/trunk (9 files)

morph-guest at users.alioth.debian.org morph-guest at users.alioth.debian.org
Sat May 24 23:34:31 UTC 2008


    Date: Saturday, May 24, 2008 @ 23:34:29
  Author: morph-guest
Revision: 5475

adoption; dual license notice; direct changes now in patch; misc work on debian/control

Added:
  packages/pycurl/trunk/debian/patches/
  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/control
  packages/pycurl/trunk/debian/copyright
  packages/pycurl/trunk/debian/python-pycurl.doc-base
  packages/pycurl/trunk/debian/rules
Deleted:
  packages/pycurl/trunk/setup.py

Modified: packages/pycurl/trunk/debian/changelog
===================================================================
--- packages/pycurl/trunk/debian/changelog	2008-05-24 20:21:57 UTC (rev 5474)
+++ packages/pycurl/trunk/debian/changelog	2008-05-24 23:34:29 UTC (rev 5475)
@@ -1,3 +1,32 @@
+pycurl (7.18.1-1) UNRELEASED; urgency=low
+
+  * Adopting packages (Closes: #481074)
+  * New upstream release.
+  * debian/control
+    - set the team as Maintainer
+    - set me in Uploaders
+    - bumped Build-Dep on libcurl4-gnutls-dev to (>= 7.18.1)
+    - added dpatch Build-Dep
+    - bumped Standards-Version to 3.7.3 (no changes)
+    - moved Homepage field to source stanza
+    - updated dependency for -dbg extension to python-pycurl to use
+      ${binary:Version}, to be binNMU safe
+    - fixed a mispell of Python in Description
+  * debian/rules
+    - added dpatch stuff
+  * debian/patches/10_setup.py.dpatch
+    - added to remove direct upstream code modification
+  * debian/python-pycurl.doc-base
+    - Section updated to Programming/Python
+  * debian/copyright
+    - indented upstream authors, copyright and license with 4 spaces
+    - separated copyright and license notice
+    - extended years in Copyright notice
+    - explicitly identified LGPL location on filesystem
+    - added dual licensing, including MIT license text
+
+ -- Sandro Tosi <matrixhasu at gmail.com>  Sun, 25 May 2008 01:33:25 +0200
+
 pycurl (7.16.4-1) unstable; urgency=low
 
   * New upstream release.

Modified: packages/pycurl/trunk/debian/control
===================================================================
--- packages/pycurl/trunk/debian/control	2008-05-24 20:21:57 UTC (rev 5474)
+++ packages/pycurl/trunk/debian/control	2008-05-24 23:34:29 UTC (rev 5475)
@@ -1,11 +1,12 @@
 Source: pycurl
 Section: python
 Priority: extra
-Maintainer: Domenico Andreoli <cavok at debian.org>
-Uploaders: Matthias Klose <doko at debian.org>
-Build-Depends: debhelper (>= 5.0.37.1), python-all-dev (>= 2.3.5-9), python-all-dbg, python-central, libcurl4-gnutls-dev (>= 7.16.4-1)
-Standards-Version: 3.7.2
+Maintainer: Debian Python Modules Team <python-modules-team at lists.alioth.debian.org>
+Uploaders: Matthias Klose <doko at debian.org>, Sandro Tosi <matrixhasu at gmail.com>
+Build-Depends: debhelper (>= 5.0.37.1), python-all-dev (>= 2.3.5-9), python-all-dbg, python-central, libcurl4-gnutls-dev (>= 7.18.1), dpatch
+Standards-Version: 3.7.3
 XS-Python-Version: all
+Homepage: http://pycurl.sourceforge.net
 
 Package: python-pycurl
 Architecture: any
@@ -20,16 +21,14 @@
  the libcurl documentation available in libcurl4-gnutls-dev Debian package.
  .
  NOTE: the SSL support is provided by GnuTLS.
- .
- Homepage: http://pycurl.sourceforge.net
 
 Package: python-pycurl-dbg
 Priority: extra
 Architecture: any
-Depends: ${shlibs:Depends}, python-dbg, python-pycurl (= ${Source-Version})
+Depends: ${shlibs:Depends}, python-dbg, python-pycurl (= ${binary:Version})
 XB-Python-Version: ${python:Versions}
 Description: Python bindings to libcurl (debug extension)
  This module provides the Python bindings to libcurl. Please refer to
  the libcurl documentation available in libcurl4-gnutls-dev Debian package.
  .
- This package contains the extension built for the python debug interpreter.
+ This package contains the extension built for the Python debug interpreter.

Modified: packages/pycurl/trunk/debian/copyright
===================================================================
--- packages/pycurl/trunk/debian/copyright	2008-05-24 20:21:57 UTC (rev 5474)
+++ packages/pycurl/trunk/debian/copyright	2008-05-24 23:34:29 UTC (rev 5475)
@@ -3,19 +3,47 @@
 
 It was downloaded from http://pycurl.sourceforge.net
 
-Upstream Authors: Kjetil Jacobsen <kjetilja at cs.uit.no> 
-                  Markus F.X.J. Oberhumer <markus at oberhumer.com>
+Upstream Authors:
 
+    Kjetil Jacobsen <kjetilja at cs.uit.no> 
+    Markus F.X.J. Oberhumer <markus at oberhumer.com>
+
 Copyright:
 
-  Copyright (c) 2001-2002 by Kjetil Jacobsen <kjetilja at cs.uit.no>
-  Copyright (c) 2001-2002 by Markus F.X.J. Oberhumer <markus at oberhumer.com>
+    Copyright (C) 2001-2008 by Kjetil Jacobsen <kjetilja at gmail.com>
+    Copyright (C) 2001-2008 by Markus F.X.J. Oberhumer <markus at oberhumer.com>
 
-  PycURL is free software; you can redistribute it and/or modify it
-  under the terms of the GNU Lesser General Public License as published
-  by the Free Software Foundation; either version 2.1 of the License,
-  or (at your option) any later version.
+License:
 
+    PycURL is dual licensed under the LGPL (either version 2.1 or later)
+    and an MIT/X derivative license based on the cURL license. You can
+    redistribute and/or modify PycURL according to the terms of either
+    license.
 
 On Debian GNU/Linux systems, the complete text of the GNU Lesser General
-Public License can be found in '/usr/share/common-licenses'.
+Public License can be found in '/usr/share/common-licenses/LGPL'.
+
+MIT License text follows:
+
+    COPYRIGHT AND PERMISSION NOTICE
+
+    Copyright (C) 2001-2008 by Kjetil Jacobsen <kjetilja at gmail.com>
+    Copyright (C) 2001-2008 by Markus F.X.J. Oberhumer <markus at oberhumer.com>
+
+    All rights reserved.
+
+    Permission to use, copy, modify, and distribute this software for any purpose
+    with or without fee is hereby granted, provided that the above copyright
+    notice and this permission notice appear in all copies.
+
+    THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+    IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+    FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT OF THIRD PARTY RIGHTS. IN
+    NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM,
+    DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR
+    OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE
+    OR OTHER DEALINGS IN THE SOFTWARE.
+
+    Except as contained in this notice, the name of a copyright holder shall not
+    be used in advertising or otherwise to promote the sale, use or other dealings
+    in this Software without prior written authorization of the copyright holder.

Added: packages/pycurl/trunk/debian/patches/00list
===================================================================
--- packages/pycurl/trunk/debian/patches/00list	                        (rev 0)
+++ packages/pycurl/trunk/debian/patches/00list	2008-05-24 23:34:29 UTC (rev 5475)
@@ -0,0 +1 @@
+10_setup.py

Added: packages/pycurl/trunk/debian/patches/10_setup.py.dpatch
===================================================================
--- packages/pycurl/trunk/debian/patches/10_setup.py.dpatch	                        (rev 0)
+++ packages/pycurl/trunk/debian/patches/10_setup.py.dpatch	2008-05-24 23:34:29 UTC (rev 5475)
@@ -0,0 +1,19 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 10_setup.py.dpatch by Sandro Tosi <matrixhasu at gmail.com>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: No description.
+
+ 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-24 18:46:20.845086611 +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 = []


Property changes on: packages/pycurl/trunk/debian/patches/10_setup.py.dpatch
___________________________________________________________________
Name: svn:executable
   + *

Modified: packages/pycurl/trunk/debian/python-pycurl.doc-base
===================================================================
--- packages/pycurl/trunk/debian/python-pycurl.doc-base	2008-05-24 20:21:57 UTC (rev 5474)
+++ packages/pycurl/trunk/debian/python-pycurl.doc-base	2008-05-24 23:34:29 UTC (rev 5475)
@@ -2,7 +2,7 @@
 Title: PycURL
 Author: Markus F.X.J. Oberhumer, Kjetil Jacobsen
 Abstract: A Python interface to the cURL library
-Section: Apps/devel
+Section: Programming/Python
 
 Format: HTML
 Index: /usr/share/doc/python-pycurl/html/pycurl.html

Modified: packages/pycurl/trunk/debian/rules
===================================================================
--- packages/pycurl/trunk/debian/rules	2008-05-24 20:21:57 UTC (rev 5474)
+++ packages/pycurl/trunk/debian/rules	2008-05-24 23:34:29 UTC (rev 5475)
@@ -1,5 +1,7 @@
 #! /usr/bin/make -f
 
+include /usr/share/dpatch/dpatch.make
+
 # Uncomment this to turn on verbose mode.
 #export DH_VERBOSE=1
 
@@ -11,7 +13,7 @@
 build: build-stamp
 
 build-stamp: DH_OPTIONS=
-build-stamp: $(PYVERS:%=build-python%)
+build-stamp: patch-stamp $(PYVERS:%=build-python%)
 	touch build-stamp
 
 build-python%:
@@ -20,7 +22,7 @@
 	python$*-dbg setup.py build
 	touch $@
 
-clean:
+clean: unpatch
 	dh_testdir
 	dh_testroot
 	rm -f build-*

Deleted: packages/pycurl/trunk/setup.py
===================================================================
--- packages/pycurl/trunk/setup.py	2008-05-24 20:21:57 UTC (rev 5474)
+++ packages/pycurl/trunk/setup.py	2008-05-24 23:34:29 UTC (rev 5475)
@@ -1,209 +0,0 @@
-#! /usr/bin/env python
-# -*- coding: iso-8859-1 -*-
-# vi:ts=4:et
-# $Id: setup.py,v 1.143 2007/07/11 17:31:07 kjetilja Exp $
-
-"""Setup script for the PycURL module distribution."""
-
-PACKAGE = "pycurl"
-PY_PACKAGE = "curl"
-VERSION = "7.16.4"
-
-import glob, os, re, sys, string
-import distutils
-from distutils.core import setup
-from distutils.extension import Extension
-from distutils.util import split_quoted
-from distutils.version import LooseVersion
-
-include_dirs = []
-define_macros = [ ('HAVE_CURL_GNUTLS', 1) ]
-library_dirs = []
-libraries = []
-runtime_library_dirs = []
-extra_objects = []
-extra_compile_args = []
-extra_link_args = []
-
-
-def scan_argv(s, default):
-    p = default
-    i = 1
-    while i < len(sys.argv):
-        arg = sys.argv[i]
-        if string.find(arg, s) == 0:
-            p = arg[len(s):]
-            assert p, arg
-            del sys.argv[i]
-        else:
-            i = i + 1
-    ##print sys.argv
-    return p
-
-
-# append contents of an environment variable to library_dirs[]
-def add_libdirs(envvar, sep, fatal=0):
-    v = os.environ.get(envvar)
-    if not v:
-        return
-    for dir in string.split(v, sep):
-        dir = string.strip(dir)
-        if not dir:
-            continue
-        dir = os.path.normpath(dir)
-        if os.path.isdir(dir):
-            if not dir in library_dirs:
-                library_dirs.append(dir)
-        elif fatal:
-            print "FATAL: bad directory %s in environment variable %s" % (dir, envvar)
-            sys.exit(1)
-
-
-if sys.platform == "win32":
-    # Windows users have to configure the CURL_DIR path parameter to match
-    # their cURL source installation.  The path set here is just an example
-    # and thus unlikely to match your installation.
-    CURL_DIR = r"c:\src\build\pycurl\curl-7.16.2.1"
-    CURL_DIR = scan_argv("--curl-dir=", CURL_DIR)
-    print "Using curl directory:", CURL_DIR
-    assert os.path.isdir(CURL_DIR), "please check CURL_DIR in setup.py"
-    include_dirs.append(os.path.join(CURL_DIR, "include"))
-    extra_objects.append(os.path.join(CURL_DIR, "lib", "libcurl.lib"))
-    extra_link_args.extend(["gdi32.lib", "winmm.lib", "ws2_32.lib",])
-    add_libdirs("LIB", ";")
-    if string.find(sys.version, "MSC") >= 0:
-        extra_compile_args.append("-O2")
-        extra_compile_args.append("-GF")        # enable read-only string pooling
-        extra_compile_args.append("-WX")        # treat warnings as errors
-        extra_link_args.append("/opt:nowin98")  # use small section alignment
-else:
-    # Find out the rest the hard way
-    OPENSSL_DIR = scan_argv("--openssl-dir=", "")
-    if OPENSSL_DIR != "":
-        include_dirs.append(os.path.join(OPENSSL_DIR, "include"))
-    CURL_CONFIG = "curl-config"
-    CURL_CONFIG = scan_argv("--curl-config=", CURL_CONFIG)
-    d = os.popen("'%s' --version" % CURL_CONFIG).read()
-    if d:
-        d = string.strip(d)
-    if not d:
-        raise Exception, ("`%s' not found -- please install the libcurl development files" % CURL_CONFIG)
-    print "Using %s (%s)" % (CURL_CONFIG, d)
-    for e in split_quoted(os.popen("'%s' --cflags" % CURL_CONFIG).read()):
-        if e[:2] == "-I":
-            # do not add /usr/include
-            if not re.search(r"^\/+usr\/+include\/*$", e[2:]):
-                include_dirs.append(e[2:])
-        else:
-            extra_compile_args.append(e)
-    for e in split_quoted(os.popen("'%s' --libs" % CURL_CONFIG).read()):
-        if e[:2] == "-l":
-            libraries.append(e[2:])
-            if e[2:] == 'ssl':
-                define_macros.append(('HAVE_CURL_OPENSSL', 1))
-            if e[2:] == 'gnutls':
-                define_macros.append(('HAVE_CURL_GNUTLS', 1))
-        elif e[:2] == "-L":
-            library_dirs.append(e[2:])
-        else:
-            extra_link_args.append(e)
-    for e in split_quoted(os.popen("'%s' --features" % CURL_CONFIG).read()):
-        if e == 'SSL':
-            define_macros.append(('HAVE_CURL_SSL', 1))
-    if not libraries:
-        libraries.append("curl")
-    # Add extra compile flag for MacOS X
-    if sys.platform[:-1] == "darwin":
-        extra_link_args.append("-flat_namespace")
-
-
-###############################################################################
-
-def get_kw(**kw): return kw
-
-ext = Extension(
-    name=PACKAGE,
-    sources=[
-        os.path.join("src", "pycurl.c"),
-    ],
-    include_dirs=include_dirs,
-    define_macros=define_macros,
-    library_dirs=library_dirs,
-    libraries=libraries,
-    runtime_library_dirs=runtime_library_dirs,
-    extra_objects=extra_objects,
-    extra_compile_args=extra_compile_args,
-    extra_link_args=extra_link_args,
-)
-##print ext.__dict__; sys.exit(1)
-
-
-###############################################################################
-
-# prepare data_files
-
-def get_data_files():
-    # a list of tuples with (path to install to, a list of local files)
-    data_files = []
-    if sys.platform == "win32":
-        datadir = os.path.join("doc", PACKAGE)
-    else:
-        datadir = os.path.join("share", "doc", PACKAGE)
-    #
-    files = ["ChangeLog", "COPYING", "INSTALL", "README", "TODO",]
-    if files:
-        data_files.append((os.path.join(datadir), files))
-    files = glob.glob(os.path.join("doc", "*.html"))
-    if files:
-        data_files.append((os.path.join(datadir, "html"), files))
-    files = glob.glob(os.path.join("examples", "*.py"))
-    if files:
-        data_files.append((os.path.join(datadir, "examples"), files))
-    files = glob.glob(os.path.join("tests", "*.py"))
-    if files:
-        data_files.append((os.path.join(datadir, "tests"), files))
-    #
-    assert data_files
-    for install_dir, files in data_files:
-        assert files
-        for f in files:
-            assert os.path.isfile(f), (f, install_dir)
-    return data_files
-
-##print get_data_files(); sys.exit(1)
-
-
-###############################################################################
-
-setup_args = get_kw(
-    name=PACKAGE,
-    version=VERSION,
-    description="PycURL -- cURL library module for Python",
-    author="Kjetil Jacobsen, Markus F.X.J. Oberhumer",
-    author_email="kjetilja at gmail.com, markus at oberhumer.com",
-    maintainer="Kjetil Jacobsen, Markus F.X.J. Oberhumer",
-    maintainer_email="kjetilja at gmail.com, markus at oberhumer.com",
-    url="http://pycurl.sourceforge.net/",
-    license="GNU Lesser General Public License (LGPL)",
-    data_files=get_data_files(),
-    ext_modules=[ext],
-    long_description="""
-This module provides Python bindings for the cURL library.""",
-)
-
-if sys.version >= "2.2":
-    setup_args["packages"] = [PY_PACKAGE]
-    setup_args["package_dir"] = { PY_PACKAGE: os.path.join('python', 'curl') }
-
-
-##print distutils.__version__
-if LooseVersion(distutils.__version__) > LooseVersion("1.0.1"):
-    setup_args["platforms"] = "All"
-if LooseVersion(distutils.__version__) < LooseVersion("1.0.3"):
-    setup_args["licence"] = setup_args["license"]
-
-if __name__ == "__main__":
-    for o in ext.extra_objects:
-        assert os.path.isfile(o), o
-    # We can live with the deprecationwarning for a while
-    apply(setup, (), setup_args)




More information about the Python-modules-commits mailing list