[Python-modules-commits] r6401 - in packages/python-django/trunk/debian (10 files)
netzwurm at users.alioth.debian.org
netzwurm at users.alioth.debian.org
Fri Aug 29 19:17:35 UTC 2008
Date: Friday, August 29, 2008 @ 19:17:33
Author: netzwurm
Revision: 6401
* 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.
Added:
packages/python-django/trunk/debian/NEWS
packages/python-django/trunk/debian/python-django.doc-base
Modified:
packages/python-django/trunk/debian/changelog
packages/python-django/trunk/debian/control
packages/python-django/trunk/debian/copyright
packages/python-django/trunk/debian/python-django.docs
packages/python-django/trunk/debian/python-django.install
packages/python-django/trunk/debian/rules
Deleted:
packages/python-django/trunk/debian/NEWS.Debian
packages/python-django/trunk/debian/python-django.NEWS.Debian
Added: packages/python-django/trunk/debian/NEWS
===================================================================
--- packages/python-django/trunk/debian/NEWS (rev 0)
+++ packages/python-django/trunk/debian/NEWS 2008-08-29 19:17:33 UTC (rev 6401)
@@ -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 <netzwurm at debian.org> Fri, 28 Aug 2008 09:10:16 -0700
Deleted: packages/python-django/trunk/debian/NEWS.Debian
===================================================================
--- packages/python-django/trunk/debian/NEWS.Debian 2008-08-29 11:47:42 UTC (rev 6400)
+++ packages/python-django/trunk/debian/NEWS.Debian 2008-08-29 19:17:33 UTC (rev 6401)
@@ -1,19 +0,0 @@
-python-django 1.0~beta2
-------------------------
-
-The transition from Django 0.96.2 to Django 1.0 means that your Django software
-will probably have to be updated. Several fundamental changes have been made
-to contrib.admin, contrib.forms and others.
-
-For a full list of incompatibilities see the release notes of 1.0 alpha1, 1.0 alpha2,
-1.0 beta1 and 1.0 beta2 at the following locations:
-
-http://docs.djangoproject.com/en/dev/releases/1.0-alpha-1/#releases-1-0-alpha-1
-http://docs.djangoproject.com/en/dev/releases/1.0-alpha-2/#releases-1-0-alpha-2
-http://docs.djangoproject.com/en/dev/releases/1.0-beta/#releases-1-0-beta
-http://docs.djangoproject.com/en/dev/releases/1.0-beta-2/
-
-Happy hacking,
-
- -- David Spreen <netzwurm at debian.org> Thu, 28 Aug 2008 19:51:16 -0700
-
\ No newline at end of file
Modified: packages/python-django/trunk/debian/changelog
===================================================================
--- packages/python-django/trunk/debian/changelog 2008-08-29 11:47:42 UTC (rev 6400)
+++ packages/python-django/trunk/debian/changelog 2008-08-29 19:17:33 UTC (rev 6401)
@@ -1,3 +1,29 @@
+python-django (1.0~beta2-3) UNRELEASED; 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 <netzwurm at debian.org> Fri, 29 Aug 2008 09:20:45 -0700
+
python-django (1.0~beta2-2) unstable; urgency=low
[ David Spreen ]
Modified: packages/python-django/trunk/debian/control
===================================================================
--- packages/python-django/trunk/debian/control 2008-08-29 11:47:42 UTC (rev 6400)
+++ packages/python-django/trunk/debian/control 2008-08-29 19:17:33 UTC (rev 6401)
@@ -5,7 +5,7 @@
Uploaders: Raphael Hertzog <hertzog at debian.org>, Gustavo Noronha Silva <kov at debian.org>, David Spreen <netzwurm at debian.org>, Debian Python Modules Team <python-modules-team at lists.alioth.debian.org>
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)
-#Build-Depends-Indep: python-sphinx, libjs-jquery
+Build-Depends-Indep: python-sphinx, libjs-jquery
Homepage: http://www.djangoproject.com/
Vcs-Svn: svn://svn.debian.org/python-modules/packages/python-django/trunk/
Vcs-Browser: http://svn.debian.org/wsvn/python-modules/packages/python-django/trunk/?op=log
@@ -32,11 +32,3 @@
* a template system
* a cache system
* internationalization support
-
-#Package: python-django-doc
-#Architecture: all
-#Depends: libjs-jquery
-#Section: doc
-#Description: Documentation for Python Django
-# This package contains the documentation for Python Django 1.0 in HTML
-# format.
Modified: packages/python-django/trunk/debian/copyright
===================================================================
--- packages/python-django/trunk/debian/copyright 2008-08-29 11:47:42 UTC (rev 6400)
+++ packages/python-django/trunk/debian/copyright 2008-08-29 19:17:33 UTC (rev 6401)
@@ -1,12 +1,13 @@
This package was debianized by Brett Parker <iDunno at sommitrealweird.co.uk> with
-the assistance of Raphael Hertzog <hertzog at debian.org>
+the assistance of Raphael Hertzog <hertzog at debian.org>, Gustavo Noronha Silva
+<kov at debian.org>, David Spreen <netzwurm at debian.org> and the Debian Python
+Modules Team <python-modules-team at lists.alioth.debian.org>.
-The upstream source is available from http://www.djangoproject.com/download/
+The upstream source is available from <http://www.djangoproject.com/download/>.
Main Django Code Licence:
=========================
-
-Copyright (c) 2005, the Lawrence Journal-World
+Copyright (c) Django Software Foundation and individual contributors.
All rights reserved.
Redistribution and use in source and binary forms, with or without modification,
@@ -34,6 +35,9 @@
(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/*):
=========================================
@@ -69,3 +73,240 @@
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 <team at cherrypy.org>
+
+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 <robert.coup at onetrackmind.co.nz>
+
+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
+<http://developer.yahoo.net/yui/license.txt> 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.
Deleted: packages/python-django/trunk/debian/python-django.NEWS.Debian
===================================================================
--- packages/python-django/trunk/debian/python-django.NEWS.Debian 2008-08-29 11:47:42 UTC (rev 6400)
+++ packages/python-django/trunk/debian/python-django.NEWS.Debian 2008-08-29 19:17:33 UTC (rev 6401)
@@ -1,19 +0,0 @@
-python-django 1.0~beta2
-------------------------
-
-The transition from Django 0.96.2 to Django 1.0 means that your Django software
-will probably have to be updated. Several fundamental changes have been made
-to contrib.admin, contrib.forms and others.
-
-For a full list of incompatibilities see the release notes of 1.0 alpha1, 1.0 alpha2,
-1.0 beta1 and 1.0 beta2 at the following locations:
-
-http://docs.djangoproject.com/en/dev/releases/1.0-alpha-1/#releases-1-0-alpha-1
-http://docs.djangoproject.com/en/dev/releases/1.0-alpha-2/#releases-1-0-alpha-2
-http://docs.djangoproject.com/en/dev/releases/1.0-beta/#releases-1-0-beta
-http://docs.djangoproject.com/en/dev/releases/1.0-beta-2/
-
-Happy hacking,
-
- -- David Spreen <netzwurm at debian.org> Thu, 28 Aug 2008 19:51:16 -0700
-
\ No newline at end of file
Added: packages/python-django/trunk/debian/python-django.doc-base
===================================================================
--- packages/python-django/trunk/debian/python-django.doc-base (rev 0)
+++ packages/python-django/trunk/debian/python-django.doc-base 2008-08-29 19:17:33 UTC (rev 6401)
@@ -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
Modified: packages/python-django/trunk/debian/python-django.docs
===================================================================
--- packages/python-django/trunk/debian/python-django.docs 2008-08-29 11:47:42 UTC (rev 6400)
+++ packages/python-django/trunk/debian/python-django.docs 2008-08-29 19:17:33 UTC (rev 6401)
@@ -1,3 +1,2 @@
README
AUTHORS
-docs/*.txt
Modified: packages/python-django/trunk/debian/python-django.install
===================================================================
--- packages/python-django/trunk/debian/python-django.install 2008-08-29 11:47:42 UTC (rev 6400)
+++ packages/python-django/trunk/debian/python-django.install 2008-08-29 19:17:33 UTC (rev 6401)
@@ -1,3 +1,2 @@
-#debian/tmp/usr/bin/django-admin.py
-#debian/tmp/usr/lib/python*/site-packages
+docs/_build/html/* usr/share/doc/python-django/html/
extras/django_bash_completion etc/bash_completion.d/
Modified: packages/python-django/trunk/debian/rules
===================================================================
--- packages/python-django/trunk/debian/rules 2008-08-29 11:47:42 UTC (rev 6400)
+++ packages/python-django/trunk/debian/rules 2008-08-29 19:17:33 UTC (rev 6401)
@@ -9,6 +9,10 @@
include /usr/share/cdbs/1/class/python-distutils.mk
include /usr/share/cdbs/1/rules/simple-patchsys.mk
+build/python-django::
+ # Build HTML documentation
+ cd docs && make html
+
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
@@ -22,17 +26,10 @@
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
+ # Remove convenience copy of libjs-jquery and replace with symlink
+ cd debian/python-django/usr/share/doc/python-django/html/_static\
+ && rm -f jquery.js\
+ && ln -s ../../../../javascript/jquery/jquery.js .
-#build/python-django-doc::
- # Build HTML documentation.
-# cd docs && make html
-
clean::
rm -rf docs/_build/*
-
-
-#binary-post-install/python-django-doc::
-# # Remove convenience copy of libjs-jquery and replace with symlink.
-# cd debian/python-django-doc/usr/share/doc/python-django-doc/html/_static\
-# && rm -f jquery.js\
-# && ln -s ../../../../javascript/jquery/jquery.js .
More information about the Python-modules-commits
mailing list