[Python-modules-commits] [django-guardian] 07/13: update debian/patches directory
Brian May
bam at moszumanska.debian.org
Tue Nov 3 10:02:00 UTC 2015
This is an automated email from the git hooks/post-receive script.
bam pushed a commit to branch master
in repository django-guardian.
commit 4314b7217c4d37c6dabfae03823b3a73ae61766c
Author: Brian May <brian at linuxpenguins.xyz>
Date: Tue Nov 3 19:47:56 2015 +1100
update debian/patches directory
---
debian/.git-dpm | 2 +-
...Append-uncompressed-JavaScript-libraries.patch} | 32 +-
.../0002-Remove-nonlocal-image-for-Travis-ci.patch | 39 ++
.../0005-Move-migrations-to-south_migrations.patch | 495 ---------------------
...e-staticfiles-in-INSTALLED_APPS-only-once.patch | 19 -
.../0007-Name-INSTALLED_APPS-consistantly.patch | 21 -
.../0008-Fix-conflicting-related_name.patch | 29 --
.../patches/0009-Add-Django-1.7-migrations.patch | 155 -------
.../0010-Add-MIDDLEWARE_CLASSES-setting.patch | 22 -
...ixed-Field-list-ends-without-a-blank-line.patch | 30 --
.../patches/Fixed-django1.6-incompatibility.patch | 22 -
.../patches/fixed_title_underline_too_short.patch | 24 -
debian/patches/python32.patch | 18 -
debian/patches/remove_non_local_image_uri.patch | 32 --
debian/patches/series | 4 +-
15 files changed, 64 insertions(+), 880 deletions(-)
diff --git a/debian/.git-dpm b/debian/.git-dpm
index 1b4146c..532c069 100644
--- a/debian/.git-dpm
+++ b/debian/.git-dpm
@@ -1,5 +1,5 @@
# see git-dpm(1) from git-dpm package
-NONE
+509aee5e579a31acdad99057d10e5738d1df6e53
509aee5e579a31acdad99057d10e5738d1df6e53
f5c84736db787d36525136be260882cd076dbba6
f5c84736db787d36525136be260882cd076dbba6
diff --git a/debian/patches/append_uncompressed_js_libraries.patch b/debian/patches/0001-Append-uncompressed-JavaScript-libraries.patch
similarity index 99%
rename from debian/patches/append_uncompressed_js_libraries.patch
rename to debian/patches/0001-Append-uncompressed-JavaScript-libraries.patch
index 889362e..26b4b36 100644
--- a/debian/patches/append_uncompressed_js_libraries.patch
+++ b/debian/patches/0001-Append-uncompressed-JavaScript-libraries.patch
@@ -1,15 +1,26 @@
-Description: Append uncompressed JavaScript libraries
+From 14276942faa056f72d746b51775b6bec36d999d1 Mon Sep 17 00:00:00 2001
+From: "Twitter, Inc" <Twitter, Inc>
+Date: Tue, 3 Nov 2015 19:47:23 +1100
+Subject: Append uncompressed JavaScript libraries
+
Append uncompressed JavaScript libraries as following.
- Twitter Bootstrap
- example_project/static/js/bootstrap.js
- example_project/static/css/bootstrap.css
-Author: Twitter, Inc
Origin: https://github.com/twbs/bootstrap/archive/v2.3.0.tar.gz
Last-Update: 2013-02-07
-Index: django-guardian-1.1.1/example_project/static/css/bootstrap.css
-===================================================================
---- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ django-guardian-1.1.1/example_project/static/css/bootstrap.css 2013-09-30 17:07:20.082253261 +0900
+---
+ example_project/static/css/bootstrap.css | 6158 ++++++++++++++++++++++++++++++
+ example_project/static/js/bootstrap.js | 2268 +++++++++++
+ 2 files changed, 8426 insertions(+)
+ create mode 100644 example_project/static/css/bootstrap.css
+ create mode 100644 example_project/static/js/bootstrap.js
+
+diff --git a/example_project/static/css/bootstrap.css b/example_project/static/css/bootstrap.css
+new file mode 100644
+index 0000000..b255056
+--- /dev/null
++++ b/example_project/static/css/bootstrap.css
@@ -0,0 +1,6158 @@
+/*!
+ * Bootstrap v2.3.0
@@ -6169,10 +6180,11 @@ Index: django-guardian-1.1.1/example_project/static/css/bootstrap.css
+.affix {
+ position: fixed;
+}
-Index: django-guardian-1.1.1/example_project/static/js/bootstrap.js
-===================================================================
---- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ django-guardian-1.1.1/example_project/static/js/bootstrap.js 2013-09-30 17:15:02.881702782 +0900
+diff --git a/example_project/static/js/bootstrap.js b/example_project/static/js/bootstrap.js
+new file mode 100644
+index 0000000..a81171b
+--- /dev/null
++++ b/example_project/static/js/bootstrap.js
@@ -0,0 +1,2268 @@
+/* ===================================================
+ * bootstrap-transition.js v2.3.0
diff --git a/debian/patches/0002-Remove-nonlocal-image-for-Travis-ci.patch b/debian/patches/0002-Remove-nonlocal-image-for-Travis-ci.patch
new file mode 100644
index 0000000..b1f530c
--- /dev/null
+++ b/debian/patches/0002-Remove-nonlocal-image-for-Travis-ci.patch
@@ -0,0 +1,39 @@
+From 509aee5e579a31acdad99057d10e5738d1df6e53 Mon Sep 17 00:00:00 2001
+From: Kouhei Maeda <Kouhei Maeda>
+Date: Tue, 3 Nov 2015 19:47:24 +1100
+Subject: Remove nonlocal image for Travis-ci.
+
+Last-Update: 2014-07-19
+---
+ docs/develop/testing.rst | 3 ---
+ docs/index.rst | 3 ---
+ 2 files changed, 6 deletions(-)
+
+diff --git a/docs/develop/testing.rst b/docs/develop/testing.rst
+index 8040442..04a5ab7 100644
+--- a/docs/develop/testing.rst
++++ b/docs/develop/testing.rst
+@@ -102,9 +102,6 @@ Travis CI
+
+ .. versionadded:: 1.0.4
+
+-.. image:: https://secure.travis-ci.org/lukaszb/django-guardian.png?branch=master
+- :target: http://travis-ci.org/lukaszb/django-guardian
+-
+ Recently we have added support for Travis_, continuous integration server so it
+ is even more easy to follow if test fails with new commits: http://travis-ci.org/#!/lukaszb/django-guardian.
+
+diff --git a/docs/index.rst b/docs/index.rst
+index 510c832..0750384 100644
+--- a/docs/index.rst
++++ b/docs/index.rst
+@@ -9,9 +9,6 @@
+
+ **Documentation**:
+
+-.. image:: https://secure.travis-ci.org/lukaszb/django-guardian.png?branch=master
+- :target: http://travis-ci.org/lukaszb/django-guardian
+-
+ .. toctree::
+ :maxdepth: 2
+
diff --git a/debian/patches/0005-Move-migrations-to-south_migrations.patch b/debian/patches/0005-Move-migrations-to-south_migrations.patch
deleted file mode 100644
index f9c58ec..0000000
--- a/debian/patches/0005-Move-migrations-to-south_migrations.patch
+++ /dev/null
@@ -1,495 +0,0 @@
-Description: Move migrations to south_migrations.
-Author: Brian May <brian at microcomaustralia.com.au>
-Bug-Debian: https://bugs.debian.org/758381
-Origin: https://github.com/brianmay/django-guardian/blob/master/debian/patches/0005-Move-migrations-to-south_migrations.patch
-Last-Update: 2014-08-25
-
---- /dev/null
-+++ django-guardian-1.2.4/guardian/south_migrations/0001_initial.py
-@@ -0,0 +1,112 @@
-+# encoding: utf-8
-+from south.db import db
-+from south.v2 import SchemaMigration
-+
-+from guardian.compat import user_model_label
-+from guardian.compat import get_user_model
-+
-+User = get_user_model()
-+
-+
-+class Migration(SchemaMigration):
-+
-+ def forwards(self, orm):
-+
-+ # Adding model 'UserObjectPermission'
-+ db.create_table('guardian_userobjectpermission', (
-+ ('id', self.gf('django.db.models.fields.AutoField')(primary_key=True)),
-+ ('permission', self.gf('django.db.models.fields.related.ForeignKey')(to=orm['auth.Permission'])),
-+ ('content_type', self.gf('django.db.models.fields.related.ForeignKey')(to=orm['contenttypes.ContentType'])),
-+ ('object_id', self.gf('django.db.models.fields.PositiveIntegerField')()),
-+ ('user', self.gf('django.db.models.fields.related.ForeignKey')(to=orm[user_model_label])),
-+ ))
-+ db.send_create_signal('guardian', ['UserObjectPermission'])
-+
-+ # Adding unique constraint on 'UserObjectPermission', fields ['user', 'permission', 'content_type', 'object_id']
-+ db.create_unique('guardian_userobjectpermission', ['user_id', 'permission_id', 'content_type_id', 'object_id'])
-+
-+ # Adding model 'GroupObjectPermission'
-+ db.create_table('guardian_groupobjectpermission', (
-+ ('id', self.gf('django.db.models.fields.AutoField')(primary_key=True)),
-+ ('permission', self.gf('django.db.models.fields.related.ForeignKey')(to=orm['auth.Permission'])),
-+ ('content_type', self.gf('django.db.models.fields.related.ForeignKey')(to=orm['contenttypes.ContentType'])),
-+ ('object_id', self.gf('django.db.models.fields.PositiveIntegerField')()),
-+ ('group', self.gf('django.db.models.fields.related.ForeignKey')(to=orm['auth.Group'])),
-+ ))
-+ db.send_create_signal('guardian', ['GroupObjectPermission'])
-+
-+ # Adding unique constraint on 'GroupObjectPermission', fields ['group', 'permission', 'content_type', 'object_id']
-+ db.create_unique('guardian_groupobjectpermission', ['group_id', 'permission_id', 'content_type_id', 'object_id'])
-+
-+
-+ def backwards(self, orm):
-+
-+ # Removing unique constraint on 'GroupObjectPermission', fields ['group', 'permission', 'content_type', 'object_id']
-+ db.delete_unique('guardian_groupobjectpermission', ['group_id', 'permission_id', 'content_type_id', 'object_id'])
-+
-+ # Removing unique constraint on 'UserObjectPermission', fields ['user', 'permission', 'content_type', 'object_id']
-+ db.delete_unique('guardian_userobjectpermission', ['user_id', 'permission_id', 'content_type_id', 'object_id'])
-+
-+ # Deleting model 'UserObjectPermission'
-+ db.delete_table('guardian_userobjectpermission')
-+
-+ # Deleting model 'GroupObjectPermission'
-+ db.delete_table('guardian_groupobjectpermission')
-+
-+
-+ models = {
-+ 'auth.group': {
-+ 'Meta': {'object_name': 'Group'},
-+ 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
-+ 'name': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '80'}),
-+ 'permissions': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['auth.Permission']", 'symmetrical': 'False', 'blank': 'True'})
-+ },
-+ 'auth.permission': {
-+ 'Meta': {'ordering': "('content_type__app_label', 'content_type__model', 'codename')", 'unique_together': "(('content_type', 'codename'),)", 'object_name': 'Permission'},
-+ 'codename': ('django.db.models.fields.CharField', [], {'max_length': '100'}),
-+ 'content_type': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['contenttypes.ContentType']"}),
-+ 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
-+ 'name': ('django.db.models.fields.CharField', [], {'max_length': '50'})
-+ },
-+ user_model_label: {
-+ 'Meta': {'object_name': user_model_label.split('.')[-1], 'db_table': "'%s'" % User._meta.db_table},
-+ 'date_joined': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime.now'}),
-+ 'email': ('django.db.models.fields.EmailField', [], {'max_length': '75', 'blank': 'True'}),
-+ 'first_name': ('django.db.models.fields.CharField', [], {'max_length': '30', 'blank': 'True'}),
-+ 'groups': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['auth.Group']", 'symmetrical': 'False', 'blank': 'True'}),
-+ 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
-+ 'is_active': ('django.db.models.fields.BooleanField', [], {'default': 'True'}),
-+ 'is_staff': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
-+ 'is_superuser': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
-+ 'last_login': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime.now'}),
-+ 'last_name': ('django.db.models.fields.CharField', [], {'max_length': '30', 'blank': 'True'}),
-+ 'password': ('django.db.models.fields.CharField', [], {'max_length': '128'}),
-+ 'user_permissions': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['auth.Permission']", 'symmetrical': 'False', 'blank': 'True'}),
-+ 'username': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '30'})
-+ },
-+ 'contenttypes.contenttype': {
-+ 'Meta': {'ordering': "('name',)", 'unique_together': "(('app_label', 'model'),)", 'object_name': 'ContentType', 'db_table': "'django_content_type'"},
-+ 'app_label': ('django.db.models.fields.CharField', [], {'max_length': '100'}),
-+ 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
-+ 'model': ('django.db.models.fields.CharField', [], {'max_length': '100'}),
-+ 'name': ('django.db.models.fields.CharField', [], {'max_length': '100'})
-+ },
-+ 'guardian.groupobjectpermission': {
-+ 'Meta': {'unique_together': "(['group', 'permission', 'content_type', 'object_id'],)", 'object_name': 'GroupObjectPermission'},
-+ 'content_type': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['contenttypes.ContentType']"}),
-+ 'group': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['auth.Group']"}),
-+ 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
-+ 'object_id': ('django.db.models.fields.PositiveIntegerField', [], {}),
-+ 'permission': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['auth.Permission']"})
-+ },
-+ 'guardian.userobjectpermission': {
-+ 'Meta': {'unique_together': "(['user', 'permission', 'content_type', 'object_id'],)", 'object_name': 'UserObjectPermission'},
-+ 'content_type': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['contenttypes.ContentType']"}),
-+ 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
-+ 'object_id': ('django.db.models.fields.PositiveIntegerField', [], {}),
-+ 'permission': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['auth.Permission']"}),
-+ 'user': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['%s']" % user_model_label})
-+ }
-+ }
-+
-+ complete_apps = ['guardian']
---- /dev/null
-+++ django-guardian-1.2.4/guardian/south_migrations/0002_auto__add_field_groupobjectpermission_object_pk__add_field_userobjectp.py
-@@ -0,0 +1,85 @@
-+# encoding: utf-8
-+from south.db import db
-+from south.v2 import SchemaMigration
-+
-+from guardian.compat import user_model_label
-+
-+
-+class Migration(SchemaMigration):
-+
-+ def forwards(self, orm):
-+
-+ # Adding field 'GroupObjectPermission.object_pk'
-+ db.add_column('guardian_groupobjectpermission', 'object_pk', self.gf('django.db.models.fields.TextField')(default=''), keep_default=False)
-+
-+ # Adding field 'UserObjectPermission.object_pk'
-+ db.add_column('guardian_userobjectpermission', 'object_pk', self.gf('django.db.models.fields.TextField')(default=''), keep_default=False)
-+
-+
-+ def backwards(self, orm):
-+
-+ # Deleting field 'GroupObjectPermission.object_pk'
-+ db.delete_column('guardian_groupobjectpermission', 'object_pk')
-+
-+ # Deleting field 'UserObjectPermission.object_pk'
-+ db.delete_column('guardian_userobjectpermission', 'object_pk')
-+
-+
-+ models = {
-+ 'auth.group': {
-+ 'Meta': {'object_name': 'Group'},
-+ 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
-+ 'name': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '80'}),
-+ 'permissions': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['auth.Permission']", 'symmetrical': 'False', 'blank': 'True'})
-+ },
-+ 'auth.permission': {
-+ 'Meta': {'ordering': "('content_type__app_label', 'content_type__model', 'codename')", 'unique_together': "(('content_type', 'codename'),)", 'object_name': 'Permission'},
-+ 'codename': ('django.db.models.fields.CharField', [], {'max_length': '100'}),
-+ 'content_type': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['contenttypes.ContentType']"}),
-+ 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
-+ 'name': ('django.db.models.fields.CharField', [], {'max_length': '50'})
-+ },
-+ user_model_label: {
-+ 'Meta': {'object_name': user_model_label.split('.')[-1]},
-+ 'date_joined': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime.now'}),
-+ 'email': ('django.db.models.fields.EmailField', [], {'max_length': '75', 'blank': 'True'}),
-+ 'first_name': ('django.db.models.fields.CharField', [], {'max_length': '30', 'blank': 'True'}),
-+ 'groups': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['auth.Group']", 'symmetrical': 'False', 'blank': 'True'}),
-+ 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
-+ 'is_active': ('django.db.models.fields.BooleanField', [], {'default': 'True'}),
-+ 'is_staff': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
-+ 'is_superuser': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
-+ 'last_login': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime.now'}),
-+ 'last_name': ('django.db.models.fields.CharField', [], {'max_length': '30', 'blank': 'True'}),
-+ 'password': ('django.db.models.fields.CharField', [], {'max_length': '128'}),
-+ 'user_permissions': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['auth.Permission']", 'symmetrical': 'False', 'blank': 'True'}),
-+ 'username': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '30'})
-+ },
-+ 'contenttypes.contenttype': {
-+ 'Meta': {'ordering': "('name',)", 'unique_together': "(('app_label', 'model'),)", 'object_name': 'ContentType', 'db_table': "'django_content_type'"},
-+ 'app_label': ('django.db.models.fields.CharField', [], {'max_length': '100'}),
-+ 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
-+ 'model': ('django.db.models.fields.CharField', [], {'max_length': '100'}),
-+ 'name': ('django.db.models.fields.CharField', [], {'max_length': '100'})
-+ },
-+ 'guardian.groupobjectpermission': {
-+ 'Meta': {'unique_together': "(['group', 'permission', 'content_type', 'object_id'],)", 'object_name': 'GroupObjectPermission'},
-+ 'content_type': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['contenttypes.ContentType']"}),
-+ 'group': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['auth.Group']"}),
-+ 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
-+ 'object_id': ('django.db.models.fields.PositiveIntegerField', [], {}),
-+ 'object_pk': ('django.db.models.fields.TextField', [], {'default': "''"}),
-+ 'permission': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['auth.Permission']"})
-+ },
-+ 'guardian.userobjectpermission': {
-+ 'Meta': {'unique_together': "(['user', 'permission', 'content_type', 'object_id'],)", 'object_name': 'UserObjectPermission'},
-+ 'content_type': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['contenttypes.ContentType']"}),
-+ 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
-+ 'object_id': ('django.db.models.fields.PositiveIntegerField', [], {}),
-+ 'object_pk': ('django.db.models.fields.TextField', [], {'default': "''"}),
-+ 'permission': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['auth.Permission']"}),
-+ 'user': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['%s']" % user_model_label})
-+ }
-+ }
-+
-+ complete_apps = ['guardian']
---- /dev/null
-+++ django-guardian-1.2.4/guardian/south_migrations/0003_update_objectpermission_object_pk.py
-@@ -0,0 +1,86 @@
-+# encoding: utf-8
-+from south.v2 import DataMigration
-+
-+from guardian.compat import user_model_label
-+
-+
-+class Migration(DataMigration):
-+
-+ def forwards(self, orm):
-+ """
-+ Updates ``object_pk`` fields on both ``UserObjectPermission`` and
-+ ``GroupObjectPermission`` from ``object_id`` values.
-+ """
-+ for Model in [orm.UserObjectPermission, orm.GroupObjectPermission]:
-+ for obj in Model.objects.all():
-+ obj.object_pk = str(obj.object_id)
-+ obj.save()
-+
-+ def backwards(self, orm):
-+ """
-+ Updates ``object_id`` fields on both ``UserObjectPermission`` and
-+ ``GroupObjectPermission`` from ``object_pk`` values.
-+ """
-+ for Model in [orm.UserObjectPermission, orm.GroupObjectPermission]:
-+ for obj in Model.objects.all():
-+ obj.object_id = int(obj.object_pk)
-+ obj.save()
-+
-+ models = {
-+ 'auth.group': {
-+ 'Meta': {'object_name': 'Group'},
-+ 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
-+ 'name': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '80'}),
-+ 'permissions': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['auth.Permission']", 'symmetrical': 'False', 'blank': 'True'})
-+ },
-+ 'auth.permission': {
-+ 'Meta': {'ordering': "('content_type__app_label', 'content_type__model', 'codename')", 'unique_together': "(('content_type', 'codename'),)", 'object_name': 'Permission'},
-+ 'codename': ('django.db.models.fields.CharField', [], {'max_length': '100'}),
-+ 'content_type': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['contenttypes.ContentType']"}),
-+ 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
-+ 'name': ('django.db.models.fields.CharField', [], {'max_length': '50'})
-+ },
-+ user_model_label: {
-+ 'Meta': {'object_name': user_model_label.split('.')[-1]},
-+ 'date_joined': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime.now'}),
-+ 'email': ('django.db.models.fields.EmailField', [], {'max_length': '75', 'blank': 'True'}),
-+ 'first_name': ('django.db.models.fields.CharField', [], {'max_length': '30', 'blank': 'True'}),
-+ 'groups': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['auth.Group']", 'symmetrical': 'False', 'blank': 'True'}),
-+ 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
-+ 'is_active': ('django.db.models.fields.BooleanField', [], {'default': 'True'}),
-+ 'is_staff': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
-+ 'is_superuser': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
-+ 'last_login': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime.now'}),
-+ 'last_name': ('django.db.models.fields.CharField', [], {'max_length': '30', 'blank': 'True'}),
-+ 'password': ('django.db.models.fields.CharField', [], {'max_length': '128'}),
-+ 'user_permissions': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['auth.Permission']", 'symmetrical': 'False', 'blank': 'True'}),
-+ 'username': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '30'})
-+ },
-+ 'contenttypes.contenttype': {
-+ 'Meta': {'ordering': "('name',)", 'unique_together': "(('app_label', 'model'),)", 'object_name': 'ContentType', 'db_table': "'django_content_type'"},
-+ 'app_label': ('django.db.models.fields.CharField', [], {'max_length': '100'}),
-+ 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
-+ 'model': ('django.db.models.fields.CharField', [], {'max_length': '100'}),
-+ 'name': ('django.db.models.fields.CharField', [], {'max_length': '100'})
-+ },
-+ 'guardian.groupobjectpermission': {
-+ 'Meta': {'unique_together': "(['group', 'permission', 'content_type', 'object_id'],)", 'object_name': 'GroupObjectPermission'},
-+ 'content_type': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['contenttypes.ContentType']"}),
-+ 'group': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['auth.Group']"}),
-+ 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
-+ 'object_id': ('django.db.models.fields.PositiveIntegerField', [], {}),
-+ 'object_pk': ('django.db.models.fields.TextField', [], {'default': "''"}),
-+ 'permission': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['auth.Permission']"})
-+ },
-+ 'guardian.userobjectpermission': {
-+ 'Meta': {'unique_together': "(['user', 'permission', 'content_type', 'object_id'],)", 'object_name': 'UserObjectPermission'},
-+ 'content_type': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['contenttypes.ContentType']"}),
-+ 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
-+ 'object_id': ('django.db.models.fields.PositiveIntegerField', [], {}),
-+ 'object_pk': ('django.db.models.fields.TextField', [], {'default': "''"}),
-+ 'permission': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['auth.Permission']"}),
-+ 'user': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['%s']" % user_model_label})
-+ }
-+ }
-+
-+ complete_apps = ['guardian']
---- /dev/null
-+++ django-guardian-1.2.4/guardian/south_migrations/0004_auto__del_field_groupobjectpermission_object_id__del_unique_groupobjec.py
-@@ -0,0 +1,107 @@
-+# encoding: utf-8
-+from south.db import db
-+from south.v2 import SchemaMigration
-+
-+from guardian.compat import user_model_label
-+
-+
-+class Migration(SchemaMigration):
-+
-+ def forwards(self, orm):
-+
-+ # Changing field 'GroupObjectPermission.object_pk'
-+ db.alter_column('guardian_groupobjectpermission', 'object_pk', self.gf('django.db.models.fields.CharField')(max_length=255))
-+
-+ # Changing field 'UserObjectPermission.object_pk'
-+ db.alter_column('guardian_userobjectpermission', 'object_pk', self.gf('django.db.models.fields.CharField')(max_length=255))
-+
-+ # Removing unique constraint on 'UserObjectPermission', fields ['object_id', 'user', 'content_type', 'permission']
-+ db.delete_unique('guardian_userobjectpermission', ['object_id', 'user_id', 'content_type_id', 'permission_id'])
-+
-+ # Removing unique constraint on 'GroupObjectPermission', fields ['group', 'object_id', 'content_type', 'permission']
-+ db.delete_unique('guardian_groupobjectpermission', ['group_id', 'object_id', 'content_type_id', 'permission_id'])
-+
-+ # Adding unique constraint on 'GroupObjectPermission', fields ['object_pk', 'group', 'content_type', 'permission']
-+ db.create_unique('guardian_groupobjectpermission', ['object_pk', 'group_id', 'content_type_id', 'permission_id'])
-+
-+ # Adding unique constraint on 'UserObjectPermission', fields ['object_pk', 'user', 'content_type', 'permission']
-+ db.create_unique('guardian_userobjectpermission', ['object_pk', 'user_id', 'content_type_id', 'permission_id'])
-+
-+
-+ def backwards(self, orm):
-+
-+ # Changing field 'GroupObjectPermission.object_pk'
-+ db.alter_column('guardian_groupobjectpermission', 'object_pk', self.gf('django.db.models.fields.TextField')())
-+
-+ # Changing field 'UserObjectPermission.object_pk'
-+ db.alter_column('guardian_userobjectpermission', 'object_pk', self.gf('django.db.models.fields.TextField')())
-+
-+ # Removing unique constraint on 'UserObjectPermission', fields ['object_pk', 'user', 'content_type', 'permission']
-+ db.delete_unique('guardian_userobjectpermission', ['object_pk', 'user_id', 'content_type_id', 'permission_id'])
-+
-+ # Removing unique constraint on 'GroupObjectPermission', fields ['object_pk', 'group', 'content_type', 'permission']
-+ db.delete_unique('guardian_groupobjectpermission', ['object_pk', 'group_id', 'content_type_id', 'permission_id'])
-+
-+ # Adding unique constraint on 'GroupObjectPermission', fields ['group', 'object_id', 'content_type', 'permission']
-+ db.create_unique('guardian_groupobjectpermission', ['group_id', 'object_id', 'content_type_id', 'permission_id'])
-+
-+ # Adding unique constraint on 'UserObjectPermission', fields ['object_id', 'user', 'content_type', 'permission']
-+ db.create_unique('guardian_userobjectpermission', ['object_id', 'user_id', 'content_type_id', 'permission_id'])
-+
-+
-+ models = {
-+ 'auth.group': {
-+ 'Meta': {'object_name': 'Group'},
-+ 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
-+ 'name': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '80'}),
-+ 'permissions': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['auth.Permission']", 'symmetrical': 'False', 'blank': 'True'})
-+ },
-+ 'auth.permission': {
-+ 'Meta': {'ordering': "('content_type__app_label', 'content_type__model', 'codename')", 'unique_together': "(('content_type', 'codename'),)", 'object_name': 'Permission'},
-+ 'codename': ('django.db.models.fields.CharField', [], {'max_length': '100'}),
-+ 'content_type': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['contenttypes.ContentType']"}),
-+ 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
-+ 'name': ('django.db.models.fields.CharField', [], {'max_length': '50'})
-+ },
-+ user_model_label: {
-+ 'Meta': {'object_name': user_model_label.split('.')[-1]},
-+ 'date_joined': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime.now'}),
-+ 'email': ('django.db.models.fields.EmailField', [], {'max_length': '75', 'blank': 'True'}),
-+ 'first_name': ('django.db.models.fields.CharField', [], {'max_length': '30', 'blank': 'True'}),
-+ 'groups': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['auth.Group']", 'symmetrical': 'False', 'blank': 'True'}),
-+ 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
-+ 'is_active': ('django.db.models.fields.BooleanField', [], {'default': 'True'}),
-+ 'is_staff': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
-+ 'is_superuser': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
-+ 'last_login': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime.now'}),
-+ 'last_name': ('django.db.models.fields.CharField', [], {'max_length': '30', 'blank': 'True'}),
-+ 'password': ('django.db.models.fields.CharField', [], {'max_length': '128'}),
-+ 'user_permissions': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['auth.Permission']", 'symmetrical': 'False', 'blank': 'True'}),
-+ 'username': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '30'})
-+ },
-+ 'contenttypes.contenttype': {
-+ 'Meta': {'ordering': "('name',)", 'unique_together': "(('app_label', 'model'),)", 'object_name': 'ContentType', 'db_table': "'django_content_type'"},
-+ 'app_label': ('django.db.models.fields.CharField', [], {'max_length': '100'}),
-+ 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
-+ 'model': ('django.db.models.fields.CharField', [], {'max_length': '100'}),
-+ 'name': ('django.db.models.fields.CharField', [], {'max_length': '100'})
-+ },
-+ 'guardian.groupobjectpermission': {
-+ 'Meta': {'unique_together': "(['group', 'permission', 'content_type', 'object_pk'],)", 'object_name': 'GroupObjectPermission'},
-+ 'content_type': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['contenttypes.ContentType']"}),
-+ 'group': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['auth.Group']"}),
-+ 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
-+ 'object_pk': ('django.db.models.fields.CharField', [], {'max_length': '255'}),
-+ 'permission': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['auth.Permission']"})
-+ },
-+ 'guardian.userobjectpermission': {
-+ 'Meta': {'unique_together': "(['user', 'permission', 'content_type', 'object_pk'],)", 'object_name': 'UserObjectPermission'},
-+ 'content_type': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['contenttypes.ContentType']"}),
-+ 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
-+ 'object_pk': ('django.db.models.fields.CharField', [], {'max_length': '255'}),
-+ 'permission': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['auth.Permission']"}),
-+ 'user': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['%s']" % user_model_label})
-+ }
-+ }
-+
-+ complete_apps = ['guardian']
---- /dev/null
-+++ django-guardian-1.2.4/guardian/south_migrations/0005_auto__chg_field_groupobjectpermission_object_pk__chg_field_userobjectp.py
-@@ -0,0 +1,84 @@
-+# encoding: utf-8
-+from south.db import db
-+from south.v2 import SchemaMigration
-+
-+from guardian.compat import user_model_label
-+
-+
-+class Migration(SchemaMigration):
-+
-+ def forwards(self, orm):
-+
-+ # Deleting field 'GroupObjectPermission.object_id'
-+ db.delete_column('guardian_groupobjectpermission', 'object_id')
-+
-+ # Deleting field 'UserObjectPermission.object_id'
-+ db.delete_column('guardian_userobjectpermission', 'object_id')
-+
-+
-+ def backwards(self, orm):
-+
-+ # We cannot add back in field 'GroupObjectPermission.object_id'
-+ raise RuntimeError(
-+ "Cannot reverse this migration. 'GroupObjectPermission.object_id' and its values cannot be restored.")
-+
-+ # We cannot add back in field 'UserObjectPermission.object_id'
-+ raise RuntimeError(
-+ "Cannot reverse this migration. 'UserObjectPermission.object_id' and its values cannot be restored.")
-+
-+ models = {
-+ 'auth.group': {
-+ 'Meta': {'object_name': 'Group'},
-+ 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
-+ 'name': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '80'}),
-+ 'permissions': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['auth.Permission']", 'symmetrical': 'False', 'blank': 'True'})
-+ },
-+ 'auth.permission': {
-+ 'Meta': {'ordering': "('content_type__app_label', 'content_type__model', 'codename')", 'unique_together': "(('content_type', 'codename'),)", 'object_name': 'Permission'},
-+ 'codename': ('django.db.models.fields.CharField', [], {'max_length': '100'}),
-+ 'content_type': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['contenttypes.ContentType']"}),
-+ 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
-+ 'name': ('django.db.models.fields.CharField', [], {'max_length': '50'})
-+ },
-+ user_model_label: {
-+ 'Meta': {'object_name': user_model_label.split('.')[-1]},
-+ 'date_joined': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime.now'}),
-+ 'email': ('django.db.models.fields.EmailField', [], {'max_length': '75', 'blank': 'True'}),
-+ 'first_name': ('django.db.models.fields.CharField', [], {'max_length': '30', 'blank': 'True'}),
-+ 'groups': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['auth.Group']", 'symmetrical': 'False', 'blank': 'True'}),
-+ 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
-+ 'is_active': ('django.db.models.fields.BooleanField', [], {'default': 'True'}),
-+ 'is_staff': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
-+ 'is_superuser': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
-+ 'last_login': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime.now'}),
-+ 'last_name': ('django.db.models.fields.CharField', [], {'max_length': '30', 'blank': 'True'}),
-+ 'password': ('django.db.models.fields.CharField', [], {'max_length': '128'}),
-+ 'user_permissions': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['auth.Permission']", 'symmetrical': 'False', 'blank': 'True'}),
-+ 'username': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '30'})
-+ },
-+ 'contenttypes.contenttype': {
-+ 'Meta': {'ordering': "('name',)", 'unique_together': "(('app_label', 'model'),)", 'object_name': 'ContentType', 'db_table': "'django_content_type'"},
-+ 'app_label': ('django.db.models.fields.CharField', [], {'max_length': '100'}),
-+ 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
-+ 'model': ('django.db.models.fields.CharField', [], {'max_length': '100'}),
-+ 'name': ('django.db.models.fields.CharField', [], {'max_length': '100'})
-+ },
-+ 'guardian.groupobjectpermission': {
-+ 'Meta': {'unique_together': "(['group', 'permission', 'content_type', 'object_pk'],)", 'object_name': 'GroupObjectPermission'},
-+ 'content_type': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['contenttypes.ContentType']"}),
-+ 'group': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['auth.Group']"}),
-+ 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
-+ 'object_pk': ('django.db.models.fields.CharField', [], {'max_length': '255'}),
-+ 'permission': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['auth.Permission']"})
-+ },
-+ 'guardian.userobjectpermission': {
-+ 'Meta': {'unique_together': "(['user', 'permission', 'content_type', 'object_pk'],)", 'object_name': 'UserObjectPermission'},
-+ 'content_type': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['contenttypes.ContentType']"}),
-+ 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
-+ 'object_pk': ('django.db.models.fields.CharField', [], {'max_length': '255'}),
-+ 'permission': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['auth.Permission']"}),
-+ 'user': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['%s']" % user_model_label})
-+ }
-+ }
-+
-+ complete_apps = ['guardian']
diff --git a/debian/patches/0006-Inlude-staticfiles-in-INSTALLED_APPS-only-once.patch b/debian/patches/0006-Inlude-staticfiles-in-INSTALLED_APPS-only-once.patch
deleted file mode 100644
index 92a7d2b..0000000
--- a/debian/patches/0006-Inlude-staticfiles-in-INSTALLED_APPS-only-once.patch
+++ /dev/null
@@ -1,19 +0,0 @@
-Description: Inlude staticfiles in INSTALLED_APPS only once.
-Author: Brian May <brian at microcomaustralia.com.au>
-Bug-Debian: https://bugs.debian.org/758381
-Origin: https://github.com/brianmay/django-guardian/blob/master/debian/patches/0006-Inlude-staticfiles-in-INSTALLED_APPS-only-once.patch
-Last-Update: 2014-08-25
-
---- django-guardian-1.2.4.orig/example_project/settings.py
-+++ django-guardian-1.2.4/example_project/settings.py
-@@ -40,10 +40,6 @@ INSTALLED_APPS = (
- 'core',
- 'integration_tests',
- )
--if django.VERSION < (1, 3):
-- INSTALLED_APPS += ('staticfiles',)
--else:
-- INSTALLED_APPS += ('django.contrib.staticfiles',)
-
- if 'GUARDIAN_NO_TESTS_APP' in os.environ:
- _apps = list(INSTALLED_APPS)
diff --git a/debian/patches/0007-Name-INSTALLED_APPS-consistantly.patch b/debian/patches/0007-Name-INSTALLED_APPS-consistantly.patch
deleted file mode 100644
index 896e39e..0000000
--- a/debian/patches/0007-Name-INSTALLED_APPS-consistantly.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-Description: Name INSTALLED_APPS consistantly.
-Author: Brian May <brian at microcomaustralia.com.au>
-Bug-Debian: https://bugs.debian.org/758381
-Origin: https://github.com/brianmay/django-guardian/blob/master/debian/patches/0007-Name-INSTALLED_APPS-consistantly.patch
-Last-Update: 2014-08-25
-
---- django-guardian-1.2.4.orig/example_project/settings.py
-+++ django-guardian-1.2.4/example_project/settings.py
-@@ -36,9 +36,9 @@ INSTALLED_APPS = (
- 'django.contrib.staticfiles',
- 'guardian',
- 'guardian.testapp',
-- 'posts',
-- 'core',
-- 'integration_tests',
-+ 'example_project.posts',
-+ 'example_project.core',
-+ 'example_project.integration_tests',
- )
-
- if 'GUARDIAN_NO_TESTS_APP' in os.environ:
diff --git a/debian/patches/0008-Fix-conflicting-related_name.patch b/debian/patches/0008-Fix-conflicting-related_name.patch
deleted file mode 100644
index ec0e72d..0000000
--- a/debian/patches/0008-Fix-conflicting-related_name.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-Description: Fix conflicting related_name.
-Author: Brian May <brian at microcomaustralia.com.au>
-Bug-Debian: https://bugs.debian.org/758381
-Origin: https://github.com/brianmay/django-guardian/blob/master/debian/patches/0008-Fix-conflicting-related_name.patch
-Last-Update: 2014-08-25
-
---- django-guardian-1.2.4.orig/example_project/core/models.py
-+++ django-guardian-1.2.4/example_project/core/models.py
-@@ -1,9 +1,9 @@
--from django.contrib.auth.models import AbstractUser
- from django.db import models
-+from guardian.testapp.models import CustomUser as BaseCustomUser
- import datetime
-
-
--class CustomUser(AbstractUser):
-+class CustomUser(BaseCustomUser):
- real_username = models.CharField(max_length=120, unique=True)
- birth_date = models.DateField(null=True, blank=True)
-
---- django-guardian-1.2.4.orig/guardian/testapp/models.py
-+++ django-guardian-1.2.4/guardian/testapp/models.py
-@@ -61,4 +61,4 @@ class LogEntryWithGroup(LogEntry):
- if django.VERSION > (1, 5):
- from django.contrib.auth.models import AbstractUser
- class CustomUser(AbstractUser, GuardianUserMixin):
-- custom_id = models.AutoField(primary_key=True)
-\ No newline at end of file
-+ custom_id = models.AutoField(primary_key=True)
diff --git a/debian/patches/0009-Add-Django-1.7-migrations.patch b/debian/patches/0009-Add-Django-1.7-migrations.patch
deleted file mode 100644
index 589fb77..0000000
--- a/debian/patches/0009-Add-Django-1.7-migrations.patch
+++ /dev/null
@@ -1,155 +0,0 @@
-Description: Add Django 1.7 migrations.
-Author: Brian May <brian at microcomaustralia.com.au>
-Bug-Debian: https://bugs.debian.org/758381
-Origin: https://github.com/brianmay/django-guardian/blob/master/debian/patches/0009-Add-Django-1.7-migrations.patch
-Last-Update: 2014-08-25
-
---- /dev/null
-+++ django-guardian-1.2.4/guardian/testapp/migrations/0001_initial.py
-@@ -0,0 +1,117 @@
-+# -*- coding: utf-8 -*-
-+from __future__ import unicode_literals
-+
-+from django.db import models, migrations
-+import datetime
-+import guardian.mixins
-+import django.utils.timezone
-+from django.conf import settings
-+import django.core.validators
-+
-+
-+class Migration(migrations.Migration):
-+
-+ dependencies = [
-+ ('auth', '0001_initial'),
-+ migrations.swappable_dependency(settings.AUTH_USER_MODEL),
-+ ]
-+
-+ operations = [
-+ migrations.CreateModel(
-+ name='CustomUser',
-+ fields=[
-+ ('password', models.CharField(max_length=128, verbose_name='password')),
-+ ('last_login', models.DateTimeField(default=django.utils.timezone.now, verbose_name='last login')),
-+ ('is_superuser', models.BooleanField(default=False, help_text='Designates that this user has all permissions without explicitly assigning them.', verbose_name='superuser status')),
-+ ('username', models.CharField(help_text='Required. 30 characters or fewer. Letters, digits and @/./+/-/_ only.', unique=True, max_length=30, verbose_name='username', validators=[django.core.validators.RegexValidator('^[\\w. at +-]+$', 'Enter a valid username.', 'invalid')])),
-+ ('first_name', models.CharField(max_length=30, verbose_name='first name', blank=True)),
-+ ('last_name', models.CharField(max_length=30, verbose_name='last name', blank=True)),
-+ ('email', models.EmailField(max_length=75, verbose_name='email address', blank=True)),
-+ ('is_staff', models.BooleanField(default=False, help_text='Designates whether the user can log into this admin site.', verbose_name='staff status')),
-+ ('is_active', models.BooleanField(default=True, help_text='Designates whether this user should be treated as active. Unselect this instead of deleting accounts.', verbose_name='active')),
-+ ('date_joined', models.DateTimeField(default=django.utils.timezone.now, verbose_name='date joined')),
-+ ('custom_id', models.AutoField(serialize=False, primary_key=True)),
-+ ('groups', models.ManyToManyField(related_query_name='user', related_name='user_set', to='auth.Group', blank=True, help_text='The groups this user belongs to. A user will get all permissions granted to each of his/her group.', verbose_name='groups')),
-+ ('user_permissions', models.ManyToManyField(related_query_name='user', related_name='user_set', to='auth.Permission', blank=True, help_text='Specific permissions for this user.', verbose_name='user permissions')),
-+ ],
-+ options={
-+ 'abstract': False,
-+ 'verbose_name': 'user',
-+ 'verbose_name_plural': 'users',
-+ },
-+ bases=(models.Model, guardian.mixins.GuardianUserMixin),
-+ ),
-+ migrations.CreateModel(
-+ name='Mixed',
-+ fields=[
-+ ('id', models.AutoField(verbose_name='ID', serialize=False, auto_created=True, primary_key=True)),
-+ ('name', models.CharField(unique=True, max_length=128)),
-+ ],
-+ options={
-+ },
-+ bases=(models.Model,),
-+ ),
-+ migrations.CreateModel(
-+ name='MixedGroupObjectPermission',
-+ fields=[
-+ ('id', models.AutoField(verbose_name='ID', serialize=False, auto_created=True, primary_key=True)),
-+ ('content_object', models.ForeignKey(to='testapp.Mixed')),
-+ ('group', models.ForeignKey(to='auth.Group')),
-+ ('permission', models.ForeignKey(to='auth.Permission')),
-+ ],
-+ options={
-+ 'abstract': False,
-+ },
-+ bases=(models.Model,),
-+ ),
-+ migrations.CreateModel(
-+ name='Project',
-+ fields=[
-+ ('id', models.AutoField(verbose_name='ID', serialize=False, auto_created=True, primary_key=True)),
-+ ('name', models.CharField(unique=True, max_length=128)),
-+ ('created_at', models.DateTimeField(default=datetime.datetime.now)),
-+ ],
-+ options={
-+ 'get_latest_by': 'created_at',
-+ },
-+ bases=(models.Model,),
-+ ),
-+ migrations.CreateModel(
-+ name='ProjectGroupObjectPermission',
-+ fields=[
-+ ('id', models.AutoField(verbose_name='ID', serialize=False, auto_created=True, primary_key=True)),
-+ ('content_object', models.ForeignKey(to='testapp.Project')),
-+ ('group', models.ForeignKey(to='auth.Group')),
-+ ('permission', models.ForeignKey(to='auth.Permission')),
-+ ],
-+ options={
-+ 'abstract': False,
-+ },
-+ bases=(models.Model,),
-+ ),
-+ migrations.CreateModel(
-+ name='ProjectUserObjectPermission',
-+ fields=[
-+ ('id', models.AutoField(verbose_name='ID', serialize=False, auto_created=True, primary_key=True)),
-+ ('content_object', models.ForeignKey(to='testapp.Project')),
-+ ('permission', models.ForeignKey(to='auth.Permission')),
-+ ('user', models.ForeignKey(to=settings.AUTH_USER_MODEL)),
-+ ],
-+ options={
-+ 'abstract': False,
-+ },
-+ bases=(models.Model,),
-+ ),
-+ migrations.AlterUniqueTogether(
-+ name='projectuserobjectpermission',
-+ unique_together=set([('user', 'permission', 'content_object')]),
-+ ),
-+ migrations.AlterUniqueTogether(
-+ name='projectgroupobjectpermission',
-+ unique_together=set([('group', 'permission', 'content_object')]),
-+ ),
-+ migrations.AlterUniqueTogether(
-+ name='mixedgroupobjectpermission',
-+ unique_together=set([('group', 'permission', 'content_object')]),
-+ ),
-+ ]
---- /dev/null
-+++ django-guardian-1.2.4/guardian/testapp/migrations/0002_logentrywithgroup.py
-@@ -0,0 +1,26 @@
-+# -*- coding: utf-8 -*-
-+from __future__ import unicode_literals
-+
-+from django.db import models, migrations
-+
-+
-+class Migration(migrations.Migration):
-+
-+ dependencies = [
-+ ('auth', '0001_initial'),
-+ ('admin', '0001_initial'),
-+ ('testapp', '0001_initial'),
-+ ]
-+
-+ operations = [
-+ migrations.CreateModel(
-+ name='LogEntryWithGroup',
-+ fields=[
-+ ('logentry_ptr', models.OneToOneField(parent_link=True, auto_created=True, primary_key=True, serialize=False, to='admin.LogEntry')),
-+ ('group', models.ForeignKey(blank=True, to='auth.Group', null=True)),
-+ ],
-+ options={
-+ },
-+ bases=('admin.logentry',),
-+ ),
-+ ]
diff --git a/debian/patches/0010-Add-MIDDLEWARE_CLASSES-setting.patch b/debian/patches/0010-Add-MIDDLEWARE_CLASSES-setting.patch
deleted file mode 100644
index 81aff39..0000000
--- a/debian/patches/0010-Add-MIDDLEWARE_CLASSES-setting.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-Description: Add MIDDLEWARE_CLASSES setting.
-Author: Brian May <brian at microcomaustralia.com.au>
-Bug-Debian: https://bugs.debian.org/758381
-Origin: https://github.com/brianmay/django-guardian/blob/master/debian/patches/0010-Add-MIDDLEWARE_CLASSES-setting.patch
-Last-Update: 2014-08-25
-
---- django-guardian-1.2.4.orig/guardian/testsettings.py
-+++ django-guardian-1.2.4/guardian/testsettings.py
-@@ -27,6 +27,13 @@ AUTHENTICATION_BACKENDS = (
- 'guardian.backends.ObjectPermissionBackend',
- )
-
-+
-+MIDDLEWARE_CLASSES = (
-+ 'django.contrib.sessions.middleware.SessionMiddleware',
-+ 'django.contrib.auth.middleware.AuthenticationMiddleware',
-+ 'django.contrib.messages.middleware.MessageMiddleware',
-+)
-+
- TEST_RUNNER = 'django.test.simple.DjangoTestSuiteRunner'
-
- DATABASES = {
diff --git a/debian/patches/Fixed-Field-list-ends-without-a-blank-line.patch b/debian/patches/Fixed-Field-list-ends-without-a-blank-line.patch
deleted file mode 100644
index 538b4ea..0000000
--- a/debian/patches/Fixed-Field-list-ends-without-a-blank-line.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-Description: Fixed Field list ends without a blank line.
-Author: Kouhei Maeda
-Origin:
-Last-Update: 2014-07-19
-
-Index: django-guardian-1.2.4/guardian/core.py
-===================================================================
---- django-guardian-1.2.4.orig/guardian/core.py 2014-07-19 13:49:17.213372845 +0900
-+++ django-guardian-1.2.4/guardian/core.py 2014-07-19 13:57:41.216446284 +0900
-@@ -14,7 +14,7 @@
- class ObjectPermissionChecker(object):
- """
- Generic object permissions checker class being the heart of
-- ``django-guardian``.
-+ ``django-guardian``.
-
- .. note::
- Once checked for single object, permissions are stored and we don't hit
-Index: django-guardian-1.2.4/guardian/forms.py
-===================================================================
---- django-guardian-1.2.4.orig/guardian/forms.py 2014-07-19 13:49:17.213372845 +0900
-+++ django-guardian-1.2.4/guardian/forms.py 2014-07-19 13:49:17.209372506 +0900
-@@ -18,6 +18,7 @@
- def __init__(self, obj, *args, **kwargs):
- """
- :param obj: Any instance which form would use to manage object
-+
- permissions"
- """
- self.obj = obj
diff --git a/debian/patches/Fixed-django1.6-incompatibility.patch b/debian/patches/Fixed-django1.6-incompatibility.patch
deleted file mode 100644
index 327350a..0000000
--- a/debian/patches/Fixed-django1.6-incompatibility.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-Description: get_objects_for_user() is incompatible with Django 1.6
- setting AUTH_USER_MODEL to an abstract user model results in a broken
- get_objects_for_user method.
-Author: thepapermen <the.paper.men at gmail.com>
-Origin: https://github.com/lukaszb/django-guardian/commit/c27e3421784a51f8181aaf8e43ea8a9a31f84621.patch
-Bug: 739524
-Bug-Upstream: https://github.com/lukaszb/django-guardian/issues/164
-Last-Update: 2013-09-24
-
-Index: django-guardian-1.1.1/guardian/shortcuts.py
-===================================================================
---- django-guardian-1.1.1.orig/guardian/shortcuts.py 2013-05-31 22:49:35.000000000 +0900
-+++ django-guardian-1.1.1/guardian/shortcuts.py 2014-02-20 06:40:05.151450410 +0900
-@@ -394,7 +394,7 @@
- group_filters = {
- 'permission__content_type': ctype,
- 'permission__codename__in': codenames,
-- 'group__%s' % get_user_model()._meta.module_name: user,
-+ 'group__%s' % get_user_model().groups.field.related_query_name(): user,
- }
- groups_obj_perms_queryset = group_model.objects.filter(**group_filters)
- if group_model.objects.is_generic():
diff --git a/debian/patches/fixed_title_underline_too_short.patch b/debian/patches/fixed_title_underline_too_short.patch
deleted file mode 100644
index de0b5b0..0000000
--- a/debian/patches/fixed_title_underline_too_short.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-Description: Fixed title underline too short.
-Author: Kouhei Maeda
-Origin: https://github.com/mkouhei/django-guardian/commit/b09bda360c80ce08d886005be17e1add9b16c32d.patch
-Last-Update: 2014-07-19
-
-Index: django-guardian-1.2.4/CHANGES
-===================================================================
---- django-guardian-1.2.4.orig/CHANGES 2014-07-15 00:20:13.000000000 +0900
-+++ django-guardian-1.2.4/CHANGES 2014-07-19 11:54:44.400519698 +0900
-@@ -1,12 +1,12 @@
- Release 1.2.4 (Jul 14, 2014)
--===========================
-+============================
-
- * Fixed another issue with custom primary keys at admin extensions (Thanks Omer
- Katz)
-
-
... 77 lines suppressed ...
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/python-modules/packages/django-guardian.git
More information about the Python-modules-commits
mailing list