[Python-modules-commits] r32238 - in packages/django-tables/trunk/debian (7 files)

bam at users.alioth.debian.org bam at users.alioth.debian.org
Fri Apr 10 06:08:24 UTC 2015 

    Date: Friday, April 10, 2015 @ 06:08:21
  Author: bam
Revision: 32238

Experimental Django 1.8 fixes.

Added:
  packages/django-tables/trunk/debian/patches/django18.patch
  packages/django-tables/trunk/debian/upstream/
  packages/django-tables/trunk/debian/upstream/signing-key.asc
Modified:
  packages/django-tables/trunk/debian/changelog
  packages/django-tables/trunk/debian/control
  packages/django-tables/trunk/debian/patches/series
  packages/django-tables/trunk/debian/watch

Modified: packages/django-tables/trunk/debian/changelog
===================================================================
--- packages/django-tables/trunk/debian/changelog	2015-04-10 03:25:24 UTC (rev 32237)
+++ packages/django-tables/trunk/debian/changelog	2015-04-10 06:08:21 UTC (rev 32238)
@@ -1,3 +1,12 @@
+django-tables (0.15.0-4) UNRELEASED; urgency=medium
+
+  * Fix debian/watch.
+  * Add patch for Django 1.8 compatibility.
+  * Can't release version 0.16.0 as no suitable upstream file for
+    release, see https://github.com/bradleyayers/django-tables2/issues/236
+
+ -- Brian May <bam at debian.org>  Fri, 10 Apr 2015 14:34:32 +1000
+
 django-tables (0.15.0-3) unstable; urgency=low
 
   * Add patch from https://github.com/bradleyayers/django-tables2/pull/214 as

Modified: packages/django-tables/trunk/debian/control
===================================================================
--- packages/django-tables/trunk/debian/control	2015-04-10 03:25:24 UTC (rev 32237)
+++ packages/django-tables/trunk/debian/control	2015-04-10 06:08:21 UTC (rev 32238)
@@ -7,7 +7,7 @@
  python-all (>= 2.6.6-3~), python-django (>= 1.4.5), python-setuptools, python-six,
  python3-all, python3-django (>= 1.4.5), python3-setuptools, python3-six,
 Build-Depends-Indep: python-sphinx (>= 1.0.7+dfsg-1~), python-doc, python-django-doc
-Standards-Version: 3.9.5
+Standards-Version: 3.9.6
 X-Python-Version: >= 2.6
 Homepage: https://github.com/bradleyayers/django-tables2/
 Vcs-Svn: svn://anonscm.debian.org/python-modules/packages/django-tables/trunk/

Added: packages/django-tables/trunk/debian/patches/django18.patch
===================================================================
--- packages/django-tables/trunk/debian/patches/django18.patch	                        (rev 0)
+++ packages/django-tables/trunk/debian/patches/django18.patch	2015-04-10 06:08:21 UTC (rev 32238)
@@ -0,0 +1,41 @@
+Index: django-tables/django_tables2/columns/base.py
+===================================================================
+--- django-tables.orig/django_tables2/columns/base.py	2015-04-10 14:54:29.884156384 +1000
++++ django-tables/django_tables2/columns/base.py	2015-04-10 16:05:52.512549246 +1000
+@@ -253,7 +253,10 @@
+         # Since this method is inherited by every subclass, only provide a
+         # column if this class was asked directly.
+         if cls is Column:
+-            return cls(verbose_name=field.verbose_name)
++            name = getattr(field, 'verbose_name', None)
++            if name is None:
++                name = field.name
++            return cls(verbose_name=name)
+ 
+ 
+ class BoundColumn(object):
+@@ -488,7 +491,9 @@
+                     continue
+                 break
+             if field:
+-                name = field.verbose_name
++                name = getattr(field, 'verbose_name', None)
++                if name is None:
++                    name = field.name
+         return name
+ 
+     @property
+Index: django-tables/django_tables2/rows.py
+===================================================================
+--- django-tables.orig/django_tables2/rows.py	2014-02-02 20:07:17.000000000 +1100
++++ django-tables/django_tables2/rows.py	2015-04-10 16:05:31.789034951 +1000
+@@ -112,7 +112,8 @@
+             try:
+                 field = penultimate._meta.get_field(remainder)
+                 display = getattr(penultimate, 'get_%s_display' % remainder, None)
+-                if field.choices and display:
++                choices = getattr(field, 'choices', None)
++                if choices and display:
+                     value = display()
+                     remainder = None
+             except FieldDoesNotExist:

Modified: packages/django-tables/trunk/debian/patches/series
===================================================================
--- packages/django-tables/trunk/debian/patches/series	2015-04-10 03:25:24 UTC (rev 32237)
+++ packages/django-tables/trunk/debian/patches/series	2015-04-10 06:08:21 UTC (rev 32238)
@@ -1,3 +1,4 @@
+django18.patch
 local_inventory
 dont_call_managers.patch
 remove_sorteddict.patch

