From 03f072d6a3ea8d33743a40ba76ed99eae9bfae62 Mon Sep 17 00:00:00 2001
From: cyeoh <>
Date: Oct 30 2000 08:31:05 +0000
Subject: Changes for relocation of lsb_release command and man pages


---

diff --git a/lsb_release/debian/changelog b/lsb_release/debian/changelog
index c2ac7a6..7fc29b0 100644
--- a/lsb_release/debian/changelog
+++ b/lsb_release/debian/changelog
@@ -1,3 +1,10 @@
+lsb-release (1.3-1) unstable; urgency=low
+
+  * Repackage so it lsb_release goes in /bin and
+    man page in /usr/share/man
+
+ -- Christopher Yeoh <cyeoh@linuxcare.com.au>  Mon, 30 Oct 2000 14:27:31 +1100
+
 lsb-release (1.2-1) unstable; urgency=low
 
   * Update for 1.2 release of lsb_release
diff --git a/lsb_release/debian/rules b/lsb_release/debian/rules
index c273867..df2c500 100755
--- a/lsb_release/debian/rules
+++ b/lsb_release/debian/rules
@@ -1,6 +1,7 @@
 #!/usr/bin/make -f
-# Sample debian/rules that uses debhelper.
-# GNU copyright 1997 to 1999 by Joey Hess.
+# Debian rules file for lsb-release package
+#
+# Christopher Yeoh <cyeoh@linuxcare.com>
 
 # Uncomment this to turn on verbose mode.
 #export DH_VERBOSE=1
@@ -31,7 +32,7 @@ install: build
 	dh_installdirs
 
 	# Add here commands to install the package into debian/tmp.
-	$(MAKE) install prefix=`pwd`/debian/tmp/opt/lsb
+	$(MAKE) install prefix=`pwd`/debian/tmp/ mandir=`pwd`/debian/tmp/usr/share/man
 
 # Build architecture-independent files here.
 binary-indep: build install
@@ -41,8 +42,6 @@ binary-indep: build install
 	dh_installdocs
 	dh_installmanpages
 	dh_installchangelogs 
-	dh_link opt/lsb/bin/lsb_release opt/bin/lsb_release
-	dh_link opt/lsb/man/man1/lsb_release.1.gz opt/man/man1/lsb_release.1.gz
 	dh_compress
 	dh_fixperms
 	# You may want to make some executables suid here.
diff --git a/lsb_release/lsb-release.spec b/lsb_release/lsb-release.spec
index 3bdd19e..34e85a5 100644
--- a/lsb_release/lsb-release.spec
+++ b/lsb_release/lsb-release.spec
@@ -6,9 +6,9 @@
 #
 Summary: Linux Standard Base tools
 Name: lsb-release
-Version: 1.2
+Version: 1.3
 Release: 1
-Prefix: /opt
+Prefix: /
 Copyright: GPL
 Source: lsb-release-1.2.tgz
 Group:  System/Tools
@@ -30,17 +30,17 @@ rm -rf $RPM_BUILD_ROOT
 make
 
 %install
-make prefix=${RPM_BUILD_ROOT}%{prefix}/lsb install 
-mkdir -p ${RPM_BUILD_ROOT}%{prefix}/lsb/doc
-cp lsb-release.template ${RPM_BUILD_ROOT}%{prefix}/lsb/doc/
+make prefix=${RPM_BUILD_ROOT}%{prefix}/bin mandir=${RPM_BUILD_ROOT}/usr/share/man/ install 
+mkdir -p ${RPM_BUILD_ROOT}%{prefix}/usr/share/doc
+cp lsb-release.template ${RPM_BUILD_ROOT}%{prefix}/usr/share/doc/
 
 %clean
 rm -rf $RPM_BUILD_ROOT
 
 %files
-%{prefix}/lsb/bin/lsb_release
-%{prefix}/lsb/man/man1/lsb_release.1.gz
-%{prefix}/lsb/doc/lsb-release.template
+%{prefix}/bin/lsb_release
+%{prefix}/usr/share/man/man1/lsb_release.1.gz
+%{prefix}/usr/share/doc/lsb-release.template
 
 %post
 P=$RPM_INSTALL_PREFIX
@@ -51,9 +51,12 @@ ln -fs $P/lsb/man/man1/lsb_release.1.gz $P/man/man1/
 
 %postun
 rm -f $RPM_INSTALL_PREFIX/bin/lsb_release
-rm -f $RPM_INSTALL_PREFIX/man/man1/lsb_release/lsb_release.1.gz
+rm -f $RPM_INSTALL_PREFIX/usr/share/man/man1/lsb_release/lsb_release.1.gz
 
 %changelog
+* Mon Oct 30 2000 Christopher Yeoh <cyeoh@linuxcare.com>
+- Repackage so lsb_release goes in /bin
+
 * Sat Oct 21 2000 Christopher Yeoh <cyeoh@linuxcare.com>
 - Changes for 1.2 release of lsb_release
 
diff --git a/lsb_release/src/Makefile b/lsb_release/src/Makefile
index cb59882..ca3b05b 100644
--- a/lsb_release/src/Makefile
+++ b/lsb_release/src/Makefile
@@ -1,9 +1,15 @@
 # 
 # Makefile for lsb_release program
 #
+# Copyright (C) 2000 Free Software Group, Inc
+# 
+# Christopher Yeoh <cyeoh@linuxcare.com>
+#
+# This is $Revision: 1.4 $
 
 # Config
-prefix=/opt/lsb
+prefix=/usr/local
+mandir=${prefix}/man
 
 all: man
 
@@ -14,5 +20,5 @@ lsb_release.1.gz: lsb_release
 	@gzip -f lsb_release.1
 
 install: all
-	install -D -m 644 lsb_release.1.gz ${prefix}/man/man1/lsb_release.1.gz
+	install -D -m 644 lsb_release.1.gz ${mandir}/man1/lsb_release.1.gz
 	install -D -m 755 lsb_release ${prefix}/bin/lsb_release