From 15a2459fed9f1fc68b39e258172703ac8dd9cac8 Mon Sep 17 00:00:00 2001 From: Guillaume Pellerin Date: Wed, 27 Sep 2017 12:27:15 +0200 Subject: [PATCH] Fix debian repos, finally fix submodule setup (should fix #1 and #2) --- app/settings.py | 1 + etc/apt/sources.list | 19 +------------------ lib/mezzanine | 2 +- lib/mezzanine-organization | 2 +- lib/mezzanine-organization-themes | 2 +- requirements.txt | 3 --- 6 files changed, 5 insertions(+), 24 deletions(-) diff --git a/app/settings.py b/app/settings.py index ad4165f1..818ed0dc 100644 --- a/app/settings.py +++ b/app/settings.py @@ -214,6 +214,7 @@ ROOT_URLCONF = "urls" ################ INSTALLED_APPS = [ + "organization_themes", "organization_themes.www_ircam_fr", "modeltranslation", diff --git a/etc/apt/sources.list b/etc/apt/sources.list index b6f14261..ab4392bc 100644 --- a/etc/apt/sources.list +++ b/etc/apt/sources.list @@ -1,26 +1,9 @@ deb http://httpredir.debian.org/debian jessie main contrib non-free -deb-src http://httpredir.debian.org/debian testing main contrib non-free - deb http://security.debian.org/ jessie/updates main -deb-src http://security.debian.org/ jessie/updates main - deb http://httpredir.debian.org/debian jessie-updates main -deb-src http://httpredir.debian.org/debian jessie-updates main - deb http://httpredir.debian.org/debian jessie-backports main contrib non-free -deb-src http://httpredir.debian.org/debian jessie-backports main contrib non-free +deb https://deb.nodesource.com/node_6.x jessie main #deb http://mirrors.ircam.fr/pub/debian/ jessie main contrib non-free -#deb-src http://mirrors.ircam.fr/pub/debian/ testing main contrib non-free - -#deb http://security.debian.org/ jessie/updates main -#deb-src http://security.debian.org/ jessie/updates main - #deb http://mirrors.ircam.fr/pub/debian/ jessie-updates main -#deb-src http://mirrors.ircam.fr/pub/debian/ jessie-updates main - #deb http://mirrors.ircam.fr/pub/debian/ jessie-backports main contrib non-free -#deb-src http://mirrors.ircam.fr/pub/debian/ jessie-backports main contrib non-free - -deb https://deb.nodesource.com/node_6.x jessie main -deb-src https://deb.nodesource.com/node_6.x jessie main diff --git a/lib/mezzanine b/lib/mezzanine index 51cf69d9..72380cb5 160000 --- a/lib/mezzanine +++ b/lib/mezzanine @@ -1 +1 @@ -Subproject commit 51cf69d973848f08bc482022fd5bdac9a41f8ff9 +Subproject commit 72380cb5c6a2c9fc0f439b9277dc88285d63d001 diff --git a/lib/mezzanine-organization b/lib/mezzanine-organization index 027dcc4e..b260f345 160000 --- a/lib/mezzanine-organization +++ b/lib/mezzanine-organization @@ -1 +1 @@ -Subproject commit 027dcc4eba786d9e53c73467e0ddc3c6c92f1e9b +Subproject commit b260f3456a97d9612f35cac601ac93cc14971f5d diff --git a/lib/mezzanine-organization-themes b/lib/mezzanine-organization-themes index cd2d9931..a8648ac0 160000 --- a/lib/mezzanine-organization-themes +++ b/lib/mezzanine-organization-themes @@ -1 +1 @@ -Subproject commit cd2d99312d4536fa7cf439b8fd84397ddda72be7 +Subproject commit a8648ac0731c3a7b908fa35aa48913f34cccf788 diff --git a/requirements.txt b/requirements.txt index 11f0d9ae..f910c2a5 100644 --- a/requirements.txt +++ b/requirements.txt @@ -10,6 +10,3 @@ vim ruby ruby-dev gettext -python-sphinx -python-numpy -python-pandas -- 2.39.5