[Pkg-gourmet-changes] gourmet/debian README.Maintainer, 1.1, 1.2 changelog, 1.3, 1.4

[seanius at haydn.debian.org]

Update of /cvsroot/pkg-gourmet/gourmet/debian
In directory haydn:/org/alioth.debian.org/chroot/home/users/seanius/tmp/cvs-serv415

Modified Files:
	README.Maintainer changelog 
Log Message:
better instructions for new upstream versions


Index: README.Maintainer
===================================================================
RCS file: /cvsroot/pkg-gourmet/gourmet/debian/README.Maintainer,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- README.Maintainer	7 Nov 2005 06:43:35 -0000	1.1
+++ README.Maintainer	14 Nov 2005 20:37:10 -0000	1.2
@@ -52,27 +52,34 @@
 
 # - download the latest upstream tarball.  keep a copy of if somewhere outside
 #   your working area in case you accidentally nuke it.
-# - untar the tarball
+# - move the tarball to be named what dpkg-buildpackage and friends would
+#   expect
 
-tar xvfz gourmet-x.y.z.tar.gz
+mv gourmet-x.y.z.tar.gz gourmet_x.y.z.orig.tar.gz
 
-# - copy over the files, skipping everything in ./debian and deleting
-#   files that no longer exist.  you might want to test this first :)
-rsync -nav --delete --exclude debian --exclude CVS gourmet-x.y.z/ sid/ | less
-#   when you're happy with what you see:
-rsync -nav --delete --exclude debian --exclude CVS gourmet-x.y.z/ sid/
-# - view the differences in the repository, looking specifically for
-#   added and removed files
-cvs diff -u | grep -E '^(cvs diff: cannot find)|\? '
-#   or alternatively, do a cvs commit, and then diff to see what's 
-#   been added/removed.  in any case, make sure you add all new files
-#   and remove all obsolete files.
+# - put it in your cvs-buildpackage work directory
 
-# - make whatever changes are necessary in ./debian (changelog, rules, etc)
-#   then tag, and build:
+mv gourmet_x.y.z.orig.tar.gz ~/debian/work/gourmet/
 
-cvs tag -b upstream_version_x_y_z
-cvs-buildpackage
+# - use cvs-buildpackage and family to import the latest version:
+
+export CVSROOT=alioth.debian.org:/cvsroot/pkg-gourmet
+cvs-upgrade gourmet x.y.z
+
+# - lookout for any scary errors (except for the "update" one caused by
+#   by our mailing scripts
+
+# - if you already had a working copy of the previous cvs tree, do:
+cvs update -d -jupstream_version_OLDVERSION -jupstream_version_x.y.z
 
+# - else
+cvs co -jupstream_version_OLDVERSION -jupstream_version_0_9_0_1 gourmet
 
+# in any case, pay very close attention to the resulting changes (piping
+# the output of the previous commands to less or a file would be a good idea).
+# look for cruft left/injected (.#foo, <<<</==== etc) by cvs too.  usually
+# at least the debian/changelog will need some extra care).
+#
+# when you're happy, dpkg-buildpackage and inspect the diff.gz file (interdiff
+# is your friend) and if everything's okay, commit/tag/build/upload.
 

Index: changelog
===================================================================
RCS file: /cvsroot/pkg-gourmet/gourmet/debian/changelog,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- changelog	14 Nov 2005 19:56:50 -0000	1.3
+++ changelog	14 Nov 2005 20:37:10 -0000	1.4
@@ -1,8 +1,11 @@
 gourmet (0.9.0.1-1) UNRELEASED; urgency=low
 
   * New upstream release.
+  * Sean Finney:
+    - updated README.Maintainer with a better set of instructions on
+      importing the new upstream versions.
 
- -- sean finney <seanius at debian.org>  Mon, 14 Nov 2005 20:54:17 +0100
+ -- sean finney <seanius at debian.org>  Mon, 14 Nov 2005 21:37:03 +0100
 
 gourmet (0.8.6.5.1-1) UNRELEASED; urgency=low