[pkg-dhcp-commits] [isc-dhcp] 04/08: release 4.3.1~b1-1

[Michael Gilbert]

This is an automated email from the git hooks/post-receive script.

mgilbert pushed a commit to branch master
in repository isc-dhcp.

commit e1e494cec26d6e263235fe4d4ce391d44347f8a3
Author: Michael Gilbert <mgilbert at debian.org>
Date:   Sat Jul 19 18:44:24 2014 -0400

    release 4.3.1~b1-1
---
 debian/README.source | 80 ++++++++++++++++++++++++++++++++++++++++++++++++++++
 debian/changelog     |  7 +++++
 2 files changed, 87 insertions(+)

diff --git a/debian/README.source b/debian/README.source
new file mode 100644
index 0000000..910b89e
--- /dev/null
+++ b/debian/README.source
@@ -0,0 +1,80 @@
+Importing a new upstream version
+--------------------------------
+
+First, define a couple environment variables:
+
+$ export version=4.3.1~b1
+$ export branch=experimental
+
+Fetch the new upstream source:
+
+$ uscan --verbose
+
+** Make sure that uscan's output states that the upstream signature is good **
+
+Import the new version into the upstream branch (this is a little complicated
+since upstream doesn't provide an importable vcs, and there are probably better
+ways to do it):
+
+$ quilt pop -a
+$ git stash
+$ get checkout upstream
+$ rm -rf *
+$ cd ..
+$ tar xf isc-dhcp_$(version).tar.xz
+$ cp -r dhcp-$(version)/* isc-dhcp
+$ cd isc-dhcp
+$ git add .
+$ git commit -m "import upstream $(version)"
+$ git tag upstream/$(version) -m "upstream $(version)"
+$ git checkout $(branch)
+$ git merge master
+$ git merge upstream
+$ git stash pop
+
+For each of the existing quilt patches, do these the next steps, resolving
+failed hunks and refreshing as you go:
+
+$ QUILT_PATCHES=debian/patches quilt push -f
+$ quilt refresh
+
+Commit changes made to the patches:
+
+$ git commit debian/patches -m "refresh patches"
+
+Update the changelog and do a test build:
+
+$ dch -v $(version)-1 -m New upstream release.
+$ debuild -sa
+
+It's useful to check lintian at this point:
+
+$ lintian -i -I ../isc-dhcp_$(version)-1_amd64.changes
+
+Make sure to push everything when you're done:
+
+$ git commit -a
+$ git tag debian/$(version)-1 -m "release $(version)-1"
+$ git push
+$ git checkout upstream
+$ git push
+$ git push --tags
+
+Handling cruft
+--------------
+
+If you kill the build, sometimes intermediate files will gum things up.  The
+easiest way to recover from this kind of situation is to do something like:
+
+$ quilt pop -af
+$ git stash
+$ git clean -f
+$ git stash pop
+
+The build creates a lot of temporary files that may make it hard to interpret
+the output of git-status.  The easiest thing to do is to clean the build:
+
+$ debuild clean
+
+Another option is to add those files to your local .git/ignore file.  Please
+don't add them to the global .gitignore.
diff --git a/debian/changelog b/debian/changelog
index 0b63087..98e87c3 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+isc-dhcp (4.3.1~b1-1) experimental; urgency=medium
+
+  * New upstream beta release.
+  * Add debian/README.source.
+
+ -- Michael Gilbert <mgilbert at debian.org>  Sat, 19 Jul 2014 22:06:23 +0000
+
 isc-dhcp (4.3.0+dfsg-2) unstable; urgency=medium
 
   * Ship dhcp-lease-list (closes: #741488).

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-dhcp/isc-dhcp.git