--- python-django-1.0.2.orig/debian/patches/04_hyphen-manpage.diff +++ python-django-1.0.2/debian/patches/04_hyphen-manpage.diff @@ -0,0 +1,17 @@ +Forwarded-Upstream: not yet +Author: Raphael Hertzog +Comment: + Fix a lintian I: message about improper usage of minus instead + of hyphen. + +--- docs/man/django-admin.1.orig 2008-09-04 08:51:48.000000000 +0200 ++++ docs/man/django-admin.1 2008-09-04 08:52:47.000000000 +0200 +@@ -153,7 +153,7 @@ + .TP + .I \-e, \-\-extension=EXTENSION + The file extension(s) to examine (default: ".html", separate multiple +-extensions with commas, or use -e multiple times). ++extensions with commas, or use \-e multiple times). + .TP + .I \-a, \-\-all + Process all available locales when using makemessages..SH "ENVIRONMENT" --- python-django-1.0.2.orig/debian/patches/03_manpage.diff +++ python-django-1.0.2/debian/patches/03_manpage.diff @@ -0,0 +1,23 @@ +Forwarded-Upstream: not needed +Author: Brett Parker +Comment: + Update the manual page to speak of django-admin instead of + django-admin.py as that's the name used by the Debian package. + . + This is a Debian specific patch. + +--- docs/man/django-admin.1.orig 2007-09-08 10:47:27.516890257 +0100 ++++ docs/man/django-admin.1 2007-09-08 10:48:01.822845242 +0100 +@@ -1,9 +1,9 @@ +-.TH "django-admin.py" "1" "March 2008" "Django Project" "" ++.TH "django-admin" "1" "March 2008" "Django Project" "" + .SH "NAME" +-django\-admin.py \- Utility script for the Django web framework ++django\-admin \- Utility script for the Django web framework + .SH "SYNOPSIS" +-.B django\-admin.py ++.B django\-admin + .I + .B [options] + .sp + .SH "DESCRIPTION" --- python-django-1.0.2.orig/debian/control +++ python-django-1.0.2/debian/control @@ -0,0 +1,32 @@ +Source: python-django +Section: python +Priority: optional +Maintainer: Brett Parker +Uploaders: Raphael Hertzog , Gustavo Noronha Silva , David Spreen , Chris Lamb , Debian Python Modules Team +Standards-Version: 3.8.0 +Build-Depends: debhelper (>= 5.0.37.2), python-dev, cdbs (>= 0.4.42), python-setuptools (>= 0.6b3), python-support (>= 0.3) +Homepage: http://www.djangoproject.com/ +Vcs-Svn: svn://svn.debian.org/python-modules/packages/python-django/trunk/ +Vcs-Browser: http://svn.debian.org/viewsvn/python-modules/packages/python-django/trunk/ + +Package: python-django +Architecture: all +Depends: ${python:Depends} +Suggests: python-psycopg2, python-psycopg, python-mysqldb, python-flup +Priority: optional +Description: A high-level Python Web framework + Django is a high-level Python Web framework that encourages rapid development + and clean, pragmatic design. + . + Python's equivalent to the famous Ruby on rails, Django lets you build + high-performing, elegant Web applications quickly. Django focuses on + automating as much as possible and adhering to the "Don't Repeat + Yourself" (DRY) principle. + . + It notably features: + * an object-relational mapper + * an automatic admin interface + * an elegant URL design + * a template system + * a cache system + * internationalization support --- python-django-1.0.2.orig/debian/compat +++ python-django-1.0.2/debian/compat @@ -0,0 +1 @@ +5 --- python-django-1.0.2.orig/debian/python-django.docs +++ python-django-1.0.2/debian/python-django.docs @@ -0,0 +1,2 @@ +README +AUTHORS --- python-django-1.0.2.orig/debian/copyright +++ python-django-1.0.2/debian/copyright @@ -0,0 +1,312 @@ +This package was debianized by Brett Parker with +the assistance of Raphael Hertzog , Gustavo Noronha Silva +, David Spreen and the Debian Python +Modules Team . + +The upstream source is available from . + +Main Django Code Licence: +========================= +Copyright (c) Django Software Foundation and individual contributors. +All rights reserved. + +Redistribution and use in source and binary forms, with or without modification, +are permitted provided that the following conditions are met: + + 1. Redistributions of source code must retain the above copyright notice, + this list of conditions and the following disclaimer. + + 2. 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. + + 3. Neither the name of Django 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 COPYRIGHT OWNER OR CONTRIBUTORS 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. + +Individual copyright holders stated in Main Django License are listed +in /usr/share/doc/python-django/AUTHORS.gz. + +PyDispatcher Licence (django/dispatch/*): +========================================= + + Copyright (c) 2001-2003, Patrick K. O'Brien and Contributors + 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. + + The name of Patrick K. O'Brien, or the name of any Contributor, + may not 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 + COPYRIGHT HOLDERS AND CONTRIBUTORS 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. + +License of django/utils/simplejson/* +==================================== + +Copyright (c) 2006 Bob Ippolito + +Permission is hereby granted, free of charge, to any person obtaining a copy of +this software and associated documentation files (the "Software"), to deal in +the Software without restriction, including without limitation the rights to +use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies +of the Software, and to permit persons to whom the Software is furnished to do +so, subject to the following conditions: + +The above copyright notice and this permission notice shall be included in all +copies or substantial portions of the Software. + +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, +OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE +SOFTWARE. + +License for django/utils/functional.py and django/utils/_decimal.py +(License taken from Python 2.5) +======================================================================= + +functional.py: +Copyright (c) 2001, 2002, 2003, 2004, 2005, 2006, 2007 Python Software Foundation + +decimal.py: +Copyright (c) 2004 Python Software Foundation + + +PYTHON SOFTWARE FOUNDATION LICENSE VERSION 2 +-------------------------------------------- + +1. This LICENSE AGREEMENT is between the Python Software Foundation +("PSF"), and the Individual or Organization ("Licensee") accessing and +otherwise using this software ("Python") in source or binary form and +its associated documentation. + +2. Subject to the terms and conditions of this License Agreement, PSF +hereby grants Licensee a nonexclusive, royalty-free, world-wide +license to reproduce, analyze, test, perform and/or display publicly, +prepare derivative works, distribute, and otherwise use Python +alone or in any derivative version, provided, however, that PSF's +License Agreement and PSF's notice of copyright, i.e., "Copyright (c) +2001, 2002, 2003, 2004, 2005, 2006, 2007 Python Software Foundation; +All Rights Reserved" are retained in Python alone or in any derivative +version prepared by Licensee. + +3. In the event Licensee prepares a derivative work that is based on +or incorporates Python or any part thereof, and wants to make +the derivative work available to others as provided herein, then +Licensee hereby agrees to include in any such work a brief summary of +the changes made to Python. + +4. PSF is making Python available to Licensee on an "AS IS" +basis. PSF MAKES NO REPRESENTATIONS OR WARRANTIES, EXPRESS OR +IMPLIED. BY WAY OF EXAMPLE, BUT NOT LIMITATION, PSF MAKES NO AND +DISCLAIMS ANY REPRESENTATION OR WARRANTY OF MERCHANTABILITY OR FITNESS +FOR ANY PARTICULAR PURPOSE OR THAT THE USE OF PYTHON WILL NOT +INFRINGE ANY THIRD PARTY RIGHTS. + +5. PSF SHALL NOT BE LIABLE TO LICENSEE OR ANY OTHER USERS OF PYTHON +FOR ANY INCIDENTAL, SPECIAL, OR CONSEQUENTIAL DAMAGES OR LOSS AS +A RESULT OF MODIFYING, DISTRIBUTING, OR OTHERWISE USING PYTHON, +OR ANY DERIVATIVE THEREOF, EVEN IF ADVISED OF THE POSSIBILITY THEREOF. + +6. This License Agreement will automatically terminate upon a material +breach of its terms and conditions. + +7. Nothing in this License Agreement shall be deemed to create any +relationship of agency, partnership, or joint venture between PSF and +Licensee. This License Agreement does not grant permission to use PSF +trademarks or trade name in a trademark sense to endorse or promote +products or services of Licensee, or any third party. + +8. By copying, installing or otherwise using Python, Licensee +agrees to be bound by the terms and conditions of this License +Agreement. + +django/utils/autoreload.py +=========================== + +Portions Copyright (c) 2004 CherryPy Team + +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 CherryPy Team 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 COPYRIGHT OWNER OR CONTRIBUTORS 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. + +Some code taken from Ian Bicking's Paste which is released under the MIT +License: + +Copyright (c) 2008 Ian Bicking + +Permission is hereby granted, free of charge, to any person obtaining a copy +of this software and associated documentation files (the "Software"), to deal +in the Software without restriction, including without limitation the rights +to use, copy, modify, merge, publish, distribute, sublicense, and/or sell +copies of the Software, and to permit persons to whom the Software is +furnished to do so, subject to the following conditions: + +The above copyright notice and this permission notice shall be included in +all copies or substantial portions of the Software. + +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, +OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN +THE SOFTWARE. + +django/contrib/gis/geos/* and django/contrib/gis/gdal/* +======================================================== +Copyright (c) 2007, Justin Bronn + +All rights reserved. + +Redistribution and use in source and binary forms, with or without modification, +are permitted provided that the following conditions are met: + + 1. Redistributions of source code must retain the above copyright notice, + this list of conditions and the following disclaimer. + + 2. 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. + + 3. Neither the name of GEOSGeometry 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 COPYRIGHT OWNER OR CONTRIBUTORS 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. + +django/contrib/gis/measure.py: +=============================== +Copyright (c) 2007, Robert Coup + +All rights reserved. + +Redistribution and use in source and binary forms, with or without modification, +are permitted provided that the following conditions are met: + + 1. Redistributions of source code must retain the above copyright notice, + this list of conditions and the following disclaimer. + + 2. 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. + + 3. Neither the name of Distance 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 COPYRIGHT OWNER OR CONTRIBUTORS 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. + +docs/_static/reset-fonts-grids.css: +==================================== +Copyright (c) 2008, Yahoo! Inc. All rights reserved. + +Software License Agreement (BSD License), downloaded from + on Friday, Aug 29 2008 + +Copyright (c) 2006, Yahoo! Inc. +All rights reserved. + +Redistribution and use of this software 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 Yahoo! Inc. nor the names of its + contributors may be used to endorse or promote products + derived from this software without specific prior + written permission of Yahoo! Inc. + +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 COPYRIGHT OWNER OR CONTRIBUTORS 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. --- python-django-1.0.2.orig/debian/pyversions +++ python-django-1.0.2/debian/pyversions @@ -0,0 +1 @@ +2.3- --- python-django-1.0.2.orig/debian/python-django.doc-base +++ python-django-1.0.2/debian/python-django.doc-base @@ -0,0 +1,20 @@ +Document: python-django +Title: Python Django Documentation +Author: Django Software Foundation +Abstract: This documentation gives an introduction + to Django and its contributed packages like its automatic + admin and the user authentication applications. +Section: Programming/Python + +Format: HTML +Index: /usr/share/doc/python-django/html/index.html +Files: /usr/share/doc/python-django/html/*.html + /usr/share/doc/python-django/html/faq/*.html + /usr/share/doc/python-django/html/howto/*.html + /usr/share/doc/python-django/html/internals/*.html + /usr/share/doc/python-django/html/intro/*.html + /usr/share/doc/python-django/html/misc/*.html + /usr/share/doc/python-django/html/obsolete/*.html + /usr/share/doc/python-django/html/ref/*.html + /usr/share/doc/python-django/html/releases/*.html + /usr/share/doc/python-django/html/topics/*.html --- python-django-1.0.2.orig/debian/python-django.manpages +++ python-django-1.0.2/debian/python-django.manpages @@ -0,0 +1 @@ +docs/man/django-admin.1 --- python-django-1.0.2.orig/debian/watch +++ python-django-1.0.2/debian/watch @@ -0,0 +1,3 @@ +version=3 +opts=filenamemangle=s/.*\/download\/(.*)\/tarball\//Django-$1.tar.gz/,uversionmangle=s/-(alpha|beta)-/~$1/ \ + http://www.djangoproject.com/download/ (.+)/tarball/ --- python-django-1.0.2.orig/debian/python-django.examples +++ python-django-1.0.2/debian/python-django.examples @@ -0,0 +1 @@ +examples/* --- python-django-1.0.2.orig/debian/python-django.README.Debian +++ python-django-1.0.2/debian/python-django.README.Debian @@ -0,0 +1,178 @@ +0.96 -> 1.0 +=========== + +Django 1.0 has a number of backwards-incompatible changes from Django +0.96. If you have apps written against Django 0.96 that you need to port, +see the detailed porting guide: +/usr/share/doc/python-django/html/releases/1.0-porting-guide.html +or +http://docs.djangoproject.com/en/dev/releases/1.0-porting-guide/ + +You can also find a complete list of of backwards incompatible changes +here: +http://code.djangoproject.com/wiki/BackwardsIncompatibleChanges + +0.95 -> 0.96 +============ + +Information here has been gathered from: + http://www.djangoproject.com/documentation/release_notes_0.96/ +and + http://code.djangoproject.com/wiki/BackwardsIncompatibleChanges + +Backwards Incompatible Changes +------------------------------ + + Database constraint names changed + ================================= + + As of [3512], the format of the constraint names Django generates for + foreign key references changed slightly. These names are only used + sometimes, when it is not possible to put the reference directly on the + affected column, so this is not always visible. + + The effect of this change is that manage.py reset app_name and similar + commands may generate SQL with invalid constraint names and thus generate + an error when run against the database (the database server will complain + about the constraint not existing). To fix this, you will need to tweak the + output of manage.py sqlreset app_name to match the correct constraint names + and pass the results to the database server manually. + + Backslash escaping changed + ========================== + + As of [3552], the Django database API now escapes backslashes given as + query parameters. If you have any database API code that match backslashes, + and it was working before (despite the broken escaping), you'll have to + change your code to "unescape" the slashes one level. + + For example, this used to work: + + # Code that matches a single backslash + MyModel.objects.filter(text__contains='\\\\') + + But it should be rewritten as this: + + # Code that matches a single backslash + MyModel.objects.filter(text__contains='\\') + + Removed ENABLE_PSYCO setting + ============================ + + As of [3877], the ENABLE_PSYCO setting no longer exists. If your settings + file includes ENABLE_PSYCO, nothing will break per se, but it just won't do + anything. If you want to use Psyco with Django, write some custom + middleware that activates Psyco. + + Changed Admin.manager option to more flexible hook + ================================================== + + As of [4342], the manager option to class Admin no longer exists. This + option was undocumented, but we're mentioning the change here in case you + used it. In favor of this option, class Admin may now define one of these + methods: + + * queryset() + * queryset_add() + * queryset_change() + + These give you much more flexibility. + + Note that this change was made to the NewformsAdminBranch. (We initially + called the new method change_list_queryset, but this was changed in [4584] + to be more flexible.) The change will not be made to trunk until that + branch is merged to trunk. + + Changed prepopulate_from to be defined in the Admin class, + not database field classes ¶ + ========================================================== + + As of [4446], the prepopulate_from option to database fields no + longer exists. It's been discontinued in favor of the new + prepopulated_fields option on class Admin. The new + prepopulated_fields option, if given, should be a dictionary + mapping field names to lists/tuples of field names. Here's an + example comparing old syntax and new syntax: + + # OLD: + class MyModel(models.Model): + first_name = models.CharField(maxlength=30) + last_name = models.CharField(maxlength=30) + slug = models.CharField(maxlength=60, prepopulate_from=('first_name', 'last_name')) + + class Admin: + pass + + # NEW: + class MyModel(models.Model): + first_name = models.CharField(maxlength=30) + last_name = models.CharField(maxlength=30) + slug = models.CharField(maxlength=60) + + class Admin: + prepopulated_fields = {'slug': ('first_name', 'last_name')} + + Moved admin doc views into django.contrib.admindocs + ==================================================== + + As of [4585], the documentation views for the Django admin site were moved + into a new package, django.contrib.admindocs. + + The admin docs, which aren't documented very well, were located at docs/ in + the admin site. They're also linked-to by the "Documentation" link in the + upper right of default admin templates. + + Because we've moved the doc views, you now have to activate admin docs + explicitly. Do this by adding the following line to your URLconf: + + (r'^admin/doc/', include('django.contrib.admindocs.urls')), + + Note that this change was made to the NewformsAdminBranch. The change will + not be made to trunk until that branch is merged to trunk. + + Enforcing MySQLdb version + ========================= + + As of [4724], Django will raise an error if you try to use the MySQL + backend with a MySQLdb ( MySQL python module) version earlier than 1.2.1p2. + There were significant, production-related bugs in earlier versions, so we + have upgraded the minimum requirement. + + In [4767], a mysql_old backend was added, that is identical to the original + mysql backend prior to the change in [4724]. This backend can be used if + upgrading the MySQLdb module is not immediately possible, however, it is + deprecated and no further development will be done on it. + +New Features +------------ + + New forms library + ================= + + The new forms library has been merged from the new forms branch in to + django.newforms in 0.96, the next revision will replace django.forms with + django.newforms, the current forms library is already copied to + django.oldforms to make the transition easier - it's advised to either + upgrade your forms code to the newforms library or to change your imports + as follows: + + from django import forms + becomes + from django import oldforms as forms + + URLconf improvements + ==================== + + It's now possible to use imported views in the urlconf rather than a string + representing the view to call. + + Test framework + ============== + + Now possible to write tests based on doctest and unittest + + Admin area changes + ================== + + Changes to the user adding and updating views so that you don't need to + worry about hashed passwords. --- python-django-1.0.2.orig/debian/NEWS +++ python-django-1.0.2/debian/NEWS @@ -0,0 +1,63 @@ +python-django (1.0~beta2-3) unstable; urgency=low + + The transition from Django 0.96.2 to Django 1.0 means that your Django software + will probably have to be updated. A comprehensive list of changes since Django + 0.96 is available at the Django Wiki[1]. If you are upgrading from 0.95 + (Sarge), you should refer to this page[2] as well. + + The Debian package now also includes the full Django documentation in HTML + format[3] + + The following incomplete list of major changes is taken from the release notes + of 1.0alpha1[4], 1.0alpha2[5], 1.0beta1[6] ad 1.0beta2[7]. For more changes + see those release notes or [1]. + + Refactored admin application (newforms-admin) + The Django administrative interface (django.contrib.admin) has been + completely refactored; admin definitions are now completely decoupled from + model definitions (no more class Admin declaration in models!), rewritten + to use Django’s new form-handling library (introduced in the 0.96 release + as django.newforms, and now available as simply django.forms) and redesigned + with extensibility and customization in mind. Full documentation for the + admin application is available online in the official Django + documentation[8]. + + INSERT/UPDATE distinction + Although Django’s default behavior of having a model’s save() method + automatically determine whether to perform an INSERT or an UPDATE at + the SQL level is suitable for the majority of cases, there are occasional + situations where forcing one or the other is useful. As a result, models + can now support an additional parameter to save() which can force a specific + operation. Consult the database API documentation[9] for details and important + notes about appropriate use of this parameter. + + Split CacheMiddleware + Django’s CacheMiddleware has been split into three classes: CacheMiddleware + itself still exists and retains all of its previous functionality, but it + is now built from two separate middleware classes which handle the two parts + of caching (inserting into and reading from the cache) separately, offering + additional flexibility for situations where combining these functions into a + single middleware posed problems. Full details, including updated notes on + appropriate use, are in the caching documentation[10]. + + Refactored django.contrib.comments + As part of a Google Summer of Code project, Thejaswi Puthraya carried out + a major rewrite and refactoring of Django’s bundled comment system, greatly + increasing its flexibility and customizability. Full documentation[11] is + available, as well as an upgrade guide[12] if you were using the previous + incarnation of the comments application. + + [1] http://code.djangoproject.com/wiki/BackwardsIncompatibleChanges + [2] http://code.djangoproject.com/wiki/OlderBackwardsIncompatibleChanges + [3] /usr/share/doc/python-django/html/index.html + [4] http://docs.djangoproject.com/en/dev/releases/1.0-alpha-1/#releases-1-0-alpha-1 + [5] http://docs.djangoproject.com/en/dev/releases/1.0-alpha-2/#releases-1-0-alpha-2 + [6] http://docs.djangoproject.com/en/dev/releases/1.0-beta/#releases-1-0-beta + [7] http://docs.djangoproject.com/en/dev/releases/1.0-beta-2/ + [8] /usr/share/doc/python-django/html/ref/contrib/admin.html + [9] /usr/share/doc/python-django/html/ref/models/index.html + [10] /usr/share/doc/python-django/html/topics/cache.html + [11] /usr/share/doc/python-django/html/ref/contrib/comments/index.html + [12] /usr/share/doc/python-django/html/ref/contrib/comments/upgrade.htm + + -- David Spreen Fri, 28 Aug 2008 09:10:16 -0700 --- python-django-1.0.2.orig/debian/changelog +++ python-django-1.0.2/debian/changelog @@ -0,0 +1,339 @@ +python-django (1.0.2-1~bpo40+1) etch-backports; urgency=low + + * Rebuild for etch-backports. + * Don't generate HTML documentation as it requires python-sphinx and + libjs-query; simply ship the text-based documentation. + + -- Chris Lamb Tue, 30 Dec 2008 01:57:53 +0000 + +python-django (1.0.2-1) unstable; urgency=low + + [ Chris Lamb ] + * New upstream bugfix release. Closes: #505783 + * Add myself to Uploaders with ACK from Brett. + + [ David Spreen ] + * Remove python-pysqlite2 from Recommends because Python 2.5 includes + sqlite library used by Django. Closes: 497886 + + [ Sandro Tosi ] + * debian/control + - switch Vcs-Browser field to viewsvn + + -- Chris Lamb Wed, 19 Nov 2008 21:31:00 +0000 + +python-django (1.0-1) unstable; urgency=low + + [ David Spreen ] + * New _stable_ upstream release. + + [ Raphael Hertzog ] + * This version fixes the latest security issue: + http://www.djangoproject.com/weblog/2008/sep/02/security/ + Closes: #497765 + * Don't include source files of documentation in the binary package, + keep only the HTML version. + * Updated README.Debian with information about the switch from 0.96 to + 1.0. + * Remove execute right on /etc/bash_completion.d/django_bash_completion + * Add debian/patches/04_hyphen-manpage.diff to fix a lintian message + (hyphen-used-as-minus-sign usr/share/man/man1/django-admin.1.gz:156). + * Don't compress javascript files. + * Add libjs-jquery to Recommends since it's used by the HTML + documentation. + + -- Raphael Hertzog Thu, 04 Sep 2008 08:33:32 +0200 + +python-django (1.0~beta2+ds-1) unstable; urgency=low + + * Bumping up upstream version to push sources into unstable. + (Thanks to Raphael Hertzog). + + -- David Spreen Sat, 30 Aug 2008 20:56:09 -0700 + +python-django (1.0~beta2-3) unstable; urgency=low + + [ David Spreen ] + * Updated the copyright information to include copyright and + licenses for individual contributions. + * Added the documentation to the main python-django package: + * debian/python-django.install + - Added installation of html documentation. + * debian/python-django.doc-base + - Added. + * debian/control + - Added Build-Depends-Indep on python-sphinx and libjs-jquery. + * debian/rules + - Readded code to build documentation. + - Readded code to link to libjs-jquery. + * debian/NEWS + - Fixed format. + - Added more comprehensive list of changes and references to + local documentation as well as the wiki pages for + backwards-incompatible changes. + * debian/python-django.docs + - Removed docs/*.txt since those are templates for the + generated docs now included with doc-base. + + -- David Spreen Fri, 29 Aug 2008 09:20:45 -0700 + +python-django (1.0~beta2-2) unstable; urgency=low + + [ David Spreen ] + * Removed all -doc related files temporarily to push beta2 into + unstable for extensive testing. The -doc package will be + readded once this package is in unstable as recommended in + http://lists.debian.org/debian-release/2008/08/msg01475.html. + * debian/python-django-doc.install + - Removed. + * debian/python-django-doc.doc-base + - Removed. + * debian/python-django-doc.examples + - Moved to python-django.examples. + * debian/rules + - Removed python-doc related build and post-installation. + * debian/control + - Removed binary package python-django-doc. + - Removed Build-Depends-Indep on python-sphinx and libjs-jquery. + * debian/python-django.install: + - Removed multiple package related issues. + + -- David Spreen Thu, 28 Aug 2008 20:15:21 -0700 + +python-django (1.0~beta2-1) experimental; urgency=low + + [ David Spreen ] + * The `hooray for the documentation' release! + * New upstream beta release. + * debian/control + - Updated standards version. + - Added python-sphinx and libjs-jquery. + - Added python-django-doc package depending on libjs-jquery. + * debian/docs + - Moved to debian/python-django.docs. + * debian/install + - Moved to debian/python-django.install. + * debian/manpages + - Moved to debian/python-django.manpages. + * debian/examples + - Moved to debian/python-django-doc.examples + * debian/README.Debian + - Moved to debian/python-django.README.Debian + * debian/python-django-doc.doc-base: + - Added doc-base file for the documentation. + * debian/python-django-doc.install: + - Added install file for sphinx generated documentation. + * debian/rules: + - Added code to generate documentation with sphinx and + replace convenience file of jquery.js with the respective + symlink to libjs-jquery. + + -- David Spreen Thu, 28 Aug 2008 10:22:29 -0700 + +python-django (1.0~beta1-1) experimental; urgency=low + + [ David Spreen ] + * New upstream beta release. Closes: #492956 + * debian/control: Added myself to Uploaders field. + * debian/watch: Added mangling for filename and version. Old watch file would + name the download 'tarball'. Also added mangling to handle alpha and beta + versioning. + * Drop debian/patches/01_add_shebang.diff as this has been fixed upstream. + * Drop debian/patches/02_bash_completion.diff as this has been committed + upstream http://code.djangoproject.com/ticket/7268. + * debian/control: Added python-flup to the Suggest field. Closes: #488123 + * debian/patches/03_manpage.diff: Adapted patch to new upstream version. + + [ Jan Dittberner ] + * add debian/watch file. + + -- David Spreen Fri, 15 Aug 2008 16:05:07 -0700 + +python-django (0.97~svn7534-1) experimental; urgency=low + + * New upstream snapshot. Closes: #409565, #481051 + - Include an XSS security fix (CVE-2008-2302). Closes: #481164 + * Drop debian/patches/04_pg_version_fix.diff as another fix + has been committed upstream (see http://code.djangoproject.com/ticket/6433 + and http://code.djangoproject.com/changeset/7415). + * Add some headers to the remaining patches. + + -- Raphael Hertzog Mon, 19 May 2008 23:41:50 +0200 + +python-django (0.97~svn7189-1) experimental; urgency=low + + * New upstream snapshot including bash completion fix + Closes: #450913 + + -- Brett Parker Sun, 02 Mar 2008 12:59:03 +0000 + +python-django (0.97~svn7047-2) experimental; urgency=low + + [ Brett Parker ] + * Patch for postgresql version issue with 8.3 beta/rc releases + Closes: #462058 + + [ Raphael Hertzog ] + * Updated Standards-Version to 3.7.3. + * Adjusted build-dependency on python-setuptools to strip the -1 part. + + -- Brett Parker Wed, 6 Feb 2008 15:15:37 +0000 + +python-django (0.97~svn7047-1) experimental; urgency=low + + * New upstream snapshot (rev 7047) + - tarball prepared by Gabriel Falcão Gonçalves de Moura + + + -- Gustavo Noronha Silva Tue, 29 Jan 2008 10:54:47 -0200 + +python-django (0.97~svn6996-1) experimental; urgency=low + + * New upstream snapshot + * debian/control: + - added myself to Uploaders + + -- Gustavo Noronha Silva Sat, 05 Jan 2008 20:53:23 -0200 + +python-django (0.97~svn6668-2) UNRELEASED; urgency=low + + [ Raphael Hertzog ] + * Install examples with dh_installexamples instead of dh_installdocs + (change done by Ubuntu) as empty files are kept. + + [ Sandro Tosi ] + * debian/control + - uniforming Vcs-Browser field + + -- Raphael Hertzog Mon, 17 Dec 2007 09:09:16 +0100 + +python-django (0.97~svn6668-1) experimental; urgency=low + + * New SVN snapshot (rev 6668) + - Auth system delegations + - Apps can now have thier own management commands + - Fix for CVE-2007-5712 remote denial of service + Closes: #448838 + * Fix missing upstream info in changelog + Closes: #450659 + + -- Brett Parker Sun, 11 Nov 2007 10:15:55 +0000 + +python-django (0.96+svn6373-1) experimental; urgency=low + + [ Raphael Hertzog ] + * New SVN snapshot (rev 6373, a few days after the last Django sprint). + * Note: The version 0.96+svn6034-1 never got uploaded. + * Rename XS-Vcs* fields to Vcs-* since they are now supported by dpkg. + + [ Piotr Ożarowski ] + * XS-Vcs-Browser and Homepage fields added + + -- Raphael Hertzog Thu, 04 Oct 2007 14:59:01 +0200 + +python-django (0.96+svn6034-1) experimental; urgency=low + + [ Brett Parker] + * New SVN snapshot (rev 6034). + * validate and runserver commands now display the number of errors + (returning back to previous functionality). + * Small documentation fixes + * assertRedirects handling for paths with get data + * start{project,app} no make sure files created are writable + * Add man page for django-admin to the debian package + + -- Brett Parker Sat, 8 Sep 2007 10:37:00 +0100 + +python-django (0.96+svn6020-1) experimental; urgency=low + + * New SVN snapshot (rev 6020). + + -- Raphael Hertzog Sun, 26 Aug 2007 18:16:08 +0200 + +python-django (0.96+svn5779-1) experimental; urgency=low + + * SVN snapshot (rev 5779) packaged to experimental as many interesting + Django applications rely on newer unreleased features. + + -- Raphael Hertzog Tue, 31 Jul 2007 13:40:18 +0200 + +python-django (0.96-1) unstable; urgency=low + + [ Brett Parker ] + * New upstream release - introduces some backwards incompatible changes, see + README.Debian or the backwards incompatible changes page at + http://code.djangoproject.com/wiki/BackwardsIncompatibleChanges + * Add documentation from upstream to /usr/share/doc/python-django + Closes: #411249 + * Install the bash completion file from extras in to + /etc/bash_completion.d/django_bash_completion + Closes: #414399 + * Egg support dropped as it's been dropped by upstream. + + -- Brett Parker Sun, 25 Mar 2007 19:18:39 +0100 + +python-django (0.95.1-1) unstable; urgency=low + + [ Brett Parker ] + * New upstream minor release for security bugs: + - http://www.djangoproject.com/weblog/2007/jan/21/0951/ + - Fixes a small security vulnerability in the script Django's + internationalization system uses to compile translation files + (changeset 4360 in the "0.95-bugfixes" branch). + - fix for a bug in Django's authentication middleware which could cause + apparent "caching" of a logged-in user (changeset 4361). + - patch which disables debugging mode in the flup FastCGI package Django + uses to launch its FastCGI server, which prevents tracebacks from + bubbling up during production use (changeset 4363). + Closes: #407786, #407607 + * Sets Recommends to python-psycopg and moves other database engines to + the Suggests field. + + [ Raphael Hertzog ] + * Use python-pysqlite2 as default database engine in Recommends. Others are + in Suggests. Closes: #403761 + * Add python-psycopg2 in Suggests. Closes: #407489 + + -- Raphael Hertzog Sun, 21 Jan 2007 17:45:50 +0100 + +python-django (0.95-3) unstable; urgency=low + + * Integrate 2 upstream changesets: + - http://code.djangoproject.com/changeset/3754 as + debian/patches/04_sec_fix_auth.diff + Fixes a possible case of mis-authentication due to bad caching. + Closes: #407521 + - http://code.djangoproject.com/changeset/3592 as + debian/patches/03_sec_fix_compile-messages.diff + Fixes an (unlikely) arbitrary command execution if the user is blindly + running compile-messages.py on a untrusted set of *.po files. + Closes: #407519 + + -- Raphael Hertzog Sat, 16 Dec 2006 15:13:29 +0100 + +python-django (0.95-2) unstable; urgency=low + + [ Piotr Ozarowski ] + * Added XS-Vcs-Svn field + + [ Brett Parker ] + * Made manage.py get a shebang with the version of python + used when running django-admin (closes: #401616) + * Created a convenience /usr/lib/python-django/bin symlink. + + [ Raphael Hertzog ] + * Adapted Brett's work to better fit my views of the packaging. + + -- Raphael Hertzog Sat, 16 Dec 2006 11:03:20 +0100 + +python-django (0.95-1) unstable; urgency=low + + [ Brett Parker ] + * 0.95 release - initial packaging + + [ Raphael Hertzog ] + * Fix recommends: s/python-sqlite/python-pysqlite2/ + * Add debian/pyversions to ensure that we have at least python 2.3 (and to + work around bug #391689 of python-support). + + -- Raphael Hertzog Mon, 9 Oct 2006 12:10:27 +0200 --- python-django-1.0.2.orig/debian/rules +++ python-django-1.0.2/debian/rules @@ -0,0 +1,29 @@ +#!/usr/bin/make -f + +DEB_PYTHON_SYSTEM := pysupport +DEB_PYTHON_MODULE_PACKAGE = python-django +DEB_DH_COMPRESS_ARGS = -X.js + +include /usr/share/cdbs/1/rules/buildcore.mk +include /usr/share/cdbs/1/rules/debhelper.mk +include /usr/share/cdbs/1/class/python-distutils.mk +include /usr/share/cdbs/1/rules/simple-patchsys.mk + +binary-post-install/python-django:: + # Use default python shebang + perl -pi -e 's|^#!/usr/bin/env python.*$$|#!/usr/bin/python|' debian/python-django/usr/share/python-support/python-django/django/conf/project_template/manage.py + # Ensure executability of some scripts that are copied to projects + # (or used within projects) + chmod 755 debian/python-django/usr/share/python-support/python-django/django/conf/project_template/manage.py + chmod 755 debian/python-django/usr/share/python-support/python-django/django/bin/[^_]*.py + chmod 755 debian/python-django/usr/share/python-support/python-django/django/bin/profiling/[^_]*.py + # Remove execute rights from stuff that shouldn't have them + chmod 644 debian/python-django/etc/bash_completion.d/django_bash_completion + # Create convenience symlink + mkdir -p debian/python-django/usr/lib/python-django + dh_link usr/share/python-support/python-django/django/bin usr/lib/python-django/bin + # Rename django-admin.py to django-admin + mv debian/python-django/usr/bin/django-admin.py debian/python-django/usr/bin/django-admin + +clean:: + rm -rf docs/_build/* --- python-django-1.0.2.orig/debian/pycompat +++ python-django-1.0.2/debian/pycompat @@ -0,0 +1 @@ +2 --- python-django-1.0.2.orig/debian/python-django.install +++ python-django-1.0.2/debian/python-django.install @@ -0,0 +1,2 @@ +docs/* usr/share/doc/python-django/docs/ +extras/django_bash_completion etc/bash_completion.d/