Control: tags -1 patch
If I can resolve #755598 too, I will consider making a NMU. -- Brian May <br...@microcomaustralia.com.au>
diff -ruN django-guardian-1.2.4.old/debian/changelog django-guardian-1.2.4/debian/changelog --- django-guardian-1.2.4.old/debian/changelog 2014-07-19 15:33:13.000000000 +1000 +++ django-guardian-1.2.4/debian/changelog 2014-08-19 11:37:51.200499879 +1000 @@ -1,3 +1,10 @@ +django-guardian (1.2.4-1.1) unstable; urgency=low + + * Non-maintainer upload. + * Python3 package. Closes: #758381. + + -- Brian May <b...@debian.org> Tue, 19 Aug 2014 11:37:25 +1000 + django-guardian (1.2.4-1) unstable; urgency=medium * New upstream release diff -ruN django-guardian-1.2.4.old/debian/control django-guardian-1.2.4/debian/control --- django-guardian-1.2.4.old/debian/control 2014-04-02 23:00:26.000000000 +1100 +++ django-guardian-1.2.4/debian/control 2014-08-19 10:33:47.240533588 +1000 @@ -2,7 +2,12 @@ Section: python Priority: optional Maintainer: Kouhei Maeda <mkou...@palmtb.net> -Build-Depends: debhelper (>= 8.0.0), python-all, python-setuptools, python-django (>= 1.2), python-sphinx, python-mock (>= 0.7.2), python-six, quilt +Build-Depends: debhelper (>= 8.0.0), dh-python, + python-all, python-setuptools, python-django (>= 1.2), + python-mock (>= 0.7.2), python-six, python-unittest2, + python3-all, python3-setuptools, python3-django (>= 1.2), + python3-mock (>= 0.7.2), python3-six, + python3-sphinx, Standards-Version: 3.9.5 X-Python-Version: >= 2.6 Homepage: http://github.com/lukaszb/django-guardian @@ -14,6 +19,21 @@ Suggests: python-django-guardian-doc Description: per object permissions of django Implementation of per object permissions as authorization backend which is + supported since Django 1.2. It provides features as followings; + - Object permissions for Django_ + - AnonymousUser support + - High level API + - Heavely tested + - Django's admin integration + - Decorators + +Package: python3-django-guardian +Architecture: all +Provides: ${python:Provides} +Depends: ${python:Depends}, ${misc:Depends}, python3-django (>= 1.2), python3-six +Suggests: python-django-guardian-doc +Description: per object permissions of django + Implementation of per object permissions as authorization backend which is supported since Django 1.2. It provides features as followings; - Object permissions for Django_ - AnonymousUser support diff -ruN django-guardian-1.2.4.old/debian/patches/python3.2 django-guardian-1.2.4/debian/patches/python3.2 --- django-guardian-1.2.4.old/debian/patches/python3.2 1970-01-01 10:00:00.000000000 +1000 +++ django-guardian-1.2.4/debian/patches/python3.2 2014-08-19 10:46:27.655157047 +1000 @@ -0,0 +1,13 @@ +Index: django-guardian-1.2.4/guardian/models.py +=================================================================== +--- django-guardian-1.2.4.orig/guardian/models.py 2014-08-19 10:46:03.875700385 +1000 ++++ django-guardian-1.2.4/guardian/models.py 2014-08-19 10:46:25.363209417 +1000 +@@ -26,7 +26,7 @@ + abstract = True + + def __unicode__(self): +- return u'%s | %s | %s' % ( ++ return '%s | %s | %s' % ( + unicode(self.content_object), + unicode(getattr(self, 'user', False) or self.group), + unicode(self.permission.codename)) diff -ruN django-guardian-1.2.4.old/debian/patches/series django-guardian-1.2.4/debian/patches/series --- django-guardian-1.2.4.old/debian/patches/series 2014-07-19 15:30:56.000000000 +1000 +++ django-guardian-1.2.4/debian/patches/series 2014-08-19 10:56:16.149708633 +1000 @@ -1,3 +1,5 @@ append_uncompressed_js_libraries.patch fixed_title_underline_too_short.patch remove_non_local_image_uri.patch +python3.2 +migrations diff -ruN django-guardian-1.2.4.old/debian/python3-django-guardian.examples django-guardian-1.2.4/debian/python3-django-guardian.examples --- django-guardian-1.2.4.old/debian/python3-django-guardian.examples 1970-01-01 10:00:00.000000000 +1000 +++ django-guardian-1.2.4/debian/python3-django-guardian.examples 2014-08-19 10:38:01.062732964 +1000 @@ -0,0 +1,2 @@ +example_project/ +benchmarks/ diff -ruN django-guardian-1.2.4.old/debian/rules django-guardian-1.2.4/debian/rules --- django-guardian-1.2.4.old/debian/rules 2014-07-19 15:00:41.000000000 +1000 +++ django-guardian-1.2.4/debian/rules 2014-08-19 10:45:02.377105585 +1000 @@ -1,14 +1,13 @@ #!/usr/bin/make -f # -*- makefile -*- -#export DH_VERBOSE=1 -export PYTHONPATH := $(CURDIR) +export PYBUILD_NAME=django-guardian %: - dh $@ --with python2,quilt + dh $@ --with python2,python3 --buildsystem=pybuild override_dh_auto_build: - python setup.py build - + dh_auto_build + # Build the HTML documentation. cd $(CURDIR)/docs/ && make html # rename file license.txt @@ -18,13 +17,9 @@ $(CURDIR)/docs/build/html/license.html rm -rf $(CURDIR)/docs/guardian -override_dh_auto_test: - set -e ;\ - python $(CURDIR)/setup.py test - override_dh_auto_install: - python setup.py install --no-compile -O0 --install-layout=deb \ - --root $(CURDIR)/debian/python-django-guardian + dh_auto_install + find $(CURDIR)/debian/ -type d -name benchmarks | xargs rm -rf find $(CURDIR)/debian/ -type d -name example_project | xargs rm -rf @@ -32,9 +27,6 @@ dh_installchangelogs CHANGES override_dh_auto_clean: - dh_clean - find $(CURDIR)/ -name "*.pyc" -delete - rm -rf $(CURDIR)/django_guardian.egg-info - rm -rf $(CURDIR)/build + dh_auto_clean rm -rf $(CURDIR)/docs/build