Added: packages/django-tables/trunk/debian/upstream/signing-key.asc
===================================================================
--- packages/django-tables/trunk/debian/upstream/signing-key.asc	                        (rev 0)
+++ packages/django-tables/trunk/debian/upstream/signing-key.asc	2015-04-10 06:08:21 UTC (rev 32238)
@@ -0,0 +1,31 @@
+-----BEGIN PGP PUBLIC KEY BLOCK-----
+Version: GnuPG v1
+
+mQENBFT/siwBCAC0NekYurLm953fKsbQ9ljQZs9IE19VJEzqM2Nz/wDFrCHqdqmV
+CeLRrRc1e6765HTmZ1XCMyBvLt69poPBewX1lk85gyLKytLaTXl9GndlHnhh96Jv
+s2mQ/N8deBl1ZeAwUspQJ0YHUO0ky0Ix64/UfvGvTLSmt/GRW6Xl17as33DZnQ2I
+pooG/CWW4cw0WHisrG8nrfQo+nMkpqc+3atGK4qRgBuV674iwUvU+S1s5XXRVO2B
+A0P/f4O9R7zWSejHFCispLWu+auR+nwJfY4g88MgufcYx/bQXMC5P5uY73SNecEZ
+oOoQvC9GNqEC5saBTuOYWOdNilTYZuPbdzXLABEBAAG0J0JyYWRsZXkgQXllcnMg
+PGJyYWRsZXkuYXllcnNAZ21haWwuY29tPokBPQQTAQoAJwUCVP+yLAIbAwUJB4Yf
+gAULCQgHAwUVCgkICwUWAgMBAAIeAQIXgAAKCRBwUp8at6LIrPUSB/9BbNjxENHj
+vbLW8WgUl7CK3aYWGmFVQhKNe0rPhD85+3BjjB1XY+my+wPcxvqfC/1nvMjNy0kJ
+xqlyb69NBkrwbE/+7oAXfMR4B0u3TkJbFy2saZHh7tywT5JrNfWpamq+sD0JdyQM
+rsffrrXqpzQrsNzEjut+W48WCR0YlVwgxNy56KdiSSzu+zGKaoEgYMQbyhvUkRr6
+dkCPx7upUpWuDU/uV97xfTXwIU8vDagI2TdIDM8YpP7gLsrBePI7FRvI3pDtksGL
+AI5XQ1n99ZypNLdmkW+/ZCH+eTmd0E9sMWWtpoaB7RMKMLNL59liX3PzaiAtRCQO
+EfISrp1IGUm7uQENBFT/siwBCACzHofmBJd96i8ux8jvlvRrx9MJ5iABjmTgFpH6
+D/Ck9roRh/eezApCIK0pS5QqmSCnG4KdhtuhvmJruT80HStkbKGzU9VmNyqjSslm
+O3QZtazUF4A3IkLR76Jar8fCgBHpn8DzXD6ZQ4sPnJmh32zRtMXXZpFMjCfbxpBR
+L58DJ7D/x8MKYd0rcsGf6GuGmnUMa7QGBZLpVkT2Azjsqbo7gvK1MoYs2MuXpj4V
+zF4wMdXzLGJCEwtkj4Oak6/aSaeaGxKbbdlCrnJQKoPD2odHhXXxUObFD0pcbX2R
+Z+lPoOiTlsyHnIDkqL4uRl0O2WU/8Lq8r9YxXLPCHq1Q6ouLABEBAAGJASUEGAEK
+AA8FAlT/siwCGwwFCQeGH4AACgkQcFKfGreiyKza/AgAg/drhGGjasnFW7mD1YBc
+tp5/GBuFSVVbQX1ygqoJFBwP9GGI46ktFsrBdzuxEA7OhhJyGthwU9loUCRH9srH
+wiuYOoGLl2O5gQ16a/LsWLAYHxemF4Kod9WS7lDOHZu30+O57x0Dz7T8zYZwXVZE
+IoxACX4ygHOTM2cjNe/qEgaUGDJlBma7TyyC+P5eEb2fxOtvPHMyiy4yNGWKVAtz
+6Rfm7YT5XNph2BmPplD3UmQKeeqP/jWAiah7oaAHU5/S2l+S2e6CZ/QGqg7mKADL
+e0o4NlysN1IrsZPAlAeTbYO+B1vEzBiDhB3AhK/CBPWOqLmP0njBpyRlP13xyRuI
+3g==
+=J8sk
+-----END PGP PUBLIC KEY BLOCK-----

Modified: packages/django-tables/trunk/debian/watch
===================================================================
--- packages/django-tables/trunk/debian/watch	2015-04-10 03:25:24 UTC (rev 32237)
+++ packages/django-tables/trunk/debian/watch	2015-04-10 06:08:21 UTC (rev 32238)
@@ -1,2 +1,3 @@
 version=3
-https://pypi.python.org/packages/source/d/django-tables2/django-tables2-([\d\.]+)\.tar\.gz
+opts=uversionmangle=s/(rc|a|b|c)/~$1/,pgpsigurlmangle=s/$/.asc/ \
+http://pypi.debian.net/django-tables2/django-tables2-(.+)\.(?:zip|tgz|tbz|txz|(?:tar\.(?:gz|bz2|xz)))

More information about the Python-modules-commits mailing list