[Python-modules-commits] r30784 - in packages/python-repoze.tm2/trunk/debian (16 files)
jandd at users.alioth.debian.org
jandd at users.alioth.debian.org
Sun Sep 28 15:19:17 UTC 2014
Date: Sunday, September 28, 2014 @ 15:19:16
Author: jandd
Revision: 30784
* New upstream version
* update debian/docs to match new upstream files
* switch to pybuild (Closes: #671329)
* add Python3 support
* split into separate Python 2, Python 3 and documentation packages
* bump debian/compat to 9
* bump Standards-Version to 3.9.5 (no changes)
* add extend-diff-ignore for egg-info data in debian/source/options
* install CHANGES.rst as upstream changelog
* change debian/copyright to machine readable format
* add uversionmangle option to debian/watch to sort upstream alpha and
beta versions correctly
Added:
packages/python-repoze.tm2/trunk/debian/patches/
packages/python-repoze.tm2/trunk/debian/patches/build-apidoc.patch
packages/python-repoze.tm2/trunk/debian/patches/series
packages/python-repoze.tm2/trunk/debian/python-repoze.tm2-doc.doc-base
(from rev 30783, packages/python-repoze.tm2/trunk/debian/doc-base)
packages/python-repoze.tm2/trunk/debian/python-repoze.tm2-doc.docs
(from rev 30783, packages/python-repoze.tm2/trunk/debian/docs)
packages/python-repoze.tm2/trunk/debian/python-repoze.tm2.install
packages/python-repoze.tm2/trunk/debian/python3-repoze.tm2.install
packages/python-repoze.tm2/trunk/debian/source/options
Modified:
packages/python-repoze.tm2/trunk/debian/changelog
packages/python-repoze.tm2/trunk/debian/compat
packages/python-repoze.tm2/trunk/debian/control
packages/python-repoze.tm2/trunk/debian/copyright
packages/python-repoze.tm2/trunk/debian/rules
packages/python-repoze.tm2/trunk/debian/watch
Deleted:
packages/python-repoze.tm2/trunk/debian/doc-base
packages/python-repoze.tm2/trunk/debian/docs
Modified: packages/python-repoze.tm2/trunk/debian/changelog
===================================================================
--- packages/python-repoze.tm2/trunk/debian/changelog 2014-09-28 10:25:24 UTC (rev 30783)
+++ packages/python-repoze.tm2/trunk/debian/changelog 2014-09-28 15:19:16 UTC (rev 30784)
@@ -1,9 +1,24 @@
-python-repoze.tm2 (1.0b2-2) UNRELEASED; urgency=low
+python-repoze.tm2 (2.0-1) UNRELEASED; urgency=low
+ [ Jakub Wilk ]
* Use canonical URIs for Vcs-* fields.
- -- Jakub Wilk <jwilk at debian.org> Sun, 05 May 2013 16:03:19 +0200
+ [ Jan Dittberner ]
+ * New upstream version
+ * update debian/docs to match new upstream files
+ * switch to pybuild (Closes: #671329)
+ * add Python3 support
+ * split into separate Python 2, Python 3 and documentation packages
+ * bump debian/compat to 9
+ * bump Standards-Version to 3.9.5 (no changes)
+ * add extend-diff-ignore for egg-info data in debian/source/options
+ * install CHANGES.rst as upstream changelog
+ * change debian/copyright to machine readable format
+ * add uversionmangle option to debian/watch to sort upstream alpha and
+ beta versions correctly
+ -- Jan Dittberner <jandd at debian.org> Sun, 28 Sep 2014 16:42:47 +0200
+
python-repoze.tm2 (1.0b2-1) unstable; urgency=low
* New upstream version (Closes: #630704)
Modified: packages/python-repoze.tm2/trunk/debian/compat
===================================================================
--- packages/python-repoze.tm2/trunk/debian/compat 2014-09-28 10:25:24 UTC (rev 30783)
+++ packages/python-repoze.tm2/trunk/debian/compat 2014-09-28 15:19:16 UTC (rev 30784)
@@ -1 +1 @@
-7
+9
Modified: packages/python-repoze.tm2/trunk/debian/control
===================================================================
--- packages/python-repoze.tm2/trunk/debian/control 2014-09-28 10:25:24 UTC (rev 30783)
+++ packages/python-repoze.tm2/trunk/debian/control 2014-09-28 15:19:16 UTC (rev 30784)
@@ -3,25 +3,49 @@
Priority: extra
Maintainer: Debian Python Modules Team <python-modules-team at lists.alioth.debian.org>
Uploaders: Jan Dittberner <jandd at debian.org>
-Build-Depends:
- debhelper (>= 7.0.50~),
- python,
- python-setuptools,
- python-sphinx (>= 1.0.7+dfsg),
- python-transaction
-Standards-Version: 3.9.2
+Build-Depends: debhelper (>= 9), python-all, python3
+Build-Depends-Indep: dh-python,
+ python-setuptools,
+ python-sphinx (>= 1.0.7+dfsg) | python3-sphinx,
+ python-transaction,
+ python3-setuptools,
+ python3-transaction
+Standards-Version: 3.9.5
Homepage: http://www.repoze.org/
Vcs-Svn: svn://anonscm.debian.org/python-modules/packages/python-repoze.tm2/trunk/
Vcs-Browser: http://anonscm.debian.org/viewvc/python-modules/packages/python-repoze.tm2/trunk/
+X-Python-Version: >= 2.7
+X-Python3-Version: >= 3.2
Package: python-repoze.tm2
Architecture: all
-Depends:
- ${misc:Depends},
- ${python:Depends},
- ${sphinxdoc:Depends},
- python-transaction
-Description: Zope-like transaction manager via WSGI middleware
+Depends: python-transaction, ${misc:Depends}, ${python:Depends}
+Recommends: python-repoze.tm2-doc (=${binary:Version})
+Description: Zope-like transaction manager WSGI middleware (Python 2)
repoze.tm2 is Python WSGI middleware which uses the ZODB (Zope
Object DataBase) package's transaction manager to wrap a call to
its pipeline children inside a transaction.
+ .
+ This is the Python 2 version of the package.
+
+Package: python3-repoze.tm2
+Architecture: all
+Depends: python3-transaction, ${misc:Depends}, ${python3:Depends}
+Recommends: python-repoze.tm2-doc (=${binary:Version})
+Description: Zope-like transaction manager WSGI middleware (Python 3)
+ repoze.tm2 is Python WSGI middleware which uses the ZODB (Zope
+ Object DataBase) package's transaction manager to wrap a call to
+ its pipeline children inside a transaction.
+ .
+ This is the Python 3 version of the package.
+
+Package: python-repoze.tm2-doc
+Architecture: all
+Section: doc
+Depends: ${misc:Depends}, ${sphinxdoc:Depends}
+Description: Zope-like transaction manager WSGI middleware documentation
+ repoze.tm2 is Python WSGI middleware which uses the ZODB (Zope
+ Object DataBase) package's transaction manager to wrap a call to
+ its pipeline children inside a transaction.
+ .
+ This is the documentation for python-repoze.tm2 and python3-repoze.tm2.
Modified: packages/python-repoze.tm2/trunk/debian/copyright
===================================================================
--- packages/python-repoze.tm2/trunk/debian/copyright 2014-09-28 10:25:24 UTC (rev 30783)
+++ packages/python-repoze.tm2/trunk/debian/copyright 2014-09-28 15:19:16 UTC (rev 30784)
@@ -1,37 +1,37 @@
-This package was debianized by Stefano Zacchiroli <zack at debian.org> on
-Fri, 29 May 2009 21:27:29 +0200.
+Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
+Upstream-Name: repoze.tm2
+Upstream-Contact: Repoze Developers <repoze-dev at lists.repoze.org>
+Source: https://github.com/repoze/repoze.tm2
-Author: Agendaless Consulting <repoze-dev at lists.repoze.org>
-
Files: *
-Copyright: Copyright © 2007 Agendaless Consulting and Contributors
-License:
+Copyright: 2007 Agendaless Consulting and Contributors
+License: BSD-4-clause
A copyright notice accompanies this license document that identifies
the copyright holders.
-
+ .
Redistribution and use in source and binary forms, with or without
modification, are permitted provided that the following conditions are
met:
-
+ .
1. Redistributions in source code must retain the accompanying
copyright notice, this list of conditions, and the following
disclaimer.
-
+ .
2. Redistributions in binary form must reproduce the accompanying
copyright notice, this list of conditions, and the following
disclaimer in the documentation and/or other materials provided
with the distribution.
-
+ .
3. Names of the copyright holders must not be used to endorse or
promote products derived from this software without prior
written permission from the copyright holders.
-
+ .
4. If any files are modified, you must cause the modified files to
carry prominent notices stating that you changed the files and
the date of any change.
-
+ .
Disclaimer
-
+ .
THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS ``AS IS'' AND
ANY EXPRESSED OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A
@@ -46,8 +46,8 @@
SUCH DAMAGE.
Files: debian/*
-Copyright: Copyright © 2009 Stefano Zacchiroli <zack at debian.org>
+Copyright: 2009 Stefano Zacchiroli <zack at debian.org>
+ 2012-2014 Jan Dittberner <jandd at debian.org>
License: GPL-3+
On Debian systems the full text of the GNU General Public License can
be found in the `/usr/share/common-licenses/GPL-3' file.
-
Deleted: packages/python-repoze.tm2/trunk/debian/doc-base
===================================================================
--- packages/python-repoze.tm2/trunk/debian/doc-base 2014-09-28 10:25:24 UTC (rev 30783)
+++ packages/python-repoze.tm2/trunk/debian/doc-base 2014-09-28 15:19:16 UTC (rev 30784)
@@ -1,8 +0,0 @@
-Document: pytyon-repoze-tm2
-Title: Documentation for repoze.tm2
-Abstract: Documentation for repoze.tm2: Zope-like transaction manager via WSGI middleware
-Section: Programming/Python
-
-Format: HTML
-Index: /usr/share/doc/python-repoze.tm2/html/index.html
-Files: /usr/share/doc/python-repoze.tm2/html/*
Deleted: packages/python-repoze.tm2/trunk/debian/docs
===================================================================
--- packages/python-repoze.tm2/trunk/debian/docs 2014-09-28 10:25:24 UTC (rev 30783)
+++ packages/python-repoze.tm2/trunk/debian/docs 2014-09-28 15:19:16 UTC (rev 30784)
@@ -1,3 +0,0 @@
-README.txt
-TODO.txt
-docs/.build/html/
Added: packages/python-repoze.tm2/trunk/debian/patches/build-apidoc.patch
===================================================================
--- packages/python-repoze.tm2/trunk/debian/patches/build-apidoc.patch (rev 0)
+++ packages/python-repoze.tm2/trunk/debian/patches/build-apidoc.patch 2014-09-28 15:19:16 UTC (rev 30784)
@@ -0,0 +1,13 @@
+Subject: add source path to sys.path to allow proper API documentation generation
+Author: Jan Dittberner <jandd at debian.org>
+--- a/docs/conf.py
++++ b/docs/conf.py
+@@ -29,6 +29,8 @@
+ for item in os.listdir(parent):
+ if item.endswith('.egg'):
+ sys.path.append(os.path.join(parent, item))
++# add base pase for API documentation generation
++sys.path.append(os.path.abspath(os.path.join(parent, '..')))
+
+ # General configuration
+ # ---------------------
Added: packages/python-repoze.tm2/trunk/debian/patches/series
===================================================================
--- packages/python-repoze.tm2/trunk/debian/patches/series (rev 0)
+++ packages/python-repoze.tm2/trunk/debian/patches/series 2014-09-28 15:19:16 UTC (rev 30784)
@@ -0,0 +1 @@
+build-apidoc.patch
Copied: packages/python-repoze.tm2/trunk/debian/python-repoze.tm2-doc.doc-base (from rev 30783, packages/python-repoze.tm2/trunk/debian/doc-base)
===================================================================
--- packages/python-repoze.tm2/trunk/debian/python-repoze.tm2-doc.doc-base (rev 0)
+++ packages/python-repoze.tm2/trunk/debian/python-repoze.tm2-doc.doc-base 2014-09-28 15:19:16 UTC (rev 30784)
@@ -0,0 +1,8 @@
+Document: python-repoze-tm2
+Title: Documentation for repoze.tm2
+Abstract: Documentation for repoze.tm2: Zope-like transaction manager via WSGI middleware
+Section: Programming/Python
+
+Format: HTML
+Index: /usr/share/doc/python-repoze.tm2-doc/html/index.html
+Files: /usr/share/doc/python-repoze.tm2-doc/html/*
Copied: packages/python-repoze.tm2/trunk/debian/python-repoze.tm2-doc.docs (from rev 30783, packages/python-repoze.tm2/trunk/debian/docs)
===================================================================
--- packages/python-repoze.tm2/trunk/debian/python-repoze.tm2-doc.docs (rev 0)
+++ packages/python-repoze.tm2/trunk/debian/python-repoze.tm2-doc.docs 2014-09-28 15:19:16 UTC (rev 30784)
@@ -0,0 +1,3 @@
+CONTRIBUTORS.txt
+README.rst
+TODO.txt
Added: packages/python-repoze.tm2/trunk/debian/python-repoze.tm2.install
===================================================================
--- packages/python-repoze.tm2/trunk/debian/python-repoze.tm2.install (rev 0)
+++ packages/python-repoze.tm2/trunk/debian/python-repoze.tm2.install 2014-09-28 15:19:16 UTC (rev 30784)
@@ -0,0 +1 @@
+usr/lib/python2*
Added: packages/python-repoze.tm2/trunk/debian/python3-repoze.tm2.install
===================================================================
--- packages/python-repoze.tm2/trunk/debian/python3-repoze.tm2.install (rev 0)
+++ packages/python-repoze.tm2/trunk/debian/python3-repoze.tm2.install 2014-09-28 15:19:16 UTC (rev 30784)
@@ -0,0 +1 @@
+usr/lib/python3*
Modified: packages/python-repoze.tm2/trunk/debian/rules
===================================================================
--- packages/python-repoze.tm2/trunk/debian/rules 2014-09-28 10:25:24 UTC (rev 30783)
+++ packages/python-repoze.tm2/trunk/debian/rules 2014-09-28 15:19:16 UTC (rev 30784)
@@ -1,16 +1,16 @@
#!/usr/bin/make -f
-override_dh_auto_clean:
- dh_clean
- find . -type f -name '*.py[co]' -delete
- $(MAKE) -C docs/ clean
+#DH_VERBOSE=1
+PYBUILD_NAME=python-repoze.tm2
-override_dh_compress:
- dh_compress -X .js
+override_dh_sphinxdoc:
+ifeq (,$(findstring nodocs, $(DEB_BUILD_OPTIONS)))
+ sphinx-build -b html docs $(CURDIR)/debian/python-repoze.tm2-doc/usr/share/doc/python-repoze.tm2-doc/html
+ dh_sphinxdoc -O--buildsystem=pybuild
+endif
-override_dh_auto_install:
- $(MAKE) -C docs/ html
- dh_auto_install
+override_dh_installchangelogs:
+ dh_installchangelogs -i CHANGES.rst
%:
- dh --with python2,sphinxdoc --buildsystem=python_distutils $@
+ dh $@ --with python2,python3,sphinxdoc --buildsystem=pybuild
Added: packages/python-repoze.tm2/trunk/debian/source/options
===================================================================
--- packages/python-repoze.tm2/trunk/debian/source/options (rev 0)
+++ packages/python-repoze.tm2/trunk/debian/source/options 2014-09-28 15:19:16 UTC (rev 30784)
@@ -0,0 +1 @@
+extend-diff-ignore = "^[^/]*[.]egg-info/"
Modified: packages/python-repoze.tm2/trunk/debian/watch
===================================================================
--- packages/python-repoze.tm2/trunk/debian/watch 2014-09-28 10:25:24 UTC (rev 30783)
+++ packages/python-repoze.tm2/trunk/debian/watch 2014-09-28 15:19:16 UTC (rev 30784)
@@ -1,2 +1,3 @@
version=3
+opts=uversionmangle=s/(\d)[_\.\-\+]?((a|b)\d*)$/$1~$2/ \
http://pypi.python.org/packages/source/r/repoze.tm2/repoze.tm2-([0-9a-z.]*)\.tar\.gz
More information about the Python-modules-commits
mailing list