Fix openafs modules to work with newer libc; updates templates

diff --git a/debian/changelog b/debian/changelog
index 8175cefe0c701197681d20f6fd865f9e7a9c2d87..8ee6cb73bc72094fb6d38cbaade370c38ff5e0dd 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,13 @@
+openafs (1.2.10-3) unstable; urgency=low
+
+  * Fix Openafs not to include kernel headers from /usr/include,
+  Closes: #220600 
+  * Fix typo in openafs templates, Closes: #215714
+  * New French translations, Closes: #216158
+  * Build-depend on e2fslibs-dev to get appropriate headers
+
+ -- Sam Hartman <hartmans@debian.org>  Thu, 20 Nov 2003 16:02:45 -0500
+
 openafs (1.2.10-2) unstable; urgency=low
 
   * New Brazilian Portuguese (pt_BR) translations, Closes: #208035

diff --git a/debian/control b/debian/control
index 1d8fe0e0a85a92e9cf570f27bcba9dca3d94a44f..2c34949e47ac872064c31c8fb3a0d9a962a79c1a 100644 (file)
--- a/debian/control
+++ b/debian/control
@@ -2,7 +2,7 @@ Source: openafs
 Section: net
 Priority: optional
 Maintainer: Sam Hartman <hartmans@debian.org>
-Build-Depends: debhelper (>= 4.1.16), libncurses5-dev, libpam0g-dev, bison, docbook-to-man, flex, autoconf, automake, perl
+Build-Depends: debhelper (>= 4.1.16), libncurses5-dev, libpam0g-dev, bison, docbook-to-man, flex, autoconf, automake, perl, e2fslibs-dev
 Standards-Version: 3.5.0
 
 Package: openafs-client
@@ -73,7 +73,7 @@ Description: The AFS distributed filesystem- development libraries
 
 Package: openafs-modules-source
 Priority: extra
-Depends: bison, flex, debhelper, libpam0g-dev, libncurses5-dev, kernel-package
+Depends: bison, flex, debhelper, libpam0g-dev, libncurses5-dev, kernel-package, e2fslibs-dev
 Architecture: all
 Description: The AFS distributed filesystem- Module Sources
  AFS is a distributed filesystem allowing cross-platform sharing of

diff --git a/debian/openafs-client.templates b/debian/openafs-client.templates
index 58c81268e39cbbcc9c1b6f743185638a188352dc..fb92bfd1e3fd6e96a977adbd2aebcc138833a171 100644 (file)
--- a/debian/openafs-client.templates
+++ b/debian/openafs-client.templates
@@ -21,8 +21,8 @@ _Description:  What AFS cell does this workstation belong to?
 Template: openafs-client/cachesize
 Type: string
 Default: 50000
-_Description:  How large is your AFS cache (kb)?
- AFS uses a  area of the disk to cache remote files for faster
+_Description:  How large is your AFS cache (kB)?
+ AFS uses an  area of the disk to cache remote files for faster
  access.  This cache will be mounted on /var/cache/openafs.  It is
  important that the cache not overfill the partition it is located
  on.  Often, people find it useful to dedicate a partition to their
@@ -70,7 +70,7 @@ _Description: Dynamically generate the contents of /afs?
  .
  If you generate /afs dynamically, you may need to create
  /etc/openafs/CellAlias to include aliases for common cells. DO NOT SELECT
- tHIS OPTION if this machine is the first database server in a new cell .
+ THIS OPTION IF THIS MACHINE IS THE FIRST DATABASE SERVER IN A NEW CELL .
 
 Template: openafs-client/fakestat
 Type: boolean

diff --git a/debian/patch.devname_e2fslibs-dev b/debian/patch.devname_e2fslibs-dev
new file mode 100644 (file)
index 0000000..5b772b8
--- /dev/null
+++ b/debian/patch.devname_e2fslibs-dev
@@ -0,0 +1,17 @@
+Index: src/vol/devname.c
+===================================================================
+RCS file: /afs/sipb.mit.edu/project/openafs/debian/cvs/openafs/src/vol/devname.c,v
+retrieving revision 1.1.1.8
+diff -u -r1.1.1.8 devname.c
+--- src/vol/devname.c  14 Oct 2001 18:07:21 -0000      1.1.1.8
++++ src/vol/devname.c  20 Nov 2003 21:03:46 -0000
+@@ -86,8 +86,7 @@
+ #endif /* ITIMER_REAL */
+ #include "partition.h"
+ #ifdef AFS_LINUX22_ENV
+-#include <asm/types.h>
+-#include <linux/ext2_fs.h>
++#include <ext2fs/ext2_fs.h>
+ #define ROOTINO EXT2_ROOT_INO /* Assuming we do this on ext2, of course. */
+ #endif
+ 

