Update packaging infrastructure for repository branch renaming

* Update import-upstream and README.source for moving 1.6 from the
  experimental and upstream-1.5 branches to the master and upstream
  branches.

diff --git a/debian/README.source b/debian/README.source
index abad91b6009153ef265aec056a4d8fa26d7b0648..a9f0657dc86ca9f5cf6f9bed9c8b90b7ab14ec17 100644 (file)
--- a/debian/README.source
+++ b/debian/README.source
@@ -18,11 +18,9 @@ General Maintenance
 
         http://openafs-wiki.stanford.edu/AFSLore/GitDevelopers
 
-    for information on how to submit patches upstream.  There are some
-    Debian-specific patches to the upstream source in the 1.4 versions of
-    the Debian packages, but in the 1.5 experimental branch there are no
-    Debian changes outside of the debian/* directory.  We want to keep it
-    that way if at all possible.
+    for information on how to submit patches upstream.  Starting from
+    OpenAFS 1.5, we're no longer carrying any Debian-specific changes
+    outside of the debian/* directory, and we want to keep it that way.
 
 Importing a New Upstream Release
 
@@ -133,4 +131,4 @@ Pulling Upstream Changes
        edited as necessary to keep the length of the changelog lines
        down.
 
- -- Russ Allbery <rra@debian.org>, Tue, 13 Jul 2010 19:30:15 -0700
+ -- Russ Allbery <rra@debian.org>, Sat, 14 May 2011 10:13:03 -0700

diff --git a/debian/changelog b/debian/changelog
index ca50a4fa4355cce0c55914906b03eeed07ec7de1..df5411a2159b47b093cfee11de97c3adf3d9083f 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+openafs (1.6.0~pre4-2) UNRELEASED; urgency=low
+
+  * Update import-upstream and README.source for moving 1.6 from the
+    experimental and upstream-1.5 branches to the master and upstream
+    branches.
+
+ -- Russ Allbery <rra@debian.org>  Sat, 14 May 2011 10:13:39 -0700
+
 openafs (1.6.0~pre4-1) unstable; urgency=low
 
   * Upload to unstable.

diff --git a/debian/import-upstream b/debian/import-upstream
index c3a8aad091b6e4e82e5179709bffeb49833aac63..4d05c1891061673eb4439e5c25f1ff05b54b3027 100755 (executable)
--- a/debian/import-upstream
+++ b/debian/import-upstream
@@ -37,11 +37,11 @@ tar xzf "$tarball"
 git add -f "$dir"
 tree=$(git write-tree --prefix="$dir"/)
 commit=$(echo "Imported upstream tag $upstream via tarball" | \
-    git commit-tree "$tree" -p upstream-1.5 -p $(git rev-list -n1 "$upstream"))
+    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-1.5 "$commit"
+git branch -f upstream "$commit"
 git tag "$tag" "$commit"
 git rm -q -r -f "$dir"
 rm -rf "$dir"