[Python-modules-commits] r26686 - in packages/django-conneg/trunk (18 files)
obergix at users.alioth.debian.org
obergix at users.alioth.debian.org
Fri Dec 6 15:59:25 UTC 2013
Date: Friday, December 6, 2013 @ 15:59:24
Author: obergix
Revision: 26686
Squashed commit of obergix git debian branch, up to:
commit b3428363816dce5bc16c70671b7a1ee1c5f32f5a
Author: Olivier Berger <olivier.berger at telecom-sudparis.eu>
Date: Fri Dec 6 16:03:53 2013 +0100
Remove verbose options
Added:
packages/django-conneg/trunk/debian/
packages/django-conneg/trunk/debian/README
packages/django-conneg/trunk/debian/README.source
packages/django-conneg/trunk/debian/changelog
packages/django-conneg/trunk/debian/compat
packages/django-conneg/trunk/debian/control
packages/django-conneg/trunk/debian/copyright
packages/django-conneg/trunk/debian/docs
packages/django-conneg/trunk/debian/patches/
packages/django-conneg/trunk/debian/patches/needtemplatestopasstests.patch
packages/django-conneg/trunk/debian/patches/series
packages/django-conneg/trunk/debian/patches/testurlsdjango16.patch
packages/django-conneg/trunk/debian/python-django-conneg.pyremove
packages/django-conneg/trunk/debian/python3-django-conneg.pyremove
packages/django-conneg/trunk/debian/rules
packages/django-conneg/trunk/debian/source/
packages/django-conneg/trunk/debian/source/format
packages/django-conneg/trunk/debian/watch
Added: packages/django-conneg/trunk/debian/README
===================================================================
--- packages/django-conneg/trunk/debian/README (rev 0)
+++ packages/django-conneg/trunk/debian/README 2013-12-06 15:59:24 UTC (rev 26686)
@@ -0,0 +1,6 @@
+The Debian Package python-django-conneg
+----------------------------
+
+Native source package from <https://github.com/ox-it/django-conneg>.
+
+ -- Alexander Dutton <alexander.dutton at it.ox.ac.uk> Mon, 19 Dec 2011 14:14:33 +0000
Added: packages/django-conneg/trunk/debian/README.source
===================================================================
--- packages/django-conneg/trunk/debian/README.source (rev 0)
+++ packages/django-conneg/trunk/debian/README.source 2013-12-06 15:59:24 UTC (rev 26686)
@@ -0,0 +1,7 @@
+This package was initially debianized by the upstream author,
+Alexander Dutton <alexander.dutton at it.ox.ac.uk>.
+
+It was later adapted to create an official Debian package by Olivier
+Berger, making it a non-native package.
+
+ -- Olivier Berger <obergix at debian.org>, Fri, 29 Nov 2013 10:14:21 +0100
Added: packages/django-conneg/trunk/debian/changelog
===================================================================
--- packages/django-conneg/trunk/debian/changelog (rev 0)
+++ packages/django-conneg/trunk/debian/changelog 2013-12-06 15:59:24 UTC (rev 26686)
@@ -0,0 +1,5 @@
+django-conneg (0.9.4-1) UNRELEASED; urgency=low
+
+ * Create official Debian packaging (Closes: #730634).
+
+ -- Olivier Berger <obergix at debian.org> Fri, 29 Nov 2013 10:11:21 +0100
Added: packages/django-conneg/trunk/debian/compat
===================================================================
--- packages/django-conneg/trunk/debian/compat (rev 0)
+++ packages/django-conneg/trunk/debian/compat 2013-12-06 15:59:24 UTC (rev 26686)
@@ -0,0 +1 @@
+7
Added: packages/django-conneg/trunk/debian/control
===================================================================
--- packages/django-conneg/trunk/debian/control (rev 0)
+++ packages/django-conneg/trunk/debian/control 2013-12-06 15:59:24 UTC (rev 26686)
@@ -0,0 +1,42 @@
+Source: django-conneg
+Section: python
+Priority: optional
+Maintainer: Olivier Berger <obergix at debian.org>
+Uploaders: Debian Python Modules Team <python-modules-team at lists.alioth.debian.org>, Olivier Berger <olivier.berger at telecom-sudparis.eu>
+Build-Depends: debhelper (>= 8),
+ dh-python,
+ python-all,
+ python-setuptools,
+ python-mock,
+# python3-all,
+# python3-setuptools,
+ python-django (>= 1.6)
+Standards-Version: 3.9.4
+X-Python-Version: >= 2.7
+X-Python3-Version: >= 3.3
+Homepage: https://github.com/ox-it/django-conneg
+Vcs-Git: http://anonscm.debian.org/git/anonscm/git/users/obergix/django-conneg.git
+Vcs-Browser: http://anonscm.debian.org/gitweb/?p=users/obergix/django-conneg.git
+
+Package: python-django-conneg
+Architecture: all
+Depends: ${misc:Depends},
+ ${python:Depends},
+ python-django (>= 1.6)
+#Description: Framework for content-negotiated views in Django (Python 2)
+Description: Framework for content-negotiated views in Django
+ django-conneg provides a simple and extensible framework for producing
+ views that content-negotiate in Django.
+# .
+# This is the Python 2 version of the package.
+
+# Package: python3-django-conneg
+# Architecture: all
+# Depends: ${misc:Depends},
+# ${python3:Depends},
+# python-django (>= 1.6)
+# Description: Framework for content-negotiated views in Django (Python 3)
+# django-conneg provides a simple and extensible framework for producing
+# views that content-negotiate in Django.
+# .
+# This is the Python 3 version of the package.
Added: packages/django-conneg/trunk/debian/copyright
===================================================================
--- packages/django-conneg/trunk/debian/copyright (rev 0)
+++ packages/django-conneg/trunk/debian/copyright 2013-12-06 15:59:24 UTC (rev 26686)
@@ -0,0 +1,38 @@
+Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
+Upstream-Contact: IT Services, University of Oxford <infodev at it.ox.ac.uk>
+Source: https://github.com/ox-it/django-conneg
+
+Files: *
+Copyright: (c) 2011-2013, University of Oxford <infodev at it.ox.ac.uk>
+License: BSD-3-clause
+ Copyright (c) 2011-2013, University of Oxford
+ All rights reserved.
+ .
+ Redistribution and use in source and binary forms, with or without
+ modification, are permitted provided that the following conditions are met:
+ * Redistributions of source code must retain the above copyright
+ notice, this list of conditions and the following disclaimer.
+ * Redistributions in binary form must reproduce the above copyright
+ notice, this list of conditions and the following disclaimer in the
+ documentation and/or other materials provided with the distribution.
+ * Neither the name of the University of Oxford nor the names of its
+ contributors may be used to endorse or promote products derived from this
+ software without specific prior written permission.
+ .
+ THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+ ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ DISCLAIMED. IN NO EVENT SHALL THE UNIVERSITY OF OXFORD BE LIABLE FOR ANY
+ DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+ (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+Files: debian/*
+Copyright: 2012-2013 University of Oxford <infodev at it.ox.ac.uk>
+ 2013 Olivier Berger <obergix at debian.org>
+License: BSD-3-clause
+ The Debian packaging source files are released under the same terms
+ as the upstream sources.
Added: packages/django-conneg/trunk/debian/docs
===================================================================
--- packages/django-conneg/trunk/debian/docs (rev 0)
+++ packages/django-conneg/trunk/debian/docs 2013-12-06 15:59:24 UTC (rev 26686)
@@ -0,0 +1 @@
+README.rst
Added: packages/django-conneg/trunk/debian/patches/needtemplatestopasstests.patch
===================================================================
--- packages/django-conneg/trunk/debian/patches/needtemplatestopasstests.patch (rev 0)
+++ packages/django-conneg/trunk/debian/patches/needtemplatestopasstests.patch 2013-12-06 15:59:24 UTC (rev 26686)
@@ -0,0 +1,36 @@
+Description: We need to add templates in the build dir for running tests
+Author: Olivier Berger <obergix at debian.org>
+
+--- django-conneg-0.9.4.orig/setup.py
++++ django-conneg-0.9.4/setup.py
+@@ -1,5 +1,6 @@
+ from distutils.core import setup
+ from distutils.command.install import INSTALL_SCHEMES
++from setuptools import find_packages
+ import os
+
+ from django_conneg import __version__
+@@ -67,7 +68,7 @@ setup(
+ author='IT Services, University of Oxford',
+ author_email='infodev at it.ox.ac.uk',
+ version=__version__,
+- packages=packages,
++ packages=find_packages(),
+ license='BSD',
+ url='https://github.com/ox-it/django-conneg',
+ long_description=open('README.rst').read(),
+@@ -82,6 +83,7 @@ setup(
+ data_files=data_files,
+ install_requires=install_requires,
+ dependency_links=dependency_links,
++ include_package_data=True,
+ )
+
+
+--- django-conneg-0.9.4.orig/MANIFEST.in
++++ django-conneg-0.9.4/MANIFEST.in
+@@ -1,3 +1,4 @@
+ include requirements.txt
+ include README.rst
++recursive-include django_conneg *.py *.html
+
Added: packages/django-conneg/trunk/debian/patches/series
===================================================================
--- packages/django-conneg/trunk/debian/patches/series (rev 0)
+++ packages/django-conneg/trunk/debian/patches/series 2013-12-06 15:59:24 UTC (rev 26686)
@@ -0,0 +1,2 @@
+testurlsdjango16.patch
+needtemplatestopasstests.patch
Added: packages/django-conneg/trunk/debian/patches/testurlsdjango16.patch
===================================================================
--- packages/django-conneg/trunk/debian/patches/testurlsdjango16.patch (rev 0)
+++ packages/django-conneg/trunk/debian/patches/testurlsdjango16.patch 2013-12-06 15:59:24 UTC (rev 26686)
@@ -0,0 +1,18 @@
+Description: Adjusting to Django 1.6 for the urls.py of the tests
+Author: Olivier Berger <obergix at debian.org>
+
+--- django-conneg-0.9.4.orig/django_conneg/tests/urls.py
++++ django-conneg-0.9.4/django_conneg/tests/urls.py
+@@ -1,4 +1,4 @@
+-from django.conf.urls.defaults import patterns, url
++from django.conf.urls import patterns, url
+ from django.conf import settings
+ from django.http import HttpResponse, HttpResponseRedirect
+ from django.utils.decorators import method_decorator
+@@ -23,4 +23,4 @@ class LoginRequiredView(HTMLView, JSONVi
+ urlpatterns = patterns('',
+ url(r'^optional-auth/$', OptionalAuthView.as_view()),
+ url(r'^login-required/$', LoginRequiredView.as_view()),
+-)
+\ No newline at end of file
++)
Added: packages/django-conneg/trunk/debian/python-django-conneg.pyremove
===================================================================
--- packages/django-conneg/trunk/debian/python-django-conneg.pyremove (rev 0)
+++ packages/django-conneg/trunk/debian/python-django-conneg.pyremove 2013-12-06 15:59:24 UTC (rev 26686)
@@ -0,0 +1,2 @@
+django_conneg/test_settings.py
+django_conneg/tests/
Added: packages/django-conneg/trunk/debian/python3-django-conneg.pyremove
===================================================================
--- packages/django-conneg/trunk/debian/python3-django-conneg.pyremove (rev 0)
+++ packages/django-conneg/trunk/debian/python3-django-conneg.pyremove 2013-12-06 15:59:24 UTC (rev 26686)
@@ -0,0 +1,2 @@
+django_conneg/test_settings.py
+django_conneg/tests/
Added: packages/django-conneg/trunk/debian/rules
===================================================================
--- packages/django-conneg/trunk/debian/rules (rev 0)
+++ packages/django-conneg/trunk/debian/rules 2013-12-06 15:59:24 UTC (rev 26686)
@@ -0,0 +1,21 @@
+#!/usr/bin/make -f
+
+#export DH_VERBOSE=1
+export PYBUILD_NAME=django-conneg
+
+#MY_PYBUILD_OPTION=-v
+#MY_DJANGOADMIN_OPTION=-v 3
+
+%:
+# dh $@ --with python2,python3 --buildsystem=pybuild
+ dh $@ --with python2 --buildsystem=pybuild
+
+override_dh_auto_test:
+ pybuild $(MY_PYBUILD_OPTION) --test -i python{version} -p 2.7 --dir . --system=custom --test-args 'cd {build_dir}; django-admin test $(MY_DJANGOADMIN_OPTION) --settings=django_conneg.test_settings --pythonpath=. django_conneg.tests'
+# pybuild $(MY_PYBUILD_OPTION) --test -i python{version} -p 3.3 --dir . --system=custom --test-args 'cd {build_dir}; django3-admin test $(MY_DJANGOADMIN_OPTION) --settings=django_conneg.test_settings --pythonpath=. django_conneg.tests'
+
+# override_dh_install:
+# dh_install
+# rm -fr debian/python3-django-conneg/usr/lib/python3.3/dist-packages/django_conneg/tests/
+# rm -fr debian/python3-django-conneg/usr/lib/python3.3/dist-packages/django_conneg/test_settings.py
+# rm -fr debian/python3-django-conneg/usr/lib/python3/dist-packages/django_conneg/tests/
Property changes on: packages/django-conneg/trunk/debian/rules
___________________________________________________________________
Added: svn:executable
+ *
Added: packages/django-conneg/trunk/debian/source/format
===================================================================
--- packages/django-conneg/trunk/debian/source/format (rev 0)
+++ packages/django-conneg/trunk/debian/source/format 2013-12-06 15:59:24 UTC (rev 26686)
@@ -0,0 +1 @@
+3.0 (quilt)
Added: packages/django-conneg/trunk/debian/watch
===================================================================
--- packages/django-conneg/trunk/debian/watch (rev 0)
+++ packages/django-conneg/trunk/debian/watch 2013-12-06 15:59:24 UTC (rev 26686)
@@ -0,0 +1,3 @@
+version=3
+opts=filenamemangle=s/.+\/v?(\d\S*)\.tar\.gz/django-conneg-$1\.tar\.gz/ \
+ https://github.com/ox-it/django-conneg/tags .*/v?(\d\S*)\.tar\.gz
More information about the Python-modules-commits
mailing list