[Python-modules-commits] r30826 - in packages/pycurl/trunk/debian (4 files)
barry at users.alioth.debian.org
barry at users.alioth.debian.org
Tue Sep 30 15:50:10 UTC 2014
Date: Tuesday, September 30, 2014 @ 15:50:09
Author: barry
Revision: 30826
* Team upload.
* New upstream release.
- wrap-and-sort
* debian/rules:
- Added --with sphinxdoc.
- In override_dh_auto_build, call `make gen` since the upstream
tarball does not seem to contain the generated src/docstrings.{h,c}
files.
- Updated override_dh_installdocs for the upstream moved docs directory.
* debian/patches/20_build_doc_for_debian.patch: Updated and refreshed.
Modified:
packages/pycurl/trunk/debian/changelog
packages/pycurl/trunk/debian/control
packages/pycurl/trunk/debian/patches/20_build_doc_for_debian.patch
packages/pycurl/trunk/debian/rules
Modified: packages/pycurl/trunk/debian/changelog
===================================================================
--- packages/pycurl/trunk/debian/changelog 2014-09-30 05:20:59 UTC (rev 30825)
+++ packages/pycurl/trunk/debian/changelog 2014-09-30 15:50:09 UTC (rev 30826)
@@ -1,5 +1,7 @@
-pycurl (7.19.3.1-2) UNRELEASED; urgency=medium
+pycurl (7.19.5-1) UNRELEASED; urgency=medium
+ * Team upload.
+
[ Sandro Tosi ]
* debian/control
- fix short description (adding py3k tag to the right package); thanks to
@@ -13,6 +15,7 @@
(Applied from NMU diff by Barry Warsaw. Closes: #756199)
[ Barry Warsaw ]
+ * New upstream release.
* 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
@@ -20,13 +23,21 @@
* debian/control:
- Add Suggests on python-curl-doc.
- Update long descriptions.
+ - wrap-and-sort
+ * debian/rules:
+ - Added --with sphinxdoc.
+ - In override_dh_auto_build, call `make gen` since the upstream
+ tarball does not seem to contain the generated src/docstrings.{h,c}
+ files.
+ - Updated override_dh_installdocs for the upstream moved docs directory.
* 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.
+ * debian/patches/20_build_doc_for_debian.patch: Updated and refreshed.
- -- Sandro Tosi <morph at debian.org> Fri, 21 Feb 2014 21:00:17 +0100
+ -- Barry Warsaw <barry at debian.org> Tue, 30 Sep 2014 10:28:15 -0400
pycurl (7.19.3.1-1) unstable; urgency=medium
Modified: packages/pycurl/trunk/debian/control
===================================================================
--- packages/pycurl/trunk/debian/control 2014-09-30 05:20:59 UTC (rev 30825)
+++ packages/pycurl/trunk/debian/control 2014-09-30 15:50:09 UTC (rev 30826)
@@ -3,7 +3,19 @@
Priority: optional
Maintainer: Sandro Tosi <morph at debian.org>
Uploaders: Debian Python Modules Team <python-modules-team at lists.alioth.debian.org>
-Build-Depends: debhelper (>= 7.0.50~), python-all-dev (>= 2.6.6-3~), python-all-dbg, python3-all-dev, python3-all-dbg, dh-python, libcurl4-gnutls-dev (>= 7.19.0), libssh2-1-dev, python-nose, python-bottle, python-cherrypy3, python-docutils, libgnutls28-dev
+Build-Depends: debhelper (>= 7.0.50~),
+ dh-python,
+ libcurl4-gnutls-dev (>= 7.19.0),
+ libgnutls28-dev,
+ libssh2-1-dev,
+ python-all-dbg,
+ python-all-dev (>= 2.6.6-3~),
+ python-bottle,
+ python-docutils,
+ python-nose,
+ python-sphinx,
+ python3-all-dbg,
+ python3-all-dev
Standards-Version: 3.9.5
X-Python-Version: all
X-Python3-Version: >= 3.3
@@ -14,7 +26,7 @@
Package: python-pycurl
Architecture: any
Suggests: libcurl4-gnutls-dev, python-pycurl-dbg, python-pycurl-doc
-Depends: ${shlibs:Depends}, ${python:Depends}, ${misc:Depends}
+Depends: ${misc:Depends}, ${python:Depends}, ${shlibs: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.
@@ -25,8 +37,8 @@
Package: python3-pycurl
Architecture: any
-Suggests: libcurl4-gnutls-dev, python3-pycurl-dbg, python-pycurl-doc
-Depends: ${shlibs:Depends}, ${python3:Depends}, ${misc:Depends}
+Suggests: libcurl4-gnutls-dev, python-pycurl-doc, python3-pycurl-dbg
+Depends: ${misc:Depends}, ${python3:Depends}, ${shlibs:Depends}
Description: Python bindings to libcurl (Python 3)
This module provides the Python bindings to libcurl. Please refer to
the libcurl documentation available in libcurl4-gnutls-dev Debian package.
@@ -39,7 +51,10 @@
Section: debug
Priority: extra
Architecture: any
-Depends: ${shlibs:Depends}, python-dbg, python-pycurl (= ${binary:Version}), ${misc:Depends}
+Depends: python-dbg,
+ python-pycurl (= ${binary:Version}),
+ ${misc:Depends},
+ ${shlibs:Depends}
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.
@@ -50,7 +65,10 @@
Section: debug
Priority: extra
Architecture: any
-Depends: ${shlibs:Depends}, python3-dbg, python3-pycurl (= ${binary:Version}), ${misc:Depends}
+Depends: python3-dbg,
+ python3-pycurl (= ${binary:Version}),
+ ${misc:Depends},
+ ${shlibs:Depends}
Description: Python bindings to libcurl (debug extension, Python 3)
This module provides the Python bindings to libcurl. Please refer to
the libcurl documentation available in libcurl4-gnutls-dev Debian package.
Modified: packages/pycurl/trunk/debian/patches/20_build_doc_for_debian.patch
===================================================================
--- packages/pycurl/trunk/debian/patches/20_build_doc_for_debian.patch 2014-09-30 05:20:59 UTC (rev 30825)
+++ packages/pycurl/trunk/debian/patches/20_build_doc_for_debian.patch 2014-09-30 15:50:09 UTC (rev 30826)
@@ -7,17 +7,11 @@
This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
--- a/Makefile
+++ b/Makefile
-@@ -63,10 +63,11 @@ windist: distclean
- rm -rf build
+@@ -142,6 +142,7 @@
+ PYTHONSUFFIX=$$(python -V 2>&1 |awk '{print $$2}' |awk -F. '{print $$1 "." $$2}') && \
+ PYTHONPATH=$$(ls -d build/lib.*$$PYTHONSUFFIX):$$PYTHONPATH \
+ sphinx-build doc build/doc
++ rst2html README.rst build/doc/README.html
- www docs:
-- mkdir -p build
-- rsync -av www build
-+ mkdir -p build/www/htdocs/doc
-+ #rsync -av www build
- cd doc && for file in *.rst; do rst2html "$$file" ../build/www/htdocs/doc/`echo "$$file" |sed -e 's/.rst$$/.html/'`; done
- rst2html RELEASE-NOTES.rst build/www/htdocs/release-notes.html
-+ rst2html README.rst build/www/htdocs/README.html
-
-
- .PHONY: all build test do-test strip install install_lib clean distclean maintainer-clean dist sdist windist
+ # Rebuild all documentation.
+ # As sphinx extracts documentation from pycurl modules, docs targets
Modified: packages/pycurl/trunk/debian/rules
===================================================================
--- packages/pycurl/trunk/debian/rules 2014-09-30 05:20:59 UTC (rev 30825)
+++ packages/pycurl/trunk/debian/rules 2014-09-30 15:50:09 UTC (rev 30826)
@@ -14,9 +14,10 @@
export FFLAGS="-fPIC"
%:
- dh $@ --with python2,python3
+ dh $@ --with python2,python3,sphinxdoc
override_dh_auto_build:
+ make gen
set -e ;\
for py in $(PY2VERS) $(PY3VERS) ; do \
python$$py setup.py build ; \
@@ -51,7 +52,7 @@
override_dh_installdocs:
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
+ cp -a build/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
More information about the Python-modules-commits
mailing list