From 3648a89f88c29e634d11b0abcae7614c3f3c9bba Mon Sep 17 00:00:00 2001 From: Russ Allbery Date: Sat, 14 May 2011 10:13:44 -0700 Subject: [PATCH] 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. --- debian/README.source | 10 ++++------ debian/changelog | 8 ++++++++ debian/import-upstream | 4 ++-- 3 files changed, 14 insertions(+), 8 deletions(-) diff --git a/debian/README.source b/debian/README.source index abad91b60..a9f0657dc 100644 --- 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 , Tue, 13 Jul 2010 19:30:15 -0700 + -- Russ Allbery , Sat, 14 May 2011 10:13:03 -0700 diff --git a/debian/changelog b/debian/changelog index ca50a4fa4..df5411a21 100644 --- 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 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 c3a8aad09..4d05c1891 100755 --- 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" -- 2.39.5