[syrthes/master] Updated debian/README.source for upstream handling

[Gilles Filippini]

---
 debian/README.source |   21 +++++++++++++--------
 debian/changelog     |    4 +++-
 2 files changed, 16 insertions(+), 9 deletions(-)

diff --git a/debian/README.source b/debian/README.source
index 8b0b3dc..66e6204 100644
--- a/debian/README.source
+++ b/debian/README.source
@@ -50,9 +50,9 @@ upstream tarball.
 They can be downloaded from <http://rd.edf.com/syrthes>.
 
 
-==================================================
-2- HOW THE SOURCE PACKAGE IS HANDLED USING SVN/GIT
-==================================================
+==============================================
+2- HOW THE SOURCE PACKAGE IS HANDLED USING GIT
+==============================================
 
 The work on this package takes place on the alioth git repository.
 It requires an alioth account with grant to the collab-maint group.
@@ -71,17 +71,22 @@ master fetched localy by the clone:
  $ git branch
  * master
 
-A packaging cycle starts by importing a new release into upstream. It
-requires having checked out origin/upstream localy (need to be done once):
+A packaging cycle starts by downloading the new upstream tarball using uscan.
+uscan triggers the script debian/orig-tar.sh to remove non DFSG-free parts
+of the tarball and append the -dfsg part to upstream version.
+
+Then the tarball is imported into git, provided the upstream and pristin-tar
+branches are tracked locally (needed only once):It
 
  $ git checkout -b upstream origin/upstream
+ $ git checkout -b pristine-tar origin/pristine-tar
 
 Then we can do the import:
 
- $ git-import-orig --filter='doc' /path/to/upstream/tarball
+ $ git-import-orig --pristine-tar /path/to/upstream-dfsg/tarball
+
+It will import, tag and merge into master the new upstream release.
 
-It will import, tag and merge into master the new upstream release, excluding
-the non DFSG-free doc folder.
 When the import is completed we then switch to the master branch:
 
   $ git checkout master
diff --git a/debian/changelog b/debian/changelog
index 9e9a0fe..5fa4e3c 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -7,8 +7,10 @@ syrthes (3.4.2-dfsg1-2) UNRELEASED; urgency=low
     + Add get-orig-source target.
   * debian/syrthes2ensight.1:
     + Escape minus signs.
+  * debian/README.source:
+    + Updated upstream source handling from uscan to git-import-orig.
 
- -- Gilles Filippini <gilles.filippini at free.fr>  Sat, 19 Sep 2009 10:33:59 +0200
+ -- Gilles Filippini <gilles.filippini at free.fr>  Sat, 26 Sep 2009 12:40:33 +0200
 
 syrthes (3.4.2-dfsg1-1) unstable; urgency=low
 
-- 
1.5.6.5