diff -Nru django-recurrence-1.3.0/debian/changelog django-recurrence-1.3.0/debian/changelog --- django-recurrence-1.3.0/debian/changelog 2016-05-03 18:33:16.000000000 +0000 +++ django-recurrence-1.3.0/debian/changelog 2016-08-05 10:53:25.000000000 +0000 @@ -1,3 +1,11 @@ +django-recurrence (1.3.0-2) unstable; urgency=medium + + * Team upload. + * Added upstream fix for Django 1.10 (Closes: #828655): + - 0002-Fixes-for-Django-1.10.patch + + -- Thomas Goirand Fri, 05 Aug 2016 10:53:25 +0000 + django-recurrence (1.3.0-1) unstable; urgency=low [ Ondřej Nový ] diff -Nru django-recurrence-1.3.0/debian/.git-dpm django-recurrence-1.3.0/debian/.git-dpm --- django-recurrence-1.3.0/debian/.git-dpm 2016-05-03 18:33:16.000000000 +0000 +++ django-recurrence-1.3.0/debian/.git-dpm 2016-08-05 10:53:25.000000000 +0000 @@ -1,6 +1,6 @@ # see git-dpm(1) from git-dpm package -5cf7d7811e952aaa56835e72d59aab4ea5df79a4 -5cf7d7811e952aaa56835e72d59aab4ea5df79a4 +f185a5e8c0a3ad7cfaf5f956d1aafc1c94aa8de1 +f185a5e8c0a3ad7cfaf5f956d1aafc1c94aa8de1 9701c091ddfd818b6a42e2b4dbdb4c3b28497833 9701c091ddfd818b6a42e2b4dbdb4c3b28497833 django-recurrence_1.3.0.orig.tar.gz diff -Nru django-recurrence-1.3.0/debian/patches/0002-Fixes-for-Django-1.10.patch django-recurrence-1.3.0/debian/patches/0002-Fixes-for-Django-1.10.patch --- django-recurrence-1.3.0/debian/patches/0002-Fixes-for-Django-1.10.patch 1970-01-01 00:00:00.000000000 +0000 +++ django-recurrence-1.3.0/debian/patches/0002-Fixes-for-Django-1.10.patch 2016-08-05 10:53:25.000000000 +0000 @@ -0,0 +1,53 @@ +Description: Fixes for Django 1.10 + django.db.models.fields.subclassing has gone away entirely + (the release notes mention that SubfieldBase has gone, but + don't mention the removal of Creator - I'm guessing it was + viewed as an internal API). +Author: Dominic Rodger +Bug-Debian: https://bugs.debian.org/828655 +Date: Fri, 5 Aug 2016 10:50:55 +0000 +Origin: https://github.com/django-recurrence/django-recurrence/commit/0d1bcfd107979a05f76eef93be806eedf017de5f +Last-Update: 2016-08-05 + +diff --git a/recurrence/compat.py b/recurrence/compat.py +new file mode 100644 +index 0000000..450537b +--- /dev/null ++++ b/recurrence/compat.py +@@ -0,0 +1,21 @@ ++try: ++ from django.db.models.fields.subclassing import Creator ++except ImportError: ++ # This class was removed in Django 1.10, so I've pulled it into ++ # django-recurrence. ++ ++ class Creator(object): ++ """ ++ A placeholder class that provides a way to set the attribute ++ on the model. ++ """ ++ def __init__(self, field): ++ self.field = field ++ ++ def __get__(self, obj, type=None): ++ if obj is None: ++ return self ++ return obj.__dict__[self.field.name] ++ ++ def __set__(self, obj, value): ++ obj.__dict__[self.field.name] = self.field.to_python(value) +diff --git a/recurrence/fields.py b/recurrence/fields.py +index 783d52b..d4652cb 100644 +--- a/recurrence/fields.py ++++ b/recurrence/fields.py +@@ -1,9 +1,8 @@ + from django.db.models import fields + from django.utils.six import string_types +-from django.db.models.fields.subclassing import Creator +- + import recurrence + from recurrence import forms ++from recurrence.compat import Creator + + try: + from south.modelsinspector import add_introspection_rules diff -Nru django-recurrence-1.3.0/debian/patches/series django-recurrence-1.3.0/debian/patches/series --- django-recurrence-1.3.0/debian/patches/series 2016-05-03 18:33:16.000000000 +0000 +++ django-recurrence-1.3.0/debian/patches/series 2016-08-05 10:53:25.000000000 +0000 @@ -1 +1,2 @@ 0001-Use-Python-3-compatible-exception-handling.patch +0002-Fixes-for-Django-1.10.patch