Hardcode version string for now

14 files changed, 21 insertions, 27 deletions

diff --git a/Makefile b/Makefile
index 9970032..2c6e464 100644
--- a/Makefile
+++ b/Makefile
@@ -249,7 +249,7 @@ define set_package_requires_melpa
 
 (with-temp-file "lisp/git-commit-pkg.el"
   (insert (format
-"(define-package \"git-commit\" \"$(GIT_COMMIT_VERSION)\"
+"(define-package \"git-commit\" \"$(GIT_COMMIT_VERSION)$(DEV_SUFFIX)\"
   \"Edit Git commit messages.\"
   '((emacs %S)
     (dash %S)
@@ -264,7 +264,7 @@ define set_package_requires_melpa
 
 (with-temp-file "lisp/magit-pkg.el"
   (insert (format
-"(define-package \"magit\" \"$(MAGIT_VERSION)\"
+"(define-package \"magit\" \"$(MAGIT_VERSION)$(DEV_SUFFIX)\"
   \"A Git porcelain inside Emacs.\"
   '((emacs %S)
     (dash %S)
@@ -283,7 +283,7 @@ define set_package_requires_melpa
 
 (with-temp-file "lisp/magit-libgit-pkg.el"
   (insert (format
-"(define-package \"magit-libgit\" \"$(MAGIT_LIBGIT_VERSION)\"
+"(define-package \"magit-libgit\" \"$(MAGIT_LIBGIT_VERSION)$(DEV_SUFFIX)\"
   \".\"
   '((emacs %S)
     (libgit %S)
@@ -296,7 +296,7 @@ define set_package_requires_melpa
 
 (with-temp-file "lisp/magit-section-pkg.el"
   (insert (format
-"(define-package \"magit-section\" \"$(MAGIT_SECTION_VERSION)\"
+"(define-package \"magit-section\" \"$(MAGIT_SECTION_VERSION)$(DEV_SUFFIX)\"
   \"Sections for read-only buffers\"
   '((emacs %S)
     (dash %S))
@@ -341,6 +341,7 @@ _bump-versions:
         $$set_package_requires_melpa)"
 
 bump-snapshots:
+	@$(eval DEV_SUFFIX := -git)
 	@$(BATCH) --eval "(let (\
         $$set_package_versions)\
         $$set_package_requires_nongnu)"
diff --git a/docs/Makefile b/docs/Makefile
index 40f9667..53c5293 100644
--- a/docs/Makefile
+++ b/docs/Makefile
@@ -92,13 +92,6 @@ ORG_EVAL += --eval "(setq indent-tabs-mode nil)"
 ORG_EVAL += --eval "(setq org-src-preserve-indentation nil)"
 ORG_EVAL += --funcall org-texinfo-export-to-texinfo
 
-# This target first bumps version strings in the Org source.  The
-# necessary tools might be missing so other targets do not depend
-# on this target and it has to be run explicitly when appropriate.
-#
-#   AMEND=t make texi    Update manual to be amended to HEAD.
-#   VERSION=N make texi  Update manual for release.
-#
 texi:
 	@$(EMACSBIN) $(ORG_ARGS) $(PKG).org $(ORG_EVAL)
 	@printf "\n" >> $(PKG).texi
diff --git a/docs/magit-section.org b/docs/magit-section.org
index 9a04fff..bda34a7 100644
--- a/docs/magit-section.org
+++ b/docs/magit-section.org
@@ -7,7 +7,7 @@
 #+texinfo_dir_category: Emacs
 #+texinfo_dir_title: Magit-Section: (magit-section).
 #+texinfo_dir_desc: Use Magit sections in your own packages.
-#+subtitle: for version {{{version}}}
+#+subtitle: for version 3.3.0-git
 
 #+setupfile: .orgconfig
 
@@ -21,7 +21,7 @@ user options see [[info:magit#Sections]].  This manual documents how you
 can use sections in your own packages.
 
 #+texinfo: @noindent
-This manual is for Magit-Section version {{{version}}}.
+This manual is for Magit-Section version 3.3.0-git.
 
 #+begin_quote
 Copyright (C) 2015-{{{year}}} Jonas Bernoulli <jonas@bernoul.li>
diff --git a/docs/magit-section.texi b/docs/magit-section.texi
index 74c57ba..ed865d8 100644
--- a/docs/magit-section.texi
+++ b/docs/magit-section.texi
@@ -31,7 +31,7 @@ General Public License for more details.
 @finalout
 @titlepage
 @title Magit-Section Developer Manual
-@subtitle for version v3.3.0-125-g345d60aea+1
+@subtitle for version 3.3.0-git
 @author Jonas Bernoulli
 @page
 @vskip 0pt plus 1filll
@@ -54,7 +54,7 @@ user options see @ref{Sections,,,magit,}.  This manual documents how you
 can use sections in your own packages.
 
 @noindent
-This manual is for Magit-Section version v3.3.0-125-g345d60aea+1.
+This manual is for Magit-Section version 3.3.0-git.
 
 @quotation
 Copyright (C) 2015-2022 Jonas Bernoulli <jonas@@bernoul.li>
diff --git a/docs/magit.org b/docs/magit.org
index 88ebe66..bd30703 100644
--- a/docs/magit.org
+++ b/docs/magit.org
@@ -7,7 +7,7 @@
 #+texinfo_dir_category: Emacs
 #+texinfo_dir_title: Magit: (magit).
 #+texinfo_dir_desc: Using Git from Emacs with Magit.
-#+subtitle: for version {{{version}}}
+#+subtitle: for version 3.3.0-git
 
 #+setupfile: .orgconfig
 
@@ -20,7 +20,7 @@ directly from within Emacs.  While many fine Git clients exist, only
 Magit and Git itself deserve to be called porcelains.
 
 #+texinfo: @noindent
-This manual is for Magit version {{{version}}}.
+This manual is for Magit version 3.3.0-git.
 
 #+begin_quote
 Copyright (C) 2015-{{{year}}} Jonas Bernoulli <jonas@bernoul.li>
diff --git a/docs/magit.texi b/docs/magit.texi
index b03f410..47b9693 100644
--- a/docs/magit.texi
+++ b/docs/magit.texi
@@ -31,7 +31,7 @@ General Public License for more details.
 @finalout
 @titlepage
 @title Magit User Manual
-@subtitle for version v3.3.0-125-g345d60aea+1
+@subtitle for version 3.3.0-git
 @author Jonas Bernoulli
 @page
 @vskip 0pt plus 1filll
@@ -53,7 +53,7 @@ directly from within Emacs.  While many fine Git clients exist, only
 Magit and Git itself deserve to be called porcelains.
 
 @noindent
-This manual is for Magit version v3.3.0-125-g345d60aea+1.
+This manual is for Magit version 3.3.0-git.
 
 @quotation
 Copyright (C) 2015-2022 Jonas Bernoulli <jonas@@bernoul.li>
diff --git a/lisp/git-commit-pkg.el b/lisp/git-commit-pkg.el
index 3485eaa..30d2699 100644
--- a/lisp/git-commit-pkg.el
+++ b/lisp/git-commit-pkg.el
@@ -1,4 +1,4 @@
-(define-package "git-commit" "3.3.0"
+(define-package "git-commit" "3.3.0-git"
   "Edit Git commit messages."
   '((emacs "25.1")
     (dash "20210826")
diff --git a/lisp/git-commit.el b/lisp/git-commit.el
index d637b2a..faca015 100644
--- a/lisp/git-commit.el
+++ b/lisp/git-commit.el
@@ -14,7 +14,7 @@
 ;; Keywords: git tools vc
 ;; Homepage: https://github.com/magit/magit
 ;; Package-Requires: ((emacs "25.1") (transient "0.3.6") (with-editor "3.0.5"))
-;; Package-Version: 3.3.0
+;; Package-Version: 3.3.0-git
 ;; SPDX-License-Identifier: GPL-3.0-or-later
 
 ;; This file is free software; you can redistribute it and/or modify
diff --git a/lisp/magit-libgit-pkg.el b/lisp/magit-libgit-pkg.el
index 6cf07a5..b3c41fc 100644
--- a/lisp/magit-libgit-pkg.el
+++ b/lisp/magit-libgit-pkg.el
@@ -1,4 +1,4 @@
-(define-package "magit-libgit" "3.3.0"
+(define-package "magit-libgit" "3.3.0-git"
   "."
   '((emacs "25.1")
     (libgit "0")
diff --git a/lisp/magit-libgit.el b/lisp/magit-libgit.el
index 995cabe..a5baf77 100644
--- a/lisp/magit-libgit.el
+++ b/lisp/magit-libgit.el
@@ -11,7 +11,7 @@
 ;; Keywords: git tools vc
 ;; Homepage: https://github.com/magit/magit
 ;; Package-Requires: ((emacs "26.1") (libgit "0") (magit "3.3.0"))
-;; Package-Version: 3.3.0
+;; Package-Version: 3.3.0-git
 ;; SPDX-License-Identifier: GPL-3.0-or-later
 
 ;; Magit is free software; you can redistribute it and/or modify it
diff --git a/lisp/magit-pkg.el b/lisp/magit-pkg.el
index 446145d..5a69c68 100644
--- a/lisp/magit-pkg.el
+++ b/lisp/magit-pkg.el
@@ -1,4 +1,4 @@
-(define-package "magit" "3.3.0"
+(define-package "magit" "3.3.0-git"
   "A Git porcelain inside Emacs."
   '((emacs "25.1")
     (dash "20210826")
diff --git a/lisp/magit-section-pkg.el b/lisp/magit-section-pkg.el
index a0645e3..23252b1 100644
--- a/lisp/magit-section-pkg.el
+++ b/lisp/magit-section-pkg.el
@@ -1,4 +1,4 @@
-(define-package "magit-section" "3.3.0"
+(define-package "magit-section" "3.3.0-git"
   "Sections for read-only buffers"
   '((emacs "25.1")
     (dash "20210826"))
diff --git a/lisp/magit-section.el b/lisp/magit-section.el
index 3daf4dc..09b5a3c 100644
--- a/lisp/magit-section.el
+++ b/lisp/magit-section.el
@@ -11,7 +11,7 @@
 ;; Keywords: tools
 ;; Homepage: https://github.com/magit/magit
 ;; Package-Requires: ((emacs "25.1") (dash "2.19.1"))
-;; Package-Version: 3.3.0
+;; Package-Version: 3.3.0-git
 ;; SPDX-License-Identifier: GPL-3.0-or-later
 
 ;; Magit-Section is free software; you can redistribute it and/or modify
diff --git a/lisp/magit.el b/lisp/magit.el
index 43fe285..716f08b 100644
--- a/lisp/magit.el
+++ b/lisp/magit.el
@@ -20,7 +20,7 @@
 ;; Keywords: git tools vc
 ;; Homepage: https://github.com/magit/magit
 ;; Package-Requires: ((emacs "25.1") (dash "2.19.1") (git-commit "3.3.0") (magit-section "3.3.0") (transient "0.3.6") (with-editor "3.0.5"))
-;; Package-Version: 3.3.0
+;; Package-Version: 3.3.0-git
 ;; SPDX-License-Identifier: GPL-3.0-or-later
 
 ;; Magit is free software; you can redistribute it and/or modify it