[Python-modules-commits] r23395 - in packages/python-cups/trunk/debian (7 files)
bigon at users.alioth.debian.org
bigon at users.alioth.debian.org
Fri Jan 25 09:57:30 UTC 2013
Date: Friday, January 25, 2013 @ 09:57:26
Author: bigon
Revision: 23395
* Drop debian/patches/02_auth_loop.patch: Applied upstream
* Switch to dh_python2
* Bump debhelper compatibility to 9
* Bump Standards-Version to 3.9.4 (no further changes)
Modified:
packages/python-cups/trunk/debian/changelog
packages/python-cups/trunk/debian/compat
packages/python-cups/trunk/debian/control
packages/python-cups/trunk/debian/patches/series
packages/python-cups/trunk/debian/rules
Deleted:
packages/python-cups/trunk/debian/patches/02_auth_loop.patch
packages/python-cups/trunk/debian/pyversions
Modified: packages/python-cups/trunk/debian/changelog
===================================================================
--- packages/python-cups/trunk/debian/changelog 2013-01-25 09:49:37 UTC (rev 23394)
+++ packages/python-cups/trunk/debian/changelog 2013-01-25 09:57:26 UTC (rev 23395)
@@ -1,9 +1,17 @@
-python-cups (1.9.62-1.1~1) unstable; urgency=low
+python-cups (1.9.62-1) UNRELEASED; urgency=low
- * Non-maintainer upload.
- * [830ed38] New upstream version 1.9.62
- * [e4459b6] Update patch
+ * Team upload.
+ [ Guido Günther ]
+ * New upstream version 1.9.62 (Closes: #554825)
+ - Fix the "unknown IPP tag" error (Closes: #656640)
+ * Update patch
+ [ Laurent Bigonville ]
+ * Drop debian/patches/02_auth_loop.patch: Applied upstream
+ * Switch to dh_python2
+ * Bump debhelper compatibility to 9
+ * Bump Standards-Version to 3.9.4 (no further changes)
+
-- Guido Günther <agx at sigxcpu.org> Fri, 30 Nov 2012 09:12:19 +0100
python-cups (1.9.48-1.1) unstable; urgency=low
Modified: packages/python-cups/trunk/debian/compat
===================================================================
--- packages/python-cups/trunk/debian/compat 2013-01-25 09:49:37 UTC (rev 23394)
+++ packages/python-cups/trunk/debian/compat 2013-01-25 09:57:26 UTC (rev 23395)
@@ -1 +1 @@
-7
+9
Modified: packages/python-cups/trunk/debian/control
===================================================================
--- packages/python-cups/trunk/debian/control 2013-01-25 09:49:37 UTC (rev 23394)
+++ packages/python-cups/trunk/debian/control 2013-01-25 09:57:26 UTC (rev 23395)
@@ -1,18 +1,18 @@
Source: python-cups
-Section: python
+Section: python
Priority: optional
Maintainer: Otavio Salvador <otavio at debian.org>
Uploaders: Jérôme Guelfucci <jeromeg at xfce.org>,
Josselin Mouette <joss at debian.org>,
Debian Python Modules Team <python-modules-team at lists.alioth.debian.org>
-Build-Depends: debhelper (>= 7.3.7),
- python-support (>= 0.6),
- python-all-dev (>= 2.5),
+Build-Depends: debhelper (>= 9),
+ python-all-dev (>= 2.6.6-3~),
libcups2-dev
-Standards-Version: 3.8.3
+Standards-Version: 3.9.4
Homepage: http://cyberelk.net/tim/software/pycups/
VCS-Svn: svn://svn.debian.org/python-modules/packages/python-cups/trunk/
VCS-Browser: http://svn.debian.org/viewsvn/python-modules/packages/python-cups/trunk/
+X-Python-Version: >= 2.5
Package: python-cups
Architecture: any
Deleted: packages/python-cups/trunk/debian/patches/02_auth_loop.patch
===================================================================
--- packages/python-cups/trunk/debian/patches/02_auth_loop.patch 2013-01-25 09:49:37 UTC (rev 23394)
+++ packages/python-cups/trunk/debian/patches/02_auth_loop.patch 2013-01-25 09:57:26 UTC (rev 23395)
@@ -1,112 +0,0 @@
-Taken from Fedora git, 7fdad2e693e74b8811beca28d4ac6dd1619c988a
-and backported to Debian version. Original commit info:
-
-From: Tim Waugh <twaugh at redhat.com>
-Date: Mon, 03 Oct 2011 16:18:53 +0000
-Subject: Prevent auth loops by returning NULL when the callback returns an empty string.
-
-Also add support for the callback returning None when it wants to
-cancel the current operation.
-
---- a/cupsconnection.c
-+++ b/cupsconnection.c
-@@ -356,20 +356,26 @@ password_callback (int newstyle,
- Py_DECREF (args);
- if (result == NULL)
- {
-- debugprintf ("<- password_callback (empty string)\n");
-+ debugprintf ("<- password_callback (exception)\n");
- Connection_begin_allow_threads (self);
-- return "";
-+ return NULL;
- }
-
-- pwval = PyString_AsString (result);
- free (self->cb_password);
-- self->cb_password = strdup (pwval);
-+ if (result == Py_None)
-+ self->cb_password = NULL;
-+ else
-+ {
-+ pwval = PyString_AsString (result);
-+ self->cb_password = strdup (pwval);
-+ }
-+
- Py_DECREF (result);
-- if (!self->cb_password)
-+ if (!self->cb_password || !*self->cb_password)
- {
-- debugprintf ("<- password_callback (empty string)\n");
-+ debugprintf ("<- password_callback (empty/null)\n");
- Connection_begin_allow_threads (self);
-- return "";
-+ return NULL;
- }
-
- Connection_begin_allow_threads (self);
---- a/cupsmodule.c
-+++ b/cupsmodule.c
-@@ -124,9 +124,9 @@ do_password_callback (const char *prompt
- Py_DECREF (args);
- if (result == NULL)
- {
-- debugprintf ("<- do_password_callback (empty string)\n");
-+ debugprintf ("<- do_password_callback (exception)\n");
- Connection_begin_allow_threads (g_current_connection);
-- return "";
-+ return NULL;
- }
-
- if (password) {
-@@ -134,14 +134,20 @@ do_password_callback (const char *prompt
- password = NULL;
- }
-
-- pwval = PyString_AsString (result);
-- password = strdup (pwval);
-+ if (result == Py_None)
-+ password = NULL;
-+ else
-+ {
-+ pwval = PyString_AsString (result);
-+ password = strdup (pwval);
-+ }
-+
- Py_DECREF (result);
-- if (!password)
-+ if (!password || !*password)
- {
-- debugprintf ("<- do_password_callback (empty string)\n");
-+ debugprintf ("<- do_password_callback (empty/null)\n");
- Connection_begin_allow_threads (g_current_connection);
-- return "";
-+ return NULL;
- }
-
- Connection_begin_allow_threads (g_current_connection);
-@@ -481,8 +487,8 @@ static PyMethodDef CupsMethods[] = {
- "setPasswordCB(fn) -> None\n\n"
- "Set password callback function. This Python function will be called \n"
- "when a password is required. It must take one string parameter \n"
-- "(the password prompt) and it must return a string (the password). To \n"
-- "abort the operation it may return the empty string ('').\n\n"
-+ "(the password prompt) and it must return a string (the password), or \n"
-+ "None to abort the operation.\n\n"
- "@type fn: callable object\n"
- "@param fn: callback function" },
-
-@@ -491,10 +497,10 @@ static PyMethodDef CupsMethods[] = {
- "setPasswordCB2(fn, context=None) -> None\n\n"
- "Set password callback function. This Python function will be called \n"
- "when a password is required. It must take parameters of type string \n"
-- "(the password prompt), instance (the cups.Connection), string (the HTTP "
-- "method), string (the HTTP resource) and, optionally, the user-supplied "
-- "context. It must return a string (the password). To \n"
-- "abort the operation it may return the empty string ('').\n\n"
-+ "(the password prompt), instance (the cups.Connection), string (the \n"
-+ "HTTP method), string (the HTTP resource) and, optionally, the user-\n"
-+ "supplied context. It must return a string (the password), or None \n"
-+ "to abort the operation.\n\n"
- "@type fn: callable object, or None for default handler\n"
- "@param fn: callback function" },
- #endif /* HAVE_CUPS_1_4 */
Modified: packages/python-cups/trunk/debian/patches/series
===================================================================
--- packages/python-cups/trunk/debian/patches/series 2013-01-25 09:49:37 UTC (rev 23394)
+++ packages/python-cups/trunk/debian/patches/series 2013-01-25 09:57:26 UTC (rev 23395)
@@ -1,2 +1 @@
01_no_epydoc.patch
-02_auth_loop.patch
Deleted: packages/python-cups/trunk/debian/pyversions
===================================================================
--- packages/python-cups/trunk/debian/pyversions 2013-01-25 09:49:37 UTC (rev 23394)
+++ packages/python-cups/trunk/debian/pyversions 2013-01-25 09:57:26 UTC (rev 23395)
@@ -1 +0,0 @@
-2.5-
Modified: packages/python-cups/trunk/debian/rules
===================================================================
--- packages/python-cups/trunk/debian/rules 2013-01-25 09:49:37 UTC (rev 23394)
+++ packages/python-cups/trunk/debian/rules 2013-01-25 09:57:26 UTC (rev 23395)
@@ -9,4 +9,4 @@
export CFLAGS=-DVERSION=\"$(DEB_UPSTREAM_VERSION)\"
%:
- dh $@ --buildsystem=python_distutils
+ dh $@ --buildsystem=python_distutils --with=python2
More information about the Python-modules-commits
mailing list