From: Russ Allbery Date: Wed, 26 May 2010 15:11:07 +0000 (-0700) Subject: Adjust get-orig-source for location of patch releases X-Git-Tag: debian/1.4.12.1+dfsg-1~5 X-Git-Url: https://git.michaelhowe.org/gitweb/?a=commitdiff_plain;h=916cb1c64985cc801a6ef8228f838799df022020;p=packages%2Fo%2Fopenafs.git 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 e8f7e577d..c60fb6892 100644 --- 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 Wed, 26 May 2010 08:06:43 -0700 diff --git a/debian/rules b/debian/rules index 6a5e3f1c5..7e319278f 100755 --- 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