[gnome-builder] Release 3.26.0

[Christian Hergert <chergert src gnome org>]

commit 5aa640856d812e8626f9666919487bedfc67e621
Author: Christian Hergert <chergert redhat com>
Date:   Mon Sep 11 15:47:25 2017 -0700

    Release 3.26.0

 NEWS                   |    3 +-
 doc/conf.py            |    4 +-
 meson.build            |    2 +-
 org.gnome.Builder.json |   52 ++++++++++++++++++++++++++++-------------------
 4 files changed, 36 insertions(+), 25 deletions(-)
---
diff --git a/NEWS b/NEWS
index 127c685..e98a85c 100644
--- a/NEWS
+++ b/NEWS
@@ -20,7 +20,8 @@ Updated Translations:
 
  Korean, Galician, Turkish, Indonesian, Czech, German, Polish,
  Brazilian Portuguese, Italian, Danish, Lithuanian, Hungarian,
- Catalan, Serbian, Serbian Latin, French, Swedish, Spanish
+ Catalan, Serbian, Serbian Latin, French, Swedish, Spanish,
+ Japanese
 
 ===============
 Version 3.25.92
diff --git a/doc/conf.py b/doc/conf.py
index 0217070..99e3009 100644
--- a/doc/conf.py
+++ b/doc/conf.py
@@ -58,9 +58,9 @@ author = 'Christian Hergert, et al.'
 # built documents.
 #
 # The short X.Y version.
-version = '3.25'
+version = '3.26'
 # The full version, including alpha/beta/rc tags.
-release = '3.25.92'
+release = '3.26.0'
 
 # The language for content autogenerated by Sphinx. Refer to documentation
 # for a list of supported languages.
diff --git a/meson.build b/meson.build
index 1641244..a718a56 100644
--- a/meson.build
+++ b/meson.build
@@ -1,6 +1,6 @@
 project('gnome-builder', 'c',
           license: 'GPL3+',
-          version: '3.25.92',
+          version: '3.26.0',
     meson_version: '>= 0.40.1',
   default_options: [
                      'c_std=gnu11',
diff --git a/org.gnome.Builder.json b/org.gnome.Builder.json
index 82fcee0..95586ba 100644
--- a/org.gnome.Builder.json
+++ b/org.gnome.Builder.json
@@ -1,11 +1,9 @@
 {
     "app-id": "org.gnome.Builder",
     "runtime": "org.gnome.Sdk",
-    "runtime-version": "master",
+    "runtime-version": "3.26",
     "sdk": "org.gnome.Sdk",
     "command": "gnome-builder",
-    "tags": ["nightly"],
-    "desktop-file-name-prefix": "(Nightly) ",
     "finish-args": [
         /* Require recent flatpak at runtime */
         "--require-version=0.8.0",
@@ -49,7 +47,6 @@
         "--filesystem=~/.local/share/flatpak",
         "--filesystem=/var/lib/flatpak"
     ],
-    "x-run-args" : [ "--standalone", "-vvvv" ],
     "build-options" : {
         "cflags": "-O2 -g",
         "cxxflags": "-O2 -g",
@@ -90,7 +87,8 @@
             "sources": [
                 {
                     "type": "git",
-                    "url": "https://git.gnome.org/browse/libgsystem.git";
+                    "url": "https://git.gnome.org/browse/libgsystem.git";,
+                    "branch": "d606bec68ddfea78de4b03c3f3568afb71bdc1ce"
                 }
             ]
         },
@@ -105,7 +103,8 @@
             "sources": [
                 {
                     "type": "git",
-                    "url": "https://github.com/ostreedev/ostree.git";
+                    "url": "https://github.com/ostreedev/ostree.git";,
+                    "branch": "v2017.10"
                 }
             ]
         },
@@ -129,7 +128,8 @@
             "sources": [
                 {
                     "type": "git",
-                    "url": "https://github.com/flatpak/flatpak.git";
+                    "url": "https://github.com/flatpak/flatpak.git";,
+                    "branch": "0.9.6"
                 }
             ]
         },
@@ -481,7 +481,7 @@
                 {
                     "type": "git",
                     "url": "https://github.com/libssh2/libssh2.git";,
-                    "branch": "libssh2-1.8.0"
+                    "branch": "30e9c1347e3b8baa2951db612f05e6d87fc8e2f2"
                 }
             ]
         },
