Backport 1.4.6.dfsg1-3 to etch.

diff --git a/debian/changelog b/debian/changelog
index f52af06f5971566a565020e18b94b035b9a95178..7cbf4e59aeda792bfaf3394448a5c7f3b880fe4e 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,8 +1,19 @@
-openafs (1.4.6.dfsg1-2~40bpo1) etch-backports; urgency=low
+openafs (1.4.6.dfsg1-3~bpo40+1) etch-backports; urgency=low
 
-  * Backport 1.4.6.dfsg1-2 to etch.
+  * Backport 1.4.6.dfsg1-3 to etch.  (No changes needed.)
 
- -- Noah Meyerhans <noahm@debian.org>  Mon, 14 Jan 2008 16:41:42 -0500
+ -- Noah Meyerhans <noahm@debian.org>  Wed,  5 Mar 2008 16:41:53 -0500
+
+openafs (1.4.6.dfsg1-3) unstable; urgency=low
+
+  * Fix FTBFS caused by a change in dh_strip behavior.  It no longer
+    creates empty files for already stripped binaries, so we should no
+    longer remove them.  Thanks, Lucas Nussbaum.  (Closes: #464274)
+  * Include debugging symbols for libpam-openafs-kaserver in openafs-dbg.
+  * Do not stop daemons in run-level S.  This isn't a real run-level and
+    hence there's no reason to create the links.
+
+ -- Russ Allbery <rra@debian.org>  Wed, 06 Feb 2008 11:24:19 -0800
 
 openafs (1.4.6.dfsg1-2) unstable; urgency=low
 

diff --git a/debian/control b/debian/control
index d8b53d9344df321af6a50e19e499d3c8dd26acea..d72177ddd7f5e40a63838dd9c0fec2d84e23ab97 100644 (file)
--- a/debian/control
+++ b/debian/control
@@ -132,6 +132,7 @@ Description: AFS distributed filesystem kaserver PAM module
 Package: openafs-dbg
 Priority: extra
 Depends: openafs-fileserver (= ${binary:Version})
+ | libpam-openafs-kaserver (= ${binary:Version})
 Architecture: i386 powerpc sparc alpha s390 ia64 hppa amd64 ppc64 s390x
 Section: libdevel
 Description: AFS distributed filesystem debugging information
@@ -140,4 +141,4 @@ Description: AFS distributed filesystem debugging information
  control, authentication, backup and administrative management.
  .
  This package contains the debugging information for the OpenAFS
- fileserver and volserver.
+ fileserver and volserver and for libpam-openafs-kaserver.

diff --git a/debian/genchanges.sh b/debian/genchanges.sh
deleted file mode 100644 (file)
index e69de29..0000000

diff --git a/debian/openafs-client.init b/debian/openafs-client.init
index 7d7cac9bd50d73cdcfee924ff48b4f9a4423d931..81e5b5ddc1fcd809521461ccf1be51c33293d0fb 100755 (executable)
--- a/debian/openafs-client.init
+++ b/debian/openafs-client.init
@@ -5,7 +5,7 @@
 # Required-Stop:        $local_fs $remote_fs $network
 # Should-Start:         $local_fs $remote_fs
 # Default-Start:        2 3 4 5
-# Default-Stop:         S 0 1 6
+# Default-Stop:         0 1 6
 # Short-Description:    OpenAFS client
 # Description:          Starts or stops the OpenAFS client, loading the
 #                       OpenAFS kernel module as necessary.

diff --git a/debian/openafs-fileserver.init b/debian/openafs-fileserver.init
index 29c85b14d19dda6e22a78e20eac92e6387933d49..5db046378cf16f071d2a3e37f5d67de1b15d2449 100755 (executable)
--- a/debian/openafs-fileserver.init
+++ b/debian/openafs-fileserver.init
@@ -4,7 +4,7 @@
 # Required-Start:       $local_fs $remote_fs $network $time
 # Required-Stop:        $local_fs $remote_fs $network
 # Default-Start:        2 3 4 5
-# Default-Stop:         S 0 1 6
+# Default-Stop:         0 1 6
 # Short-Description:    OpenAFS file and database server manager
 # Description:          Starts, stops, or restarts the OpenAFS bosserver,
 #                       which is the process that starts and manages the

diff --git a/debian/patches/amd64-syscall-probe b/debian/patches/amd64-syscall-probe
deleted file mode 100644 (file)
index e69de29..0000000

diff --git a/debian/patches/des-alignment b/debian/patches/des-alignment
deleted file mode 100644 (file)
index e69de29..0000000

diff --git a/debian/patches/ka-forwarder b/debian/patches/ka-forwarder
deleted file mode 100644 (file)
index e69de29..0000000

diff --git a/debian/patches/kbuild-assembly b/debian/patches/kbuild-assembly
deleted file mode 100644 (file)
index e69de29..0000000

diff --git a/debian/patches/linux-2.6.22 b/debian/patches/linux-2.6.22
deleted file mode 100644 (file)
index e69de29..0000000

diff --git a/debian/patches/linux-2.6.22.1-proc b/debian/patches/linux-2.6.22.1-proc
deleted file mode 100644 (file)
index e69de29..0000000

diff --git a/debian/patches/null-uuid-client b/debian/patches/null-uuid-client
deleted file mode 100644 (file)
index e69de29..0000000

diff --git a/debian/patches/null-uuid-server b/debian/patches/null-uuid-server
deleted file mode 100644 (file)
index e69de29..0000000

diff --git a/debian/patches/pag-cleanup-lock b/debian/patches/pag-cleanup-lock
deleted file mode 100644 (file)
index e69de29..0000000

diff --git a/debian/patches/paravirt-workaround b/debian/patches/paravirt-workaround
deleted file mode 100644 (file)
index e69de29..0000000

diff --git a/debian/patches/pt_util-man-page b/debian/patches/pt_util-man-page
deleted file mode 100644 (file)
index e69de29..0000000

diff --git a/debian/rules b/debian/rules
index 5eb4d9ecdca9a6e4cca7884ca43035ebb350860b..2f0beace2b01f6d4b27aa5953b4c224f688e03a5 100755 (executable)
--- a/debian/rules
+++ b/debian/rules
@@ -217,12 +217,6 @@ binary-arch: install-stamp
        DH_OPTIONS= dh_installinit -popenafs-fileserver -r
        dh_link
        dh_strip --dbg-package=openafs-dbg
-       rm -r debian/openafs-dbg/usr/lib/debug/lib
-       rm -r debian/openafs-dbg/usr/lib/debug/sbin
-       rm -r debian/openafs-dbg/usr/lib/debug/usr/bin
-       rm -r debian/openafs-dbg/usr/lib/debug/usr/sbin
-       cd debian/openafs-dbg/usr/lib/debug/usr/lib/openafs \
-           && rm buserver ptserver salvager upserver upclient vlserver
        dh_compress
        dh_fixperms
        chmod 700 debian/openafs-client/var/cache/openafs

diff --git a/doc/html/AdminGuide/cachmgr.gif b/doc/html/AdminGuide/cachmgr.gif
new file mode 100755 (executable)
index 0000000..48dda88
Binary files /dev/null and b/doc/html/AdminGuide/cachmgr.gif differ

diff --git a/doc/html/AdminGuide/fserver1.gif b/doc/html/AdminGuide/fserver1.gif
new file mode 100755 (executable)
index 0000000..5d62af5
Binary files /dev/null and b/doc/html/AdminGuide/fserver1.gif differ

diff --git a/doc/html/AdminGuide/fserver2.gif b/doc/html/AdminGuide/fserver2.gif
new file mode 100755 (executable)
index 0000000..47cad10
Binary files /dev/null and b/doc/html/AdminGuide/fserver2.gif differ

diff --git a/doc/html/AdminGuide/overview.gif b/doc/html/AdminGuide/overview.gif
new file mode 100755 (executable)
index 0000000..dd17f94
Binary files /dev/null and b/doc/html/AdminGuide/overview.gif differ

diff --git a/doc/html/AdminGuide/scout1.gif b/doc/html/AdminGuide/scout1.gif
new file mode 100755 (executable)
index 0000000..00bcb9d
Binary files /dev/null and b/doc/html/AdminGuide/scout1.gif differ

diff --git a/doc/html/AdminGuide/scout2.gif b/doc/html/AdminGuide/scout2.gif
new file mode 100755 (executable)
index 0000000..391982b
Binary files /dev/null and b/doc/html/AdminGuide/scout2.gif differ

diff --git a/doc/html/AdminGuide/scout3.gif b/doc/html/AdminGuide/scout3.gif
new file mode 100755 (executable)
index 0000000..7212d94
Binary files /dev/null and b/doc/html/AdminGuide/scout3.gif differ

diff --git a/doc/html/AdminGuide/scout4.gif b/doc/html/AdminGuide/scout4.gif
new file mode 100755 (executable)
index 0000000..556b97a
Binary files /dev/null and b/doc/html/AdminGuide/scout4.gif differ

diff --git a/doc/html/AdminGuide/vnode.gif b/doc/html/AdminGuide/vnode.gif
new file mode 100755 (executable)
index 0000000..bbf7f69
Binary files /dev/null and b/doc/html/AdminGuide/vnode.gif differ

diff --git a/doc/man-pages/check-pod b/doc/man-pages/check-pod
old mode 100644 (file)
new mode 100755 (executable)

diff --git a/src/packaging/Debian/CellServDB b/src/packaging/Debian/CellServDB
deleted file mode 100644 (file)
index e69de29..0000000

diff --git a/src/packaging/HP-UX/files/usr/vice/etc/CellServDB b/src/packaging/HP-UX/files/usr/vice/etc/CellServDB
deleted file mode 100644 (file)
index e69de29..0000000