X-Git-Url: http://git.annexia.org/?a=blobdiff_plain;f=libguestfs_upstream.ml;h=0d41d336ca6fc87706ff46aaecfbca6af5fcad7d;hb=428096c1c01b9942c62105e547eaa6c7d44e6ce1;hp=dd69b25dd452737525457d976c4a2635e2e57dbd;hpb=99decc69916ff3a6fc78c077c3550e6f4ca33863;p=goaljobs-goals.git

diff --git a/libguestfs_upstream.ml b/libguestfs_upstream.ml
index dd69b25..0d41d33 100644
--- a/libguestfs_upstream.ml
+++ b/libguestfs_upstream.ml
@@ -93,7 +93,7 @@ and website_built version =
 
     ./localconfigure
     make V=1
-    make website WEBSITEDIR=%s
+    make maintainer-upload-website WEBSITEDIR=%s
   " buildtmp version.tarball
     version.package_version
     (quote (libguestfs_localconfigure `Tarball))
@@ -135,6 +135,13 @@ and tarball_created version =
 
   let repodir = sprintf "%s/repos/%s-%s" buildtmp package version.branch in
 
+  (* Branches <= 1.32 are tagged with "1.32.11",
+   * branches >= 1.33 are tagged with "v1.33.11".
+   *)
+  let version_tag =
+    if version.minor >= 33 then "v" ^ version.version
+    else version.version in
+
   sh "
     cp -a %s libguestfs
     cd libguestfs
@@ -160,7 +167,7 @@ and tarball_created version =
 
     mv %s %s/tarballs/%s
   " repodir
-    version.version
+    version_tag
     (quote (libguestfs_localconfigure `Git))
     (quote (libguestfs_localenv (supermin version)))
     version.tarball