* nem address for me

* fix bos restart
* fix init.d scripts

diff --git a/debian/changelog b/debian/changelog
index d55c603b77402d0d5978fae0ee614fa8a977bf7d..53bfe82174da7c0cd47b2eb6a75b0e0b7a445f0f 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,13 @@
+openafs (1.0.1-2) unstable; urgency=medium
+
+  * New maintainer address.
+  * Depend on debhelper 2.1.16 for /usr/share/doc symlinks.
+  * Only run init script once; confusion with DH_OPTIONS
+  * Fix bosserver to look in /usr/openafs/lib so it restarts correctly every Sunday.
+  * Upload to Debian (Gloses: BUG#69336)
+
+ -- Sam Hartman <hartmans@debian.org>  Wed,  6 Dec 2000 10:28:13 -0500
+
 openafs (1.0.1-1) unstable; urgency=low
 
   * New upstream version

diff --git a/debian/control b/debian/control
index 4aae356267b95f866e1f12c5d7156264d13f668d..d13d955fb864367be9e2a40278170d51a5d92649 100644 (file)
--- a/debian/control
+++ b/debian/control
@@ -1,8 +1,8 @@
 Source: openafs
 Section: non-us/main
 Priority: optional
-Maintainer: Sam Hartman <hartmans@mit.edu>
-Build-Depends: debhelper (>= 2.0.0), libncurses5-dev, libpam0g-dev, bison
+Maintainer: Sam Hartman <hartmans@debian.org>
+Build-Depends: debhelper (>= 2.1.16), libncurses5-dev, libpam0g-dev, bison
 Standards-Version: 3.1.1
 
 Package: openafs-client

diff --git a/debian/rules b/debian/rules
index 991ad319bc164f414d1d76eeeaeefe7d51f50183..632fad4dd9f5dcfc08c91f5713532f4ee00f4298 100755 (executable)
--- a/debian/rules
+++ b/debian/rules
@@ -142,8 +142,8 @@ binary-arch: build install
        dh_installmenu
 #      dh_installemacsen
 #      dh_installpam
-       dh_installinit -popenafs-client -r -- defaults 25 18
-       dh_installinit -popenafs-fileserver -r
+       DH_OPTIONS= dh_installinit -popenafs-client -r -- defaults 25 18
+       DH_OPTIONS= dh_installinit -popenafs-fileserver -r
        dh_installcron
 #      dh_installmanpages
        dh_installinfo

diff --git a/src/util/dirpath.c b/src/util/dirpath.c
index 589c81c3ed8540381d2eebc137f2208640b3e68c..1fd00bf12957c8f5b578a719208d2570454b8f46 100644 (file)
--- a/src/util/dirpath.c
+++ b/src/util/dirpath.c
@@ -277,7 +277,7 @@ static void initDirPathArray(void)
   AFSDIR_SERVER_FILEPATH(pathp, AFSDIR_CANONICAL_SERVER_LOCAL_DIRPATH, AFSDIR_BOZINIT_FILE);
 
   pathp = dirPathArray[AFSDIR_SERVER_BOSVR_FILEPATH_ID];
-  AFSDIR_SERVER_FILEPATH(pathp, AFSDIR_CANONICAL_SERVER_BIN_DIRPATH, AFSDIR_BOSVR_FILE);
+  AFSDIR_SERVER_FILEPATH(pathp, "/usr/sbin", AFSDIR_BOSVR_FILE);
 
   pathp = dirPathArray[AFSDIR_SERVER_VOLSERLOG_FILEPATH_ID];
   AFSDIR_SERVER_FILEPATH(pathp, AFSDIR_CANONICAL_SERVER_LOGS_DIRPATH, AFSDIR_VOLSERLOG_FILE);

diff --git a/src/util/dirpath.h b/src/util/dirpath.h
index 39d4711371882131d680abb81f79c266abb1a4bc..bd25864f2324820f4038c38f2345188a04e3e195 100644 (file)
--- a/src/util/dirpath.h
+++ b/src/util/dirpath.h
@@ -102,7 +102,7 @@ ConstructLocalLogPath(const char *cpath,
 
 /* afs installation dir names */
 #define AFSDIR_ETC_DIR   ""
-#define AFSDIR_BIN_DIR   "bin"
+#define AFSDIR_BIN_DIR   ""
 #define AFSDIR_CORES_DIR "cores"
 #define AFSDIR_DB_DIR    "db"
 #define AFSDIR_LOGS_DIR  "logs"