@@ -502,7 +502,8 @@
             "sources": [
                 {
                     "type": "git",
-                    "url": "https://git.gnome.org/browse/libgit2-glib";
+                    "url": "https://git.gnome.org/browse/libgit2-glib";,
+                    "branch": "v0.26.0"
                 }
             ]
         },
@@ -512,7 +513,8 @@
             "sources": [
                 {
                     "type": "git",
-                    "url": "https://git.gnome.org/browse/libpeas";
+                    "url": "https://git.gnome.org/browse/libpeas";,
+                    "branch": "libpeas-1.22.0"
                 }
             ]
         },
@@ -533,18 +535,20 @@
             "sources": [
                 {
                     "type": "git",
-                    "url": "https://git.gnome.org/browse/devhelp";
+                    "url": "https://git.gnome.org/browse/devhelp";,
+                    "branch": "3.26.0"
                 }
             ]
         },
         {
             "name": "json-glib",
-           "buildsystem": "meson",
-           "builddir": true,
+            "buildsystem": "meson",
+            "builddir": true,
             "sources": [
                 {
                     "type": "git",
-                    "url": "https://gitlab.gnome.org/GNOME/json-glib.git";
+                    "url": "https://gitlab.gnome.org/GNOME/json-glib.git";,
+                    "branch": "9db74a03b96bafbbd7698682d713a57122627e39"
                 }
             ]
         },
@@ -555,7 +559,8 @@
             "sources": [
                 {
                      "type": "git",
-                     "url": "https://git.gnome.org/browse/gspell";
+                     "url": "https://git.gnome.org/browse/gspell";,
+                     "branch": "1.6.0"
                 }
             ]
         },
@@ -566,7 +571,8 @@
             "sources": [
                 {
                     "type": "git",
-                    "url": "https://git.gnome.org/browse/sysprof";
+                    "url": "https://git.gnome.org/browse/sysprof";,
+                    "branch": "sysprof-3-24"
                 }
             ]
         },
@@ -578,7 +584,8 @@
             "sources": [
                 {
                     "type": "git",
-                    "url": "https://git.gnome.org/browse/template-glib";
+                    "url": "https://git.gnome.org/browse/template-glib";,
+                    "branch": "template-glib-3-26"
                 }
             ]
         },
@@ -590,7 +597,8 @@
             "sources": [
                 {
                     "type": "git",
-                    "url": "https://git.gnome.org/browse/jsonrpc-glib";
+                    "url": "https://git.gnome.org/browse/jsonrpc-glib";,
+                    "branch": "jsonrpc-glib-3-26"
                 }
             ]
         },
@@ -602,7 +610,8 @@
             "sources": [
                 {
                     "type": "git",
-                    "url": "https://git.gnome.org/browse/libdazzle";
+                    "url": "https://git.gnome.org/browse/libdazzle";,
+                    "branch": "libdazzle-3-26"
                 }
             ]
         },
@@ -610,11 +619,12 @@
             "name": "gnome-builder",
             "buildsystem": "meson",
             "builddir": true,
-            "config-opts": [ "--libdir=/app/lib", "-Denable_tracing=true", "-Denable_debug=true", 
"-Dwith_docs=true", "-Dwith_channel=flatpak-nightly" ],
+            "config-opts": [ "--libdir=/app/lib", "-Denable_tracing=true", "-Denable_debug=true", 
"-Dwith_docs=true", "-Dwith_channel=flatpak-stable" ],
             "sources": [
                 {
                     "type": "git",
-                    "url": "https://git.gnome.org/browse/gnome-builder";
+                    "url": "https://git.gnome.org/browse/gnome-builder";,
+                    "branch": "gnome-builder-3-26"
                 }
             ]
         }