Merge from trunk up through 1.2.12-1

diff --git a/debian/changelog b/debian/changelog
index 62198c8764c636f3b194e6c6dcdcb53af16703ec..7d622a421d1089535452b3a877dc8d7105864d15 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -46,6 +46,34 @@ openafs (1.3.64-1) experimental; urgency=low
 
  -- Sam Hartman <hartmans@debian.org>  Sun, 30 May 2004 18:12:54 -0400
 
+openafs (1.2.12-1) unstable; urgency=medium
+
+  * New upstream version
+  * Medium urgency because this version fixes a significant server crash
+    bug.  Windows clients, particularly greater than version 1.3.70 tend
+    to crash openafs servers.
+  * Cause openafs-kpasswd to conflict  with kerberos4kth-clients, Closes:
+    #277844 
+  * Conflict between libopenafs-dev and arla-dev, Closes: #274788
+
+ -- Sam Hartman <hartmans@debian.org>  Fri, 22 Oct 2004 16:21:29 -0400
+
+openafs (1.2.11-3) unstable; urgency=high
+
+  * Now that libopenafs-dev contains binaries, it should have shared
+    library dependencies, Closes: #267509
+  * New fr.po from Christian Perrier, Closes: #237098
+
+ -- Sam Hartman <hartmans@debian.org>  Tue, 24 Aug 2004 12:10:02 -0400
+
+openafs (1.2.11-2) unstable; urgency=low
+
+  * Install rxgen
+  * Install upserver and upclient
+  * Mark as version 1.2.11, Closes: #255883
+
+ -- Sam Hartman <hartmans@debian.org>  Thu, 12 Aug 2004 14:27:39 -0400
+
 openafs (1.2.11-1) unstable; urgency=high
 
   * Versions prior to 1.2.10 stopped working with multiple servers in a

diff --git a/debian/control b/debian/control
index 5ffa592f070d56f6774f50d4b2d2b4a593e70e81..e970b030c00b602117f95d7ab98b5ae2c7d2997d 100644 (file)
--- a/debian/control
+++ b/debian/control
@@ -21,7 +21,7 @@ Package: openafs-kpasswd
 Priority: extra
 Architecture: i386 powerpc sparc alpha s390 ia64 hppa amd64
 Depends: ${shlibs:Depends}, openafs-client (= ${Source-Version})
-Conflicts: krb5-user, heimdal-clients
+Conflicts: krb5-user, heimdal-clients, kerberos4kth-clients
 Description: The AFS distributed filesystem- old password changing
  AFS is a distributed filesystem allowing cross-platform sharing of
  files among multiple computers.  Facilities are provided for access
@@ -63,6 +63,8 @@ Package: libopenafs-dev
 Section: libdevel
 Architecture: i386 powerpc sparc alpha s390 ia64 hppa amd64
 Priority: extra
+Conflicts: arla-dev
+Depends: ${shlibs:Depends}
 Description: The AFS distributed filesystem- development libraries
  AFS is a distributed filesystem allowing cross-platform sharing of
  files among multiple computers.  Facilities are provided for access

diff --git a/debian/filelist b/debian/filelist
index 5e0ad59159dc2edab91af0d9260b9150fd7f0adb..fbbda7b5234d462313e6c1cc8cc32cd43c374884 100644 (file)
--- a/debian/filelist
+++ b/debian/filelist
@@ -13,3 +13,5 @@ openafs-dbserver/usr/lib/openafs      root.server/usr/afs/bin/vlserver
 openafs-dbserver/usr/lib/openafs root.server/usr/afs/bin/ptserver
 libopenafs-dev/usr/lib lib/*.a lib/afs
 libopenafs-dev/usr include
+libopenafs-dev/usr/bin bin/rxgen
+openafs-fileserver/usr/sbin root.server/usr/afs/bin/up*

diff --git a/debian/openafs-client.docs b/debian/openafs-client.docs
index b195c67258a79f5868456f9f5825422605e2e5e4..79b2a31613137651e417605ba7ed3b9cbac6a8a3 100644 (file)
--- a/debian/openafs-client.docs
+++ b/debian/openafs-client.docs
@@ -3,4 +3,3 @@ debian/README.servers
 debian/configuration-transcript.txt
 debian/README.modules
 NEWS
-RELNOTES-1.2.11