Use git-import-orig instead of debian/import-upstream

* Remove debian/import-upstream and change README.source to document
  using git-import-orig with --upstream-vcs-tag instead.

diff --git a/debian/README.source b/debian/README.source
index 6e88e153428db512e22bab4d0c42d3b2a67cf1a1..84c523c8ebdbc941d5a2484754d05ae7a2a44b7f 100644 (file)
--- a/debian/README.source
+++ b/debian/README.source
@@ -44,7 +44,7 @@ Importing a New Upstream Release
 
     3. Run debian/rules get-orig-source.  This will generate a tarball
        from the upstream Git tag using git archive, remove the WINNT
-       directory, and create a file named openafs_<version>.orig.tar.gz in
+       directory, and create a file named openafs_<version>.orig.tar.xz in
        the current directory.
 
     4. Ensure that you have the OpenAFS upstream Git repository available
@@ -69,30 +69,12 @@ Importing a New Upstream Release
 
     6. Import the upstream source from the tarball with:
 
-           debian/import-upstream <tarball> <upstream-tag> <local-tag>
+           git-import-orig --upstream-vcs-tag <tag> <tarball>
 
-       where <tarball> is the tarball created by get-orig-source above,
-       <upstream-tag> is the corresponding tag from the upstream Git
-       repository, and <local-tag> is of the form upstream/<version> where
-       <version> is the non-Debian portion of the package version number.
-       (In other words, including any tildes, but not the dash and the
-       Debian revision.)  Replace any tildes in the version with periods
-       when forming the local tag (due to Git limitations).
+       where <tarball> is the tarball created by get-orig-source above and
+       <tag> is the corresponding tag from the upstream Git repository.
 
-    7. Commit the tarball to the repository with pristine-tar, using the
-       new local tag as the reference:
-
-           pristine-tar commit <tarball> <local-tag>
-
-    8. Merge the new upstream source into the master branch:
-
-           git checkout master
-           git merge <local-tag>
-
-       where <local-tag> is the tag you used above.  You can also just
-       merge with the upstream branch; either is equivalent.
-
-    9. Flesh out the changelog entry for the new version with a summary of
+    7. Flesh out the changelog entry for the new version with a summary of
        what changed in that release, and continue as normal with Debian
        packaging.
 
@@ -133,4 +115,4 @@ Pulling Upstream Changes
        edited as necessary to keep the length of the changelog lines
        down.
 
- -- Russ Allbery <rra@debian.org>, Mon, 18 Jul 2011 16:52:14 -0700
+ -- Russ Allbery <rra@debian.org>, Wed,  2 Jan 2013 21:38:50 -0800

diff --git a/debian/changelog b/debian/changelog
index c3e18dc613fa00ae628b382e478ea04390fedc66..a889147c7472fbe9a8ecccdf34cca51b31167579 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -16,6 +16,8 @@ openafs (1.6.2~pre2-1) UNRELEASED; urgency=low
       bytes of a file as nulls.
     - Support Linux kernels up to 3.7.
     - Support newer glibc versions.
+  * Remove debian/import-upstream and change README.source to document
+    using git-import-orig with --upstream-vcs-tag instead.
   
  -- Russ Allbery <rra@debian.org>  Wed, 02 Jan 2013 21:25:52 -0800
 

diff --git a/debian/import-upstream b/debian/import-upstream
deleted file mode 100755 (executable)
index 4d05c18..0000000
--- a/debian/import-upstream
+++ /dev/null
@@ -1,47 +0,0 @@
-#!/bin/sh
-#
-# This script is used rather than git-import-orig to import a new upstream
-# tarball.  It does essentially the same work as git-import-orig -- take the
-# contents of the tarball and commit it to the upstream branch and then tag it
-# with a new upstream/* tag -- but it records that commit as a merge commit
-# between the upstream branch and another tag.
-#
-# The purpose of this procedure is to have the imported tarball look to Git
-# like a merge between upstream's tagged Git tree corresponding to that
-# tarball and our upstream branch.  This lets things like git cherry-pick work
-# properly against upstream's release branch.
-#
-# This script assumes that the upstream tarball has already had non-DFSG
-# material removed.
-#
-# Written by Sam Hartman <hartmans@debian.org> for krb5
-# Adopted for openafs by Russ Allbery <rra@debian.org>
-
-set -e
-
-if [ $# -ne 3 ] ; then
-    echo "Usage: import-upstream <tarball> <upstream-tag> <local-tag>" >&2
-    exit 2
-fi
-tarball="$1"
-upstream="$2"
-tag="$3"
-
-# Unpack the tarball.
-dir=$(basename $(tar tzf "$tarball" | head -1))
-tar xzf "$tarball"
-
-# Add the tarball to the current index and then use that to create a tree
-# object corresponding to the contents of that directory.  Then, use
-# commit-tree to commit that to the repository.
-git add -f "$dir"
-tree=$(git write-tree --prefix="$dir"/)
-commit=$(echo "Imported upstream tag $upstream via tarball" | \
-    git commit-tree "$tree" -p upstream -p $(git rev-list -n1 "$upstream"))
-
-# Now that we have a commit, repoint upstream at that commit, tag it, and then
-# remove the unpacked upstream tarball from our index.
-git branch -f upstream "$commit"
-git tag "$tag" "$commit"
-git rm -q -r -f "$dir"
-rm -rf "$dir"