From edb96c300a560f35ed8f8d6dd87d3159e1edbbe2 Mon Sep 17 00:00:00 2001 From: Parabola Date: Wed, 29 Dec 2010 21:38:35 +0000 Subject: Revert "Various changes, plus licenses are now pointing to the real licenses. (gtklocker)" This reverts commit d8fe78f471f2b7821a99f7c2697e0e2ab0a374c1. Conflicts: media/devs/gtklocker.png --- .gitignore | 1 - include/python2.7 | 1 - settings.py | 13 +-- templates/packages/details.html | 9 +- templates/public/install.html | 191 ---------------------------------------- urls.py | 4 +- 6 files changed, 6 insertions(+), 213 deletions(-) delete mode 120000 include/python2.7 delete mode 100644 templates/public/install.html diff --git a/.gitignore b/.gitignore index 8f5826bb..0e28f9f1 100644 --- a/.gitignore +++ b/.gitignore @@ -4,4 +4,3 @@ local_settings.py archweb.db testing/ -.git/ diff --git a/include/python2.7 b/include/python2.7 deleted file mode 120000 index ad4ca80b..00000000 --- a/include/python2.7 +++ /dev/null @@ -1 +0,0 @@ -/usr/include/python2.7 \ No newline at end of file diff --git a/settings.py b/settings.py index 70cfeae2..f98f709c 100644 --- a/settings.py +++ b/settings.py @@ -2,21 +2,19 @@ # Django settings for archweb project. ## Set the debug values -DEBUG = True +DEBUG = False TEMPLATE_DEBUG = DEBUG ## Notification admins -# Put yourself here ADMINS = ( - ('Nicolas Reynolds', 'fauno@kiwwwi.com.ar'), + ('Dan McGee', 'dan@archlinux.org'), ) # Set managers to admins MANAGERS = ADMINS # Package out-of-date emails for orphans -# TODO configure email client -NOTIFICATIONS = ['packages@list.parabolagnulinux.org'] +NOTIFICATIONS = ['arch-notifications@archlinux.org'] # Full path to the data directory DEPLOY_PATH = os.path.dirname(os.path.realpath(__file__)) @@ -35,7 +33,6 @@ # If you set this to False, Django will make some optimizations so as not # to load the internationalization machinery. -# TODO work i18n USE_I18N = False # If you set this to False, Django will not format dates, numbers and @@ -91,7 +88,6 @@ # Put strings here, like "/home/html/django_templates". # Always use forward slashes, even on Windows. '%s/templates' % DEPLOY_PATH, - '/usr/lib/python2.7/site-packages/django_git/templates/django_git/' ) TEMPLATE_LOADERS = ( @@ -125,11 +121,8 @@ 'devel', 'public', 'south', # database migration support - # 'django_git' ) -REPOS_ROOT='/srv/git/projects' - ## Import local settings from local_settings import * diff --git a/templates/packages/details.html b/templates/packages/details.html index f7680593..1721dc56 100644 --- a/templates/packages/details.html +++ b/templates/packages/details.html @@ -108,13 +108,7 @@

Versions Elsewhere

title="Visit the website for {{ pkg.pkgname }}">{{ pkg.url }}{% endif %} License: - {% if pkg.license = 'GPL' %} - {{ pkg.license }} - {% else %}{% if pkg.license = 'GPL3' %} - {{ pkg.license }} - {% else %} - {{ pkg.license }} - {% endif %} + {{ pkg.license }} Groups: {% with pkg.packagegroup_set.all as groups %} @@ -213,7 +207,6 @@

- {% endif %} {% endcache %} diff --git a/templates/public/install.html b/templates/public/install.html deleted file mode 100644 index 8244f971..00000000 --- a/templates/public/install.html +++ /dev/null @@ -1,191 +0,0 @@ -{% extends "base.html" %} -{% load cache %} - -{% block title %}Parabola - Install it!{% endblock %} -{% block navbarclass %}anb-download{% endblock %} - -{% block content %} -
- -

Parabola Downloads

- - {% with "2010.05" as version %} -

Release Info

- -

