← Back to branch summary

~ubuntu-branches/ubuntu/utopic/python-django/utopic

« back to all changes in this revision

Viewing changes to debian/patches/series

  • Committer: Package Import Robot
  • Author(s): Dave Walker (Daviey)
  • Date: 2012-02-17 14:59:51 UTC
  • mfrom: (4.4.18 sid)
  • Revision ID: package-import@ubuntu.com-20120217145951-irkw1txxjtqoqk2e
Tags: 1.3.1-4ubuntu1
https://launchpad.net/bugs/829487
https://launchpad.net/bugs/905837
* 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 

Show diffs side-by-side

added added

removed removed

Lines of Context:
debian/patches/series
1
1
01_disable_url_verify_regression_tests.diff
2
 
# Disabled until 641710 is fixed
3
 
# 02_disable-sources-in-sphinxdoc.diff
 
2
02_disable-sources-in-sphinxdoc.diff
4
3
03_manpage.diff
5
4
04_hyphen-manpage.diff
 
5
05_fix_djangodocs_sphinx_ext.diff
 
6
06_use_debian_geoip_database_as_default.diff
 
7
07_fix_for_sphinx1.1.2.diff
 
8
08_fix_test_week_view_allow_future.diff
6
9
09_test_view_decorator_sleep.diff
 
10
psycopg2_creation.diff
 
11
compat_psycopg2_plus2.4.2.diff