From: Russ Allbery <rra@debian.org>
Date: Tue, 13 Jul 2010 21:45:49 +0000 (-0700)
Subject: Set the OpenAFS build version
X-Git-Tag: debian/1.5.75-1~4
X-Git-Url: https://git.michaelhowe.org/gitweb/?a=commitdiff_plain;h=2d2aed122e78993ff7892631d0be5e94f6597671;p=packages%2Fo%2Fopenafs.git

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 3edd2a212..4d54bfcc1 100644
--- 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 454dc1256..ac1bb432a 100644
--- 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 a21330c22..4212a8c84 100755
--- 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