[SCM] Packaging for gvl branch, master, updated. 84e966a78a9d59bcb3d52b023b17d43b84cc0a7c

[Martin Erik Werner]

The following commit has been merged in the master branch:
commit 84e966a78a9d59bcb3d52b023b17d43b84cc0a7c
Author: Martin Erik Werner <martinerikwerner at gmail.com>
Date:   Fri Dec 16 20:37:18 2011 +0100

    Remove hg integration from README

diff --git a/debian/README.source b/debian/README.source
index 246e15c..86b6120 100644
--- a/debian/README.source
+++ b/debian/README.source
@@ -3,94 +3,13 @@ gvl for Debian
 
 Contents:
  1. gvl and Liero
- 2. Version control in Debian
-    2.1 VCS setup for Debian changes
-    2.2 VCS setup for new upstream versions
-    2.3 Disable post-receive hook when updating tracking branch
- 3. Quilt
-
+ 2. Quilt
 
 1. GVL AND LIERO
 gvl is a support library with c++ hacks for the game Liero, the last known
 working snapshot that works to build Liero is commit 4b0e9659ebbc.
 
-
-2. VERSION CONTROL IN DEBIAN
-The Debian gvl git repository is set up as follows:
-
-<googlecode mercurial>           master
-                                   ||
-<debian git>                     master
-                                   |
-                                 debian
-
-* <debian git> master:
-  Converted directly from master branch of <http://code.google.com/p/gvl>
-  using git-hg from <https://github.com/offbytwo/git-hg>
-* debian:
-  Branched from master, contains the debian packaging.
-
-
-2.1 VCS SETUP FOR DEBIAN CHANGES
-Debian packaging work should happen on the debian branch, and NOT on master.
-Hence, after a standard git clone it is convenient to do:
- $ git branch debian origin/debian
- $ git checkout debian
-
-2.2 VCS SETUP FOR NEW UPSTREAM VERSIONS
-In the case or releasing a new snapshot from upstream things are a bit more
-complicated, the suggested way to set this up is is:
- i.   Clone the Debian git repository
- ii.  Use git-hg to clone the upstream mercurial repository
- iii. Manually add the hg integration to the Debian git clone
- iiv. Setup our local master branch to track the remote mercurial master branch
- iv.  Merge master into debian
-This integration does unfortunately not follow along as the git repository is
-cloned, and hence will have to be setup locally for each person.
-
- i. Clone the Debian git repository
-    $ git clone git://git.debian.org/git/pkg-games/gvl.git liero-debian
-
- ii. Use git-hg to clone the upstream mercurial repository
-     $ git clone https://github.com/offbytwo/git-hg.git git-hg
-     $ cd git-hg/
-     (Get the required fast-export submodule)
-     $ git submodule update --init
-     $ cd ..
-     $ git-hg/bin/git-hg clone https://gvl.googlecode.com/hg/ gvl-hg-git
-
- iii. Manually add the hg integration to the Debian git clone
-      $ cp -r gvl-hg-git/.git/hgremote/ liero-debian/.git/
-      $ cp -r gvl-hg-git/.git/hgcheckout/ liero-debian/.git/
-      $ cp gvl-hg-git/.git/FETCH_HEAD liero-debian/.git/
-      $ cp -r gvl-hg-git/.git/refs/remotes/hg liero-debian/.git/refs/remotes
-
- iiv. Setup our local master branch to track the remote mercurial master branch
-      $ git remote add hg .git/hgremote
-      $ git checkout master
-      $ git-hg pull
-
- iv. Merge master into debian
-     $ git branch debian origin/debian
-     $ git checkout debian
-     $ git merge master
-
-2.3 DISABLE POST-RECEIVE HOOK WHEN UPDATING TRACKING BRANCH
-Please disable the git-post-receive hook when pushing the tracking branch.
-Alioth uses the commiter's email address and this will result in email spam to
-all commiters on the tracking branch.
-
-To disable it use:
- $ ssh user-guest at git.alioth.org
- $ cd /git/pkg-games/liero.git/hooks
- $ mv post-receive post-receive_disabled
-And enable via:
- $ ssh user-guest at git.alioth.org
- $ cd /git/pkg-games/liero.git/hooks
- $ mv post-receive_disabled post-receive
-
-
-3. QUILT
+2. QUILT
 This package uses quilt to manage all modifications to the upstream
 source.  Changes are stored in the source package as diffs in
 debian/patches and applied during the build.
@@ -98,5 +17,5 @@ debian/patches and applied during the build.
 On Debian systems with quilt installed, further documentation is available in
 `/usr/share/doc/quilt/README.source'
 
- -- Martin Erik Werner <martinerikwerner at gmail.com>  Thu, 17 Nov 2011 23:58:56 +0100
+ -- Martin Erik Werner <martinerikwerner at gmail.com>  Fri, 16 Dec 2011 20:36:24 +0100
 

-- 
Packaging for gvl