[Python-modules-commits] [python-django] 01/01: Add geoip-database-extra as an alternative to geoip-database-contrib.

[Raphaël Hertzog]

This is an automated email from the git hooks/post-receive script.

hertzog pushed a commit to branch debian/sid
in repository python-django.

commit aa2a8368391d4404f009eb9402c6e582d1d4a00b
Author: Raphaël Hertzog <hertzog at debian.org>
Date:   Mon Dec 15 08:34:13 2014 +0100

    Add geoip-database-extra as an alternative to geoip-database-contrib.
---
 debian/changelog | 6 ++++++
 debian/control   | 2 +-
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/debian/changelog b/debian/changelog
index 2f1ae92..4c2c2e4 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+python-django (1.7.1-2) UNRELEASED; urgency=medium
+
+  * Add geoip-database-extra as an alternative to geoip-database-contrib.
+
+ -- Raphaël Hertzog <hertzog at debian.org>  Mon, 15 Dec 2014 08:33:25 +0100
+
 python-django (1.7.1-1) unstable; urgency=medium
 
   [ Raphaël Hertzog ]
diff --git a/debian/control b/debian/control
index e16eb75..b6cecf9 100644
--- a/debian/control
+++ b/debian/control
@@ -29,7 +29,7 @@ Package: python-django
 Architecture: all
 Depends: ${misc:Depends}, ${python:Depends}, python-django-common (= ${binary:Version})
 Recommends: libjs-jquery, python-sqlparse, python-tz
-Suggests: python-psycopg2, python-mysqldb, python-flup, python-sqlite, python-memcache, python-pil, python-bcrypt, python-yaml, geoip-database-contrib, gettext, python-django-doc, ipython, bpython, libgdal1
+Suggests: python-psycopg2, python-mysqldb, python-flup, python-sqlite, python-memcache, python-pil, python-bcrypt, python-yaml, geoip-database-extra | geoip-database-contrib, gettext, python-django-doc, ipython, bpython, libgdal1
 Description: High-level Python web development framework (Python 2 version)
  Django is a high-level web application framework that loosely follows the
  model-view-controller design pattern.

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/python-modules/packages/python-django.git