* use make only_libafs not dest_only_libafs

    - AS a result, build times are much faster, Closes: #144781
  * Correct module build scripts to install module package from new location
  * Require 1.3.64 clients for modules built by 1.3.64
* installo penafs.o not libafs-*.o

diff --git a/debian/changelog b/debian/changelog
index a941c9cd4b9510ba19634b57153555ff443101d6..0d6deb9e10dd70687e9752716bf780bd070911bc 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,10 +3,12 @@ openafs (1.3.64-1) experimental; urgency=low
   * New upstream version
   * Add 2.6 to kern-sysname for i386
   * Apply patch from
-    /afs/cs.cmu.edu/user/jhutz/junk/openafs-patches/openafs-build-on-linux26  which correctly generates 2.6 modules.
+    /afs/cs.cmu.edu/user/jhutz/junk/openafs-patches/openafs-build-on-linux26  which correctly generates 2.6 modules, Closes: #234284
   * use make only_libafs not dest_only_libafs
+    - AS a result, build times are much faster, Closes: #144781
+  * Correct module build scripts to install module package from new location
 
- -- Sam Hartman <hartmans@debian.org>  Sun, 30 May 2004 16:02:19 -0400
+ --
 
 openafs (1.2.11-1) unstable; urgency=high
 

diff --git a/debian/control.module b/debian/control.module
index c72c5a6eda076e8602657509342f12df5440e5f7..2c175bad6b55f77d2c8fd03eecfc089c11211f4d 100644 (file)
--- a/debian/control.module
+++ b/debian/control.module
@@ -5,7 +5,7 @@ Maintainer: Sam Hartman <hartmans@debian.org>
 Standards-Version: 3.1.1
 
 Package: openafs-modules-=KVERS
-Conflicts: openafs-client (<< 1.2.9)
+Conflicts: openafs-client (<< 1.3.64)
 Provides: openafs-modules2
 Architecture: any
 Description: The AFS distributed filesystem- Kernel Module

diff --git a/debian/control.module-image b/debian/control.module-image
index f1aaf33926107b937af0bfc7a857db465420b342..fca77aa9a9ca79cd5386cbc05a85643ed82b501d 100644 (file)
--- a/debian/control.module-image
+++ b/debian/control.module-image
@@ -5,7 +5,7 @@ Maintainer: Sam Hartman <hartmans@debian.org>
 Standards-Version: 3.1.1
 
 Package: openafs-modules-=KVERS
-Conflicts: openafs-client (<< 1.2.9)
+Conflicts: openafs-client (<< 1.3.64)
 Provides: openafs-modules2
 Architecture: any
 Recommends: kernel-image-=KVERS (= =KREVS)

diff --git a/debian/rules b/debian/rules
index c6b7b5e3ba75ecbf64041b015f08cd8edc589149..86bc59e555b6de1a36088256e48d3b1b7d0d79bc 100755 (executable)
--- a/debian/rules
+++ b/debian/rules
@@ -240,7 +240,7 @@ binary-modules: build-modules
 
 # Install the software
        install -d -g root -o root -m 755 debian/$(modulepkg)/lib/modules/$(KVERS)/fs
-       install -g root -o root -m 755  dest/root.client/usr/vice/etc/modload/*.o \
+       install -g root -o root -m 755  debian/tmp/lib/openafs/*o \
                debian/$(modulepkg)/lib/modules/$(KVERS)/fs
 # Fix some stuff up
        install -d -o root -g root -m 755 debian/$(modulepkg)/usr/share/doc

diff --git a/src/libafs/MakefileProto.LINUX.in b/src/libafs/MakefileProto.LINUX.in
index aeaf2ba94316373ea19de3ce352799d8044393c5..51d4ce4baa8adb3a221f42518e27a2cd353e2ce4 100644 (file)
--- a/src/libafs/MakefileProto.LINUX.in
+++ b/src/libafs/MakefileProto.LINUX.in
@@ -201,8 +201,8 @@ linux_destdirs_libafs.bm: dest_libafs.bm
 
 # Below this line are targets when in the COMMON directory:
 # For Linux there is no kernel NFS server.
-LIBAFS = libafs-${CLIENT}.${LINUX_MODULE_EXT}
-LIBAFS_MP = libafs-${CLIENT}.mp.${LINUX_MODULE_EXT}
+LIBAFS = openafs.${LINUX_MODULE_EXT}
+LIBAFS_MP = openafs.${LINUX_MODULE_EXT}
 LIBAFS_EP = libafs-${CLIENT}.ep.${LINUX_MODULE_EXT}
 LIBAFS_BM = libafs-${CLIENT}.bm.${LINUX_MODULE_EXT}