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

barry at users.alioth.debian.org barry at users.alioth.debian.org
Mon Sep 29 22:37:24 UTC 2014 

    Date: Monday, September 29, 2014 @ 22:37:23
  Author: barry
Revision: 30822

* debian/control, debian/rules:
  - Back ported Ubuntu change to split the docs into a separate
    python-pycurl-doc package.  This breaks the dependency of python3-curl
    on python-curl.  Given by Matthias Klose.  Closes: #757694
* debian/control:
  - Add Suggests on python-curl-doc.
  - Update long descriptions.
* debian/copyright: Added short license description to LGPL part to quiet
  lintian warning empty-short-license-in-dep5-copyright.
* debian/python-pycurl-doc.doc-base: Renamed from python-pycurl.doc-base
  and fixed links.
* debian/python-pycurl.dirs: Removed.

Added:
  packages/pycurl/trunk/debian/TODO
  packages/pycurl/trunk/debian/python-pycurl-doc.doc-base
    (from rev 30820, packages/pycurl/trunk/debian/python-pycurl.doc-base)
Modified:
  packages/pycurl/trunk/debian/changelog
  packages/pycurl/trunk/debian/control
  packages/pycurl/trunk/debian/copyright
  packages/pycurl/trunk/debian/rules
Deleted:
  packages/pycurl/trunk/debian/python-pycurl.dirs
  packages/pycurl/trunk/debian/python-pycurl.doc-base

Added: packages/pycurl/trunk/debian/TODO
===================================================================
--- packages/pycurl/trunk/debian/TODO	                        (rev 0)
+++ packages/pycurl/trunk/debian/TODO	2014-09-29 22:37:23 UTC (rev 30822)
@@ -0,0 +1 @@
+- check what tests can be executed even on buildd machines (no network and so)

