From 3bdf8aad39d39168d096d3042b659fb9d2ef1651 Mon Sep 17 00:00:00 2001
From: Thomas Schwinge <thomas@codesourcery.com>
Date: Fri, 27 Sep 2013 20:36:58 +0200
Subject: Decouple the Hurd version from the package version.

* config.make.in (package-version): New variable.
(hurd-version): Set to 0.3.
* Makeconf (%: %.sh): Use package-version instead of hurd-version.
* Makefile (stamp-version): Likewise.
* doc/Makefile (stamp-version): Likewise.
---
 Makeconf       | 4 ++--
 Makefile       | 2 +-
 config.make.in | 6 ++++--
 doc/Makefile   | 4 ++--
 proc/host.c    | 7 ++++---
 5 files changed, 13 insertions(+), 10 deletions(-)

diff --git a/Makeconf b/Makeconf
index c72287a5..5cf995d3 100644
--- a/Makeconf
+++ b/Makeconf
@@ -1,7 +1,7 @@
 # Generic configuration for Hurd compilation		-*- makefile-gmake -*-
 
 # Copyright (C) 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2001, 2002, 2003,
-# 2006, 2007, 2008, 2010, 2011, 2012 Free Software Foundation, Inc.
+# 2006, 2007, 2008, 2010, 2011, 2012, 2013 Free Software Foundation, Inc.
 #
 # This program is free software; you can redistribute it and/or
 # modify it under the terms of the GNU General Public License as
@@ -647,5 +647,5 @@ endef
 
 # Rule to make executable shell scripts from .sh files.
 %: %.sh $(..)config.make
-	sed -e 's/STANDARD_HURD_VERSION_\(.[^_]*\)_/\1 (GNU Hurd) $(hurd-version)/' < $< > $@
+	sed -e 's/STANDARD_HURD_VERSION_\(.[^_]*\)_/\1 (GNU Hurd) $(package-version)/' < $< > $@
 	chmod +x $@
diff --git a/Makefile b/Makefile
index 85bbe23a..106f2f60 100644
--- a/Makefile
+++ b/Makefile
@@ -262,7 +262,7 @@ config.make: config.status $(top_srcdir)/config.make.in
 
 version.h: stamp-version; @:
 stamp-version: version.h.in config.make
-	sed -e 's/MASTER_HURD_VERSION/\"$(hurd-version)\"/' \
+	sed -e 's/MASTER_HURD_VERSION/\"$(package-version)\"/' \
 	  < $< > version.h.new
 	$(move-if-change) version.h.new version.h
 	touch $@
diff --git a/config.make.in b/config.make.in
index 4d2abcca..5bfc777e 100644
--- a/config.make.in
+++ b/config.make.in
@@ -1,7 +1,9 @@
 # @configure_input@
 
-# What version of the Hurd is this?
-hurd-version := @PACKAGE_VERSION@
+package-version := @PACKAGE_VERSION@
+# What version of the Hurd is this?  For compatibility (libraries' SONAMEs),
+# hard-code this to 0.3 instead of coupling with PACKAGE_VERSION.
+hurd-version := 0.3
 
 # Machine architecture.
 machine = @host_cpu@
diff --git a/doc/Makefile b/doc/Makefile
index b64a8386..2a75803b 100644
--- a/doc/Makefile
+++ b/doc/Makefile
@@ -1,4 +1,4 @@
-#   Copyright (C) 1994, 1998, 1999, 2003, 2012 Free Software Foundation
+#   Copyright (C) 1994, 1998, 1999, 2003, 2012, 2013 Free Software Foundation
 #
 #   This program is free software; you can redistribute it and/or
 #   modify it under the terms of the GNU General Public License as
@@ -50,6 +50,6 @@ include ../Makeconf
 
 version.texi: stamp-version; @:
 stamp-version: $(..)config.make
-	echo '@set VERSION $(hurd-version)' > version.texi.new
+	echo '@set VERSION $(package-version)' > version.texi.new
 	$(move-if-change) version.texi.new version.texi
 	touch $@
diff --git a/proc/host.c b/proc/host.c
index 2b3c4f3c..488863bb 100644
--- a/proc/host.c
+++ b/proc/host.c
@@ -1,5 +1,7 @@
 /* Proc server host management calls
-   Copyright (C) 1992,93,94,96,97,2001,02 Free Software Foundation, Inc.
+
+   Copyright (C) 1992, 1993, 1994, 1996, 1997, 2001, 2002, 2013 Free Software
+   Foundation, Inc.
 
 This file is part of the GNU Hurd.
 
@@ -231,8 +233,7 @@ check_dead_execdata_notify (mach_port_t port)
 
 /* Version information handling.
 
-   A server registers its name and version with
-   startup_register_version.
+   A server registers its name and version with proc_register_version.
 
    The uname release is the most popular version number.
 
-- 
cgit v1.2.3