Adjust get-orig-source for location of patch releases

* Adjust get-orig-source to cope with tarballs for patch releases being
  in the same directory as the parent normal release.

diff --git a/debian/changelog b/debian/changelog
index e8f7e577d80ab8279dc118ceb1bcb4a0960fd085..c60fb6892b066588df35f43a88658cca18d619b5 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,6 +3,8 @@ openafs (1.4.12.1+dfsg-1) UNRELEASED; urgency=low
   * New upstream release.
     - Support for Linux 2.6.34.  (LP: #566956)
     - Fix some possible kernel panics.
+  * Adjust get-orig-source to cope with tarballs for patch releases being
+    in the same directory as the parent normal release.
 
  -- Russ Allbery <rra@debian.org>  Wed, 26 May 2010 08:06:43 -0700
 

diff --git a/debian/rules b/debian/rules
index 6a5e3f1c5d6d7426dd4ec42117c6f018162f99b1..7e319278f18443cdc8b9b7f243daf8ec50665434 100755 (executable)
--- a/debian/rules
+++ b/debian/rules
@@ -60,7 +60,9 @@ IGNORE += -Xknfs -Xrmtsysd
 DEBVERS  := $(shell dpkg-parsechangelog | grep ^Version: | cut -d' ' -f2 \
                | cut -d- -f1)
 VERSION  := $(shell echo '$(DEBVERS)' | sed -e 's/[+-].*//' -e 's/~//g')
-UPSTREAM  = /afs/grand.central.org/software/openafs/$(VERSION)
+VERSHORT := $(shell echo '$(VERSION)' \
+               | sed -e 's/\([0-9]*\.[0-9]*\.[0-9]*\).*/\1/')
+UPSTREAM  = /afs/grand.central.org/software/openafs/$(VERSHORT)
 
 # Download the upstream source, merge in the doc tarball, and do the
 # repackaging that we have to do for DFSG reasons.  This assumes AFS is