Dear maintainer of cnews, On I sent you a notice announcing my intent to upload a NMU of your package after an initial notice sent on 11 Feb 2007.
You either agreed for this NMU or did not respond to my notices.
I will now upload this NMU to DELAYED/0-DAY (which means an immediate
upload).
The NMU patch is attached to this mail.
The NMU changelog is:
Source: cnews
Version: cr.g7-40.1
Distribution: unstable
Urgency: low
Maintainer: Christian Perrier <[EMAIL PROTECTED]>
Date: Sun, 11 Feb 2007 14:41:52 +0100
Closes: 401747 403501
Changes:
cnews (cr.g7-40.1) unstable; urgency=low
.
* Non-maintainer upload to fix pending l10n issues and a FTBFS.
* Fix FTBFS on GNU/kFreeBSD. Closes: #401747
* Debconf translations:
- Portuguese fixed. Closes: #403501
--
diff -Nru cnews-cr.g7.old/debian/changelog cnews-cr.g7/debian/changelog
--- cnews-cr.g7.old/debian/changelog 2007-02-11 14:37:10.370978798 +0100
+++ cnews-cr.g7/debian/changelog 2007-02-11 15:10:42.067315103 +0100
@@ -1,3 +1,12 @@
+cnews (cr.g7-40.1) unstable; urgency=low
+
+ * Non-maintainer upload to fix pending l10n issues and a FTBFS.
+ * Fix FTBFS on GNU/kFreeBSD. Closes: #401747
+ * Debconf translations:
+ - Portuguese fixed. Closes: #403501
+
+ -- Christian Perrier <[EMAIL PROTECTED]> Sun, 11 Feb 2007 14:41:52 +0100
+
cnews (cr.g7-40) unstable; urgency=low
* Use -n with tail, new sort options in domkov (Closes: #374934)
diff -Nru cnews-cr.g7.old/debian/po/pt.po cnews-cr.g7/debian/po/pt.po
--- cnews-cr.g7.old/debian/po/pt.po 2007-02-11 14:37:10.370978798 +0100
+++ cnews-cr.g7/debian/po/pt.po 2007-02-11 15:10:26.727190531 +0100
@@ -9,8 +9,8 @@
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2004-03-29 09:43-0800\n"
"PO-Revision-Date: 2005-11-12 23:40+0000\n"
-"Last-Translator: Simão Pedro Cardoso <a class="moz-txt-link-rfc2396E" href="mailto:[EMAIL PROTECTED]"><[EMAIL PROTECTED]></a>\n"
-"Language-Team: Portuguese <a class="moz-txt-link-rfc2396E" href="mailto:[EMAIL PROTECTED]"><[EMAIL PROTECTED]></a>\n"
+"Last-Translator: Simão Pedro Cardoso <[EMAIL PROTECTED]>\n"
+"Language-Team: Portuguese <[EMAIL PROTECTED]>\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit"
diff -Nru cnews-cr.g7.old/util/dostatfs.c cnews-cr.g7/util/dostatfs.c
--- cnews-cr.g7.old/util/dostatfs.c 2007-02-11 14:37:10.274978019 +0100
+++ cnews-cr.g7/util/dostatfs.c 2007-02-11 14:41:48.137234444 +0100
@@ -18,21 +18,8 @@
#include <sys/mount.h>
/* Second, assorted variations... */
-#ifdef linux
-#define sun 1 /* Linux happens to be the same as Sun for this... */
-#else
-#ifdef __linux__
-#define sun 1 /* a Linux by any other name... */
-#endif
-#endif
-#ifdef hpux
-#define sun 1 /* likewise HP */
-#endif
-#ifdef __FreeBSD__
-#define BSD4_4 1 /* and FreeBSD is sort of 4.4 */
-#endif
-#ifdef sun
+#if defined(sun) || defined(linux) || defined(__linux__) || defined(__GLIBC__) || defined(__GNU__) || defined(hpux)
#include <sys/vfs.h>
#define UNIT f_bsize
#endif
@@ -49,7 +36,7 @@
#define f_bavail f_bfree /* talk about kludges */
#endif
-#ifdef BSD4_4
+#if defined(BSD4_4) || defined(__FreeBSD__)
#define UNIT f_bsize
#endif
diff -Nru cnews-cr.g7.old/util/dostatfs.c~ cnews-cr.g7/util/dostatfs.c~
--- cnews-cr.g7.old/util/dostatfs.c~ 1970-01-01 01:00:00.000000000 +0100
+++ cnews-cr.g7/util/dostatfs.c~ 2007-02-11 14:37:01.000000000 +0100
@@ -0,0 +1,114 @@
+/*
+ * dostatfs - the heart of spacefor.statfs
+ */
+
+#include <stdio.h>
+#include <string.h>
+#include <sys/types.h>
+
+/*
+ * Unfortunately, the whereabouts of the necessary struct, the exact
+ * calling convention for statfs(), and the name of the "units in which
+ * free space is expressed" member, are rather system-specific. Here's
+ * a few attempts...
+ */
+
+/* First, pick up a few popular headers on general principles. */
+#include <sys/param.h>
+#include <sys/mount.h>
+
+/* Second, assorted variations... */
+#ifdef linux
+#define sun 1 /* Linux happens to be the same as Sun for this... */
+#else
+#ifdef __linux__
+#define sun 1 /* a Linux by any other name... */
+#endif
+#endif
+#ifdef hpux
+#define sun 1 /* likewise HP */
+#endif
+#ifdef __FreeBSD__
+#define BSD4_4 1 /* and FreeBSD is sort of 4.4 */
+#endif
+
+#ifdef sun
+#include <sys/vfs.h>
+#define UNIT f_bsize
+#endif
+
+#ifdef _AIX
+#include <sys/statfs.h>
+#define UNIT f_fsize
+#endif
+
+#ifdef M_XENIX /* SCO */
+#include <sys/statfs.h>
+#define STATFS(fs, result) statfs(fs, &result, (int)sizeof(result), 0)
+#define UNIT f_fsize
+#define f_bavail f_bfree /* talk about kludges */
+#endif
+
+#ifdef BSD4_4
+#define UNIT f_bsize
+#endif
+
+/* Finally, some defaults to simplify the above. */
+#ifndef UNIT
+#define UNIT f_fsize
+#endif
+#ifndef STATFS
+#define STATFS(fs, result) statfs(fs, &result)
+#endif
+
+
+extern int debug;
+extern void error();
+
+/*
+ - spacefor - do the work
+ */
+long
+spacefor(filesize, fileonfs, wantspace, wantinodes, bperi)
+long filesize;
+char *fileonfs;
+long wantspace;
+long wantinodes;
+long bperi;
+{
+ struct statfs info;
+ register long n;
+# define LOTS 10000
+ register long iperfile = filesize/bperi + 1;
+
+ if (STATFS(fileonfs, info) < 0)
+ error("cannot do statfs(%s)", fileonfs);
+ if (debug)
+ fprintf(stderr, "bsize %ld, avail %ld, inodes %ld\n",
+ info.UNIT, info.f_bavail, info.f_ffree);
+
+ n = LOTS;
+ if (info.f_bavail <= wantspace)
+ n = 0;
+ else if (info.UNIT > 0 && filesize > 0)
+ n = (info.f_bavail - wantspace) / (filesize/info.UNIT + 1);
+
+#ifdef __linux__
+ /* reiserfs always reports 0 inodes, but it's unlimited */
+ if (info.f_type == 0x52654973) /* REISERFS_SUPER_MAGIC */
+ info.f_ffree = -1;
+#endif
+ if (info.f_ffree < 0) /* information unavailable */
+ ; /* bypass check, and pray */
+ else if (info.f_ffree <= wantinodes)
+ n = 0;
+ else if ((info.f_ffree - wantinodes) / iperfile < n)
+ n = (info.f_ffree - wantinodes) / iperfile;
+
+ if (n < 0)
+ n = 0;
+ else if (n > LOTS)
+ n = LOTS; /* to avert 16-bit trouble elsewhere */
+
+ return(n);
+}
signature.asc
Description: Digital signature
