diff -uNr debian/debian//changelog lp.636482/debian//changelog
--- debian/debian//changelog	2010-10-04 20:54:24.888633000 +0200
+++ lp.636482/debian//changelog	2010-09-21 20:25:15.201547000 +0200
@@ -1,11 +1,8 @@
-python-django (1.2.3-1) unstable; urgency=low
+python-django (1.2.3-0ubuntu1) UNRELEASED; urgency=low
 
-  [ Krzysztof Klimonda ]
-  * New upstream release. Closes: #596893 LP: #636482
+  * New upstream release. (LP: #636482)
   * Fixes both a XSS vulnerability introduced in 1.2 series and
-    the regressions caused by 1.2.2 release. Closes: #596205
-  * debian/control:
-    - depend on language packs for en_US.utf8 locales required for unit tests.
+    the regressions caused by 1.2.2 release.
   * debian/rules:
     - re-enable build time tests.
     - set LC_ALL to en_US.utf8 for test suite.
@@ -13,13 +10,11 @@
     - two new patches: 05_fix_regression_tests.diff and
       06_fix_regression_tests.diff backported from 1.2.x branch to fix
       test suite failures.
+  *  debian/patches/01_disable_url_verify_regression_tests.diff:
+     - disable another test that fails without internet connection, thanks
+       Kai Kasurinen for reporting it.
 
-  [ Raphaël Hertzog ]
-  * Update Standards-Version to 3.9.1.
-  * Drop "--with quilt" and quilt build-dependency since the package is
-    already using source format "3.0 (quilt)".
-
- -- Raphaël Hertzog <hertzog@debian.org>  Sat, 18 Sep 2010 19:37:03 +0200
+ -- Krzysztof Klimonda <kklimonda@syntaxhighlighted.com>  Sun, 12 Sep 2010 18:10:01 +0200
 
 python-django (1.2.1-1) unstable; urgency=low
 
diff -uNr debian/debian//changelog.~1~ lp.636482/debian//changelog.~1~
diff -uNr debian/debian//control lp.636482/debian//control
--- debian/debian//control	2010-10-04 20:54:24.888633000 +0200
+++ lp.636482/debian//control	2010-09-14 13:59:30.000159000 +0200
@@ -1,10 +1,11 @@
 Source: python-django
 Section: python
 Priority: optional
-Maintainer: Chris Lamb <lamby@debian.org>
+Maintainer: Ubuntu Developers <ubuntu-devel-discuss@lists.ubuntu.com>
+XSBC-Original-Maintainer: Chris Lamb <lamby@debian.org>
 Uploaders: Debian Python Modules Team <python-modules-team@lists.alioth.debian.org>, Raphaël Hertzog <hertzog@debian.org>
-Standards-Version: 3.9.1
-Build-Depends: debhelper (>= 7.0.50), python-support, python (>= 2.5) | python-sqlite, locales-all | language-pack-en-base
+Standards-Version: 3.8.4
+Build-Depends: debhelper (>= 7.0.50), python-support, quilt (>= 0.46-7~), python (>= 2.5) | python-sqlite, language-pack-en-base
 Build-Depends-Indep: python-sphinx, libjs-jquery
 Homepage: http://www.djangoproject.com/
 Vcs-Svn: svn://svn.debian.org/python-modules/packages/python-django/trunk/
diff -uNr debian/debian//patches/01_disable_url_verify_regression_tests.diff lp.636482/debian//patches/01_disable_url_verify_regression_tests.diff
--- debian/debian//patches/01_disable_url_verify_regression_tests.diff	2010-10-04 20:54:24.888633000 +0200
+++ lp.636482/debian//patches/01_disable_url_verify_regression_tests.diff	2010-09-21 20:26:28.421547000 +0200
@@ -5,9 +5,10 @@
  .
  This is a Debian specific patch.
 
-diff -urNad Django-1.2-rc-1.orig/tests/regressiontests/forms/fields.py Django-1.2-rc-1/tests/regressiontests/forms/fields.py
---- Django-1.2-rc-1.orig/tests/regressiontests/forms/fields.py	2010-05-06 08:39:00.000000000 +0100
-+++ Django-1.2-rc-1/tests/regressiontests/forms/fields.py	2010-05-06 08:39:41.000000000 +0100
+Index: lp.636482/tests/regressiontests/forms/fields.py
+===================================================================
+--- lp.636482.orig/tests/regressiontests/forms/fields.py	2010-09-21 20:05:50.661547000 +0200
++++ lp.636482/tests/regressiontests/forms/fields.py	2010-09-21 20:24:10.145632000 +0200
 @@ -513,33 +513,6 @@
          self.assertRaisesErrorWithMessage(ValidationError, "[u'Enter a valid URL.']", f.clean, 'http://example.')
          self.assertRaisesErrorWithMessage(ValidationError, "[u'Enter a valid URL.']", f.clean, 'http://.com')
@@ -42,3 +43,18 @@
      def test_urlfield_41(self):
          f = URLField(min_length=15, max_length=20)
          self.assertRaisesErrorWithMessage(ValidationError, "[u'Ensure this value has at least 15 characters (it has 13).']", f.clean, 'http://f.com')
+Index: lp.636482/tests/modeltests/validation/tests.py
+===================================================================
+--- lp.636482.orig/tests/modeltests/validation/tests.py	2010-09-21 20:05:50.681547000 +0200
++++ lp.636482/tests/modeltests/validation/tests.py	2010-09-21 20:26:24.101547000 +0200
+@@ -56,10 +56,6 @@
+         mtv = ModelToValidate(number=10, name='Some Name', url='http://google.com/we-love-microsoft.html')
+         self.assertFieldFailsValidationWithMessage(mtv.full_clean, 'url', [u'This URL appears to be a broken link.'])
+ 
+-    def test_correct_url_value_passes(self):
+-        mtv = ModelToValidate(number=10, name='Some Name', url='http://www.djangoproject.com/')
+-        self.assertEqual(None, mtv.full_clean()) # This will fail if there's no Internet connection
+-
+     def test_text_greater_that_charfields_max_length_eaises_erros(self):
+         mtv = ModelToValidate(number=10, name='Some Name'*100)
+         self.assertFailsValidation(mtv.full_clean, ['name',])
diff -uNr debian/debian//patches/01_disable_url_verify_regression_tests.diff.~1~ lp.636482/debian//patches/01_disable_url_verify_regression_tests.diff.~1~
diff -uNr debian/debian//patches/05_fix_regression_tests.diff lp.636482/debian//patches/05_fix_regression_tests.diff
--- debian/debian//patches/05_fix_regression_tests.diff	2010-10-04 20:54:24.888633000 +0200
+++ lp.636482/debian//patches/05_fix_regression_tests.diff	2010-09-14 13:59:30.000159000 +0200
@@ -1,39 +1,39 @@
-Description: Adjust AdminDocTests to run after r13728. Also match comments
-  to tests and add test that was there in comment form only.
-Origin: upstream, http://code.djangoproject.com/changeset/13750
-Bug: http://code.djangoproject.com/ticket/3695
---- a/tests/regressiontests/admin_views/tests.py (revision 13697)
-+++ b/tests/regressiontests/admin_views/tests.py (revision 13750)
-@@ -2207,14 +2207,17 @@
- 
-             # A builtin tag exists in both the index and detail
--            self.assertContains(response, '<h3 id="autoescape">autoescape</h3>')
--            self.assertContains(response, '<li><a href="#autoescape">autoescape</a></li>')
-+            self.assertContains(response, '<h3 id="built_in-autoescape">autoescape</h3>')
-+            self.assertContains(response, '<li><a href="#built_in-autoescape">autoescape</a></li>')
- 
-             # An app tag exists in both the index and detail
--            # The builtin tag group exists
-+            self.assertContains(response, '<h3 id="flatpages-get_flatpages">get_flatpages</h3>')
-+            self.assertContains(response, '<li><a href="#flatpages-get_flatpages">get_flatpages</a></li>')
-+
-+            # The admin list tag group exists
-             self.assertContains(response, "<h2>admin_list</h2>", count=2)
- 
--            # A builtin tag exists in both the index and detail
--            self.assertContains(response, '<h3 id="autoescape">autoescape</h3>')
--            self.assertContains(response, '<li><a href="#admin_actions">admin_actions</a></li>')
-+            # An admin list tag exists in both the index and detail
-+            self.assertContains(response, '<h3 id="admin_list-admin_actions">admin_actions</h3>')
-+            self.assertContains(response, '<li><a href="#admin_list-admin_actions">admin_actions</a></li>')
- 
-         def test_filters(self):
-@@ -2225,6 +2228,6 @@
- 
-             # A builtin filter exists in both the index and detail
--            self.assertContains(response, '<h3 id="add">add</h3>')
--            self.assertContains(response, '<li><a href="#add">add</a></li>')
-+            self.assertContains(response, '<h3 id="built_in-add">add</h3>')
-+            self.assertContains(response, '<li><a href="#built_in-add">add</a></li>')
- 
- except ImportError:
+Description: Adjust AdminDocTests to run after r13728. Also match comments
+  to tests and add test that was there in comment form only.
+Origin: upstream, http://code.djangoproject.com/changeset/13750
+Bug: http://code.djangoproject.com/ticket/3695
+--- a/tests/regressiontests/admin_views/tests.py (revision 13697)
++++ b/tests/regressiontests/admin_views/tests.py (revision 13750)
+@@ -2207,14 +2207,17 @@
+ 
+             # A builtin tag exists in both the index and detail
+-            self.assertContains(response, '<h3 id="autoescape">autoescape</h3>')
+-            self.assertContains(response, '<li><a href="#autoescape">autoescape</a></li>')
++            self.assertContains(response, '<h3 id="built_in-autoescape">autoescape</h3>')
++            self.assertContains(response, '<li><a href="#built_in-autoescape">autoescape</a></li>')
+ 
+             # An app tag exists in both the index and detail
+-            # The builtin tag group exists
++            self.assertContains(response, '<h3 id="flatpages-get_flatpages">get_flatpages</h3>')
++            self.assertContains(response, '<li><a href="#flatpages-get_flatpages">get_flatpages</a></li>')
++
++            # The admin list tag group exists
+             self.assertContains(response, "<h2>admin_list</h2>", count=2)
+ 
+-            # A builtin tag exists in both the index and detail
+-            self.assertContains(response, '<h3 id="autoescape">autoescape</h3>')
+-            self.assertContains(response, '<li><a href="#admin_actions">admin_actions</a></li>')
++            # An admin list tag exists in both the index and detail
++            self.assertContains(response, '<h3 id="admin_list-admin_actions">admin_actions</h3>')
++            self.assertContains(response, '<li><a href="#admin_list-admin_actions">admin_actions</a></li>')
+ 
+         def test_filters(self):
+@@ -2225,6 +2228,6 @@
+ 
+             # A builtin filter exists in both the index and detail
+-            self.assertContains(response, '<h3 id="add">add</h3>')
+-            self.assertContains(response, '<li><a href="#add">add</a></li>')
++            self.assertContains(response, '<h3 id="built_in-add">add</h3>')
++            self.assertContains(response, '<li><a href="#built_in-add">add</a></li>')
+ 
+ except ImportError:
diff -uNr debian/debian//patches/06_fix_regression_tests.diff lp.636482/debian//patches/06_fix_regression_tests.diff
--- debian/debian//patches/06_fix_regression_tests.diff	2010-10-04 20:54:24.888633000 +0200
+++ lp.636482/debian//patches/06_fix_regression_tests.diff	2010-09-14 13:59:30.000159000 +0200
@@ -1,16 +1,16 @@
-Description: A second part of patch to update AdminDocsTest to fix test suite.
-Source: upstream, http://code.djangoproject.com/changeset/13764
-
-Index: /django/branches/releases/1.2.X/tests/regressiontests/admin_views/tests.py
-===================================================================
---- a/tests/regressiontests/admin_views/tests.py (revision 13750)
-+++ b/tests/regressiontests/admin_views/tests.py (revision 13764)
-@@ -2211,6 +2211,6 @@
- 
-             # An app tag exists in both the index and detail
--            self.assertContains(response, '<h3 id="flatpages-get_flatpages">get_flatpages</h3>')
--            self.assertContains(response, '<li><a href="#flatpages-get_flatpages">get_flatpages</a></li>')
-+            self.assertContains(response, '<h3 id="comments-get_comment_count">get_comment_count</h3>')
-+            self.assertContains(response, '<li><a href="#comments-get_comment_count">get_comment_count</a></li>')
- 
-             # The admin list tag group exists
+Description: A second part of patch to update AdminDocsTest to fix test suite.
+Source: upstream, http://code.djangoproject.com/changeset/13764
+
+Index: /django/branches/releases/1.2.X/tests/regressiontests/admin_views/tests.py
+===================================================================
+--- a/tests/regressiontests/admin_views/tests.py (revision 13750)
++++ b/tests/regressiontests/admin_views/tests.py (revision 13764)
+@@ -2211,6 +2211,6 @@
+ 
+             # An app tag exists in both the index and detail
+-            self.assertContains(response, '<h3 id="flatpages-get_flatpages">get_flatpages</h3>')
+-            self.assertContains(response, '<li><a href="#flatpages-get_flatpages">get_flatpages</a></li>')
++            self.assertContains(response, '<h3 id="comments-get_comment_count">get_comment_count</h3>')
++            self.assertContains(response, '<li><a href="#comments-get_comment_count">get_comment_count</a></li>')
+ 
+             # The admin list tag group exists
diff -uNr debian/debian//rules lp.636482/debian//rules
--- debian/debian//rules	2010-10-04 20:54:24.888633000 +0200
+++ lp.636482/debian//rules	2010-09-21 20:24:10.145632000 +0200
@@ -5,15 +5,11 @@
 PREFIX = debian/python-django
 DJANGO_DIR = $(PREFIX)/$(call py_libdir_sh,`pyversions -d`)/django
 
-# FIXME: if the build is run while non-default python version are
-# available, the build process will install files in
-# /usr/lib/pyshared/pythonX.Y while we don't need them
-
 %:
-	dh $@
+	dh --with quilt $@
 
 override_dh_auto_clean:
-	rm -rf docs.debian tests/__init__.py
+	rm -rf docs.debian testproject
 	find -name "*.DS_Store" -delete
 	dh_auto_clean
 
@@ -30,7 +26,8 @@
 
 override_dh_auto_test:
 	touch tests/__init__.py
-	LC_ALL=en_US.utf8 PYTHONPATH=. tests/runtests.py --settings=tests.test_sqlite --verbosity=2
+	LC_ALL=en_US.utf8 PYTHONPATH=. tests/runtests.py --settings=tests.test_sqlite --verbosity=1
+	rm tests/__init__.py
 
 override_dh_install:
 	dh_install
diff -uNr debian/debian//rules.~1~ lp.636482/debian//rules.~1~