All available images can be burned to a CD, mounted as an ISO file, - or be directly written to a USB stick using a utility like `dd`. These - are intended for new installations only; an existing Parabola system - can always be updated with `pacman -Syu`.

- - - -

Links and Instructions:

- - - -

Existing Arch Users

-

If you already have installed Arch, you can easily upgrade to Parabola by - doing several simple things. First, you have to download our own mirrorlist! We - can guarantee that you'll be happy with that.

- - 
pacman -U
-    http://repo.parabolagnulinux.org/free/core/os/any/pacman-mirrorlist-libre-20101017-1-any.pkg.tar.gz
- -

It is also proposed that you clean up your package cache, so that your - old packages don't get mixed up with the Parabola ones. It's as easy as - 

pacman -Scc
.

- -

Next step is to force pacman to update the databases. You may already - know that, but if you don't, all you have to do is 

pacman
-    -Syy
.

- -

At this point, you have to install the libre kernel. Easy step, thanks - to pacman: 
pacman -Sf kernel26
. Oh, don't forget the - headers! 
pacman -Sf kernel26-headers
.

- -

It seems like the only thing remaining is a 

pacman
-    -Suu
. Reboot and say hello to your brand new Parabola - system!

- -

BitTorrent Download (recommended)

- -

If you can spare the bytes, please leave the client open after your - download is finished, so you can seed it back to others. - A web-seed capable client is recommended for fastest download speeds.

- - - - - - - - - - - - - - - - - -
Formati686 CPUx86-64 CPUDescription
- Netinstall Image - - Download - - Download - - Download - - Downloads and installs packages versions via FTP for absolute freshness. -
- Core Image - - Download - - Download - - Download - - Core packages are included on the media. Good for basic off-line installation. -
- -{% comment %} -

Get Parabola on CD

- - - -

The following suppliers donate a portion of their proceeds to the - Parabola project:

- - - -

Parabola CDs are also available for purchase from these suppliers:

- - -{% endcomment %} - -

HTTP/FTP Direct Downloads

- -

In addition to the BitTorrent links above, install images can also be - downloaded via HTTP or FTP from the mirror sites listed below. Please - ensure the download image matches the checksum from the md5sums.txt or - sha1sums.txt file in the same directory as the image.

- -

Checksums

- -

File integrity checksums for the latest releases can be found below:

- - - {% endwith %} - - {% cache 600 download-mirrors %} - - - - - - - - - - - - -

Server Location

Download

- {% for mirror_url in mirror_url_list %} - {% ifchanged mirror_url.mirror.country %} -
{{mirror_url.mirror.country}} - {% endifchanged %} - {% ifchanged mirror_url.mirror.name %} -
{{mirror_url.mirror.name}} - {% endifchanged %} - {{mirror_url.protocol.protocol|upper}} - {% endfor %} -
- {% endcache %} - -

If you want to become an Official Parabola Mirror please follow the - instructions listed here.

- -
-{% endblock %} diff --git a/urls.py b/urls.py index 72a7989a..886cd375 100644 --- a/urls.py +++ b/urls.py @@ -120,13 +120,13 @@ (r'^hackers/$', 'public.views.userlist', { 'type':'Hackers' }, 'page-devs'), (r'^fellows/$', 'public.views.userlist', { 'type':'Fellows' }, 'page-fellows'), (r'^donate/$', 'public.views.donate', {}, 'page-donate'), -# (r'^install/$', 'public.views.install', {}, 'page-install'), + (r'^download/$', 'public.views.download', {}, 'page-download'), (r'^opensearch/packages/$', 'packages.views.opensearch', {}, 'opensearch-packages'), # Some django internals we use (r'^jsi18n/$', 'django.views.i18n.null_javascript_catalog'), # Static content - (r'^media/(.*)$', 'django.views.static.serve', {'document_root': settings.DEPLOY_PATH+'/media'}), + (r'^media/(.*)$', 'django.views.static.serve', {'document_root': settings.DEPLOY_PATH+'/media'}) ) # vim: set ts=4 sw=4 et: -- cgit v1.2.3-54-g00ecf