Modified: packages/pycurl/trunk/debian/changelog
===================================================================
--- packages/pycurl/trunk/debian/changelog	2014-09-29 22:00:47 UTC (rev 30821)
+++ packages/pycurl/trunk/debian/changelog	2014-09-29 22:37:23 UTC (rev 30822)
@@ -12,6 +12,20 @@
       #includes <gnutls/gnutls.h>. Closes: #751059
       (Applied from NMU diff by Barry Warsaw.  Closes: #756199)
 
+  [ Barry Warsaw ]
+  * debian/control, debian/rules:
+    - Back ported Ubuntu change to split the docs into a separate
+      python-pycurl-doc package.  This breaks the dependency of python3-curl
+      on python-curl.  Given by Matthias Klose.  Closes: #757694
+  * debian/control:
+    - Add Suggests on python-curl-doc.
+    - Update long descriptions.
+  * debian/copyright: Added short license description to LGPL part to quiet
+    lintian warning empty-short-license-in-dep5-copyright.
+  * debian/python-pycurl-doc.doc-base: Renamed from python-pycurl.doc-base
+    and fixed links.
+  * debian/python-pycurl.dirs: Removed.
+
  -- Sandro Tosi <morph at debian.org>  Fri, 21 Feb 2014 21:00:17 +0100
 
 pycurl (7.19.3.1-1) unstable; urgency=medium

Modified: packages/pycurl/trunk/debian/control
===================================================================
--- packages/pycurl/trunk/debian/control	2014-09-29 22:00:47 UTC (rev 30821)
+++ packages/pycurl/trunk/debian/control	2014-09-29 22:37:23 UTC (rev 30822)
@@ -13,17 +13,19 @@
 
 Package: python-pycurl
 Architecture: any
-Suggests: libcurl4-gnutls-dev, python-pycurl-dbg
+Suggests: libcurl4-gnutls-dev, python-pycurl-dbg, python-pycurl-doc
 Depends: ${shlibs:Depends}, ${python:Depends}, ${misc:Depends}
 Description: Python bindings to libcurl
  This module provides the Python bindings to libcurl. Please refer to
  the libcurl documentation available in libcurl4-gnutls-dev Debian package.
  .
  NOTE: the SSL support is provided by GnuTLS.
+ .
+ This package contains PyCURL for Python 2.
 
 Package: python3-pycurl
 Architecture: any
-Suggests: libcurl4-gnutls-dev, python3-pycurl-dbg
+Suggests: libcurl4-gnutls-dev, python3-pycurl-dbg, python-pycurl-doc
 Depends: ${shlibs:Depends}, ${python3:Depends}, ${misc:Depends}
 Description: Python bindings to libcurl (Python 3)
  This module provides the Python bindings to libcurl. Please refer to
@@ -42,7 +44,7 @@
  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 2 debug interpreter.
 
 Package: python3-pycurl-dbg
 Section: debug
@@ -54,3 +56,16 @@
  the libcurl documentation available in libcurl4-gnutls-dev Debian package.
  .
  This package contains the extension built for the Python 3 debug interpreter.
+
+Package: python-pycurl-doc
+Architecture: all
+Section: doc
+Depends: ${misc:Depends}
+Conflicts: python-pycurl (<< 7.19.3.1-2)
+Description: Python bindings to libcurl (documentation)
+ This module provides the Python bindings to libcurl. Please refer to
+ the libcurl documentation available in libcurl4-gnutls-dev Debian package.
+ .
+ NOTE: the SSL support is provided by GnuTLS.
+ .
+ This package contains the PyCURL documentation.

Modified: packages/pycurl/trunk/debian/copyright
===================================================================
--- packages/pycurl/trunk/debian/copyright	2014-09-29 22:00:47 UTC (rev 30821)
+++ packages/pycurl/trunk/debian/copyright	2014-09-29 22:37:23 UTC (rev 30822)
@@ -7,7 +7,7 @@
  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>
  Copyright (C) 2013-2014 by Oleg Pudeyev <oleg at bsdpower.com>
-License:
+License: LGPL-2.1
  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

Copied: packages/pycurl/trunk/debian/python-pycurl-doc.doc-base (from rev 30820, packages/pycurl/trunk/debian/python-pycurl.doc-base)
===================================================================
--- packages/pycurl/trunk/debian/python-pycurl-doc.doc-base	                        (rev 0)
+++ packages/pycurl/trunk/debian/python-pycurl-doc.doc-base	2014-09-29 22:37:23 UTC (rev 30822)
@@ -0,0 +1,9 @@
+Document: python-pycurl
+Title: PycURL
+Author: Markus F.X.J. Oberhumer, Kjetil Jacobsen
+Abstract: A Python interface to the cURL library
+Section: Programming/Python
+
+Format: HTML
+Index: /usr/share/doc/python-pycurl-doc/html/pycurl.html
+Files: /usr/share/doc/python-pycurl-doc/html/*.html

Deleted: packages/pycurl/trunk/debian/python-pycurl.dirs
===================================================================
--- packages/pycurl/trunk/debian/python-pycurl.dirs	2014-09-29 22:00:47 UTC (rev 30821)
+++ packages/pycurl/trunk/debian/python-pycurl.dirs	2014-09-29 22:37:23 UTC (rev 30822)
@@ -1 +0,0 @@
-usr/share/doc/python-pycurl/html

Deleted: packages/pycurl/trunk/debian/python-pycurl.doc-base
===================================================================
--- packages/pycurl/trunk/debian/python-pycurl.doc-base	2014-09-29 22:00:47 UTC (rev 30821)
+++ packages/pycurl/trunk/debian/python-pycurl.doc-base	2014-09-29 22:37:23 UTC (rev 30822)
@@ -1,9 +0,0 @@
-Document: python-pycurl
-Title: PycURL
-Author: Markus F.X.J. Oberhumer, Kjetil Jacobsen
-Abstract: A Python interface to the cURL library
-Section: Programming/Python
-
-Format: HTML
-Index: /usr/share/doc/python-pycurl/html/pycurl.html
-Files: /usr/share/doc/python-pycurl/html/*.html

Modified: packages/pycurl/trunk/debian/rules
===================================================================
--- packages/pycurl/trunk/debian/rules	2014-09-29 22:00:47 UTC (rev 30821)
+++ packages/pycurl/trunk/debian/rules	2014-09-29 22:37:23 UTC (rev 30822)
@@ -35,12 +35,12 @@
 
 override_dh_auto_install:
 	for py in $(PY2VERS); do \
-  	    python$$py setup.py install --root=$(CURDIR)/debian/python-pycurl --install-layout=deb; \
- 	    python$$py-dbg setup.py install --root=$(CURDIR)/debian/python-pycurl-dbg --install-layout=deb; \
+	    python$$py setup.py install --root=$(CURDIR)/debian/python-pycurl --install-layout=deb; \
+	    python$$py-dbg setup.py install --root=$(CURDIR)/debian/python-pycurl-dbg --install-layout=deb; \
 	done
 	for py in $(PY3VERS); do \
-  	    python$$py setup.py install --root=$(CURDIR)/debian/python3-pycurl --install-layout=deb; \
- 	    python$$py-dbg setup.py install --root=$(CURDIR)/debian/python3-pycurl-dbg --install-layout=deb; \
+	    python$$py setup.py install --root=$(CURDIR)/debian/python3-pycurl --install-layout=deb; \
+	    python$$py-dbg setup.py install --root=$(CURDIR)/debian/python3-pycurl-dbg --install-layout=deb; \
 	done
 
 	# Remove documentation as installed by setup.py
@@ -50,11 +50,17 @@
 	rm -f $(CURDIR)/debian/python*-pycurl-dbg/usr/lib/python*/*-packages/pycurl-*.egg-info
 
 override_dh_installdocs:
-	cp -a build/www/htdocs/doc/*.html $(CURDIR)/debian/python-pycurl/usr/share/doc/python-pycurl/html
-	dh_installdocs -A --link-doc=python-pycurl
+	mkdir -p debian/python-pycurl-doc/usr/share/doc/python-pycurl-doc/html
+	cp -a build/www/htdocs/doc/*.html $(CURDIR)/debian/python-pycurl-doc/usr/share/doc/python-pycurl-doc/html
+	dh_link -ppython-pycurl-doc \
+		/usr/share/doc/python-pycurl-doc/html /usr/share/doc/python-pycurl/html \
+		/usr/share/doc/python-pycurl-doc/html /usr/share/doc/python3-pycurl/html
+	dh_installdocs -ppython-pycurl -ppython-pycurl-dbg --link-doc=python-pycurl
+	dh_installdocs -ppython3-pycurl -ppython3-pycurl-dbg --link-doc=python3-pycurl
+	dh_installdocs -ppython-pycurl-doc
 
 override_dh_installexamples:
-	dh_installexamples examples/*
+	dh_installexamples -ppython-pycurl-doc examples/*
 
 override_dh_installchangelogs:
 	dh_installchangelogs ChangeLog

More information about the Python-modules-commits mailing list