[SCM] Vim packaging branch, debian, updated. upstream/7.1.285-171-g6715863

[James Vega]

The following commit has been merged in the debian branch:
commit 67158638d30f32da9c0207398958a81f9de462c2
Author: James Vega <jamessan at debian.org>
Date:   Wed Jun 18 20:04:37 2008 -0400

    Update README.git and turn it into README.source
    
    Signed-off-by: James Vega <jamessan at debian.org>

diff --git a/debian/README.git b/debian/README.git
deleted file mode 100644
index 19d4083..0000000
--- a/debian/README.git
+++ /dev/null
@@ -1,15 +0,0 @@
-In order to update the upstream patches, debian/update-patches should be run
-from the debian branch.  This will update debian/README in the debian
-branch, pull the new upstream patches into the upstream branch (with Bram as
-the author and useful commit messages), and merge the new upstream patches
-into the upstream-runtime, debian, and deb/* branches.
-
-If you're building a package with new upstream patches, a new orig.tar.gz
-should be built.  This can be done by running "git archive --format=tar
---prefix=vim-7.1.$newest_patch_number/ upstream | gzip
-../vim_7.1.$newest_patch_number.orig.tar.gz".  This should probably be
-handled by debian/update-patches.
-
-Before building a new package which changes runtime/doc,
-master:runtime/doc/tags should be rebuilt.  This is simply done by running
-"vim -c 'helptags ++t runtime/doc' -c 'q'" and then checking the file in.
diff --git a/debian/README.source b/debian/README.source
new file mode 100644
index 0000000..84b4d4c
--- /dev/null
+++ b/debian/README.source
@@ -0,0 +1,79 @@
+Updating upstream source
+------------------------
+If a new major version is released, this should be imported to the
+upstream branch and then merged into upstream-runtime, debian, and deb/*
+branches.  Be sure to handle file removals/additions properly by either
+using git_load_dirs or other known methods for importing source.
+
+In new patches have been released, debian/update-patches should be run
+from the debian branch.  This will update debian/README in the debian
+branch, pull the new upstream patches into the upstream branch (with
+Bram as the author and useful commit messages), and merge the new
+upstream patches into the upstream-runtime, debian, and deb/* branches.
+
+Preparing uploads
+-----------------
+If you're building a package with new upstream patches, a new
+orig.tar.gz should be built.  Running "debian/rules update-orig" after
+preparing the new changelog on the master branch will do this for you.
+
+If you simply need to build an orig.tar.gz for an upstream version
+that's already been uploaded, "debian/rules check-tarball" will build
+one for you.
+
+Before building a new package which changes runtime/doc,
+master:runtime/doc/tags should be rebuilt.  This is simply done by
+running "vim -c 'helptags ++t runtime/doc' -c 'q'" and then checking the
+file in.
+
+Branch layout/purpose
+---------------------
+upstream:
+ - Branch where major releases and official patches are imported
+ - Merged into upstream-runtime, debian, deb/* branches
+ - Parent branch for all other branches except deb/runtime
+
+upstream-runtime:
+ - Branch where updated runtime files (only from ftp.vim.org) are
+   imported
+ - Merged into deb/runtime and debian branches
+ - Parent branch for deb/runtime
+
+deb/runtime:
+ - Branch where bugs against non-Debian maintained runtime files are
+   fixed.
+
+deb/*:
+ - Branches created for specific features/fixes.
+
+debian:
+ - Branch where packaging and maintenance of Debian's runtime files take
+   place.
+
+master:
+ - Integration branch.  Releases are built from this branch.
+ - debian/changelog only exists in this branch.  Tools like git-dch are
+   useful to build an initial version of the changelog.
+
+Simple (I hope) diagram providing a visual summary of the above
+information.
+'+' is the starting source from which the other branches are formed.
+'o' is a commit on that branch.
+'*' is a commit caused by merging a 'o' to that branch.
+
+master            ---------------------*----*----*----*----*------
+                  |                   /    /    /    /    /
+                  |                  /    /    /    /    /
+debian            ------------------*----*--------------o---------
+                  |                /    /    /    /
+                  |               /    /    /    /
+deb/*             ---------------*--------------o-----------------
+                  |             /    /    /
+                  |            /    /    /
+deb/runtime       |  ---------*----*----o-------------------------
+                  | /        /    /
+                  |/        /    /
+upstream-runtime  ---------*----o---------------------------------
+                  |       /
+                  |      /
+upstream          +-----o-----------------------------------------

-- 
Vim packaging