Merge git://projects.archlinux.org/archweb

Conflicts:
	templates/public/index.html
	urls.py

1 files changed, 37 insertions, 0 deletions

diff --git a/packages/urls.py b/packages/urls.py
new file mode 100644
index 00000000..da24ee03
--- /dev/null
+++ b/packages/urls.py
@@ -0,0 +1,37 @@
+from django.conf.urls.defaults import include, patterns
+
+package_patterns = patterns('packages.views',
+    (r'^$',            'details'),
+    (r'^files/$',      'files'),
+    (r'^maintainer/$', 'getmaintainer'),
+    (r'^flag/$',       'flag'),
+    (r'^unflag/$',     'unflag'),
+    (r'^download/$',   'download'),
+)
+
+urlpatterns = patterns('packages.views',
+    (r'^flaghelp/$', 'flaghelp'),
+    (r'^signoffs/$', 'signoffs'),
+    (r'^signoff_package/(?P<arch>[A-z0-9]+)/(?P<pkgname>[A-z0-9\-+.]+)/$',
+        'signoff_package'),
+    (r'^update/$',   'update'),
+
+    # Preference is for the non-search url below, but search is kept
+    # because other projects link to it
+    (r'^search/$',               'search'),
+    (r'^search/(?P<page>\d+)/$', 'search'),
+    (r'^$',                      'search'),
+    (r'^(?P<page>\d+)/$',        'search'),
+
+    (r'^differences/$',          'arch_differences'),
+
+    (r'^(?P<name>[A-z0-9\-+.]+)/$',
+        'details'),
+    (r'^(?P<repo>[A-z0-9\-]+)/(?P<name>[A-z0-9\-+.]+)/$',
+        'details'),
+    # canonical package url. subviews defined above
+    (r'^(?P<repo>[A-z0-9\-]+)/(?P<arch>[A-z0-9]+)/(?P<name>[A-z0-9\-+.]+)/',
+        include(package_patterns)),
+)
+
+# vim: set ts=4 sw=4 et: