Merge branch 'master' of git://projects.archlinux.org/archweb

Conflicts:
	packages/urls.py
	templates/packages/details.html

1 files changed, 4 insertions, 4 deletions

diff --git a/packages/urls.py b/packages/urls.py
index 3f0755b3..d7d01170 100644
--- a/packages/urls.py
+++ b/packages/urls.py
@@ -9,19 +9,19 @@ package_patterns = patterns('packages.views',
     (r'^flag/done/$',  'flag_confirmed', {}, 'package-flag-confirmed'),
     (r'^unflag/$',     'unflag'),
     (r'^unflag/all/$', 'unflag_all'),
+    (r'^signoff/$',    'signoff_package'),
+    (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'^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'),