Switch from /usr/lib/xen-tools/ to /usr/share/xen-tools/ to properly adhere FHS

Makefile

@@ -147,62 +147,62 @@ install-bin:
 #
 install-hooks:
 	for i in roles/* ; do if [ -f $$i ]; then cp $$i ${prefix}/etc/xen-tools/role.d; fi ; done
-	for i in ${prefix}/usr/lib/xen-tools/*.d; do if [ -L "$$i" ]; then rm -vf "$$i"; fi; done
-	mkdir -p ${prefix}/usr/lib/xen-tools/centos-4.d/
-	mkdir -p ${prefix}/usr/lib/xen-tools/centos-5.d/
-	mkdir -p ${prefix}/usr/lib/xen-tools/centos-6.d/
-	mkdir -p ${prefix}/usr/lib/xen-tools/fedora-core-6.d/
-	cp -R hooks/centos-4/*-* ${prefix}/usr/lib/xen-tools/centos-4.d
-	cp -R hooks/centos-5/*-* ${prefix}/usr/lib/xen-tools/centos-5.d
-	cp -R hooks/centos-6/*-* ${prefix}/usr/lib/xen-tools/centos-6.d
-	cp -R hooks/fedora-core-6/*-* ${prefix}/usr/lib/xen-tools/fedora-core-6.d
-	-cd ${prefix}/usr/lib/xen-tools/ && ln -s fedora-core-6.d fedora-core-4.d
-	-cd ${prefix}/usr/lib/xen-tools/ && ln -s fedora-core-6.d fedora-core-5.d
-	-cd ${prefix}/usr/lib/xen-tools/ && ln -s fedora-core-6.d fedora-core-7.d
-	-cd ${prefix}/usr/lib/xen-tools/ && ln -s fedora-core-6.d fedora-core-8.d
-	-cd ${prefix}/usr/lib/xen-tools/ && ln -s fedora-core-6.d fedora-core-9.d
-	-cd ${prefix}/usr/lib/xen-tools/ && ln -s fedora-core-6.d fedora-core-10.d
-	-cd ${prefix}/usr/lib/xen-tools/ && ln -s fedora-core-6.d fedora-core-11.d
-	-cd ${prefix}/usr/lib/xen-tools/ && ln -s fedora-core-6.d fedora-core-12.d
-	-cd ${prefix}/usr/lib/xen-tools/ && ln -s fedora-core-6.d fedora-core-13.d
-	-cd ${prefix}/usr/lib/xen-tools/ && ln -s fedora-core-6.d fedora-core-14.d
-	-cd ${prefix}/usr/lib/xen-tools/ && ln -s fedora-core-6.d fedora-core-15.d
-	-cd ${prefix}/usr/lib/xen-tools/ && ln -s fedora-core-6.d fedora-core-16.d
-	-cd ${prefix}/usr/lib/xen-tools/ && ln -s fedora-core-6.d fedora-core-17.d
-	mkdir -p ${prefix}/usr/lib/xen-tools/debian.d/
-	cp -R hooks/debian/*-* ${prefix}/usr/lib/xen-tools/debian.d
-	-cd ${prefix}/usr/lib/xen-tools/ && ln -s debian.d sarge.d
-	-cd ${prefix}/usr/lib/xen-tools/ && ln -s debian.d etch.d
-	-cd ${prefix}/usr/lib/xen-tools/ && ln -s debian.d lenny.d
-	-cd ${prefix}/usr/lib/xen-tools/ && ln -s debian.d squeeze.d
-	-cd ${prefix}/usr/lib/xen-tools/ && ln -s debian.d wheezy.d
-	-cd ${prefix}/usr/lib/xen-tools/ && ln -s debian.d jessie.d
-	-cd ${prefix}/usr/lib/xen-tools/ && ln -s debian.d sid.d
-	-cd ${prefix}/usr/lib/xen-tools/ && ln -s debian.d testing.d
-	-cd ${prefix}/usr/lib/xen-tools/ && ln -s debian.d stable.d
-	mkdir -p ${prefix}/usr/lib/xen-tools/gentoo.d/
-	cp -R hooks/gentoo/*-* ${prefix}/usr/lib/xen-tools/gentoo.d
-	mkdir -p ${prefix}/usr/lib/xen-tools/dapper.d/
-	cp -R hooks/dapper/*-* ${prefix}/usr/lib/xen-tools/dapper.d/
-	mkdir -p ${prefix}/usr/lib/xen-tools/edgy.d/
-	cp -R hooks/edgy/*-* ${prefix}/usr/lib/xen-tools/edgy.d/
-	-cd ${prefix}/usr/lib/xen-tools/ && ln -s edgy.d feisty.d
-	-cd ${prefix}/usr/lib/xen-tools/ && ln -s edgy.d gutsy.d
-	-cd ${prefix}/usr/lib/xen-tools/ && ln -s edgy.d hardy.d
-	mkdir -p ${prefix}/usr/lib/xen-tools/intrepid.d/
-	cp -R hooks/intrepid/*-* ${prefix}/usr/lib/xen-tools/intrepid.d/
-	-cd ${prefix}/usr/lib/xen-tools/ && ln -s intrepid.d jaunty.d
-	mkdir -p ${prefix}/usr/lib/xen-tools/karmic.d/
-	cp -R hooks/karmic/*-* ${prefix}/usr/lib/xen-tools/karmic.d/
-	-cd ${prefix}/usr/lib/xen-tools/ && ln -s karmic.d lucid.d
-	-cd ${prefix}/usr/lib/xen-tools/ && ln -s karmic.d maverick.d
-	-cd ${prefix}/usr/lib/xen-tools/ && ln -s karmic.d natty.d
-	-cd ${prefix}/usr/lib/xen-tools/ && ln -s karmic.d oneiric.d
-	-cd ${prefix}/usr/lib/xen-tools/ && ln -s karmic.d precise.d
-	-cd ${prefix}/usr/lib/xen-tools/ && ln -s karmic.d quantal.d
-	-cd ${prefix}/usr/lib/xen-tools/ && ln -s karmic.d raring.d
-	cp hooks/common.sh ${prefix}/usr/lib/xen-tools
-	cp -r hooks/common ${prefix}/usr/lib/xen-tools
+	for i in ${prefix}/usr/share/xen-tools/*.d; do if [ -L "$$i" ]; then rm -vf "$$i"; fi; done
+	mkdir -p ${prefix}/usr/share/xen-tools/centos-4.d/
+	mkdir -p ${prefix}/usr/share/xen-tools/centos-5.d/
+	mkdir -p ${prefix}/usr/share/xen-tools/centos-6.d/
+	mkdir -p ${prefix}/usr/share/xen-tools/fedora-core-6.d/
+	cp -R hooks/centos-4/*-* ${prefix}/usr/share/xen-tools/centos-4.d
+	cp -R hooks/centos-5/*-* ${prefix}/usr/share/xen-tools/centos-5.d
+	cp -R hooks/centos-6/*-* ${prefix}/usr/share/xen-tools/centos-6.d
+	cp -R hooks/fedora-core-6/*-* ${prefix}/usr/share/xen-tools/fedora-core-6.d
+	-cd ${prefix}/usr/share/xen-tools/ && ln -s fedora-core-6.d fedora-core-4.d
+	-cd ${prefix}/usr/share/xen-tools/ && ln -s fedora-core-6.d fedora-core-5.d
+	-cd ${prefix}/usr/share/xen-tools/ && ln -s fedora-core-6.d fedora-core-7.d
+	-cd ${prefix}/usr/share/xen-tools/ && ln -s fedora-core-6.d fedora-core-8.d
+	-cd ${prefix}/usr/share/xen-tools/ && ln -s fedora-core-6.d fedora-core-9.d
+	-cd ${prefix}/usr/share/xen-tools/ && ln -s fedora-core-6.d fedora-core-10.d
+	-cd ${prefix}/usr/share/xen-tools/ && ln -s fedora-core-6.d fedora-core-11.d
+	-cd ${prefix}/usr/share/xen-tools/ && ln -s fedora-core-6.d fedora-core-12.d
+	-cd ${prefix}/usr/share/xen-tools/ && ln -s fedora-core-6.d fedora-core-13.d
+	-cd ${prefix}/usr/share/xen-tools/ && ln -s fedora-core-6.d fedora-core-14.d
+	-cd ${prefix}/usr/share/xen-tools/ && ln -s fedora-core-6.d fedora-core-15.d
+	-cd ${prefix}/usr/share/xen-tools/ && ln -s fedora-core-6.d fedora-core-16.d
+	-cd ${prefix}/usr/share/xen-tools/ && ln -s fedora-core-6.d fedora-core-17.d
+	mkdir -p ${prefix}/usr/share/xen-tools/debian.d/
+	cp -R hooks/debian/*-* ${prefix}/usr/share/xen-tools/debian.d
+	-cd ${prefix}/usr/share/xen-tools/ && ln -s debian.d sarge.d
+	-cd ${prefix}/usr/share/xen-tools/ && ln -s debian.d etch.d
+	-cd ${prefix}/usr/share/xen-tools/ && ln -s debian.d lenny.d
+	-cd ${prefix}/usr/share/xen-tools/ && ln -s debian.d squeeze.d
+	-cd ${prefix}/usr/share/xen-tools/ && ln -s debian.d wheezy.d
+	-cd ${prefix}/usr/share/xen-tools/ && ln -s debian.d jessie.d
+	-cd ${prefix}/usr/share/xen-tools/ && ln -s debian.d sid.d
+	-cd ${prefix}/usr/share/xen-tools/ && ln -s debian.d testing.d
+	-cd ${prefix}/usr/share/xen-tools/ && ln -s debian.d stable.d
+	mkdir -p ${prefix}/usr/share/xen-tools/gentoo.d/
+	cp -R hooks/gentoo/*-* ${prefix}/usr/share/xen-tools/gentoo.d
+	mkdir -p ${prefix}/usr/share/xen-tools/dapper.d/
+	cp -R hooks/dapper/*-* ${prefix}/usr/share/xen-tools/dapper.d/
+	mkdir -p ${prefix}/usr/share/xen-tools/edgy.d/
+	cp -R hooks/edgy/*-* ${prefix}/usr/share/xen-tools/edgy.d/
+	-cd ${prefix}/usr/share/xen-tools/ && ln -s edgy.d feisty.d
+	-cd ${prefix}/usr/share/xen-tools/ && ln -s edgy.d gutsy.d
+	-cd ${prefix}/usr/share/xen-tools/ && ln -s edgy.d hardy.d
+	mkdir -p ${prefix}/usr/share/xen-tools/intrepid.d/
+	cp -R hooks/intrepid/*-* ${prefix}/usr/share/xen-tools/intrepid.d/
+	-cd ${prefix}/usr/share/xen-tools/ && ln -s intrepid.d jaunty.d
+	mkdir -p ${prefix}/usr/share/xen-tools/karmic.d/
+	cp -R hooks/karmic/*-* ${prefix}/usr/share/xen-tools/karmic.d/
+	-cd ${prefix}/usr/share/xen-tools/ && ln -s karmic.d lucid.d
+	-cd ${prefix}/usr/share/xen-tools/ && ln -s karmic.d maverick.d
+	-cd ${prefix}/usr/share/xen-tools/ && ln -s karmic.d natty.d
+	-cd ${prefix}/usr/share/xen-tools/ && ln -s karmic.d oneiric.d
+	-cd ${prefix}/usr/share/xen-tools/ && ln -s karmic.d precise.d
+	-cd ${prefix}/usr/share/xen-tools/ && ln -s karmic.d quantal.d
+	-cd ${prefix}/usr/share/xen-tools/ && ln -s karmic.d raring.d
+	cp hooks/common.sh ${prefix}/usr/share/xen-tools
+	cp -r hooks/common ${prefix}/usr/share/xen-tools
 
 
 #
@@ -303,7 +303,9 @@ uninstall:
 	-rm -rf ${prefix}/etc/xen-tools/skel
 	-rmdir ${prefix}/etc/xen-tools/
 	-rm -f ${prefix}/etc/bash_completion.d/xen-tools
+	# Maybe needed to remove older releases of xen-tools
 	rm -rf ${prefix}/usr/lib/xen-tools
+	rm -rf ${prefix}/usr/share/xen-tools
 	rm -f ${prefix}/usr/share/man/man8/xen-create-image.8.gz
 	rm -f ${prefix}/usr/share/man/man8/xen-delete-image.8.gz
 	rm -f ${prefix}/usr/share/man/man8/xen-list-images.8.gz

TODO.markdown

@@ -232,6 +232,3 @@ Axel's Break-Backwards-Compatibility Wishlist
   Maybe add some `--autostart` or such.
 
 * Maybe replace findBinary with File::Which
-
-* Move /usr/lib/xen-tools/ to /usr/share/xen-tools/ as all file in
-  there are either shell or perl scripts.

bin/xen-create-image

@@ -1426,9 +1426,9 @@ sub checkOption
             message => "takes a suffixed integer.\n",
         },
         distribution => {
-            check   => sub { -d "/usr/lib/xen-tools/$_[0].d" },
+            check   => sub { -d "/usr/share/xen-tools/$_[0].d" },
             message => "takes a distribution name " .
-                       "(see /usr/lib/xen-tools for valid values).\n",
+                       "(see /usr/share/xen-tools for valid values).\n",
         },
         imageType => {
             check   => qr/^sparse|full$/,

bin/xt-customize-image

@@ -54,7 +54,7 @@ xt-customize-image - Customize a freshly installed copy of GNU/Linux
  the --location option.
 
   For the distribution named 'foo' the scripts will be loaded and
- executed from '/usr/lib/xen-tools/foo.d'.  Each executable will
+ executed from '/usr/share/xen-tools/foo.d'.  Each executable will
  be loaded and executed in sorted order.
 
 =cut
@@ -215,7 +215,7 @@ sub checkArguments
     #  If there are no scripts then we clearly cannot
     # customise it!
     #
-    my $dir = "/usr/lib/xen-tools/" . $CONFIG{ 'dist' } . ".d";
+    my $dir = "/usr/share/xen-tools/" . $CONFIG{ 'dist' } . ".d";
 
     if ( !-d $dir )
     {
@@ -257,7 +257,7 @@ sub runDistributionHooks
     #
     #  Hook directory.
     #
-    my $hooks = "/usr/lib/xen-tools/" . $CONFIG{ 'dist' } . ".d/";
+    my $hooks = "/usr/share/xen-tools/" . $CONFIG{ 'dist' } . ".d/";
 
     #
     #  Installation prefix

bin/xt-install-image

@@ -387,7 +387,7 @@ sub checkArguments
     #  If there are no scripts then we clearly cannot
     # customise it!
     #
-    my $dir = "/usr/lib/xen-tools/" . $CONFIG{ 'dist' } . ".d";
+    my $dir = "/usr/share/xen-tools/" . $CONFIG{ 'dist' } . ".d";
 
     if ( !-d $dir )
     {

debian/NEWS

@@ -4,7 +4,14 @@ xen-tools (4.4~dev-1) UNRELEASED; urgency=low
     environment variable names are from now on converted to underscores
     ("_") before being exported. May affect some hook or role scripts.
 
- -- Axel Beckert <abe@debian.org>  Wed, 13 Mar 2013 23:22:20 +0100
+  * /usr/lib/xen-tools/ has been moved to /usr/share/xen-tools/ to
+    properly adhere to FHS. In case you had local scripts added to
+    /usr/lib/xen-tools/, please move them to /usr/share/xen-tools/, too
+    and then remove /usr/lib/xen-tools/ and its left-over subdirectories
+    which all should be empty at that point, i.e. "rmdir -p
+    /usr/lib/xen-tools/*" should do the trick.
+
+ -- Axel Beckert <abe@debian.org>  Fri, 05 Apr 2013 20:19:02 +0200
 
 xen-tools (4.2~rc1-1) unstable; urgency=low
 

debian/changelog

@@ -2,6 +2,7 @@ xen-tools (4.4~dev-1) UNRELEASED; urgency=low
 
   * New upstream release
     - Code deduplication to unify the xen-*-image scripts
+    - Moves /usr/lib/xen-tools/ to /usr/share/xen-tools/
     - Use http.debian.net as default Debian mirror if no mirror is given
       and xt-guess-suite-and-mirror is not used.
     - Fix symbolic link hooks/centos-6/15-setup-arch (Closes: #690299)

debian/dirs

@@ -1,4 +1,4 @@
 /etc/xen-tools
 /etc/xen-tools/role.d
 /etc/xen-tools/skel
-/usr/lib/xen-tools
+/usr/share/xen-tools

hooks/README

@@ -19,7 +19,7 @@ hooks/
    * The installation will have a running installation of OpenSSH
 
   The subdirectories in this hooks/ directory will be installed
- to the directory /usr/lib/xen-tools/
+ to the directory /usr/share/xen-tools/
 
 Steve
 --

hooks/centos-5/25-setup-kernel

@@ -8,8 +8,8 @@ prefix=$1
 #
 #  Source our common functions
 #
-if [ -e /usr/lib/xen-tools/common.sh ]; then
-    . /usr/lib/xen-tools/common.sh
+if [ -e /usr/share/xen-tools/common.sh ]; then
+    . /usr/share/xen-tools/common.sh
 else
     . ./hooks/common.sh
 fi

hooks/centos-6/25-setup-kernel

@@ -8,8 +8,8 @@ prefix=$1
 #
 #  Source our common functions
 #
-if [ -e /usr/lib/xen-tools/common.sh ]; then
-    . /usr/lib/xen-tools/common.sh
+if [ -e /usr/share/xen-tools/common.sh ]; then
+    . /usr/share/xen-tools/common.sh
 else
     . ./hooks/common.sh
 fi

hooks/common/01-disable-daemons

@@ -14,8 +14,8 @@ prefix=$1
 #
 #  Source our common functions
 #
-if [ -e /usr/lib/xen-tools/common.sh ]; then
-    . /usr/lib/xen-tools/common.sh
+if [ -e /usr/share/xen-tools/common.sh ]; then
+    . /usr/share/xen-tools/common.sh
 else
     . ./hooks/common.sh
 fi

hooks/common/05-shadowconfig-on

@@ -13,8 +13,8 @@ prefix=$1
 #
 #  Source our common functions
 #
-if [ -e /usr/lib/xen-tools/common.sh ]; then
-    . /usr/lib/xen-tools/common.sh
+if [ -e /usr/share/xen-tools/common.sh ]; then
+    . /usr/share/xen-tools/common.sh
 else
     . ./hooks/common.sh
 fi

hooks/common/10-disable-tls

@@ -14,8 +14,8 @@ prefix=$1
 #
 #  Source our common functions
 #
-if [ -e /usr/lib/xen-tools/common.sh ]; then
-    . /usr/lib/xen-tools/common.sh
+if [ -e /usr/share/xen-tools/common.sh ]; then
+    . /usr/share/xen-tools/common.sh
 else
     . ./hooks/common.sh
 fi

hooks/common/15-disable-hwclock

@@ -13,8 +13,8 @@ prefix=$1
 #
 #  Source our common functions
 #
-if [ -e /usr/lib/xen-tools/common.sh ]; then
-    . /usr/lib/xen-tools/common.sh
+if [ -e /usr/share/xen-tools/common.sh ]; then
+    . /usr/share/xen-tools/common.sh
 else
     . ./hooks/common.sh
 fi

hooks/common/15-setup-arch

@@ -6,8 +6,8 @@ prefix=$1
 #
 #  Source our common functions
 #
-if [ -e /usr/lib/xen-tools/common.sh ]; then
-    . /usr/lib/xen-tools/common.sh
+if [ -e /usr/share/xen-tools/common.sh ]; then
+    . /usr/share/xen-tools/common.sh
 else
     . ./hooks/common.sh
 fi

hooks/common/20-setup-apt

@@ -14,8 +14,8 @@ prefix=$1
 #
 #  Source our common functions
 #
-if [ -e /usr/lib/xen-tools/common.sh ]; then
-    . /usr/lib/xen-tools/common.sh
+if [ -e /usr/share/xen-tools/common.sh ]; then
+    . /usr/share/xen-tools/common.sh
 else
     . ./hooks/common.sh
 fi

hooks/common/20-setup-yum

@@ -13,8 +13,8 @@ prefix=$1
 #
 #  Source our common functions
 #
-if [ -e /usr/lib/xen-tools/common.sh ]; then
-    . /usr/lib/xen-tools/common.sh
+if [ -e /usr/share/xen-tools/common.sh ]; then
+    . /usr/share/xen-tools/common.sh
 else
     . ./hooks/common.sh
 fi

hooks/common/25-generate-locale

@@ -13,8 +13,8 @@ prefix=$1
 #
 #  Source our common functions
 #
-if [ -e /usr/lib/xen-tools/common.sh ]; then
-    . /usr/lib/xen-tools/common.sh
+if [ -e /usr/share/xen-tools/common.sh ]; then
+    . /usr/share/xen-tools/common.sh
 else
     . ./hooks/common.sh
 fi

hooks/common/30-disable-gettys

@@ -12,8 +12,8 @@ prefix=$1
 #
 #  Source our common functions
 #
-if [ -e /usr/lib/xen-tools/common.sh ]; then
-    . /usr/lib/xen-tools/common.sh
+if [ -e /usr/share/xen-tools/common.sh ]; then
+    . /usr/share/xen-tools/common.sh
 else
     . ./hooks/common.sh
 fi

hooks/common/40-setup-networking-deb

@@ -13,8 +13,8 @@ prefix=$1
 #
 #  Source our common functions
 #
-if [ -e /usr/lib/xen-tools/common.sh ]; then
-    . /usr/lib/xen-tools/common.sh
+if [ -e /usr/share/xen-tools/common.sh ]; then
+    . /usr/share/xen-tools/common.sh
 else
     . ./hooks/common.sh
 fi

hooks/common/40-setup-networking-rpm

@@ -13,8 +13,8 @@ prefix=$1
 #
 #  Source our common functions
 #
-if [ -e /usr/lib/xen-tools/common.sh ]; then
-    . /usr/lib/xen-tools/common.sh
+if [ -e /usr/share/xen-tools/common.sh ]; then
+    . /usr/share/xen-tools/common.sh
 else
     . ./hooks/common.sh
 fi

hooks/common/50-setup-hostname-deb

@@ -15,8 +15,8 @@ prefix=$1
 #
 #  Source our common functions
 #
-if [ -e /usr/lib/xen-tools/common.sh ]; then
-    . /usr/lib/xen-tools/common.sh
+if [ -e /usr/share/xen-tools/common.sh ]; then
+    . /usr/share/xen-tools/common.sh
 else
     . ./hooks/common.sh
 fi

hooks/common/50-setup-hostname-rpm

@@ -15,8 +15,8 @@ prefix=$1
 #
 #  Source our common functions
 #
-if [ -e /usr/lib/xen-tools/common.sh ]; then
-    . /usr/lib/xen-tools/common.sh
+if [ -e /usr/share/xen-tools/common.sh ]; then
+    . /usr/share/xen-tools/common.sh
 else
     . ./hooks/common.sh
 fi

hooks/common/55-create-dev

@@ -14,8 +14,8 @@ prefix=$1
 #
 #  Source our common functions
 #
-if [ -e /usr/lib/xen-tools/common.sh ]; then
-    . /usr/lib/xen-tools/common.sh
+if [ -e /usr/share/xen-tools/common.sh ]; then
+    . /usr/share/xen-tools/common.sh
 else
     . ./hooks/common.sh
 fi

hooks/common/60-copy-host-files

@@ -11,8 +11,8 @@ prefix=$1
 #
 #  Source our common functions
 #
-if [ -e /usr/lib/xen-tools/common.sh ]; then
-    . /usr/lib/xen-tools/common.sh
+if [ -e /usr/share/xen-tools/common.sh ]; then
+    . /usr/share/xen-tools/common.sh
 else
     . ./hooks/common.sh
 fi

hooks/common/65-copy-user-files

@@ -11,8 +11,8 @@ prefix=$1
 #
 #  Source our common functions
 #
-if [ -e /usr/lib/xen-tools/common.sh ]; then
-    . /usr/lib/xen-tools/common.sh
+if [ -e /usr/share/xen-tools/common.sh ]; then
+    . /usr/share/xen-tools/common.sh
 else
     . ./hooks/common.sh
 fi

hooks/common/70-install-ssh-deb

@@ -15,8 +15,8 @@ prefix=$1
 #
 #  Source our common functions
 #
-if [ -e /usr/lib/xen-tools/common.sh ]; then
-    . /usr/lib/xen-tools/common.sh
+if [ -e /usr/share/xen-tools/common.sh ]; then
+    . /usr/share/xen-tools/common.sh
 else
     . ./hooks/common.sh
 fi

hooks/common/70-install-ssh-rpm

@@ -13,8 +13,8 @@ prefix=$1
 #
 #  Source our common functions
 #
-if [ -e /usr/lib/xen-tools/common.sh ]; then
-    . /usr/lib/xen-tools/common.sh
+if [ -e /usr/share/xen-tools/common.sh ]; then
+    . /usr/share/xen-tools/common.sh
 else
     . ./hooks/common.sh
 fi

hooks/common/75-fixup-securetty

@@ -14,8 +14,8 @@ prefix=$1
 #
 #  Source our common functions
 #
-if [ -e /usr/lib/xen-tools/common.sh ]; then
-    . /usr/lib/xen-tools/common.sh
+if [ -e /usr/share/xen-tools/common.sh ]; then
+    . /usr/share/xen-tools/common.sh
 else
     . ./hooks/common.sh
 fi

hooks/common/80-install-modules-deb

@@ -19,8 +19,8 @@ prefix=$1
 #
 #  Source our common functions
 #
-if [ -e /usr/lib/xen-tools/common.sh ]; then
-    . /usr/lib/xen-tools/common.sh
+if [ -e /usr/share/xen-tools/common.sh ]; then
+    . /usr/share/xen-tools/common.sh
 else
     . ./hooks/common.sh
 fi

hooks/common/80-install-modules-rpm

@@ -19,8 +19,8 @@ prefix=$1
 #
 #  Source our common functions
 #
-if [ -e /usr/lib/xen-tools/common.sh ]; then
-    . /usr/lib/xen-tools/common.sh
+if [ -e /usr/share/xen-tools/common.sh ]; then
+    . /usr/share/xen-tools/common.sh
 else
     . ./hooks/common.sh
 fi

hooks/common/81-install-modules-init-tools

@@ -13,8 +13,8 @@ prefix=$1
 #
 #  Source our common functions
 #
-if [ -e /usr/lib/xen-tools/common.sh ]; then
-    . /usr/lib/xen-tools/common.sh
+if [ -e /usr/share/xen-tools/common.sh ]; then
+    . /usr/share/xen-tools/common.sh
 else
     . ./hooks/common.sh
 fi

hooks/common/82-install-grub-legacy

@@ -14,8 +14,8 @@ prefix=$1
 #
 #  Source our common functions
 #
-if [ -e /usr/lib/xen-tools/common.sh ]; then
-    . /usr/lib/xen-tools/common.sh
+if [ -e /usr/share/xen-tools/common.sh ]; then
+    . /usr/share/xen-tools/common.sh
 else
     . ./hooks/common.sh
 fi

hooks/common/90-make-fstab

@@ -17,8 +17,8 @@ prefix=$1
 #
 #  Source our common functions
 #
-if [ -e /usr/lib/xen-tools/common.sh ]; then
-    . /usr/lib/xen-tools/common.sh
+if [ -e /usr/share/xen-tools/common.sh ]; then
+    . /usr/share/xen-tools/common.sh
 else
     . ./hooks/common.sh
 fi

hooks/common/99-clean-image-deb

@@ -13,8 +13,8 @@ prefix=$1
 #
 #  Source our common functions
 #
-if [ -e /usr/lib/xen-tools/common.sh ]; then
-    . /usr/lib/xen-tools/common.sh
+if [ -e /usr/share/xen-tools/common.sh ]; then
+    . /usr/share/xen-tools/common.sh
 else
     . ./hooks/common.sh
 fi

hooks/common/99-clean-image-rpm

@@ -12,8 +12,8 @@ prefix=$1
 #
 #  Source our common functions
 #
-if [ -e /usr/lib/xen-tools/common.sh ]; then
-    . /usr/lib/xen-tools/common.sh
+if [ -e /usr/share/xen-tools/common.sh ]; then
+    . /usr/share/xen-tools/common.sh
 else
     . ./hooks/common.sh
 fi

hooks/common/99-enable-daemons

@@ -14,8 +14,8 @@ prefix=$1
 #
 #  Source our common functions
 #
-if [ -e /usr/lib/xen-tools/common.sh ]; then
-    . /usr/lib/xen-tools/common.sh
+if [ -e /usr/share/xen-tools/common.sh ]; then
+    . /usr/share/xen-tools/common.sh
 else
     . ./hooks/common.sh
 fi

hooks/debian/20-setup-apt

@@ -14,8 +14,8 @@ prefix=$1
 #
 #  Source our common functions
 #
-if [ -e /usr/lib/xen-tools/common.sh ]; then
-    . /usr/lib/xen-tools/common.sh
+if [ -e /usr/share/xen-tools/common.sh ]; then
+    . /usr/share/xen-tools/common.sh
 else
     . ./hooks/common.sh
 fi

hooks/debian/80-install-kernel

@@ -15,8 +15,8 @@ prefix=$1
 #  Source our common functions
 #
 
-if [ -e /usr/lib/xen-tools/common.sh ]; then
-    . /usr/lib/xen-tools/common.sh
+if [ -e /usr/share/xen-tools/common.sh ]; then
+    . /usr/share/xen-tools/common.sh
 else
     . ./hooks/common.sh
 fi

hooks/debian/95-configure-locales

@@ -12,8 +12,8 @@ prefix=$1
 #
 #  Source our common functions
 #
-if [ -e /usr/lib/xen-tools/common.sh ]; then
-    . /usr/lib/xen-tools/common.sh
+if [ -e /usr/share/xen-tools/common.sh ]; then
+    . /usr/share/xen-tools/common.sh
 else
     . ./hooks/common.sh
 fi

hooks/edgy/80-install-kernel

@@ -15,8 +15,8 @@ prefix=$1
 #  Source our common functions
 #
 
-if [ -e /usr/lib/xen-tools/common.sh ]; then
-    . /usr/lib/xen-tools/common.sh
+if [ -e /usr/share/xen-tools/common.sh ]; then
+    . /usr/share/xen-tools/common.sh
 else
     . ./hooks/common.sh
 fi

hooks/gentoo/20-enable-su

@@ -12,8 +12,8 @@ prefix=$1
 #
 #  Source our common functions
 #
-if [ -e /usr/lib/xen-tools/common.sh ]; then
-    . /usr/lib/xen-tools/common.sh
+if [ -e /usr/share/xen-tools/common.sh ]; then
+    . /usr/share/xen-tools/common.sh
 else
     . ./hooks/common.sh
 fi

hooks/gentoo/40-setup-networking

@@ -12,8 +12,8 @@ prefix=$1
 #
 #  Source our common functions
 #
-if [ -e /usr/lib/xen-tools/common.sh ]; then
-    . /usr/lib/xen-tools/common.sh
+if [ -e /usr/share/xen-tools/common.sh ]; then
+    . /usr/share/xen-tools/common.sh
 else
     . ./hooks/common.sh
 fi

hooks/gentoo/50-setup-hostname

@@ -15,8 +15,8 @@ prefix=$1
 #
 #  Source our common functions
 #
-if [ -e /usr/lib/xen-tools/common.sh ]; then
-    . /usr/lib/xen-tools/common.sh
+if [ -e /usr/share/xen-tools/common.sh ]; then
+    . /usr/share/xen-tools/common.sh
 else
     . ./hooks/common.sh
 fi

hooks/gentoo/70-install-ssh

@@ -16,8 +16,8 @@ prefix=$1
 #
 #  Source our common functions
 #
-if [ -e /usr/lib/xen-tools/common.sh ]; then
-    . /usr/lib/xen-tools/common.sh
+if [ -e /usr/share/xen-tools/common.sh ]; then
+    . /usr/share/xen-tools/common.sh
 else
     . ./hooks/common.sh
 fi

hooks/intrepid/80-install-kernel

@@ -15,8 +15,8 @@ prefix=$1
 #  Source our common functions
 #
 
-if [ -e /usr/lib/xen-tools/common.sh ]; then
-    . /usr/lib/xen-tools/common.sh
+if [ -e /usr/share/xen-tools/common.sh ]; then
+    . /usr/share/xen-tools/common.sh
 else
     . ./hooks/common.sh
 fi

hooks/karmic/80-install-kernel

@@ -15,8 +15,8 @@ prefix=$1
 #  Source our common functions
 #
 
-if [ -e /usr/lib/xen-tools/common.sh ]; then
-    . /usr/lib/xen-tools/common.sh
+if [ -e /usr/share/xen-tools/common.sh ]; then
+    . /usr/share/xen-tools/common.sh
 else
     . ./hooks/common.sh
 fi

misc/xen-tools.bash-completion

@@ -65,8 +65,8 @@ _xen_create_image()
     # Available distributions, by which we mean distributions which
     # we have hook scripts available.
     #
-    for i in `/bin/ls -1 /usr/lib/xen-tools/ ` ; do
-        if [ -d /usr/lib/xen-tools/${i} ]; then
+    for i in `/bin/ls -1 /usr/share/xen-tools/ ` ; do
+        if [ -d /usr/share/xen-tools/${i} ]; then
             dists="${dists} ${i/.d/}"
         fi
     done

misc/xen-tools.spec

@@ -40,7 +40,7 @@ rm -rf $RPM_BUILD_ROOT
 /etc/bash_completion.d/*
 /usr/bin/*
 /usr/share/man/man8/*
-/usr/lib/xen-tools
+/usr/share/xen-tools
 
 
 %changelog

roles/builder

@@ -15,8 +15,8 @@ prefix=$1
 #
 #  Source our common functions - this will let us install a Debian package.
 #
-if [ -e /usr/lib/xen-tools/common.sh ]; then
-    . /usr/lib/xen-tools/common.sh
+if [ -e /usr/share/xen-tools/common.sh ]; then
+    . /usr/share/xen-tools/common.sh
 else
     echo "Installation problem"
 fi

roles/cfengine

@@ -11,8 +11,8 @@ prefix=$1
 #
 #  Source our common functions - this will let us install a Debian package.
 #
-if [ -e /usr/lib/xen-tools/common.sh ]; then
-    . /usr/lib/xen-tools/common.sh
+if [ -e /usr/share/xen-tools/common.sh ]; then
+    . /usr/share/xen-tools/common.sh
 else
     echo "Installation problem"
 fi

roles/editor

@@ -30,8 +30,8 @@ source=/etc/xen-tools/sed.d/
 #
 #  Source our common functions - this will let us install a Debian package.
 #
-if [ -e /usr/lib/xen-tools/common.sh ]; then
-    . /usr/lib/xen-tools/common.sh
+if [ -e /usr/share/xen-tools/common.sh ]; then
+    . /usr/share/xen-tools/common.sh
 else
     echo "Installation problem"
 fi

roles/gdm

@@ -15,8 +15,8 @@ prefix=$1
 #
 #  Source our common functions - this will let us install a Debian package.
 #
-if [ -e /usr/lib/xen-tools/common.sh ]; then
-    . /usr/lib/xen-tools/common.sh
+if [ -e /usr/share/xen-tools/common.sh ]; then
+    . /usr/share/xen-tools/common.sh
 else
     echo "Installation problem"
 fi

roles/minimal

@@ -16,8 +16,8 @@ prefix=$1
 #
 #  Source our common functions - this will let us install a Debian package.
 #
-if [ -e /usr/lib/xen-tools/common.sh ]; then
-    . /usr/lib/xen-tools/common.sh
+if [ -e /usr/share/xen-tools/common.sh ]; then
+    . /usr/share/xen-tools/common.sh
 else
     echo "Installation problem"
 fi

roles/puppet

@@ -11,8 +11,8 @@ prefix=$1
 #
 #  Source our common functions - this will let us install a Debian package.
 #
-if [ -e /usr/lib/xen-tools/common.sh ]; then
-    . /usr/lib/xen-tools/common.sh
+if [ -e /usr/share/xen-tools/common.sh ]; then
+    . /usr/share/xen-tools/common.sh
 else
     echo "Installation problem"
 fi

roles/resolv

@@ -8,8 +8,8 @@ prefix=$1
 #
 #  Source our common functions - this will let us install a Debian package.
 #
-if [ -e /usr/lib/xen-tools/common.sh ]; then
-    . /usr/lib/xen-tools/common.sh
+if [ -e /usr/share/xen-tools/common.sh ]; then
+    . /usr/share/xen-tools/common.sh
 else
     echo "Installation problem"
 fi

roles/sudoers

@@ -8,8 +8,8 @@ prefix=$1
 #
 #  Source our common functions - this will let us install a Debian package.
 #
-if [ -e /usr/lib/xen-tools/common.sh ]; then
-    . /usr/lib/xen-tools/common.sh
+if [ -e /usr/share/xen-tools/common.sh ]; then
+    . /usr/share/xen-tools/common.sh
 else
     echo "Installation problem"
 fi

roles/tmpfs

@@ -12,8 +12,8 @@ prefix=$1
 #
 #  Source our common functions
 #
-if [ -e /usr/lib/xen-tools/common.sh ]; then
-    . /usr/lib/xen-tools/common.sh
+if [ -e /usr/share/xen-tools/common.sh ]; then
+    . /usr/share/xen-tools/common.sh
 else
     . ./hooks/common.sh
 fi

roles/udev

@@ -15,8 +15,8 @@ prefix=$1
 #
 #  Source our common functions - this will let us install a Debian package.
 #
-if [ -e /usr/lib/xen-tools/common.sh ]; then
-    . /usr/lib/xen-tools/common.sh
+if [ -e /usr/share/xen-tools/common.sh ]; then
+    . /usr/share/xen-tools/common.sh
 else
     echo "Installation problem"
 fi

roles/xdm

@@ -15,8 +15,8 @@ prefix=$1
 #
 #  Source our common functions - this will let us install a Debian package.
 #
-if [ -e /usr/lib/xen-tools/common.sh ]; then
-    . /usr/lib/xen-tools/common.sh
+if [ -e /usr/share/xen-tools/common.sh ]; then
+    . /usr/share/xen-tools/common.sh
 else
     echo "Installation problem"
 fi