[Python-modules-commits] r32968 - in packages/sip4/trunk/debian (4 files)

[mitya57 at users.alioth.debian.org]

    Date: Saturday, June 13, 2015 @ 11:17:23
  Author: mitya57
Revision: 32968

* New upstream release.
* Drop fix_methodcode_regression.diff, applied upstream.
* Bump API version to 11.2 (keep 11.0 and 11.1 in provided versions).

Modified:
  packages/sip4/trunk/debian/changelog
  packages/sip4/trunk/debian/patches/series
  packages/sip4/trunk/debian/rules
Deleted:
  packages/sip4/trunk/debian/patches/fix_methodcode_regression.diff

Modified: packages/sip4/trunk/debian/changelog
===================================================================
--- packages/sip4/trunk/debian/changelog	2015-06-13 07:35:08 UTC (rev 32967)
+++ packages/sip4/trunk/debian/changelog	2015-06-13 11:17:23 UTC (rev 32968)
@@ -1,3 +1,11 @@
+sip4 (4.16.8+dfsg-1) UNRELEASED; urgency=medium
+
+  * New upstream release.
+  * Drop fix_methodcode_regression.diff, applied upstream.
+  * Bump API version to 11.2 (keep 11.0 and 11.1 in provided versions).
+
+ -- Dmitry Shachnev <mitya57 at debian.org>  Sat, 13 Jun 2015 14:12:52 +0300
+
 sip4 (4.16.7+dfsg-2) unstable; urgency=medium
 
   * Bump debhelper compatibility level to 9.

Deleted: packages/sip4/trunk/debian/patches/fix_methodcode_regression.diff
===================================================================
--- packages/sip4/trunk/debian/patches/fix_methodcode_regression.diff	2015-06-13 07:35:08 UTC (rev 32967)
+++ packages/sip4/trunk/debian/patches/fix_methodcode_regression.diff	2015-06-13 11:17:23 UTC (rev 32968)
@@ -1,15 +0,0 @@
-Description: fix a regression that affects methods with %MethodCode and __len__ annotation
-Origin: upstream, http://riverbankcomputing.co.uk/hg/sip/rev/765b6874363f
-Last-Update: 2015-03-16
-
---- a/sipgen/metasrc/parser.y
-+++ b/sipgen/metasrc/parser.y
-@@ -7172,7 +7172,7 @@
-         len->common = findFunction(pt, mod, c_scope, mt_scope, len->cppname,
-                 TRUE, 0, FALSE);
- 
--        if (od->methodcode == NULL)
-+        if ((len->methodcode = od->methodcode) == NULL)
-         {
-             char *buf = sipStrdup("            sipRes = (SIP_SSIZE_T)sipCpp->");
-             codeBlock *code;

Modified: packages/sip4/trunk/debian/patches/series
===================================================================
--- packages/sip4/trunk/debian/patches/series	2015-06-13 07:35:08 UTC (rev 32967)
+++ packages/sip4/trunk/debian/patches/series	2015-06-13 11:17:23 UTC (rev 32968)
@@ -1,3 +1,2 @@
 siputils_debian_changes.diff
-fix_methodcode_regression.diff
 old_sphinx.diff

Modified: packages/sip4/trunk/debian/rules
===================================================================
--- packages/sip4/trunk/debian/rules	2015-06-13 07:35:08 UTC (rev 32967)
+++ packages/sip4/trunk/debian/rules	2015-06-13 11:17:23 UTC (rev 32968)
@@ -2,8 +2,8 @@
 # Uncomment this to turn on verbose mode.
 #export DH_VERBOSE=1
 
-PY2_PROVIDES=sip-api-11.0, sip-api-11.1
-PY3_PROVIDES=sip-py3api-11.0, sip-py3api-11.1
+PY2_PROVIDES=sip-api-11.0, sip-api-11.1, sip-api-11.2
+PY3_PROVIDES=sip-py3api-11.0, sip-py3api-11.1, sip-api-11.2
 # `dh_python3 --depends sip3` should generate dependency on newest API only
 PYDIST=sip $(lastword $(PY3_PROVIDES))