diff --git a/debian/po/de.po b/debian/po/de.po
index c581b6b0842656aea3827f44623f9aef61ccf1f6..08fe40ced21973eb2d674a5b854212b8745ba1f5 100644 (file)
--- a/debian/po/de.po
+++ b/debian/po/de.po
@@ -16,7 +16,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2003-10-13 00:08-0400\n"
+"POT-Creation-Date: 2003-11-20 16:00-0500\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -59,13 +59,13 @@ msgstr ""
 
 #. Description
 #: ../openafs-client.templates:24
-msgid "How large is your AFS cache (kb)?"
+msgid "How large is your AFS cache (kB)?"
 msgstr ""
 
 #. Description
 #: ../openafs-client.templates:24
 msgid ""
-"AFS uses a  area of the disk to cache remote files for faster access.  This "
+"AFS uses an  area of the disk to cache remote files for faster access.  This "
 "cache will be mounted on /var/cache/openafs.  It is important that the cache "
 "not overfill the partition it is located on.  Often, people find it useful "
 "to dedicate a partition to their AFS cache."
@@ -134,8 +134,8 @@ msgstr ""
 #: ../openafs-client.templates:65
 msgid ""
 "If you generate /afs dynamically, you may need to create /etc/openafs/"
-"CellAlias to include aliases for common cells. DO NOT SELECT tHIS OPTION if "
-"this machine is the first database server in a new cell ."
+"CellAlias to include aliases for common cells. DO NOT SELECT THIS OPTION IF "
+"THIS MACHINE IS THE FIRST DATABASE SERVER IN A NEW CELL ."
 msgstr ""
 
 #. Description

diff --git a/debian/po/fr.po b/debian/po/fr.po
index 40eae14f9fb02fe80351243c90cc10a03fd645aa..8e7069f7d14e245e1a24fde6aa8b172146d1a99f 100644 (file)
--- a/debian/po/fr.po
+++ b/debian/po/fr.po
@@ -14,9 +14,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: openafs 1.2.9-2\n"
-"Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2003-10-13 00:08-0400\n"
-"PO-Revision-Date: 2003-07-31 10:36+0100\n"
+"PO-Revision-Date: 2003-10-16 23:34+0100\n"
 "Last-Translator: Christian Perrier <bubulle@debian.org>\n"
 "Language-Team: French <debian-l10n-french@lists.debian.org>\n"
 "MIME-Version: 1.0\n"
@@ -98,7 +97,6 @@ msgstr ""
 
 #. Description
 #: ../openafs-client.templates:34
-#, fuzzy
 msgid ""
 "Should the Openafs filesystem be started and mounted at boot? Normally, most "
 "users who install the openafs-client package expect to run it at boot.  "
@@ -112,8 +110,9 @@ msgstr ""
 "paquet openafs-client s'attendent à ce qu'il soit lancé au démarrage. "
 "Cependant, si vous prévoyez de mettre en service une nouvelle cellule ou si "
 "vous utilisez un ordinateur portable, vous ne souhaitez peut-être pas le "
-"lancer au démarrage. Dans ce cas, refusez ici et utilisez la commande « /etc/"
-"init.d/openafs-client force-start » pour le lancer."
+"lancer au démarrage. Si vous préférez ne pas le lancer au démarrage, "
+"utilisez la commande « /etc/init.d/openafs-client force-start » pour le "
+"lancer quand vous en aurez besoin."
 
 #. Description
 #: ../openafs-client.templates:45
@@ -176,15 +175,15 @@ msgstr ""
 
 #. Description
 #: ../openafs-client.templates:65
-#, fuzzy
 msgid ""
 "If you generate /afs dynamically, you may need to create /etc/openafs/"
-"CellAlias to include aliases for common cells. DO NOT SELECT tHIS OPTION if "
+"CellAlias to include aliases for common cells. DO NOT SELECT THIS OPTION if "
 "this machine is the first database server in a new cell ."
 msgstr ""
 "Si vous créez /afs de manière dynamique, vous aurez peut-être à créer /etc/"
 "openafs/CellAlias pour inclure les alias des cellules communes. NE "
-"CHOISISSEZ PAS CETTE OPTION SI VOUS CRÉEZ UNE NOUVELLE CELLULE."
+"CHOISISSEZ PAS CETTE OPTION si cette machine est le premier serveur de bases "
+"de données d'une nouvelle cellule."
 
 #. Description
 #: ../openafs-client.templates:78

diff --git a/debian/po/pt_BR.po b/debian/po/pt_BR.po
index 0cc8b785c07b247c515fd81c6764bb19f222b9d5..5b4c93afc390479b2f829949fc976bf53453f97a 100644 (file)
--- a/debian/po/pt_BR.po
+++ b/debian/po/pt_BR.po
@@ -15,7 +15,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openafs_1.2.10-1\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2003-10-13 00:08-0400\n"
+"POT-Creation-Date: 2003-11-20 16:00-0500\n"
 "PO-Revision-Date: 2003-08-31 13:28-0300\n"
 "Last-Translator: André Luís Lopes <andrelop@debian.org>\n"
 "Language-Team: Debian-BR Project <debian-l10n-portuguese@lists.debian.org>\n"
