README.source: Bump version numbers in sample commands

diff --git a/debian/README.source b/debian/README.source
index 2e150432d22eda0e0a37a95814e45cf95c474ac8..fc24668561580d9518f751f94632505ceb0b303b 100644 (file)
--- a/debian/README.source
+++ b/debian/README.source
@@ -53,8 +53,8 @@ Check out the relevant master branches in each of ~/src/deb/emacs/ and
 ~/src/deb/emacs-non-dfsg.  In each,
 
     % gbp dch --ignore-branch --git-author --git-log="--first-parent" \
-        -aS --meta --full -N 1:30.1+1-1
-    % git commit -am"Adjust debian/changelog for UNRELEASED 30.1+1-1 development"
+        -aS --meta --full -N 1:30.2+1-1
+    % git commit -am"Adjust debian/changelog for UNRELEASED 30.2+1-1 development"
 
 Diff upstream's release tags, and verify the signature on the new tag.
 
@@ -77,9 +77,9 @@ one was.  Here are various ways rlb suggests for doing that:
   + Look at path changes:
     * Check additions/deletions/renames and add/remove them from each repo as
       needed, e.g.:
-      - `git diff --diff-filter=ACRB(maybe D) --name-status emacs-29.1 emacs-29.2`
-      - `diff -u <(git ls-files --with-tree emacs-29.1) \
-            <(git ls-files --with-tree emacs-29.2) | less`
+      - `git diff --diff-filter=ACRB(maybe D) --name-status emacs-30.1 emacs-30.2`
+      - `diff -u <(git ls-files --with-tree emacs-30.1) \
+            <(git ls-files --with-tree emacs-30.2) | less`
     * e.g. rm new files that have appeared in a non-dfsg dir like doc/emacs
     * e.g. remove anything with gfdl invariants (front/back/sections)
 
@@ -93,24 +93,24 @@ one was.  Here are various ways rlb suggests for doing that:
 Then, again in each worktree, replacing 'emacs'->'emacs-non-dfsg',
 
     % git -c core.whitespace=-blank-at-eol,-space-before-tab,-blank-at-eof \
-        commit -m"Merge upstream version 30.1"
-    % git tag -sm deb/emacs/v/30.1+1 deb/emacs/v/30.1+1
-    % git tag -sm deb/emacs/v/1%30.1+1 deb/emacs/v/1%30.1+1
-    % git archive --prefix=emacs-30.1+1.orig/ deb/emacs/v/30.1+1 \
-        | xz -9v >../emacs_30.1+1.orig.tar.xz
-    % pristine-tar commit ../emacs_30.1+1.orig.tar.xz deb/emacs/v/30.1+1
+        commit -m"Merge upstream version 30.2"
+    % git tag -sm deb/emacs/v/30.2+1 deb/emacs/v/30.2+1
+    % git tag -sm deb/emacs/v/1%30.2+1 deb/emacs/v/1%30.2+1
+    % git archive --prefix=emacs-30.2+1.orig/ deb/emacs/v/30.2+1 \
+        | xz -9v >../emacs_30.2+1.orig.tar.xz
+    % pristine-tar commit ../emacs_30.2+1.orig.tar.xz deb/emacs/v/30.2+1
     % git checkout deb/emacs/d/sid/master
-    % git dpm record-new-upstream ../emacs_30.1+1.orig.tar.xz \
+    % git dpm record-new-upstream ../emacs_30.2+1.orig.tar.xz \
         deb/emacs/d/sid/upstream
     % git dpm rebase-patched
     % git dpm update-patches
-    % git commit --amend -m"Merge upstream version 30.1"
+    % git commit --amend -m"Merge upstream version 30.2"
 
 Other tasks after merging a new upstream release
 ------------------------------------------------
 
     % debian/rules debian-sync # fix copyright.in
-    % git grep -F 29 debian    # find other places to update
+    % git grep -F 30 debian    # find other places to update
 
 Fix patches, and d/rules, as needed.
 
@@ -125,13 +125,13 @@ Check out the correct branch.  If necessary, start work on the new upload:
 
     % gbp dch --ignore-branch --git-author --git-log="--first-parent" -aS --meta --full
     % git commit debian/changelog \
-        -m"Adjust debian/changelog for UNRELEASED 29.3+1-3 development"
+        -m"Adjust debian/changelog for UNRELEASED 30.1+1-2 development"
 
 Use `Closes: N` trailers in commit messages.  Then, when ready to release,
 
     % gbp dch --ignore-branch --git-author --git-log="--first-parent" -aR --meta --full
     % # Edit d/changelog to reflow paragraphs, add separator lines etc.
-    % git commit debian/changelog -m"Update debian/changelog for 29.3+1-3 release"
+    % git commit debian/changelog -m"Update debian/changelog for 30.1+1-2 release"
     % # sbuild etc.
 
 Backporting a patch from upstream
@@ -154,12 +154,12 @@ have both src:emacs and src:emacs-non-dfsg in the same repository.
 
     % cd ~/tmp/
     % git clone ~/src/deb/emacs/
-    % ln ~/src/deb/emacs_29.3+1.orig.tar.xz .
+    % ln ~/src/deb/emacs_30.1+1.orig.tar.xz .
     % cd emacs
     % dgit --dpm push-source
     % cd ~/src/deb/emacs/
-    % git tag -sm deb/emacs/v/29.3+1-3 deb/emacs/v/29.3+1-3
-    % git tag -sm deb/emacs/v/1%29.3+1-3 deb/emacs/v/1%29.3+1-3
+    % git tag -sm deb/emacs/v/30.1+1-2 deb/emacs/v/30.1+1-2
+    % git tag -sm deb/emacs/v/1%30.1+1-2 deb/emacs/v/1%30.1+1-2
     % git push --follow-tags debian BRANCH # for each branch updated
     % rm -rf ~/tmp/emacs/