Properly install afszcm.cat

* Upstream now installs afszcm.cat and finds it in /usr/share/openafs/C,
  so use the version installed via make install and install it in the
  same location.

diff --git a/debian/changelog b/debian/changelog
index a2c9e5fe4746220bee1f4e040b364ce45999f1d9..21034aeffcd782a7b3f3d2ffcd33c5a51d7f25b9 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -23,6 +23,9 @@ openafs (1.5.69+dfsg-1) UNRELEASED; urgency=low
     should be mode 0600 anyway.  Drop the patch to bosserver to allow more
     restrictive permissions.  bosserver will complain about directory
     permissions after upgrade until the directory is manually changed.
+  * Upstream now installs afszcm.cat and finds it in /usr/share/openafs/C,
+    so use the version installed via make install and install it in the
+    same location.
   * Add README.source explaining maintenance procedures and a
     debian/import-upstream script to do a Git-aware merge of a new
     upstream release that will allow us to cherry-pick upstream patches

diff --git a/debian/openafs-client.install b/debian/openafs-client.install
index 8653adb044787a849a4f73b960058d2bad56f7df..b0a8ac207ce65cc07a5d585d8acd065b094a2c48 100644 (file)
--- a/debian/openafs-client.install
+++ b/debian/openafs-client.install
@@ -31,9 +31,8 @@ debian/tmp/usr/sbin/rmtsysd             usr/sbin
 
 debian/tmp/usr/sbin/afsd                sbin
 
-src/afs/afszcm.cat                      usr/share/openafs
-
-debian/CellServDB                       usr/share/openafs
+debian/CellServDB                                     usr/share/openafs
+debian/tmp/usr/share/openafs/C/afszcm.cat             usr/share/openafs/C
 
 debian/tmp/usr/share/man/man1/afs.1                   usr/share/man/man1
 debian/tmp/usr/share/man/man1/afs-up.1                usr/share/man/man1