@@ -71,13 +71,15 @@ msgstr ""
 
 #. Description
 #: ../openafs-client.templates:24
-msgid "How large is your AFS cache (kb)?"
+#, fuzzy
+msgid "How large is your AFS cache (kB)?"
 msgstr "Qual o tamanho de seu cache AFS (em kb) ?"
 
 #. Description
 #: ../openafs-client.templates:24
+#, fuzzy
 msgid ""
-"AFS uses a  area of the disk to cache remote files for faster access.  This "
+"AFS uses an  area of the disk to cache remote files for faster access.  This "
 "cache will be mounted on /var/cache/openafs.  It is important that the cache "
 "not overfill the partition it is located on.  Often, people find it useful "
 "to dedicate a partition to their AFS cache."
@@ -174,8 +176,8 @@ msgstr ""
 #, fuzzy
 msgid ""
 "If you generate /afs dynamically, you may need to create /etc/openafs/"
-"CellAlias to include aliases for common cells. DO NOT SELECT tHIS OPTION if "
-"this machine is the first database server in a new cell ."
+"CellAlias to include aliases for common cells. DO NOT SELECT THIS OPTION IF "
+"THIS MACHINE IS THE FIRST DATABASE SERVER IN A NEW CELL ."
 msgstr ""
 "Caso você gere o /afs dinamicamente, você pode precisar criar o /etc/openafs/"
 "CellAlias para incluir apelidos (aliases) para células comuns. NÂO SELECIONE "

diff --git a/debian/po/templates.pot b/debian/po/templates.pot
index 9265172bc7feeb8e0389a34d3439fe7246e5bceb..663361d9dc373a2846c2bb9c76caf0481e164388 100644 (file)
--- a/debian/po/templates.pot
+++ b/debian/po/templates.pot
@@ -16,7 +16,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2003-10-13 00:08-0400\n"
+"POT-Creation-Date: 2003-11-20 16:00-0500\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -58,13 +58,13 @@ msgstr ""
 
 #. Description
 #: ../openafs-client.templates:24
-msgid "How large is your AFS cache (kb)?"
+msgid "How large is your AFS cache (kB)?"
 msgstr ""
 
 #. Description
 #: ../openafs-client.templates:24
 msgid ""
-"AFS uses a  area of the disk to cache remote files for faster access.  This "
+"AFS uses an  area of the disk to cache remote files for faster access.  This "
 "cache will be mounted on /var/cache/openafs.  It is important that the cache "
 "not overfill the partition it is located on.  Often, people find it useful "
 "to dedicate a partition to their AFS cache."
@@ -133,8 +133,8 @@ msgstr ""
 #: ../openafs-client.templates:65
 msgid ""
 "If you generate /afs dynamically, you may need to create /etc/openafs/"
-"CellAlias to include aliases for common cells. DO NOT SELECT tHIS OPTION if "
-"this machine is the first database server in a new cell ."
+"CellAlias to include aliases for common cells. DO NOT SELECT THIS OPTION IF "
+"THIS MACHINE IS THE FIRST DATABASE SERVER IN A NEW CELL ."
 msgstr ""
 
 #. Description

diff --git a/src/vol/devname.c b/src/vol/devname.c
index 6f3656978d59d37751c7e477e5836fd7e169afe0..f50dd40421a39146f831a0bcea5fa52e1fe31035 100644 (file)
--- a/src/vol/devname.c
+++ b/src/vol/devname.c
@@ -10,7 +10,7 @@
 #include <sys/param.h>
 #include <afsconfig.h>
 
-RCSID("$Header: /tmp/cvstemp/openafs/src/vol/devname.c,v 1.1.1.8 2001/10/14 18:07:21 hartmans Exp $");
+RCSID("$Header: /tmp/cvstemp/openafs/src/vol/devname.c,v 1.2 2003/11/20 21:43:49 hartmans Exp $");
 
 #include <afs/param.h>
 #include <rx/xdr.h>
@@ -86,8 +86,7 @@ RCSID("$Header: /tmp/cvstemp/openafs/src/vol/devname.c,v 1.1.1.8 2001/10/14 18:0
 #endif /* ITIMER_REAL */
 #include "partition.h"
 #ifdef AFS_LINUX22_ENV
-#include <asm/types.h>
-#include <linux/ext2_fs.h>
+#include <ext2fs/ext2_fs.h>
 #define ROOTINO EXT2_ROOT_INO /* Assuming we do this on ext2, of course. */
 #endif