[Python-modules-commits] r25395 - in packages/python-django-threadedcomments/trunk/debian (3 files)

[ockham-guest at users.alioth.debian.org]

    Date: Monday, August 5, 2013 @ 12:51:58
  Author: ockham-guest
Revision: 25395

debian/patches/series, debian/patches/add_markup_deps_to_install,
debian/patches/gravatar_default_url, debian/patches/django14:
Remove patches, as obsolete.

Modified:
  packages/python-django-threadedcomments/trunk/debian/changelog
Deleted:
  packages/python-django-threadedcomments/trunk/debian/patches/django14
  packages/python-django-threadedcomments/trunk/debian/patches/series

Modified: packages/python-django-threadedcomments/trunk/debian/changelog
===================================================================
--- packages/python-django-threadedcomments/trunk/debian/changelog	2013-08-05 12:50:24 UTC (rev 25394)
+++ packages/python-django-threadedcomments/trunk/debian/changelog	2013-08-05 12:51:58 UTC (rev 25395)
@@ -5,9 +5,9 @@
   * debian/control, debian/copyright: Update upstream links. (Closes: #713930)
   * debian/control: Remove python-textile, python-markdown, python-docutils
     from Build-Depends: and Suggests:
-  * debian/patches/add_markup_deps_to_install,
-    debian/patches/gravatar_default_url,
-    debian/patches/series: Remove patches, as obsolete.
+  * debian/patches/series, debian/patches/add_markup_deps_to_install,
+    debian/patches/gravatar_default_url, debian/patches/django14:
+    Remove patches, as obsolete.
 
   [ Jakub Wilk ]
   * Use canonical URIs for Vcs-* fields.

Deleted: packages/python-django-threadedcomments/trunk/debian/patches/django14
===================================================================
--- packages/python-django-threadedcomments/trunk/debian/patches/django14	2013-08-05 12:50:24 UTC (rev 25394)
+++ packages/python-django-threadedcomments/trunk/debian/patches/django14	2013-08-05 12:51:58 UTC (rev 25395)
@@ -1,65 +0,0 @@
-# Description: Fix some incompatibilities with Django 1.4.
-# Author: Bernhard Reiter <ockham at raz.or.at>
-# Forwarded: https://github.com/ockham/django-threadedcomments/commit/7a9bf0d379d6e874a7a69ffaf8d60f36998a941f
-
---- a/tests/runtests.py
-+++ b/tests/runtests.py
-@@ -6,11 +6,12 @@
- backup = os.environ.get('DJANGO_SETTINGS_MODULE', '')
- os.environ['DJANGO_SETTINGS_MODULE'] = 'settings'
- 
--from django.test.simple import run_tests
-+from django.test.simple import DjangoTestSuiteRunner
- 
- if __name__ == "__main__":
--    failures = run_tests(['threadedcomments',], verbosity=9)
-+    runner = DjangoTestSuiteRunner(verbosity=9)
-+    failures = runner.run_tests(['threadedcomments',])
-     if failures:
-         sys.exit(failures)
-     # Reset the DJANGO_SETTINGS_MODULE to what it was before running tests.
--    os.environ['DJANGO_SETTINGS_MODULE'] = backup
-\ No newline at end of file
-+    os.environ['DJANGO_SETTINGS_MODULE'] = backup
---- a/tests/settings.py
-+++ b/tests/settings.py
-@@ -2,8 +2,12 @@
- 
- DEFAULT_CHARSET = 'utf-8'
- 
--DATABASE_ENGINE = 'sqlite3'
--DATABASE_NAME = os.path.join(os.path.dirname(__file__), 'threadedcomments_test.db')
-+DATABASES = {
-+    'default' : {
-+        'ENGINE' : 'django.db.backends.sqlite3',
-+        'NAME' : os.path.join(os.path.dirname(__file__), 'threadedcomments_test.db'),
-+    }
-+}
- 
- ROOT_URLCONF = 'threadedcomments.urls'
- 
---- a/examples/tut1/settings.py
-+++ b/examples/tut1/settings.py
-@@ -9,12 +9,16 @@
- 
- MANAGERS = ADMINS
- 
--DATABASE_ENGINE = 'sqlite3'           # 'postgresql_psycopg2', 'postgresql', 'mysql', 'sqlite3' or 'oracle'.
--DATABASE_NAME = 'sampledb.db'             # Or path to database file if using sqlite3.
--DATABASE_USER = ''             # Not used with sqlite3.
--DATABASE_PASSWORD = ''         # Not used with sqlite3.
--DATABASE_HOST = ''             # Set to empty string for localhost. Not used with sqlite3.
--DATABASE_PORT = ''             # Set to empty string for default. Not used with sqlite3.
-+DATABASES = {
-+    'default' : {
-+        'ENGINE' : 'django.db.backends.sqlite3', # 'postgresql_psycopg2', 'postgresql', 'mysql', 'sqlite3' or 'oracle'.
-+        'NAME' : 'sampledb.db',                  # Or path to database file if using sqlite3.
-+        'USER' : '',             # Not used with sqlite3.
-+        'PASSWORD' : '',         # Not used with sqlite3.
-+        'HOST' : '',             # Set to empty string for localhost. Not used with sqlite3.
-+        'PORT' : '',             # Set to empty string for default. Not used with sqlite3.
-+    }
-+}
- 
- # Local time zone for this installation. Choices can be found here:
- # http://en.wikipedia.org/wiki/List_of_tz_zones_by_name

Deleted: packages/python-django-threadedcomments/trunk/debian/patches/series
===================================================================
--- packages/python-django-threadedcomments/trunk/debian/patches/series	2013-08-05 12:50:24 UTC (rev 25394)
+++ packages/python-django-threadedcomments/trunk/debian/patches/series	2013-08-05 12:51:58 UTC (rev 25395)
@@ -1 +0,0 @@
-django14