Viewing all changes in revision 37.
- Committer: Package Import Robot
- Date: 2012-02-17 14:59:51 UTC
- mfrom: (4.4.18 sid)
- Revision ID: package-import@ubuntu.com-20120217145951-irkw1txxjtqoqk2e
* Merge with Debian. Remaining changes:
- 09_test_view_decorator_sleep.diff increases the sleep time to
reduce race condition effects on build machines.
https://code.djangoproject.com/ticket/16686 (LP: #829487)
* debian/patches/{psycopg2_creation.diff,compat-psycopg2-plus2.4.2.diff}:
- New patches, resolve compatibility with psycopg2 > 2.4.1, patches
based on upstream submissions, rebasing courtesy of Dave Pifke.
- LP: #905837
- 09_test_view_decorator_sleep.diff increases the sleep time to
reduce race condition effects on build machines.
https://code.djangoproject.com/ticket/16686 (LP: #829487)
* debian/patches/{psycopg2_creation.diff,compat-psycopg2-plus2.4.2.diff}:
- New patches, resolve compatibility with psycopg2 > 2.4.1, patches
based on upstream submissions, rebasing courtesy of Dave Pifke.
- LP: #905837
- files added:
- .pc/02_disable-sources-in-sphinxdoc.diff
- .pc/02_disable-sources-in-sphinxdoc.diff/docs
- .pc/05_fix_djangodocs_sphinx_ext.diff
- .pc/05_fix_djangodocs_sphinx_ext.diff/docs
- .pc/05_fix_djangodocs_sphinx_ext.diff/docs/_ext
- .pc/06_use_debian_geoip_database_as_default.diff
- .pc/06_use_debian_geoip_database_as_default.diff/django
- .pc/06_use_debian_geoip_database_as_default.diff/django/contrib
- .pc/06_use_debian_geoip_database_as_default.diff/django/contrib/gis
- .pc/06_use_debian_geoip_database_as_default.diff/django/contrib/gis/utils
- .pc/07_fix_for_sphinx1.1.2.diff
- .pc/07_fix_for_sphinx1.1.2.diff/docs
- .pc/07_fix_for_sphinx1.1.2.diff/docs/_ext
- .pc/08_fix_test_week_view_allow_future.diff
- .pc/08_fix_test_week_view_allow_future.diff/tests
- .pc/08_fix_test_week_view_allow_future.diff/tests/regressiontests
- .pc/08_fix_test_week_view_allow_future.diff/tests/regressiontests/generic_views
- .pc/compat_psycopg2_plus2.4.2.diff
- .pc/compat_psycopg2_plus2.4.2.diff/django
- .pc/compat_psycopg2_plus2.4.2.diff/django/db
- .pc/compat_psycopg2_plus2.4.2.diff/django/db/backends
- .pc/compat_psycopg2_plus2.4.2.diff/django/db/backends/postgresql_psycopg2
- .pc/psycopg2_creation.diff
- .pc/psycopg2_creation.diff/django
- .pc/psycopg2_creation.diff/django/db
- .pc/psycopg2_creation.diff/django/db/backends
- .pc/psycopg2_creation.diff/django/db/backends/postgresql_psycopg2
- files modified:
- .pc/applied-patches
expand all
collapse all
added
removed
