[Glibc-bsd-commits] r1411 - in trunk/freebsd-utils/debian: . patches

[Robert Millan]

Author: rmh
Date: 2006-03-30 14:05:31 +0000 (Thu, 30 Mar 2006)
New Revision: 1411

Modified:
   trunk/freebsd-utils/debian/changelog
   trunk/freebsd-utils/debian/control
   trunk/freebsd-utils/debian/patches/008_swapon.diff
   trunk/freebsd-utils/debian/patches/011_swapon_setprogname.diff
Log:
  * Use freebsd/stdlib.h instead of bsd/stdlib.h, because we need devname
    declaration.
  * Increase swapctl blocksize to 1024 * 1024 (1 MiB).

Modified: trunk/freebsd-utils/debian/changelog
===================================================================
--- trunk/freebsd-utils/debian/changelog	2006-03-30 14:00:46 UTC (rev 1410)
+++ trunk/freebsd-utils/debian/changelog	2006-03-30 14:05:31 UTC (rev 1411)
@@ -3,8 +3,11 @@
   * Bump version to this ugly mess in order to provide an upgrade path on
     kfreebsd-amd64.  Hopefuly we'll get back to normal versioning when 5.x is
     no longer supported.
+  * Use freebsd/stdlib.h instead of bsd/stdlib.h, because we need devname
+    declaration.
+  * Increase swapctl blocksize to 1024 * 1024 (1 MiB).
 
- -- Robert Millan <rmh at aybabtu.com>  Wed, 29 Mar 2006 16:39:22 +0200
+ -- Robert Millan <rmh at aybabtu.com>  Thu, 30 Mar 2006 16:04:06 +0200
 
 freebsd-utils (5.4+2-0.1) unreleased; urgency=low
 

Modified: trunk/freebsd-utils/debian/control
===================================================================
--- trunk/freebsd-utils/debian/control	2006-03-30 14:00:46 UTC (rev 1410)
+++ trunk/freebsd-utils/debian/control	2006-03-30 14:05:31 UTC (rev 1411)
@@ -3,7 +3,7 @@
 Priority: required
 Maintainer: GNU/kFreeBSD Maintainers <debian-bsd at lists.debian.org>
 Uploaders: Aurelien Jarno <aurel32 at debian.org>, Guillem Jover <guillem at debian.org>
-Build-Depends: cdbs, debhelper (>= 4.1.0), freebsd5-buildutils, libkvm-dev, libbsd-dev (>= 0.0-1.2+r1367), libc0.1-dev (>= 2.3.6-3+kbsd.r1365), flex | flex-old, kfreebsd-kernel-headers (>= 0.16), libfreebsd-dev (>= 0.0-2)
+Build-Depends: cdbs, debhelper (>= 4.1.0), freebsd5-buildutils, libkvm-dev, libbsd-dev (>= 0.0-1.2+r1367), libc0.1-dev (>= 2.3.6-3+kbsd.r1365), flex | flex-old, kfreebsd-kernel-headers (>= 0.16), libfreebsd-dev (>= 0.0-4)
 Standards-Version: 3.6.0
 
 Package: freebsd-utils

Modified: trunk/freebsd-utils/debian/patches/008_swapon.diff
===================================================================
--- trunk/freebsd-utils/debian/patches/008_swapon.diff	2006-03-30 14:00:46 UTC (rev 1410)
+++ trunk/freebsd-utils/debian/patches/008_swapon.diff	2006-03-30 14:05:31 UTC (rev 1411)
@@ -9,7 +9,7 @@
  	    break;
  	default:
 -	    getbsize(&hlen, &blocksize);
-+	    blocksize = 1024;
++	    blocksize = 1024 * 1024;
 +	    hlen = 10;
  	    break;
  	}

Modified: trunk/freebsd-utils/debian/patches/011_swapon_setprogname.diff
===================================================================
--- trunk/freebsd-utils/debian/patches/011_swapon_setprogname.diff	2006-03-30 14:00:46 UTC (rev 1410)
+++ trunk/freebsd-utils/debian/patches/011_swapon_setprogname.diff	2006-03-30 14:05:31 UTC (rev 1411)
@@ -1,5 +1,18 @@
---- src/sbin/swapon/swapon.c~	2006-03-18 16:56:04.000000000 +0100
-+++ src/sbin/swapon/swapon.c	2006-03-18 16:57:03.000000000 +0100
+
+Use freebsd/stdlib.h instead of bsd/stdlib.h, because we need devname
+declaration as well.
+
+--- src/sbin/swapon/swapon.c.old	2006-03-30 15:28:23.000000000 +0200
++++ src/sbin/swapon/swapon.c	2006-03-30 15:28:46.000000000 +0200
+@@ -50,7 +50,7 @@
+ #include <errno.h>
+ #include <fstab.h>
+ #include <stdio.h>
+-#include <stdlib.h>
++#include <freebsd/stdlib.h>
+ #include <string.h>
+ #include <unistd.h>
+ #include <fcntl.h>
 @@ -70,6 +70,8 @@
  	int ch, doall;
  	int sflag = 0, lflag = 0, hflag = 0;