Hi,

Here's a diff which can be used to up the version of this package.
Do you agree that I do the upgrade using this diff?

Note that if you need a sponsor for the upload of this package, I can
also do that.

Cheers,

Thomas Goirand (zigo)
diff -u -N -r kazoo-1.3.1/debian/changelog kazoo-2.2.1/debian/changelog
--- kazoo-1.3.1/debian/changelog	2014-02-22 09:10:25.000000000 +0000
+++ kazoo-2.2.1/debian/changelog	2015-07-15 13:47:53.757405553 +0000
@@ -1,3 +1,12 @@
+kazoo (2.2.1-0.1) unstable; urgency=medium
+
+  * Non-maintainer upload.
+  * New upstream release.
+  * Removed no-tag-build.patch applied upstream.
+  * Removed -doc package as the docs folder is gone from upstream.
+
+ -- Thomas Goirand <z...@debian.org>  Wed, 15 Jul 2015 13:41:10 +0000
+
 kazoo (1.3.1-1) unstable; urgency=low
 
   * New upstream release.
diff -u -N -r kazoo-1.3.1/debian/control kazoo-2.2.1/debian/control
--- kazoo-1.3.1/debian/control	2014-02-22 09:17:37.000000000 +0000
+++ kazoo-2.2.1/debian/control	2015-07-15 13:47:26.205418238 +0000
@@ -8,8 +8,6 @@
                python-setuptools (>= 0.6b3),
                python3-all,
                python3-setuptools,
-               python-repoze.sphinx.autointerface,
-               python-sphinx (>= 1.0.7+dfsg) | python3-sphinx,
                python-gevent,
 Standards-Version: 3.9.5
 Homepage: https://kazoo.readthedocs.org
@@ -57,24 +55,3 @@
  Kazoo is heavily inspired by Netflix Curator simplifications and helpers.
  .
  This is the Python 3 version of the package.
-
-Package: python-kazoo-doc
-Architecture: all
-Section: doc
-Depends: ${misc:Depends}, ${sphinxdoc:Depends}
-Description: API to Apache Zookeeper for Python clients. - API documentation
- Kazoo features:
- .
-  * Support for gevent 0.13 and gevent 1.0b
-  * Unified asynchronous API for use with greenlets or threads
-  * Lock, Party, Election, and Partitioner recipe implementations (more
-    implementations are in development)
-  * Data and Children Watchers
-  * Integrated testing helpers for Zookeeper clusters
-  * Simplified Zookeeper connection state tracking
-  * Pure-Python based implementation of the wire protocol, avoiding all the
-    memory leaks, lacking features, and debugging madness of the C library
- .
- Kazoo is heavily inspired by Netflix Curator simplifications and helpers.
- .
- This package contains the API documentation.
diff -u -N -r kazoo-1.3.1/debian/patches/no-tag-build.patch kazoo-2.2.1/debian/patches/no-tag-build.patch
--- kazoo-1.3.1/debian/patches/no-tag-build.patch	2014-02-22 08:24:17.000000000 +0000
+++ kazoo-2.2.1/debian/patches/no-tag-build.patch	1970-01-01 00:00:00.000000000 +0000
@@ -1,15 +0,0 @@
-Description: Unset build_tag so the installed module isn't "dev" suffixed.
-Author: Neil Williams <n...@spladug.net>
-Forwarded: not-needed
-Last-Update: 2012-12-24
-Index: kazoo/setup.cfg
-===================================================================
---- kazoo.orig/setup.cfg	2012-12-21 19:25:50.649997478 -0800
-+++ kazoo/setup.cfg	2012-12-23 22:43:45.557703554 -0800
-@@ -1,5 +1,5 @@
- [egg_info]
--tag_build = dev
-+tag_build =
- 
- [nosetests]
- where=kazoo
diff -u -N -r kazoo-1.3.1/debian/patches/series kazoo-2.2.1/debian/patches/series
--- kazoo-1.3.1/debian/patches/series	2014-02-22 08:24:17.000000000 +0000
+++ kazoo-2.2.1/debian/patches/series	1970-01-01 00:00:00.000000000 +0000
@@ -1 +0,0 @@
-no-tag-build.patch
diff -u -N -r kazoo-1.3.1/debian/python-kazoo-doc.doc-base kazoo-2.2.1/debian/python-kazoo-doc.doc-base
--- kazoo-1.3.1/debian/python-kazoo-doc.doc-base	2014-02-22 08:24:17.000000000 +0000
+++ kazoo-2.2.1/debian/python-kazoo-doc.doc-base	1970-01-01 00:00:00.000000000 +0000
@@ -1,10 +0,0 @@
-Document: python-kazoo-doc
-Title: Python Kazoo Documentation
-Author: Kazoo Team
-Section: Programming/Python
-
-Format: HTML
-Index: /usr/share/doc/python-kazoo-doc/html/index.html
-Files: /usr/share/doc/python-kazoo-doc/html/*.html
-       /usr/share/doc/python-kazoo-doc/html/api/*.html
-       /usr/share/doc/python-kazoo-doc/html/api/*/*.html
diff -u -N -r kazoo-1.3.1/debian/python-kazoo-doc.docs kazoo-2.2.1/debian/python-kazoo-doc.docs
--- kazoo-1.3.1/debian/python-kazoo-doc.docs	2014-02-22 08:24:17.000000000 +0000
+++ kazoo-2.2.1/debian/python-kazoo-doc.docs	1970-01-01 00:00:00.000000000 +0000
@@ -1 +0,0 @@
-build/html
diff -u -N -r kazoo-1.3.1/debian/rules kazoo-2.2.1/debian/rules
--- kazoo-1.3.1/debian/rules	2014-02-22 09:05:43.000000000 +0000
+++ kazoo-2.2.1/debian/rules	2015-07-15 13:47:02.065429342 +0000
@@ -4,17 +4,12 @@
 export PYBUILD_DISABLE=test
 
 %:
-	dh $@ --with python2,python3,sphinxdoc --buildsystem=pybuild
+	dh $@ --with python2,python3 --buildsystem=pybuild
 
 .PHONY: override_dh_installchangelogs
 override_dh_installchangelogs:
 	dh_installchangelogs CHANGES.rst
 
-.PHONY: override_dh_auto_build
-override_dh_auto_build:
-	sphinx-build -b html docs build/html
-	dh_auto_build
-
 .PHONY: override_dh_clean
 override_dh_clean:
 	rm -rf build

Reply via email to