Commit changes for 1.0.4-1

diff --git a/debian/changelog b/debian/changelog
index 8bf8934c96c3f1e06172ea2e5087abfd0a2ddc04..0c027dcc736b835170f3caa5b735aaff7285434e 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,14 @@
+openafs (1.0.4-1) unstable; urgency=low
+
+  * New upstream version, closes: #92776
+  * Allow openafs-client to depend on openafs-modules-source not just
+    openafs-modules.  This allows us to be installable on testing even
+    without binary modules which may become a necessity given the current
+    kernel image mess.
+  *  implement target for modules_clean, closes: #95049
+
+ -- Sam Hartman <hartmans@debian.org>  Tue, 24 Apr 2001 14:56:57 -0400
+
 openafs (1.0.3-2) unstable; urgency=low
 
   * Fix  direntry type to be DT_UNKNOWN not DT_DIR on Linux (contributed upstream)

diff --git a/debian/control b/debian/control
index 8e53b647e3af99b5508052492e271a6b11900b78..2b4658acb2b8fce3adaa24d3df01962cbf545c34 100644 (file)
--- a/debian/control
+++ b/debian/control
@@ -7,7 +7,7 @@ Standards-Version: 3.5.0
 
 Package: openafs-client
 Architecture: i386 powerpc sparc
-Depends: ${shlibs:Depends}, debconf, host|dnsutils, openafs-modules
+Depends: ${shlibs:Depends}, debconf, host|dnsutils, openafs-modules-source|openafs-modules
 Conflicts: arla
 Description: The AFS distributed filesystem- client support
  AFS is a distributed filesystem allowing cross-platform sharing of

diff --git a/debian/rules b/debian/rules
index 5a56b6145c70124724b256be88a7289bbb493630..ae8a0d8587873bd61025950c2761b2463e3d0cee 100755 (executable)
--- a/debian/rules
+++ b/debian/rules
@@ -187,9 +187,9 @@ kdist:  build-modules
 
 
 
-dist_config: configure
+kdist_config: configure
 
-dist_clean: clean
+kdist_clean: clean
 
 ############################ source stuff #################################
 binary-source:

diff --git a/src/afsd/Makefile b/src/afsd/Makefile
index b518a9f7bedb5ffce1b4354612286eab14e2cdc9..27be8a9d3ba17e86196d526a9829dd49a6179cb1 100644 (file)
--- a/src/afsd/Makefile
+++ b/src/afsd/Makefile
@@ -100,7 +100,7 @@ install: all
                        ${INSTALL} afs.rc.hpux10 ${DESTDIR}root.client/usr/vice/etc/dkload/afs.rc ;;\
                *linux* ) \
                        ${INSTALLex}  -f afs.rc.linux ${DESTDIR}root.client/usr/vice/etc/afs.rc; \
-                       ${INSTALL}  afs.conf.linux ${DESTDIR}root.client/usr/vice/etc/afs.conf ;; \
+                       ${INSTALL}  -f afs.conf.linux ${DESTDIR}root.client/usr/vice/etc/afs.conf ;; \
                ppc_darwin*) \
                        mkdir -p ${DESTDIR}root.client/usr/vice/etc/afs.kext/Contents/MacOS ;\
                        ${INSTALL} -f afs.ppc_darwin.plist ${DESTDIR}root.client/usr/vice/etc/afs.kext/Contents/Info.plist ; \

diff --git a/src/libafs/MakefileProto.LINUX b/src/libafs/MakefileProto.LINUX
index d8adcad3eb40d6577c14065157292b69034befb8..d7b36466ae2437d43071bd7031e44f9f7ac20fda 100644 (file)
--- a/src/libafs/MakefileProto.LINUX
+++ b/src/libafs/MakefileProto.LINUX
@@ -164,7 +164,6 @@ libafs.mp: $(DEST_LIBAFS_MP)
        echo MP Build Complete
 
 $(DEST_LIBAFS): $(LIBAFS)
-       ${INSTALL} -d $(@D)
        ${INSTALL} $? $@
 
 $(DEST_LIBAFS_MP): $(LIBAFS_MP)