Update changelog for the final 1.4.12 release

Switch the get-orig-source target back to the main release directory.

diff --git a/debian/changelog b/debian/changelog
index 697d099a256a091eecf8881f75740f47e74c3a88..eec343fce761d76605db5a4817187cc7e2dfbf37 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -31,9 +31,9 @@ openafs (1.5.69+dfsg-1) UNRELEASED; urgency=low
 
  -- Russ Allbery <rra@debian.org>  Fri, 21 Aug 2009 22:19:03 -0700
 
-openafs (1.4.12~pre4+dfsg-1) UNRELEASED; urgency=low
+openafs (1.4.12+dfsg-1) UNRELEASED; urgency=low
 
-  * New upstream release candidate.
+  * New upstream release.
     - Enable weak encryption types in aklog and klog.krb5.
     - Build support for Linux 2.6.33.
     - Improvements to host tracking safety in the file server.

diff --git a/debian/rules b/debian/rules
index 65b19b812b8c0a7e919ed27563efd48bcf5e340c..d9deef8c26627601b2b0831e931fb51ccd2ec7bd 100755 (executable)
--- a/debian/rules
+++ b/debian/rules
@@ -57,7 +57,7 @@ IGNORE += -Xpam_afs
 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/candidate/$(VERSION)
+UPSTREAM  = /afs/grand.central.org/software/openafs/$(VERSION)
 
 # 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