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

Conflicts:
	devel/views.py
	feeds.py
	templates/devel/index.html
	templates/packages/flag.html
	templates/public/index.html
	todolists/views.py
	urls.py

2 files changed, 248 insertions, 26 deletions

diff --git a/main/fixtures/groups.json b/main/fixtures/groups.json
index 32416a7a..8a6b2287 100644
--- a/main/fixtures/groups.json
+++ b/main/fixtures/groups.json
@@ -85,11 +85,6 @@
                     "mirrorprotocol"
                 ], 
                 [
-                    "delete_mirrorprotocol", 
-                    "mirrors", 
-                    "mirrorprotocol"
-                ], 
-                [
                     "add_mirrorrsync", 
                     "mirrors", 
                     "mirrorrsync"
@@ -123,6 +118,219 @@
         }
     }, 
     {
+        "pk": 6, 
+        "model": "auth.group", 
+        "fields": {
+            "name": "Package Relation Maintainers", 
+            "permissions": [
+                [
+                    "add_packagerelation", 
+                    "packages", 
+                    "packagerelation"
+                ], 
+                [
+                    "change_packagerelation", 
+                    "packages", 
+                    "packagerelation"
+                ], 
+                [
+                    "delete_packagerelation", 
+                    "packages", 
+                    "packagerelation"
+                ]
+            ]
+        }
+    }, 
+    {
+        "pk": 5, 
+        "model": "auth.group", 
+        "fields": {
+            "name": "Release Engineering", 
+            "permissions": [
+                [
+                    "add_architecture", 
+                    "releng", 
+                    "architecture"
+                ], 
+                [
+                    "change_architecture", 
+                    "releng", 
+                    "architecture"
+                ], 
+                [
+                    "delete_architecture", 
+                    "releng", 
+                    "architecture"
+                ], 
+                [
+                    "add_bootloader", 
+                    "releng", 
+                    "bootloader"
+                ], 
+                [
+                    "change_bootloader", 
+                    "releng", 
+                    "bootloader"
+                ], 
+                [
+                    "delete_bootloader", 
+                    "releng", 
+                    "bootloader"
+                ], 
+                [
+                    "add_boottype", 
+                    "releng", 
+                    "boottype"
+                ], 
+                [
+                    "change_boottype", 
+                    "releng", 
+                    "boottype"
+                ], 
+                [
+                    "delete_boottype", 
+                    "releng", 
+                    "boottype"
+                ], 
+                [
+                    "add_clockchoice", 
+                    "releng", 
+                    "clockchoice"
+                ], 
+                [
+                    "change_clockchoice", 
+                    "releng", 
+                    "clockchoice"
+                ], 
+                [
+                    "delete_clockchoice", 
+                    "releng", 
+                    "clockchoice"
+                ], 
+                [
+                    "add_filesystem", 
+                    "releng", 
+                    "filesystem"
+                ], 
+                [
+                    "change_filesystem", 
+                    "releng", 
+                    "filesystem"
+                ], 
+                [
+                    "delete_filesystem", 
+                    "releng", 
+                    "filesystem"
+                ], 
+                [
+                    "add_hardwaretype", 
+                    "releng", 
+                    "hardwaretype"
+                ], 
+                [
+                    "change_hardwaretype", 
+                    "releng", 
+                    "hardwaretype"
+                ], 
+                [
+                    "delete_hardwaretype", 
+                    "releng", 
+                    "hardwaretype"
+                ], 
+                [
+                    "add_installtype", 
+                    "releng", 
+                    "installtype"
+                ], 
+                [
+                    "change_installtype", 
+                    "releng", 
+                    "installtype"
+                ], 
+                [
+                    "delete_installtype", 
+                    "releng", 
+                    "installtype"
+                ], 
+                [
+                    "add_iso", 
+                    "releng", 
+                    "iso"
+                ], 
+                [
+                    "change_iso", 
+                    "releng", 
+                    "iso"
+                ], 
+                [
+                    "delete_iso", 
+                    "releng", 
+                    "iso"
+                ], 
+                [
+                    "add_isotype", 
+                    "releng", 
+                    "isotype"
+                ], 
+                [
+                    "change_isotype", 
+                    "releng", 
+                    "isotype"
+                ], 
+                [
+                    "delete_isotype", 
+                    "releng", 
+                    "isotype"
+                ], 
+                [
+                    "add_module", 
+                    "releng", 
+                    "module"
+                ], 
+                [
+                    "change_module", 
+                    "releng", 
+                    "module"
+                ], 
+                [
+                    "delete_module", 
+                    "releng", 
+                    "module"
+                ], 
+                [
+                    "add_source", 
+                    "releng", 
+                    "source"
+                ], 
+                [
+                    "change_source", 
+                    "releng", 
+                    "source"
+                ], 
+                [
+                    "delete_source", 
+                    "releng", 
+                    "source"
+                ], 
+                [
+                    "add_test", 
+                    "releng", 
+                    "test"
+                ], 
+                [
+                    "change_test", 
+                    "releng", 
+                    "test"
+                ], 
+                [
+                    "delete_test", 
+                    "releng", 
+                    "test"
+                ]
+            ]
+        }
+    }, 
+    {
         "pk": 2, 
         "model": "auth.group", 
         "fields": {
diff --git a/main/fixtures/repos.json b/main/fixtures/repos.json
index 3b79d964..f480000d 100644
--- a/main/fixtures/repos.json
+++ b/main/fixtures/repos.json
@@ -3,70 +3,84 @@
         "pk": 5, 
         "model": "main.repo", 
         "fields": {
-            "svn_root": "community", 
-            "testing": false, 
+            "bugs_category": 33, 
+            "staging": false, 
             "name": "Community", 
-            "bugs_project": 5
+            "bugs_project": 5, 
+            "svn_root": "community", 
+            "testing": false
         }
     }, 
     {
         "pk": 6, 
         "model": "main.repo", 
         "fields": {
-            "svn_root": "community", 
-            "testing": true, 
+            "bugs_category": 41, 
+            "staging": false, 
             "name": "Community-Testing", 
-            "bugs_project": 5
+            "bugs_project": 5, 
+            "svn_root": "community", 
+            "testing": true
         }
     }, 
     {
         "pk": 1, 
         "model": "main.repo", 
         "fields": {
-            "svn_root": "packages", 
-            "testing": false, 
+            "bugs_category": 31, 
+            "staging": false, 
             "name": "Core", 
-            "bugs_project": 1
+            "bugs_project": 1, 
+            "svn_root": "packages", 
+            "testing": false
         }
     }, 
     {
         "pk": 2, 
         "model": "main.repo", 
         "fields": {
-            "svn_root": "packages", 
-            "testing": false, 
+            "bugs_category": 2, 
+            "staging": false, 
             "name": "Extra", 
-            "bugs_project": 1
+            "bugs_project": 1, 
+            "svn_root": "packages", 
+            "testing": false
         }
     }, 
     {
         "pk": 7, 
         "model": "main.repo", 
         "fields": {
-            "svn_root": "community", 
-            "testing": false, 
+            "bugs_category": 46, 
+            "staging": false, 
             "name": "Multilib", 
-            "bugs_project": 5
+            "bugs_project": 5, 
+            "svn_root": "community", 
+            "testing": false
         }
     }, 
     {
         "pk": 8, 
         "model": "main.repo", 
         "fields": {
-            "svn_root": "community", 
-            "testing": true, 
+            "bugs_category": 46, 
+            "staging": false, 
             "name": "Multilib-Testing", 
-            "bugs_project": 5
+            "bugs_project": 5, 
+            "svn_root": "community", 
+            "testing": true
         }
     }, 
     {
         "pk": 3, 
         "model": "main.repo", 
         "fields": {
-            "svn_root": "packages", 
-            "testing": true, 
+            "bugs_category": 10, 
+            "staging": false, 
             "name": "Testing", 
-            "bugs_project": 1
+            "bugs_project": 1, 
+            "svn_root": "packages", 
+            "testing": true
         }
     }, 
     {