Add libguestfs 1.36 branches.

diff --git a/Makefile b/Makefile
index 88284f6..3d509c4 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -3,7 +3,7 @@
 # Comment out the next line if goaljobs is installed.  If it is not
 # installed, change the path to the location of the goaljobs build
 # directory.
 # Comment out the next line if goaljobs is installed.  If it is not
 # installed, change the path to the location of the goaljobs build
 # directory.

-#pkgdir = ../goaljobs
+pkgdir = ../goaljobs

 
 ifeq ($(pkgdir),)
 goaljobs = goaljobs --package pcre,extlib
 
 ifeq ($(pkgdir),)
 goaljobs = goaljobs --package pcre,extlib

diff --git a/libguestfs_fedora.ml b/libguestfs_fedora.ml
index 86a0b23..6f65a9c 100644 (file)
--- a/libguestfs_fedora.ml
+++ b/libguestfs_fedora.ml
@@ -22,8 +22,9 @@ let package = "libguestfs"
 
 (* How branches in libguestfs upstream map to branches in Fedora. *)
 let branches = [
 
 (* How branches in libguestfs upstream map to branches in Fedora. *)
 let branches = [

-  "1.35-development", "master";    (* Rawhide follows development. *)
-  "1.34-stable", "f25";            (* F25 follows 1.34. *)
+  "1.37-development", "master";    (* Rawhide follows development. *)
+  (*"1.36-stable", "f26";            (* F26 follows 1.36. *)*)
+  "1.36-stable", "f25";            (* F25 follows 1.36. *)

   "1.34-stable", "f24";            (* F24 follows 1.34. *)
   "1.32-stable", "f23";            (* F23 follows 1.32. *)
   "1.30-stable", "f22";            (* F22 follows 1.30. *)
   "1.34-stable", "f24";            (* F24 follows 1.34. *)
   "1.32-stable", "f23";            (* F23 follows 1.32. *)
   "1.30-stable", "f22";            (* F22 follows 1.30. *)