Set the OpenAFS build version

* Set the OpenAFS build version to the Debian package version with
  -debian appended so that the Debian package versions can be
  distinguished from unmodified upstream versions.

diff --git a/debian/changelog b/debian/changelog
index 3edd2a212533f34f3c3439770b97db1858b1c1de..4d54bfcc12b6a043ab483ba34cd2fe2a21624fb8 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -41,6 +41,9 @@ openafs (1.5.75-1) UNRELEASED; urgency=low
     - [c790e7d0] Remove a few erroneous NEWS entries for 1.5.75
     - [9e2aba99] Fix ktime test for errors
     - [5cc6293c] Provide man pages for more fssync-debug commands
+  * Set the OpenAFS build version to the Debian package version with
+    -debian appended so that the Debian package versions can be
+    distinguished from unmodified upstream versions.
   * Build shared library packages for libafsauthent and libafsrpc.
     Upstream is now more careful about the ABI.  (Closes: #433054)
   * Explicitly link libafsauthent with -lresolv -lcrypt.  This is a

diff --git a/debian/clean b/debian/clean
index 454dc12568a161d773ad1b0a861b27b1163b2c0d..ac1bb432a8324b3e9d099c86b61e453cf74da95b 100644 (file)
--- a/debian/clean
+++ b/debian/clean
@@ -1,3 +1,4 @@
+.version
 aclocal.m4
 configure
 configure-libafs

diff --git a/debian/rules b/debian/rules
index a21330c22e53e6e920de837785d1ae17a6188745..4212a8c842287ca5f785f05c5babb4f9d325db22 100755 (executable)
--- a/debian/rules
+++ b/debian/rules
@@ -53,11 +53,11 @@ IGNORE = -XAuthLog -Xcompile_et -Xcopyauth -Xdlog -Xdpass -Xfms.log     \
 # Installed via other means since we have to rename them.
 IGNORE += -Xafsd.fuse.8 -Xpam_afs
 
-# These variables are used by get-orig-source and to construct dkms.conf.
-# You will need to change TAG to package stable releases instead of
-# experimental releases.
-DEBVERS := $(shell dpkg-parsechangelog | grep ^Version: | cut -d' ' -f2 \
-               | cut -d- -f1)
+# These variables are used by get-orig-source, to construct dkms.conf, and
+# to set the build version.  You will need to change TAG to package stable
+# releases instead of experimental releases.
+DEBIAN  := $(shell dpkg-parsechangelog | grep ^Version: | cut -d' ' -f2)
+DEBVERS := $(shell echo '$(DEBIAN)' | cut -d- -f1)
 VERSION := $(shell echo '$(DEBVERS)' | sed -e 's/[+-].*//' -e 's/~//g')
 TAG     := $(shell echo 'openafs-devel-$(VERSION)' | sed 's/\./_/g')
 REPO    := git://git.openafs.org/openafs.git
@@ -89,6 +89,7 @@ build-indep:
 build-stamp:
        @if test x"$(SYS_NAME)" = x"UNKNOWN" ; then exit 1 ; fi
        dh build --before configure
+       echo '$(DEBIAN)'-debian > .version
        mv doc/man-pages/pod1/up.pod doc/man-pages/pod1/afs-up.pod
        rm -f doc/man-pages/man1/up.1
        sh regen.sh