From 6d049afcd16b1a117bc3f575d9a763941aa5de5e Mon Sep 17 00:00:00 2001 From: Russ Allbery Date: Tue, 19 Jan 2010 20:34:45 -0800 Subject: [PATCH] Document commiting the tarball with pristine-tar in README.source --- debian/README.source | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/debian/README.source b/debian/README.source index babae40df..3559977f1 100644 --- a/debian/README.source +++ b/debian/README.source @@ -84,7 +84,12 @@ Importing a New Upstream Release (In other words, including any tildes and the "+dfsg" part, but not the dash and the Debian revision.) - 7. Merge the new upstream source into the master branch: + 7. Commit the tarball to the repository with pristine-tar, using the + new local tag as the reference: + + pristine-tar commit + + 8. Merge the new upstream source into the master branch: git checkout master git merge @@ -92,7 +97,7 @@ Importing a New Upstream Release where is the tag you used above. You can also just merge with the upstream branch; either is equivalent. - 8. Flesh out the changelog entry for the new version with a summary of + 9. Flesh out the changelog entry for the new version with a summary of what changed in that release, and continue as normal with Debian packaging. @@ -133,4 +138,4 @@ Pulling Upstream Changes edited as necessary to keep the length of the changelog lines down. - -- Russ Allbery , Tue, 5 Jan 2010 16:50:11 -0800 + -- Russ Allbery , Tue, 19 Jan 2010 20:34:36 -0800 -- 2.39.5