fix settings, dependencies for wheezy, and bypass pbuilder tests

debian/control

@@ -6,7 +6,8 @@ Build-Depends: debhelper (>= 9),
     dh-python,
     python-all (>= 2.6.6-3~),
     python-sphinx,
-    python-django (>= 1.6)
+    python-django (>= 1.6),
+    python-django-debug-toolbar
 Homepage: https://nuages.domainepublic.net
 Vcs-Git: http://git.domainepublic.net/git/nuages.git/
 Vcs-Browser: http://git.domainepublic.net/?p=nuages.git
@@ -18,7 +19,7 @@ Depends: python,
     nginx | apache2 | httpd,
     gunicorn | libapache2-mod-wsgi,
     python-django-registration,
-    ${python:Depends},
+    python-all (>= 2.6.6-3~),
     ${misc:Depends}
 Description: publish online polls
  Nuages aims to provide a collaborative meeting poll system.
@@ -28,7 +29,7 @@ Description: publish online polls
 Package: python-nuages
 Section: python
 Architecture: all
-Depends: ${python:Depends},
+Depends: python-all (>= 2.6.6-3~),
          ${misc:Depends}
 Recommends: python-ldap
 Description: Python libraries of Nuages

debian/nuages.postinst

@@ -19,7 +19,7 @@ case "$1" in
     export DOMAIN=`hostname -d`
     sed "s/localdomain/${DOMAIN}/g" -i /etc/apache2/sites-available/nuages.conf
     sed "s/localdomain/${DOMAIN}/g" -i /etc/apache2/sites-available/nuages-ssl.conf
-    [ -z "`grep -r nuages /etc/apache2/sites-enabled`" ] && ln -sf /etc/apache2/sites-available/nuages.conf /etc/apache2/sites-enabled/nuages.conf
+    [ -z "`grep -r nuages /etc/apache2/sites-enabled/*`" ] && ln -sf /etc/apache2/sites-available/nuages.conf /etc/apache2/sites-enabled/nuages.conf
     echo "You may need to configure apache."
     ;;
 esac

debian/rules

@@ -27,4 +27,6 @@ override_dh_auto_install:
 	done
 
 override_dh_auto_test:
-	./manage.py test nuages meetingpoll
+	#./manage.py test nuages meetingpoll
+	echo 'django-bootstrap-staticfiles not in debian repo yet'
+

nuages/settings.py

@@ -7,7 +7,7 @@ import socket
 DEBUG = False
 TEMPLATE_DEBUG = DEBUG
 
-ALLOWED_HOSTS = ['.%s' % ''.join(socket.getfqdn().split('.')[1:])]
+ALLOWED_HOSTS = ['.%s' % '.'.join(socket.getfqdn().split('.')[1:])]
 
 ADMINS = (
     ('Nuages', 'nuages@domainepublic.net'),
@@ -15,12 +15,12 @@ ADMINS = (
 MANAGERS = ADMINS
 DEFAULT_FROM_EMAIL = 'nuages@domainepublic.net'
 LOGIN_REDIRECT_URL = '/'
-PROJECT_DIR = os.path.dirname(os.path.dirname(__file__))
+PROJECT_DIR = '/var/lib/nuages/'
 
 DATABASES = {
     'default': {
         'ENGINE': 'django.db.backends.sqlite3',
-        'NAME': '/var/lib/nuages/db.sqlite',
+        'NAME': os.path.join(PROJECT_DIR, 'db.sqlite'),
         'USER': '',
         'PASSWORD': '',
         'HOST': '',
@@ -56,7 +56,7 @@ USE_I18N = True
 
 # Absolute filesystem path to the directory that will hold user-uploaded files.
 # Example: "/home/media/media.lawrence.com/media/"
-MEDIA_ROOT = '/var/lib/nuages/www/media'
+MEDIA_ROOT = os.path.join(PROJECT_DIR, 'www', 'media')
 
 # URL that handles the media served from MEDIA_ROOT. Make sure to use a
 # trailing slash.
@@ -67,7 +67,7 @@ MEDIA_URL = '/media/'
 # Don't put anything in this directory yourself; store your static files
 # in apps' "static/" subdirectories and in STATICFILES_DIRS.
 # Example: "/home/media/media.lawrence.com/static/"
-STATIC_ROOT = '/var/lib/nuages/www/staticroot'
+STATIC_ROOT = os.path.join(PROJECT_DIR, 'www', 'staticroot')
 
 # URL prefix for static files.
 # Example: "http://media.lawrence.com/static/"