Merge branch 'master' of /srv/git/repositories/parabolaweb

1 files changed, 9 insertions, 5 deletions

diff --git a/packages/urls.py b/packages/urls.py
index c02a0ed7..1f25e3fd 100644
--- a/packages/urls.py
+++ b/packages/urls.py
@@ -2,25 +2,29 @@ from django.conf.urls.defaults import include, patterns
 
 package_patterns = patterns('packages.views',
     (r'^$',            'details'),
+    (r'^json/$',       'details_json'),
     (r'^files/$',      'files'),
-    (r'^maintainer/$', 'getmaintainer'),
+    (r'^files/json/$', 'files_json'),
     (r'^flag/$',       'flag'),
     (r'^flag/done/$',  'flag_confirmed', {}, 'package-flag-confirmed'),
     (r'^unflag/$',     'unflag'),
     (r'^unflag/all/$', 'unflag_all'),
+    (r'^signoff/$',    'signoff_package'),
+    (r'^signoff/revoke/$', 'signoff_package', {'revoke': True}),
+    (r'^signoff/options/$', 'signoff_options'),
+    (r'^download/$',   'download'),
 )
 
 urlpatterns = patterns('packages.views',
     (r'^flaghelp/$', 'flaghelp'),
     (r'^signoffs/$', 'signoffs', {}, 'package-signoffs'),
-    (r'^signoff_package/(?P<arch>[A-z0-9]+)/(?P<pkgname>[A-z0-9\-+.]+)/$',
-        'signoff_package'),
+    (r'^signoffs/json/$', 'signoffs_json', {}, 'package-signoffs-json'),
     (r'^update/$',   'update'),
 
-    (r'^$',                      'search'),
+    (r'^$',                      'search', {}, 'packages-search'),
     (r'^(?P<page>\d+)/$',        'search'),
 
-    (r'^differences/$',          'arch_differences'),
+    (r'^differences/$',          'arch_differences', {}, 'packages-differences'),
     (r'^stale_relations/$',      'stale_relations'),
     (r'^stale_relations/update/$','stale_relations_update'),