[Glibc-bsd-commits] r3312 - in trunk: bsd-airtools/debian freebsd-buildutils/debian freebsd-libs/debian freebsd-moused/debian freebsd-quota/debian freebsd-sendpr/debian freebsd-utils/debian kfreebsd-6/debian kfreebsd-7/debian kfreebsd-8/debian kfreebsd-9/debian kfreebsd-kernel-headers/debian libbsd/debian posixtestsuite/debian ufsutils/debian zfsutils/debian

Wed May 25 17:50:21 UTC 2011

Author: guillem
Date: 2011-05-25 17:50:19 +0000 (Wed, 25 May 2011)
New Revision: 3312

Modified:
   trunk/bsd-airtools/debian/changelog
   trunk/bsd-airtools/debian/rules
   trunk/freebsd-buildutils/debian/changelog
   trunk/freebsd-buildutils/debian/rules
   trunk/freebsd-libs/debian/changelog
   trunk/freebsd-libs/debian/control
   trunk/freebsd-libs/debian/libusb-config
   trunk/freebsd-libs/debian/rules
   trunk/freebsd-moused/debian/changelog
   trunk/freebsd-moused/debian/init
   trunk/freebsd-moused/debian/rules
   trunk/freebsd-quota/debian/rules
   trunk/freebsd-sendpr/debian/changelog
   trunk/freebsd-sendpr/debian/control
   trunk/freebsd-sendpr/debian/copyright
   trunk/freebsd-sendpr/debian/rules
   trunk/freebsd-utils/debian/changelog
   trunk/freebsd-utils/debian/control
   trunk/freebsd-utils/debian/freebsd-net-tools.postinst
   trunk/freebsd-utils/debian/freebsd-utils.init
   trunk/freebsd-utils/debian/kbdcontrol.init
   trunk/freebsd-utils/debian/kbdcontrol.postinst
   trunk/freebsd-utils/debian/kldutils.init
   trunk/freebsd-utils/debian/rules
   trunk/kfreebsd-6/debian/control.flavor.in
   trunk/kfreebsd-6/debian/control.in
   trunk/kfreebsd-6/debian/kfreebsd-image.overrides
   trunk/kfreebsd-6/debian/kfreebsd-image.postinst.in
   trunk/kfreebsd-6/debian/rules
   trunk/kfreebsd-7/debian/changelog
   trunk/kfreebsd-7/debian/control.flavor.in
   trunk/kfreebsd-7/debian/control.in
   trunk/kfreebsd-7/debian/copyright
   trunk/kfreebsd-7/debian/kfreebsd-image.README.Debian
   trunk/kfreebsd-7/debian/kfreebsd-image.postinst.in
   trunk/kfreebsd-7/debian/kfreebsd-image.postrm.in
   trunk/kfreebsd-7/debian/kfreebsd-image.preinst.in
   trunk/kfreebsd-7/debian/kfreebsd-image.prerm.in
   trunk/kfreebsd-7/debian/rules
   trunk/kfreebsd-8/debian/changelog
   trunk/kfreebsd-8/debian/control.flavor.in
   trunk/kfreebsd-8/debian/control.in
   trunk/kfreebsd-8/debian/copyright
   trunk/kfreebsd-8/debian/kfreebsd-image.README.Debian
   trunk/kfreebsd-8/debian/kfreebsd-image.postinst.in
   trunk/kfreebsd-8/debian/kfreebsd-image.postrm.in
   trunk/kfreebsd-8/debian/kfreebsd-image.preinst.in
   trunk/kfreebsd-8/debian/kfreebsd-image.prerm.in
   trunk/kfreebsd-8/debian/rules
   trunk/kfreebsd-9/debian/control.flavor.in
   trunk/kfreebsd-9/debian/control.in
   trunk/kfreebsd-9/debian/copyright
   trunk/kfreebsd-9/debian/kfreebsd-image.README.Debian
   trunk/kfreebsd-9/debian/kfreebsd-image.postinst.in
   trunk/kfreebsd-9/debian/kfreebsd-image.postrm.in
   trunk/kfreebsd-9/debian/kfreebsd-image.preinst.in
   trunk/kfreebsd-9/debian/kfreebsd-image.prerm.in
   trunk/kfreebsd-9/debian/prune.sh
   trunk/kfreebsd-9/debian/rules
   trunk/kfreebsd-kernel-headers/debian/changelog
   trunk/kfreebsd-kernel-headers/debian/control
   trunk/kfreebsd-kernel-headers/debian/copyright
   trunk/kfreebsd-kernel-headers/debian/generate-asm.sh
   trunk/kfreebsd-kernel-headers/debian/install
   trunk/kfreebsd-kernel-headers/debian/rules
   trunk/libbsd/debian/changelog
   trunk/libbsd/debian/control
   trunk/libbsd/debian/copyright
   trunk/libbsd/debian/rules
   trunk/posixtestsuite/debian/changelog
   trunk/posixtestsuite/debian/control
   trunk/posixtestsuite/debian/copyright
   trunk/posixtestsuite/debian/rules
   trunk/ufsutils/debian/TODO
   trunk/ufsutils/debian/changelog
   trunk/ufsutils/debian/copyright
   trunk/ufsutils/debian/rules
   trunk/zfsutils/debian/changelog
   trunk/zfsutils/debian/control
   trunk/zfsutils/debian/rules
   trunk/zfsutils/debian/zfsutils.zfs.init
Log:
Cleanup of spaces and blank lines


Modified: trunk/bsd-airtools/debian/changelog
===================================================================

--- trunk/bsd-airtools/debian/changelog	2011-05-25 08:52:01 UTC (rev 3311)
+++ trunk/bsd-airtools/debian/changelog	2011-05-25 17:50:19 UTC (rev 3312)
@@ -3,4 +3,3 @@
   * Initial release.
 
  -- Robert Millan <rmh at aybabtu.com>  Wed, 29 Mar 2006 14:31:37 +0200
-

Modified: trunk/bsd-airtools/debian/rules
===================================================================
--- trunk/bsd-airtools/debian/rules	2011-05-25 08:52:01 UTC (rev 3311)
+++ trunk/bsd-airtools/debian/rules	2011-05-25 17:50:19 UTC (rev 3312)
@@ -1,17 +1,17 @@
 #!/usr/bin/make -f
 # Sample debian/rules that uses cdbs.  Originaly written by Robert Millan.
 # This file is public domain.
-  
+
 DEB_TAR_SRCDIR                  := bsd-airtools
 DEB_AUTO_CLEANUP_RCS            := yes
 
-package=bsd-airtools
+package = bsd-airtools
 
-SHELL:=bash
-PATH:=/usr/lib/freebsd:$(PATH)
-PMAKE=make COPTS="-D_GNU_SOURCE" NO_WERROR=1 NOGCCERROR=1 NOSHARED=NO NO_SHARED=NO
+SHELL := bash
+PATH := /usr/lib/freebsd:$(PATH)
+PMAKE = make COPTS="-D_GNU_SOURCE" NO_WERROR=1 NOGCCERROR=1 NOSHARED=NO NO_SHARED=NO
 
-dirs=dweputils/{dwepcrack,dwepdump,dwepkeygen} prism2ctl prism2dump
+dirs = dweputils/{dwepcrack,dwepdump,dwepkeygen} prism2ctl prism2dump
 # FIXME: add wnet/{libwnet{,/examples},dinject,reinj}
 
 build/bsd-airtools:: apply-patches

Modified: trunk/freebsd-buildutils/debian/changelog
===================================================================
--- trunk/freebsd-buildutils/debian/changelog	2011-05-25 08:52:01 UTC (rev 3311)
+++ trunk/freebsd-buildutils/debian/changelog	2011-05-25 17:50:19 UTC (rev 3312)
@@ -24,7 +24,7 @@
 
   [ Petr Salinger ]
   * New upstream version (RELENG_8_0_0_RELEASE)
-  * Add a get-orig-source target to debian/rules and 
+  * Add a get-orig-source target to debian/rules and
        stop using a tar in tar system.
   * Use quilt for patches management
 
@@ -38,7 +38,7 @@
   * Remove part of the automatic patches in favor of patches.
   * Use libbsd instead of hacked funtions (Closes: #379259).
   * Use <bsd/sys/*.h> includes instead of <bsd/*.h>.
-  * Remove depends on dash, it is now essential. 
+  * Remove depends on dash, it is now essential.
   * Add depends on ${misc:Depends}.
   * Bumped Standard-Versions to 3.8.4 (no changes).
   * Handle nostrip build options (Closes: #436857).
@@ -99,7 +99,7 @@
 
 freebsd6-buildutils (6.3-2) unreleased; urgency=low
 
-  * Don't build-depends nor depends on gcc-3.4. 
+  * Don't build-depends nor depends on gcc-3.4.
 
  -- Aurelien Jarno <aurel32 at debian.org>  Sat, 12 Jan 2008 18:02:07 +0100
 
@@ -200,7 +200,7 @@
 
   * Added a dependency on bsdmainutils (closes: bug#323758).
   * Bumped Standard-Versions to 3.6.2 (no changes).
-  
+
  -- Aurelien Jarno <aurel32 at debian.org>  Fri, 19 Aug 2005 17:47:15 +0200
 
 freebsd5-buildutils (5.4-1) unstable; urgency=low
@@ -219,11 +219,11 @@
 
 freebsd5-buildutils (5.3+2-3) unstable; urgency=low
 
-  * Package adopted by the GNU/kFreeBSD Maintainers. Thanks to Robert 
+  * Package adopted by the GNU/kFreeBSD Maintainers. Thanks to Robert
     Millan for all the work done on this package.
   * Added patch from Victor Hsieh to fix incompatibilities with linux
     utilities (closes: bug#306146).
-  
+
  -- Aurelien Jarno <aurel32 at debian.org>  Thu,  9 Jun 2005 01:02:28 +0200
 
 freebsd5-buildutils (5.3+2-2) unstable; urgency=low
@@ -397,4 +397,3 @@
   * Initial Release.
 
  -- Nathan Hawkins <utsl at debian.org>  Fri, 11 Oct 2002 20:43:20 -0400
-

Modified: trunk/freebsd-buildutils/debian/rules
===================================================================
--- trunk/freebsd-buildutils/debian/rules	2011-05-25 08:52:01 UTC (rev 3311)
+++ trunk/freebsd-buildutils/debian/rules	2011-05-25 17:50:19 UTC (rev 3312)
@@ -15,20 +15,20 @@
     export STRIPFLAG=
 endif
 
-VERSION=$(shell dpkg-parsechangelog | sed -e '/^Version:/!d' -e 's/^Version: //g' -e 's/-.*//g')
-SVN=http://svn.freebsd.org/base/release/$(VERSION).0
+VERSION = $(shell dpkg-parsechangelog | sed -e '/^Version:/!d' -e 's/^Version: //g' -e 's/-.*//g')
+SVN = http://svn.freebsd.org/base/release/$(VERSION).0
 
-PVERSION=$(shell dpkg-parsechangelog | sed -e '/^Version:/!d' -e 's/^Version: //g' -e 's/-.*//g' -e 's/\./_/g')
-PCVS=anoncvs at anoncvs.fr.freebsd.org:/home/ncvs
-PTAG=RELEASE_$(PVERSION)_0
+PVERSION = $(shell dpkg-parsechangelog | sed -e '/^Version:/!d' -e 's/^Version: //g' -e 's/-.*//g' -e 's/\./_/g')
+PCVS = anoncvs at anoncvs.fr.freebsd.org:/home/ncvs
+PTAG = RELEASE_$(PVERSION)_0
 
-ORIGDIR=freebsd-buildutils-$(VERSION)
-PMAKE=pmake
-CFLAGS=-O2 -g -Wall -DMACHINE_ARCH='"$(DEB_HOST_ARCH_CPU)"' -D_GNU_SOURCE -D'__FBSDID(string)=' -I$(CURDIR)/build-tree/src/sys
-MAKE_BUILD_FLAGS= CC=gcc NO_WERROR=1 NOGCCERROR=1 NOSHARED=NO NO_SHARED=NO
-YACC=$(CURDIR)/build-tree/src/usr.bin/yacc/yacc
+ORIGDIR = freebsd-buildutils-$(VERSION)
+PMAKE = pmake
+CFLAGS = -O2 -g -Wall -DMACHINE_ARCH='"$(DEB_HOST_ARCH_CPU)"' -D_GNU_SOURCE -D'__FBSDID(string)=' -I$(CURDIR)/build-tree/src/sys
+MAKE_BUILD_FLAGS = CC=gcc NO_WERROR=1 NOGCCERROR=1 NOSHARED=NO NO_SHARED=NO
+YACC = $(CURDIR)/build-tree/src/usr.bin/yacc/yacc
 
-package=freebsd-buildutils
+package = freebsd-buildutils
 
 get-orig-source:
 	rm -rf $(ORIGDIR)
@@ -104,7 +104,7 @@
 		cp y.tab.c config.c ; \
 		PATH=$(PATH):$(CURDIR)/build-tree/src/usr.bin/file2c \
 		$(PMAKE) $(MAKE_BUILD_FLAGS)
-	
+
 	touch build-stamp
 
 install: build
@@ -112,7 +112,7 @@
 	dh_testroot
 	dh_clean -k
 	dh_installdirs
-	
+
 	for i in cksum lex make mkdep yacc file2c brandelf ; do \
 		cd $(CURDIR)/build-tree/src/usr.bin/$$i; \
 		$(PMAKE) install DESTDIR=$(CURDIR)/debian/$(package) BINDIR=/usr/bin ; \
@@ -154,14 +154,14 @@
 
 
 # Build architecture-independent files here.
-binary-indep: build install 
+binary-indep: build install
 # We have nothing to do by default.
 
 # Build architecture-dependent files here.
 binary-arch: build install
 	dh_testdir
 	dh_testroot
-#	dh_installdebconf	
+#	dh_installdebconf
 	dh_installdocs
 #	dh_installexamples
 #	dh_installmenu
@@ -173,7 +173,7 @@
 #	dh_installcron
 	dh_installman
 #	dh_installinfo
-	dh_installchangelogs 
+	dh_installchangelogs
 	dh_link
 	dh_strip
 	dh_compress

Modified: trunk/freebsd-libs/debian/changelog
===================================================================
--- trunk/freebsd-libs/debian/changelog	2011-05-25 08:52:01 UTC (rev 3311)
+++ trunk/freebsd-libs/debian/changelog	2011-05-25 17:50:19 UTC (rev 3312)
@@ -44,7 +44,7 @@
 
   [ Aurelien Jarno ]
   * Bumped Standards-Version to 3.9.1.
-  * Add a libusbhid-common package containing usb_hid_usages. Closes: 
+  * Add a libusbhid-common package containing usb_hid_usages. Closes:
     bug#578678.
 
  -- Aurelien Jarno <aurel32 at debian.org>  Wed, 28 Jul 2010 20:21:25 +0200
@@ -55,7 +55,7 @@
   * Use kfreebsd-any instead of explicit architecture list.
 
   [ Aurelien Jarno ]
-  * Add libgeom0 and libipx2 udeb packages. 
+  * Add libgeom0 and libipx2 udeb packages.
 
  -- Aurelien Jarno <aurel32 at debian.org>  Mon, 28 Jun 2010 23:10:06 +0200
 
@@ -76,7 +76,7 @@
 
   [ Aurelien Jarno ]
   * Make libusb2-dev conflict with libusb-dev.
-  * Add a libusb2-udev package. 
+  * Add a libusb2-udev package.
   * Add pkg-config files matching libusb 0.1/libusb 1.0.
   * Add a libusb-config script matching libusb 0.1.
   * Make libusb2-dev provides libusb-1.0-0-dev.
@@ -105,7 +105,7 @@
 freebsd-libs (7.2-4) unstable; urgency=low
 
   [ Aurelien Jarno ]
-  * Fix description of libgeom-dev. 
+  * Fix description of libgeom-dev.
   * libkvm0: use our own copy of getbootfile().
   * Fix dependency between lib and -dev packages.
   * Add README.source.
@@ -318,4 +318,3 @@
   * Initial release.
 
  -- Robert Millan <rmh at aybabtu.com>  Fri, 12 Aug 2005 12:04:07 +0200
-

Modified: trunk/freebsd-libs/debian/control
===================================================================
--- trunk/freebsd-libs/debian/control	2011-05-25 08:52:01 UTC (rev 3311)
+++ trunk/freebsd-libs/debian/control	2011-05-25 17:50:19 UTC (rev 3312)
@@ -103,7 +103,7 @@
  dependent way. The usbhid library contains routines to extract the report
  descriptor which contains the data layout information and then use this
  information.
- . 
+ .
  This package contains the common files which the library need.
 
 Package: libusbhid-dev

Modified: trunk/freebsd-libs/debian/libusb-config
===================================================================
--- trunk/freebsd-libs/debian/libusb-config	2011-05-25 08:52:01 UTC (rev 3311)
+++ trunk/freebsd-libs/debian/libusb-config	2011-05-25 17:50:19 UTC (rev 3312)
@@ -75,5 +75,5 @@
 	echo $includes
 fi
 if test "$echo_libs" = "yes"; then
-	echo -L${exec_prefix}/lib -lusb 
+	echo -L${exec_prefix}/lib -lusb
 fi

Modified: trunk/freebsd-libs/debian/rules
===================================================================
--- trunk/freebsd-libs/debian/rules	2011-05-25 08:52:01 UTC (rev 3311)
+++ trunk/freebsd-libs/debian/rules	2011-05-25 17:50:19 UTC (rev 3312)
@@ -1,8 +1,9 @@
 #!/usr/bin/make -f
 # -*- makefile -*-
 # Sample debian/rules that uses debhelper.
-SHELL=bash
 
+SHELL = bash
+
 # Uncomment this to turn on verbose mode.
 #export DH_VERBOSE=1
 
@@ -17,15 +18,15 @@
 	CFLAGS += -O2
 endif
 
-VERSION=$(shell dpkg-parsechangelog | sed -e '/^Version:/!d' -e 's/^Version: //g' -e 's/-.*//g')
-SVN=http://svn.freebsd.org/base/release/$(VERSION).0
-#SVN=http://svn.freebsd.org/base/releng/8.1
-ORIGDIR=freebsd-libs-$(VERSION)
-PATH:=/usr/lib/freebsd:$(PATH)
-DESTDIR=$(CURDIR)/debian/tmp
-PMAKE=COPTS="$(CFLAGS)" CFLAGS="$(CFLAGS)" NO_WERROR=1 NOGCCERROR=1 NOSHARED=NO NO_SHARED=NO DESTDIR=$(DESTDIR) make
-export SHLIB_MAJOR=0
-kernel=$(shell dpkg-architecture -qDEB_HOST_ARCH_OS)
+VERSION = $(shell dpkg-parsechangelog | sed -e '/^Version:/!d' -e 's/^Version: //g' -e 's/-.*//g')
+SVN = http://svn.freebsd.org/base/release/$(VERSION).0
+#SVN = http://svn.freebsd.org/base/releng/8.1
+ORIGDIR = freebsd-libs-$(VERSION)
+PATH := /usr/lib/freebsd:$(PATH)
+DESTDIR = $(CURDIR)/debian/tmp
+PMAKE = COPTS="$(CFLAGS)" CFLAGS="$(CFLAGS)" NO_WERROR=1 NOGCCERROR=1 NOSHARED=NO NO_SHARED=NO DESTDIR=$(DESTDIR) make
+export SHLIB_MAJOR = 0
+kernel = $(shell dpkg-architecture -qDEB_HOST_ARCH_OS)
 
 get-orig-source:
 	rm -rf $(ORIGDIR)

Modified: trunk/freebsd-moused/debian/changelog
===================================================================
--- trunk/freebsd-moused/debian/changelog	2011-05-25 08:52:01 UTC (rev 3311)
+++ trunk/freebsd-moused/debian/changelog	2011-05-25 17:50:19 UTC (rev 3312)
@@ -27,4 +27,3 @@
   * Initial Release.
 
  -- Robert Millan <rmh at debian.org>  Wed, 18 Aug 2004 00:45:07 +0200
-

Modified: trunk/freebsd-moused/debian/init
===================================================================
--- trunk/freebsd-moused/debian/init	2011-05-25 08:52:01 UTC (rev 3311)
+++ trunk/freebsd-moused/debian/init	2011-05-25 17:50:19 UTC (rev 3312)
@@ -4,7 +4,7 @@
 #		This file should be used to construct scripts for /etc/init.d.
 #
 #		Written by Miquel van Smoorenburg <miquels at cistron.nl>.
-#		Modified for Debian 
+#		Modified for Debian
 #		by Ian Murdock <imurdock at gnu.ai.mit.edu>.
 #
 # Version:	@(#)skeleton  1.9  26-Feb-2001  miquels at cistron.nl

Modified: trunk/freebsd-moused/debian/rules
===================================================================
--- trunk/freebsd-moused/debian/rules	2011-05-25 08:52:01 UTC (rev 3311)
+++ trunk/freebsd-moused/debian/rules	2011-05-25 17:50:19 UTC (rev 3312)
@@ -41,9 +41,9 @@
 clean:
 	dh_testdir
 	dh_testroot
-	
+
 	$(PMAKE) -C usr.sbin/moused clean
-	
+
 	dh_clean
 
 install-indep: build-indep
@@ -53,11 +53,11 @@
 	dh_testroot
 	dh_prep -a
 	dh_installdirs -a
-	
+
 	$(PMAKE) -C usr.sbin/moused install
 	# Geez
 	mv $(DESTDIR)/moused $(DESTDIR)/usr/sbin/
-	
+
 	dh_install -a
 
 install: install-indep install-arch

Modified: trunk/freebsd-quota/debian/rules
===================================================================
--- trunk/freebsd-quota/debian/rules	2011-05-25 08:52:01 UTC (rev 3311)
+++ trunk/freebsd-quota/debian/rules	2011-05-25 17:50:19 UTC (rev 3312)
@@ -1,22 +1,22 @@
 #!/usr/bin/make -f
 
-PATH:=/usr/lib/freebsd:$(PATH)
+PATH := /usr/lib/freebsd:$(PATH)
 
-VERSION=$(shell dpkg-parsechangelog | sed -n '/^Version/ {s/.*: //; s/-.*//; p;}')
-SVNLOC="http://svn.freebsd.org/base/release/$(VERSION).0"
+VERSION = $(shell dpkg-parsechangelog | sed -n '/^Version/ {s/.*: //; s/-.*//; p;}')
+SVNLOC = "http://svn.freebsd.org/base/release/$(VERSION).0"
 
-DESTDIR=$(CURDIR)/debian/tmp
-ORIGDIR=freebsd-quota-$(VERSION)
-TARNAME=freebsd-quota_$(VERSION).orig.tar.gz
+DESTDIR = $(CURDIR)/debian/tmp
+ORIGDIR = freebsd-quota-$(VERSION)
+TARNAME = freebsd-quota_$(VERSION).orig.tar.gz
 
 CFLAGS = -Wall -g -pipe -fPIC -I. -D_GNU_SOURCE -D'__FBSDID(string)=' -D'__RCSID(string)='
-PMAKE=COPTS="$(CFLAGS)" CFLAGS="$(CFLAGS)" NO_WERROR=1 NOGCCERROR=1 NOSHARED=NO NO_SHARED=NO DESTDIR=$(DESTDIR) make
+PMAKE = COPTS="$(CFLAGS)" CFLAGS="$(CFLAGS)" NO_WERROR=1 NOGCCERROR=1 NOSHARED=NO NO_SHARED=NO DESTDIR=$(DESTDIR) make
 
 get-orig-source:
 	rm -rf $(ORIGDIR)
-	for nn in  sbin/fsck  sbin/fsck_ffs  sbin/quotacheck \
-			libexec/rpc.rquotad  usr.bin/quota \
-			usr.sbin/edquota  usr.sbin/quotaon  usr.sbin/repquota; \
+	for nn in sbin/fsck sbin/fsck_ffs sbin/quotacheck \
+		  libexec/rpc.rquotad usr.bin/quota \
+		  usr.sbin/edquota usr.sbin/quotaon usr.sbin/repquota; \
 	do \
 		svn export $(SVNLOC)/$$nn $(ORIGDIR)/$$nn; \
 	done

Modified: trunk/freebsd-sendpr/debian/changelog
===================================================================
--- trunk/freebsd-sendpr/debian/changelog	2011-05-25 08:52:01 UTC (rev 3311)
+++ trunk/freebsd-sendpr/debian/changelog	2011-05-25 17:50:19 UTC (rev 3312)
@@ -85,7 +85,7 @@
 freebsd-sendpr (3.113+5.3-6) unstable; urgency=low
 
   * Don't change the build dependencies at build time.
-  * Updated Standards-Version to 3.6.2. 
+  * Updated Standards-Version to 3.6.2.
 
  -- Aurelien Jarno <aurel32 at debian.org>  Wed,  6 Jul 2005 22:26:30 +0200
 
@@ -128,4 +128,3 @@
   * Initial Release. (Closes: #257979)
 
  -- Robert Millan <rmh at debian.org>  Fri,  9 Jul 2004 20:34:53 +0200
-

Modified: trunk/freebsd-sendpr/debian/control
===================================================================
--- trunk/freebsd-sendpr/debian/control	2011-05-25 08:52:01 UTC (rev 3311)
+++ trunk/freebsd-sendpr/debian/control	2011-05-25 17:50:19 UTC (rev 3312)
@@ -2,7 +2,7 @@
 Section: utils
 Priority: extra
 Maintainer: GNU/kFreeBSD Maintainers <debian-bsd at lists.debian.org>
-Uploaders: Aurelien Jarno <aurel32 at debian.org>, Guillem Jover <guillem at debian.org> 
+Uploaders: Aurelien Jarno <aurel32 at debian.org>, Guillem Jover <guillem at debian.org>
 Vcs-Browser: http://svn.debian.org/wsvn/glibc-bsd/trunk/freebsd-sendpr/
 Vcs-Svn: svn://svn.debian.org/glibc-bsd/trunk/freebsd-sendpr/
 Build-Depends: debhelper (>= 7)

Modified: trunk/freebsd-sendpr/debian/copyright
===================================================================
--- trunk/freebsd-sendpr/debian/copyright	2011-05-25 08:52:01 UTC (rev 3311)
+++ trunk/freebsd-sendpr/debian/copyright	2011-05-25 17:50:19 UTC (rev 3312)
@@ -36,4 +36,3 @@
 
 On Debian systems, the complete text of the GNU General
 Public License can be found in '/usr/share/common-licenses/GPL-2'.
-

Modified: trunk/freebsd-sendpr/debian/rules
===================================================================
--- trunk/freebsd-sendpr/debian/rules	2011-05-25 08:52:01 UTC (rev 3311)
+++ trunk/freebsd-sendpr/debian/rules	2011-05-25 17:50:19 UTC (rev 3312)
@@ -12,14 +12,14 @@
 clean:
 	dh_testdir
 	dh_testroot
-	
+
 	$(PMAKE) clean
-	
+
 	dh_clean
 
 build-indep:
 	dh_testdir
-	
+
 	$(PMAKE)
 
 build-arch:
@@ -31,7 +31,7 @@
 	dh_testroot
 	dh_prep
 	dh_installdirs
-	
+
 	$(PMAKE) install etc-gnats-freefall
 	for i in $(pkgdir)/usr/share/man/man1/*.gz ; do \
 		[ -L $$i ] || gunzip $$i ; \
@@ -59,6 +59,5 @@
 
 binary: binary-indep binary-arch
 
-.PHONY: build build-indep build-arch 
+.PHONY: build build-indep build-arch
 .PHONY: clean binary-indep binary-arch binary install
-

Modified: trunk/freebsd-utils/debian/changelog
===================================================================
--- trunk/freebsd-utils/debian/changelog	2011-05-25 08:52:01 UTC (rev 3311)
+++ trunk/freebsd-utils/debian/changelog	2011-05-25 17:50:19 UTC (rev 3312)
@@ -3,7 +3,7 @@
   [ Petr Salinger ]
   * Based on FreeBSD 8.2.
 
-  [Mats Erik Andersson]
+  [ Mats Erik Andersson ]
   * Add IPv6 support into route wrapper. Closes: #605723.
   * Update mount wrapper for remount requests. Closes: #609574.
 
@@ -28,7 +28,7 @@
   [ Petr Salinger ]
   * enhance kbdcontrol.init, related to Debian Policy,
     9.8 Keyboard configuration. See: #605777.
- 
+
  -- Aurelien Jarno <aurel32 at debian.org>  Sat, 22 Jan 2011 23:44:13 +0100
 
 freebsd-utils (8.1-3.1) unstable; urgency=high
@@ -43,7 +43,7 @@
 freebsd-utils (8.1-3) unstable; urgency=low
 
   [ Aurelien Jarno ]
-  * Add Catalan Debconf translation from Jordi Mallach (closes: 
+  * Add Catalan Debconf translation from Jordi Mallach (closes:
     bug#600624).
   * Add 032_delete_key.diff to conform to Debian Policy,
     9.8 Keyboard configuration. Closes: #605777.
@@ -54,7 +54,7 @@
 
   [ Aurelien Jarno ]
   * freebsd-utils-udeb: add mdconfig.
-  * Update Italian Debconf translation from Luca Monducci (closes: 
+  * Update Italian Debconf translation from Luca Monducci (closes:
     bug#593717).
 
  -- Aurelien Jarno <aurel32 at debian.org>  Sun, 22 Aug 2010 17:10:02 +0200
@@ -76,7 +76,7 @@
   * Use kfreebsd-any instead of explicit architecture list.
 
   [ Aurelien Jarno ]
-  * Add a freebsd-net-tools-udeb package. 
+  * Add a freebsd-net-tools-udeb package.
 
  -- Aurelien Jarno <aurel32 at debian.org>  Tue, 29 Jun 2010 00:58:59 +0200
 
@@ -99,7 +99,7 @@
     and the screen maps. Closes: bug#544083.
   * Update patches/016_swapon.diff to fix segfault on kfreebsd-amd64.
     Closes: bug#574645.
-  * kldutils.init, freebsd-utils-init: don't set PATH to /usr/bin and 
+  * kldutils.init, freebsd-utils-init: don't set PATH to /usr/bin and
     /usr/sbin to make lintian happy.
   * Bumped Standards-Version to 3.8.4 (no changes).
 
@@ -115,7 +115,7 @@
 freebsd-utils (8.0-7) unstable; urgency=low
 
   * Fix clean rule.
-  * Fix build with newer <sys/ptrace.h>. 
+  * Fix build with newer <sys/ptrace.h>.
   * Use <bsd/stdlib.h> instead of deprecated <bsd/random.h>.
 
  -- Aurelien Jarno <aurel32 at debian.org>  Sun, 24 Jan 2010 14:07:33 +0100
@@ -123,22 +123,22 @@
 freebsd-utils (8.0-6) unstable; urgency=low
 
   * mount: assume that the mount helpers are located in /sbin instead of
-    looking in $PATH, which may not contain /sbin when called from 
+    looking in $PATH, which may not contain /sbin when called from
     scripts.
   * Add kdump and ppctl binaries. Closes: bug#557247.
-  * Move ktrace to /usr/bin. 
+  * Move ktrace to /usr/bin.
 
  -- Aurelien Jarno <aurel32 at debian.org>  Sun, 24 Jan 2010 03:14:27 +0100
 
 freebsd-utils (8.0-5) unstable; urgency=low
 
-  * Add build-depends on libcam-dev for camcontrol. 
+  * Add build-depends on libcam-dev for camcontrol.
 
  -- Aurelien Jarno <aurel32 at debian.org>  Sun, 17 Jan 2010 22:06:41 +0100
 
 freebsd-utils (8.0-4) unstable; urgency=low
 
-  * Add atacontrol and camcontrol binaries. 
+  * Add atacontrol and camcontrol binaries.
 
  -- Aurelien Jarno <aurel32 at debian.org>  Sun, 17 Jan 2010 18:31:25 +0100
 
@@ -146,7 +146,7 @@
 
   * Add acpiconf and devd binaries, patch by Werner Koch.
   * Add devfs binary.
-  * Load /dev permissions through from /etc/devfs.d/* instead of 
+  * Load /dev permissions through from /etc/devfs.d/* instead of
     setting them manually at boot time.
 
  -- Aurelien Jarno <aurel32 at debian.org>  Sun, 17 Jan 2010 16:58:42 +0100
@@ -155,7 +155,7 @@
 
   * freebsd-utils.init: fix quoting, and use a symbolic links instead
     of an hardlink (closes: #560125).
-  * freebsd-utils: conflicts with module-init-tools (closes: #559344). 
+  * freebsd-utils: conflicts with module-init-tools (closes: #559344).
 
  -- Aurelien Jarno <aurel32 at debian.org>  Mon, 14 Dec 2009 20:53:21 +0100
 
@@ -166,16 +166,16 @@
   * add netstat into freebsd-net-tools
 
   [ Aurelien Jarno ]
-  * Update Italian Debconf translation from Luca Monducci (closes: 
+  * Update Italian Debconf translation from Luca Monducci (closes:
     bug#540515).
-  * Add Vietnamese Debconf translation from Clytie Siddall (closes: 
+  * Add Vietnamese Debconf translation from Clytie Siddall (closes:
     bug#547923).
 
  -- Aurelien Jarno <aurel32 at debian.org>  Sun, 29 Nov 2009 10:19:43 +0100
 
 freebsd-utils (7.2-9) unstable; urgency=low
 
-  * debian/rules: adjust start priority of freebsd-utils.init and 
+  * debian/rules: adjust start priority of freebsd-utils.init and
     kldutils.init.
   * debian/freebsd-utils.init: avoid printing error messages during
     boot.
@@ -192,7 +192,7 @@
 
   * debian/kldutils.init: don't try to load built-in modules.
   * debian/*.init: adjust insserver header.
-  * debian/rules: increase start priority of freebsd-utils.init and 
+  * debian/rules: increase start priority of freebsd-utils.init and
     kldutils.init.
 
  -- Aurelien Jarno <aurel32 at debian.org>  Fri, 21 Aug 2009 21:04:06 +0200
@@ -206,9 +206,9 @@
 
 freebsd-utils (7.2-6) unstable; urgency=low
 
-  * Update Japanese Debconf translation from Hideki Yamane (closes: 
+  * Update Japanese Debconf translation from Hideki Yamane (closes:
     bug#539599).
-  * Add Italian Debconf translation from Luca Monducci (closes: 
+  * Add Italian Debconf translation from Luca Monducci (closes:
     bug#539599).
   * kbdcontrol: change the priority of debconf question to critical to
     make sure it appears in debian-installer. Default to us.unix.kbd.
@@ -240,10 +240,10 @@
 freebsd-utils (7.2-2) unstable; urgency=low
 
   * Remove debconf template to select modules to load. Most modules are
-    either built-in or autoloaded, and a lot of person are disappointed 
-    by the fact their network card is not listed. Keep loading modules 
+    either built-in or autoloaded, and a lot of person are disappointed
+    by the fact their network card is not listed. Keep loading modules
     listed in /etc/modules at boot time.
-  * Drop depends on kfreebsd-image in kldutils to make debootstrap 
+  * Drop depends on kfreebsd-image in kldutils to make debootstrap
     working.
   * Bumped Standards-Version to 3.8.2 (no changes).
 
@@ -272,7 +272,7 @@
 
   [ Aurelien Jarno ]
   * freebsd-utils.init: create /sys if it doesn't exists.
-  * Use SVN server instead of the deprecated CVS server in get-orig-source. 
+  * Use SVN server instead of the deprecated CVS server in get-orig-source.
 
  -- Aurelien Jarno <aurel32 at debian.org>  Mon, 15 Jun 2009 22:57:19 +0200
 
@@ -454,7 +454,7 @@
 
 freebsd-utils (6.1-3) unreleased; urgency=low
 
-  * Finally disable net-tools again, ifconfig and route build, seem 
+  * Finally disable net-tools again, ifconfig and route build, seem
     to work, but they don't...
   * Bump the dependency on freebsd-hackedutils to (>= 5.2.1-31).
   * Remove the dependency on net-tools.
@@ -464,7 +464,7 @@
 freebsd-utils (6.1-2) unreleased; urgency=low
 
   * Change priority of kldutils and module-init-tools to important.
-  * module-init-tools: don't conflict (only replace), so that apt 
+  * module-init-tools: don't conflict (only replace), so that apt
     is able to resolve the dependency loop.
   * Add manpages.
   * Enable net-tools.
@@ -486,7 +486,7 @@
   * Add start/stop options to /etc/init.d/kbdcontrol
   * Add LSB section to /etc/init.d/kbdcontrol
   * Use debhelper code to call /etc/init.d/kbdcontrol
-  * Drop/adjust dependencies on non-official version of the glibc. 
+  * Drop/adjust dependencies on non-official version of the glibc.
 
  -- Aurelien Jarno <aurel32 at debian.org>  Sat,  4 Nov 2006 16:24:54 +0100
 
@@ -582,4 +582,3 @@
   * Initial release.
 
  -- Robert Millan <rmh at aybabtu.com>  Sat, 18 Mar 2006 12:08:57 +0100
-

Modified: trunk/freebsd-utils/debian/control
===================================================================
--- trunk/freebsd-utils/debian/control	2011-05-25 08:52:01 UTC (rev 3311)
+++ trunk/freebsd-utils/debian/control	2011-05-25 17:50:19 UTC (rev 3312)
@@ -7,8 +7,8 @@
  libkvm-dev (>= 8.2),
  libbsd-dev (>= 0.2.0),
  libc0.1-dev (>= 2.11.2),
- flex | flex-old, 
- kfreebsd-kernel-headers (>= 0.54), 
+ flex | flex-old,
+ kfreebsd-kernel-headers (>= 0.54),
  libmemstat-dev, libnetgraph-dev,
  libipx-dev, libkiconv-dev, libgeom-dev, libdevstat-dev,
  libsbuf-dev (>= 8.2), libcam-dev (>= 8.2),

Modified: trunk/freebsd-utils/debian/freebsd-net-tools.postinst
===================================================================
--- trunk/freebsd-utils/debian/freebsd-net-tools.postinst	2011-05-25 08:52:01 UTC (rev 3311)
+++ trunk/freebsd-utils/debian/freebsd-net-tools.postinst	2011-05-25 17:50:19 UTC (rev 3312)
@@ -23,5 +23,3 @@
 #DEBHELPER#
 
 exit 0
-
-

Modified: trunk/freebsd-utils/debian/freebsd-utils.init
===================================================================
--- trunk/freebsd-utils/debian/freebsd-utils.init	2011-05-25 08:52:01 UTC (rev 3311)
+++ trunk/freebsd-utils/debian/freebsd-utils.init	2011-05-25 17:50:19 UTC (rev 3312)
@@ -4,7 +4,7 @@
 #		This file should be used to construct scripts for /etc/init.d.
 #
 #		Written by Miquel van Smoorenburg <miquels at cistron.nl>.
-#		Modified for Debian 
+#		Modified for Debian
 #		by Ian Murdock <imurdock at gnu.ai.mit.edu>.
 #
 # Version:	@(#)skeleton  1.9  26-Feb-2001  miquels at cistron.nl
@@ -13,10 +13,10 @@
 ### BEGIN INIT INFO
 # Provides:          freebsd-utils udev
 # Required-Start:
-# Required-Stop:     
+# Required-Stop:
 # X-Start-Before:    mtab
 # Default-Start:     S
-# Default-Stop:      
+# Default-Stop:
 # Short-Description: FreeBSD kernel specific setup
 ### END INIT INFO
 
@@ -54,7 +54,7 @@
       done
     fi
     log_action_end_msg 0
-   
+
     log_action_begin_msg "Mounting kernel filesystems"
     # Mount /dev/fd, /proc and /sys
     if ! test -f /proc/cmdline ; then
@@ -74,7 +74,7 @@
     ;;
 
   stop|reload|restart|force-reload)
-    ;; 
+    ;;
 
   *)
       echo "Usage: $0 {start|stop|restart|force-reload}" >&2
@@ -83,4 +83,3 @@
 esac
 
 exit 0
-    

Modified: trunk/freebsd-utils/debian/kbdcontrol.init
===================================================================
--- trunk/freebsd-utils/debian/kbdcontrol.init	2011-05-25 08:52:01 UTC (rev 3311)
+++ trunk/freebsd-utils/debian/kbdcontrol.init	2011-05-25 17:50:19 UTC (rev 3312)
@@ -13,7 +13,7 @@
 #		This file should be used to construct scripts for /etc/init.d.
 #
 #		Written by Miquel van Smoorenburg <miquels at cistron.nl>.
-#		Modified for Debian 
+#		Modified for Debian
 #		by Ian Murdock <imurdock at gnu.ai.mit.edu>.
 #
 # Version:	@(#)skeleton  1.9  26-Feb-2001  miquels at cistron.nl
@@ -68,10 +68,10 @@
 	  -e "s/^  231   .*/  231   fkey61 fkey61 fkey61 fkey61 fkey61 fkey61 boot   fkey61  O/" \
 	  > $TMPFILE
 
-	kbdcontrol -l $TMPFILE  
+	kbdcontrol -l $TMPFILE
 	rm -f $TMPFILE
-  
-	# and generate  ESC [ 3 ~ for fkey61  
+
+	# and generate  ESC [ 3 ~ for fkey61
 	SEQ=`/bin/echo -n -e \\\033[3~`
 	#echo $SEQ | od -ax
 	kbdcontrol -f 61 $SEQ
@@ -93,10 +93,10 @@
 	  -e "s/^  142   .*/  142   bs     bs     del    del    bs     bs     del    del     O/" \
 	  > $TMPFILE
 
-	kbdcontrol -l $TMPFILE  
+	kbdcontrol -l $TMPFILE
 	rm -f $TMPFILE
-  
-	# and generate del for fkey61  
+
+	# and generate del for fkey61
 	SEQ=`/bin/echo -n -e \\\\177`
 	#echo $SEQ | od -ax
 	kbdcontrol -f 61 $SEQ

Modified: trunk/freebsd-utils/debian/kbdcontrol.postinst
===================================================================
--- trunk/freebsd-utils/debian/kbdcontrol.postinst	2011-05-25 08:52:01 UTC (rev 3311)
+++ trunk/freebsd-utils/debian/kbdcontrol.postinst	2011-05-25 17:50:19 UTC (rev 3312)
@@ -5,7 +5,7 @@
 
 set -e
 
-. /usr/share/debconf/confmodule 
+. /usr/share/debconf/confmodule
 
 case "$1" in
     configure)
@@ -35,5 +35,3 @@
 #DEBHELPER#
 
 exit 0
-
-

Modified: trunk/freebsd-utils/debian/kldutils.init
===================================================================
--- trunk/freebsd-utils/debian/kldutils.init	2011-05-25 08:52:01 UTC (rev 3311)
+++ trunk/freebsd-utils/debian/kldutils.init	2011-05-25 17:50:19 UTC (rev 3312)
@@ -15,7 +15,7 @@
 #		This file should be used to construct scripts for /etc/init.d.
 #
 #		Written by Miquel van Smoorenburg <miquels at cistron.nl>.
-#		Modified for Debian 
+#		Modified for Debian
 #		by Ian Murdock <imurdock at gnu.ai.mit.edu>.
 #
 # Version:	@(#)skeleton  1.9  26-Feb-2001  miquels at cistron.nl

Modified: trunk/freebsd-utils/debian/rules
===================================================================
--- trunk/freebsd-utils/debian/rules	2011-05-25 08:52:01 UTC (rev 3311)
+++ trunk/freebsd-utils/debian/rules	2011-05-25 17:50:19 UTC (rev 3312)
@@ -16,13 +16,13 @@
 	CXXFLAGS += -O2
 endif
 
-VERSION=$(shell dpkg-parsechangelog | sed -e '/^Version:/!d' -e 's/^Version: //g' -e 's/-.*//g')
-SVN=http://svn.freebsd.org/base/release/$(VERSION).0
-#SVN=http://svn.freebsd.org/base/releng/8.1
-ORIGDIR=freebsd-utils-$(VERSION)
-PATH:=/usr/lib/freebsd:$(PATH)
-DESTDIR=$(CURDIR)/debian/tmp
-PMAKE=COPTS="$(CFLAGS)" CFLAGS="$(CFLAGS) -I$(CURDIR)/debian/include" NO_WERROR=1 NOGCCERROR=1 NOSHARED=NO NO_SHARED=NO DESTDIR=$(DESTDIR) make
+VERSION = $(shell dpkg-parsechangelog | sed -e '/^Version:/!d' -e 's/^Version: //g' -e 's/-.*//g')
+SVN = http://svn.freebsd.org/base/release/$(VERSION).0
+#SVN = http://svn.freebsd.org/base/releng/8.1
+ORIGDIR = freebsd-utils-$(VERSION)
+PATH := /usr/lib/freebsd:$(PATH)
+DESTDIR = $(CURDIR)/debian/tmp
+PMAKE = COPTS="$(CFLAGS)" CFLAGS="$(CFLAGS) -I$(CURDIR)/debian/include" NO_WERROR=1 NOGCCERROR=1 NOSHARED=NO NO_SHARED=NO DESTDIR=$(DESTDIR) make
 
 build: build-arch build-indep
 
@@ -34,14 +34,14 @@
 		 sbin/kldconfig sbin/kldload sbin/kldstat sbin/kldunload \
 		 usr.bin/ktrdump usr.bin/vmstat sbin/devfs sbin/fdisk \
 		 sbin/ifconfig sbin/route usr.bin/netstat usr.sbin/rpc.umntall \
-	         usr.sbin/ppp usr.sbin/pppctl usr.sbin/arp usr.bin/mkuzip \
+		 usr.sbin/ppp usr.sbin/pppctl usr.sbin/arp usr.bin/mkuzip \
 		 sbin/ipfw contrib/pf sbin/pfctl usr.sbin/authpf \
 		 sbin/mount_std sbin/umount sbin/mount_autofs sbin/mount_cd9660 \
 		 sbin/mount_ext2fs sbin/mount_hpfs sbin/mount_msdosfs sbin/mount_nfs \
 		 sbin/mount_ntfs sbin/mount_nullfs sbin/mount_udf sbin/mount_unionfs \
 		 sbin/mount_reiserfs sbin/mount \
 		 sbin/mdconfig sbin/ccdconfig sbin/swapon sbin/atacontrol sbin/camcontrol \
-	         sbin/gbde sbin/geom bin/kenv \
+		 sbin/gbde sbin/geom bin/kenv \
 		 usr.sbin/kbdcontrol usr.sbin/vidcontrol share/syscons \
 		 sbin/savecore sbin/dumpon \
 		 sys/kern/syscalls.c etc/pf.os ; do \
@@ -89,7 +89,7 @@
 	$(PMAKE) -C sbin/mount_std
 	$(PMAKE) -C sbin/savecore
 	$(PMAKE) -C sbin/swapon
-	$(PMAKE) -C sbin/sysctl 
+	$(PMAKE) -C sbin/sysctl
 	$(PMAKE) -C sbin/umount
 	$(PMAKE) -C usr.bin/kdump
 	$(PMAKE) -C usr.bin/ktrace
@@ -186,7 +186,7 @@
 	$(PMAKE) -C sbin/gbde clean
 
 	$(PMAKE) -C usr.sbin/kbdcontrol clean
-	
+
 	$(PMAKE) -C usr.sbin/vidcontrol clean
 	$(PMAKE) -C share/syscons/scrnmaps clean
 

Modified: trunk/kfreebsd-6/debian/control.flavor.in
===================================================================
--- trunk/kfreebsd-6/debian/control.flavor.in	2011-05-25 08:52:01 UTC (rev 3311)
+++ trunk/kfreebsd-6/debian/control.flavor.in	2011-05-25 17:50:19 UTC (rev 3312)
@@ -43,4 +43,3 @@
 Description: header files for kernel of FreeBSD @major@
  This package depends on the latest header files for kernel of FreeBSD @major@ on
  @flavor at -class machines.
-  

Modified: trunk/kfreebsd-6/debian/control.in
===================================================================
--- trunk/kfreebsd-6/debian/control.in	2011-05-25 08:52:01 UTC (rev 3311)
+++ trunk/kfreebsd-6/debian/control.in	2011-05-25 17:50:19 UTC (rev 3312)
@@ -29,4 +29,3 @@
  apt-get install kfreebsd-headers-$(uname -r)
  .
  and it will be unpacked in /usr/src/kfreebsd-headers- at version@- at abiname@-(flavour)
-

Modified: trunk/kfreebsd-6/debian/kfreebsd-image.overrides
===================================================================
--- trunk/kfreebsd-6/debian/kfreebsd-image.overrides	2011-05-25 08:52:01 UTC (rev 3311)
+++ trunk/kfreebsd-6/debian/kfreebsd-image.overrides	2011-05-25 17:50:19 UTC (rev 3312)
@@ -1,3 +1,2 @@
 shlib-with-non-pic-code
 shared-lib-without-dependency-information
-

Modified: trunk/kfreebsd-6/debian/kfreebsd-image.postinst.in
===================================================================
--- trunk/kfreebsd-6/debian/kfreebsd-image.postinst.in	2011-05-25 08:52:01 UTC (rev 3311)
+++ trunk/kfreebsd-6/debian/kfreebsd-image.postinst.in	2011-05-25 17:50:19 UTC (rev 3312)
@@ -60,5 +60,3 @@
 #DEBHELPER#
 
 exit 0
-
-

Modified: trunk/kfreebsd-6/debian/rules
===================================================================
--- trunk/kfreebsd-6/debian/rules	2011-05-25 08:52:01 UTC (rev 3311)
+++ trunk/kfreebsd-6/debian/rules	2011-05-25 17:50:19 UTC (rev 3312)
@@ -28,18 +28,20 @@
 HEADERS_DIR	:= kfreebsd-headers-$(version)-$(abiname)
 FLAVOR_DIR	:= flavor-$(version)-$(abiname)
 
-MAKE		:= make MACHINE_ARCH=$(cpu) CC=gcc-3.4 WERROR= 
+MAKE		:= make MACHINE_ARCH=$(cpu) CC=gcc-3.4 WERROR=
 PATH		:= $(CURDIR)/config:/usr/lib/freebsd:$(PATH)
 
 control: clean
 	sed -e "s/@major@/$(major)/g" -e "s/@version@/$(version)/g" -e "s/@abiname@/$(abiname)/g" -e "s/@flavor@/$$flavor/g" \
 		$(CURDIR)/debian/control.in > $(CURDIR)/debian/control
+	echo >> $(CURDIR)/debian/control
 	for arch in `ls $(CURDIR)/debian/arch/` ; do \
 		for config in `ls $(CURDIR)/debian/arch/$$arch/ | grep \.config` ; do \
 			flavor=$${config/.config/} ; \
 			test -f $(CURDIR)/debian/arch/$$arch/$$flavor.defines && recommends=`awk '/^Recommends: / {print $$2}' $(CURDIR)/debian/arch/$$arch/$$flavor.defines` ; \
 			sed -e "s/@major@/$(major)/g" -e "s/@version@/$(version)/g" -e "s/@abiname@/$(abiname)/g" -e "s/@flavor@/$$flavor/g" -e "s/@arch@/$$arch/g" -e "s/@recommends@/$$recommends/g" \
 				$(CURDIR)/debian/control.flavor.in >> $(CURDIR)/debian/control ; \
+			echo >> $(CURDIR)/debian/control ; \
 		done ; \
 	done
 
@@ -55,7 +57,7 @@
 src: src-stamp
 src-stamp:
 	tar xfj $(CURDIR)/src.tar.bz2
-	
+
 	set -e ; find src -type d -name CVS | xargs rm -rf
 
 	set -e ; find src -type f | (while read i ; do \
@@ -71,7 +73,7 @@
 		-e 's,#\( \|\t\)*include\( \|\t\)*\(<\|"\)bpfilter.h\(>\|"\),,g' \
 		-e 's,#\( \|\t\)*include\( \|\t\)*\(<\|"\)pflog.h\(>\|"\),,g' \
 	; done)
-	
+
 	set -e ; cd $(CURDIR)/src ; QUILT_PC=$(CURDIR)/.pc QUILT_PATCHES=$(CURDIR)/debian/patches quilt push -a ; cd $(CURDIR)
 
 	install debian/gen-ld-u-options src/usr.sbin/config
@@ -81,7 +83,7 @@
 build-indep: build-indep-stamp
 build-indep-stamp: src
 	dh_testdir
-	
+
 	cp -af src $(SRC_DIR)
 
 	touch build-indep-stamp
@@ -112,7 +114,7 @@
 build-arch: $(foreach flavor,$(flavours),build-flavor-$(flavor)-stamp)
 build-flavor-%-stamp: src config
 	cp -af src $(FLAVOR_DIR)-$*
-	
+
 	# Add the abiname and the flavor to the kernel version
 	sed -i -e 's/^RELEASE=".*"/RELEASE="$(version)-$(abiname)-$*"/g' $(FLAVOR_DIR)-$*/sys/conf/newvers.sh
 
@@ -132,11 +134,11 @@
 	touch build-flavor-$*-stamp
 
 install-common-stamp: src
-	dh_testdir 
+	dh_testdir
 	dh_testroot
 	mkdir -p $(HEADERS_PACKAGE)/usr/src/$(HEADERS_DIR)
 	cd src \
-		&& find . -type f -name "*.h" -not -regex ".*modules.*" -not -regex ".*sys/$(cpu)/.*" -exec cp --parents {} $(HEADERS_PACKAGE)/usr/src/$(HEADERS_DIR) \; 
+		&& find . -type f -name "*.h" -not -regex ".*modules.*" -not -regex ".*sys/$(cpu)/.*" -exec cp --parents {} $(HEADERS_PACKAGE)/usr/src/$(HEADERS_DIR) \;
 	find $(HEADERS_PACKAGE)/usr/src/$(HEADERS_DIR) -type f -exec chmod 644 {} \;
 
 	touch install-common-stamp
@@ -160,7 +162,7 @@
 	install -o root -g root -m 644 \
 		$(FLAVOR_DIR)-$*/sys/boot/forth/loader.conf \
 		$(IMAGE_PACKAGE)-$*/boot/defaults/loader.conf
-	
+
 	# now install the kernel
 	$(MAKE) -C $(FLAVOR_DIR)-$*/sys/$(cpu)/compile/$(configfile) DESTDIR=$(IMAGE_PACKAGE)-$* install
 	mv $(IMAGE_PACKAGE)-$*/lib/modules/$(version)-$(abiname)-$*/kernel $(IMAGE_PACKAGE)-$*/boot/kfreebsd-$(version)-$(abiname)-$*
@@ -179,7 +181,7 @@
 
 	# remove device.hints (built into kernel)
 	rm -f $(IMAGE_PACKAGE)-$*/boot/device.hints
-	
+
 	# override file
 	mkdir -p $(IMAGE_PACKAGE)-$*/usr/share/lintian/overrides
 	install -p -o root -g root -m 644 \
@@ -194,13 +196,13 @@
 	# scripts
 	sed -e "s/@RELEASE@/$(version)-$(abiname)-$*/g" debian/kfreebsd-image.postinst.in \
 		> debian/kfreebsd-image-$(version)-$(abiname)-$*.postinst
-	
+
 	# headers package
 	mkdir -p $(HEADERS_PACKAGE)-$*/usr/src/$(HEADERS_DIR)-$*/sys/$(cpu)
 	cd $(FLAVOR_DIR)-$*/sys/$(cpu) \
 		&& find . -type f -name "*.h" -not -regex ".*modules.*" -exec cp --parents {} $(HEADERS_PACKAGE)-$*/usr/src/$(HEADERS_DIR)-$*/sys/$(cpu) \; \
 		&& cp -d --parents compile/$(configfile)/machine $(HEADERS_PACKAGE)-$*/usr/src/$(HEADERS_DIR)-$*/sys/$(cpu) \
-		&& cp -d --parents conf/$(configfile) $(HEADERS_PACKAGE)-$*/usr/src/$(HEADERS_DIR)-$*/sys/$(cpu) 
+		&& cp -d --parents conf/$(configfile) $(HEADERS_PACKAGE)-$*/usr/src/$(HEADERS_DIR)-$*/sys/$(cpu)
 	find $(HEADERS_PACKAGE)-$*/usr/src/$(HEADERS_DIR)-$*/sys/$(cpu) -type f -exec chmod 644 {} \;
 	for dir in `ls $(HEADERS_PACKAGE)/usr/src/$(HEADERS_DIR)/sys` ; do \
 		ln -s ../../$(HEADERS_DIR)/sys/$$dir $(HEADERS_PACKAGE)-$*/usr/src/$(HEADERS_DIR)-$*/sys/$$dir ; \
@@ -246,10 +248,9 @@
 else
 binary-arch:
 	# We have nothing to do
-endif	
+endif
 
 binary: binary-indep binary-arch
 
 .PHONY: clean build build-indep
 .PHONY: binary-indep binary-arch binary-indep binary-arch binary
-

Modified: trunk/kfreebsd-7/debian/changelog
===================================================================
--- trunk/kfreebsd-7/debian/changelog	2011-05-25 08:52:01 UTC (rev 3311)
+++ trunk/kfreebsd-7/debian/changelog	2011-05-25 17:50:19 UTC (rev 3312)
@@ -7,7 +7,7 @@
 kfreebsd-7 (7.3-7) unstable; urgency=high
 
   [ Aurelien Jarno ]
-  * Call postinst/postrm hooks as defined by the "Policy for Linux kernel, 
+  * Call postinst/postrm hooks as defined by the "Policy for Linux kernel,
     initramfs, boot loader update process".
 
   [ Guillem Jover ]
@@ -77,16 +77,16 @@
      - Improve linprocfs. Closes: #344546, #521304.
      - Set kernel ident to kernel flavour and package version.
      - Enhance debian/copyright.
-     - Add a get-orig-source target to debian/rules and 
+     - Add a get-orig-source target to debian/rules and
        stop using a tar in tar system.
 
  -- Aurelien Jarno <aurel32 at debian.org>  Fri, 09 Apr 2010 14:41:20 +0200
 
 kfreebsd-7 (7.2-11) unstable; urgency=low
 
-  * Revert BOOPT kernel options changes.  Closes: #565396. 
+  * Revert BOOPT kernel options changes.  Closes: #565396.
     Reopens: #550429.
-  * debian/control: add ${misc:Depends} to all packages. 
+  * debian/control: add ${misc:Depends} to all packages.
 
  -- Aurelien Jarno <aurel32 at debian.org>  Fri, 15 Jan 2010 16:04:12 +0100
 
@@ -129,7 +129,7 @@
 
   [ Aurelien Jarno ]
   * Really build the ZFS module.
-  * Enable TMPFS, it is need early in the boot process. 
+  * Enable TMPFS, it is need early in the boot process.
   * Add debian/README.source.
   * Align modules load address on pages.
 
@@ -192,7 +192,7 @@
 
   [ Aurelien Jarno ]
   * Keep sources of ZFS but don't enable them.
-  * Remove alternative build-depends on freebsd6-buildutils. 
+  * Remove alternative build-depends on freebsd6-buildutils.
   * Remove compat flavours as we are going to the official archive.
   * Move ndiswrapper modules to kfreebsd-image, the same way the Linux
     modules are in main in the Debian.
@@ -201,8 +201,8 @@
 
 kfreebsd-7 (7.1-4) unstable; urgency=low
 
-  * debian/control.flavor.in: depends on kldutils instead of 
-    module-init-tools. 
+  * debian/control.flavor.in: depends on kldutils instead of
+    module-init-tools.
 
  -- Aurelien Jarno <aurel32 at debian.org>  Mon, 13 Apr 2009 21:27:55 +0200
 
@@ -214,7 +214,7 @@
   * debian/rules: make sure ~/.quiltrc or /etc/quilt.quiltrc is not used.
   * 000_ktimer.diff: fix local privilege escalation (CVE-2009-1041 /
     FreeBSD-SA-09:06.ktimer).
-  * 000_kenv.diff: fix kernel panic when dumping environment 
+  * 000_kenv.diff: fix kernel panic when dumping environment
     (FreeBSD-EN-09:01.kenv).
 
  -- Aurelien Jarno <aurel32 at debian.org>  Mon, 23 Mar 2009 19:00:14 +0100
@@ -243,9 +243,9 @@
   * Do not specify SMP in GENERIC, it is enabled on per flavour basis
   * Ship config file used for building corresponding flavour
   * redefine POLL_HUP to be distinct from POLL_ERR
-  
+
   [ Aurelien Jarno ]
-  * debian/patches/*: convert to patchlevel p1 as requested by the new 
+  * debian/patches/*: convert to patchlevel p1 as requested by the new
     dpkg-source.
   * debian/control.compat.in, debian/control.flavor.in: set section of
     images to admin.
@@ -275,11 +275,11 @@
 
 kfreebsd-7 (7.0-5) unstable; urgency=high
 
-  * Fix amd64 swapgs local privilege escalation 
+  * Fix amd64 swapgs local privilege escalation
     (FreeBSD-SA-08:07.amd64 / CVE-2008-3890).
-  * Fix nmount(2) local arbitrary code execution 
+  * Fix nmount(2) local arbitrary code execution
     (FreeBSD-SA-08:08.nmount / CVE-2008-3531).
-  * Fix remote kernel panics on IPv6 connections 
+  * Fix remote kernel panics on IPv6 connections
     (FreeBSD-SA-08:09.icmp6 /CVE-2008-3530).
 
  -- Aurelien Jarno <aurel32 at debian.org>  Thu, 04 Sep 2008 11:49:44 +0200
@@ -325,7 +325,7 @@
 
   [ Aurelien Jarno ]
   * Refresh all patches.
-  * Bumped Standards-Version to 3.7.3 (no changes). 
+  * Bumped Standards-Version to 3.7.3 (no changes).
 
  -- Aurelien Jarno <aurel32 at debian.org>  Mon, 07 Jan 2008 11:48:14 +0100
 
@@ -388,7 +388,7 @@
   * New upstream version (RELENG_6_2_0_RELEASE)
      - drop obsolete 000_kmem, 000_net, 000_ppp, 000_smbfs,
                      002_glibc_dev_isp, 006_proc_mounts patches
-     - update 009_disable_duped_modules, 
+     - update 009_disable_duped_modules,
               903_disable_non-free_drivers,
               999_config patches
 
@@ -433,7 +433,7 @@
 
 kfreebsd-6 (6.1-0.3) unreleased; urgency=low
 
-  * Relax the conflict with kfreebsd-loader to (<< 5.4-1.3). 
+  * Relax the conflict with kfreebsd-loader to (<< 5.4-1.3).
 
  -- Aurelien Jarno <aurel32 at debian.org>  Thu, 12 Oct 2006 16:19:38 +0200
 
@@ -463,7 +463,7 @@
   * Do not load directly executed shared library (e.g. ld.so) at base addr 0
 
   [ Aurelien Jarno ]
-  * Bumped Standards-Version to 3.7.2 (no changes). 
+  * Bumped Standards-Version to 3.7.2 (no changes).
 
  -- Aurelien Jarno <aurel32 at debian.org>  Tue, 25 Jul 2006 00:58:48 +0200
 
@@ -579,13 +579,13 @@
 kfreebsd-5 (5.3-5) unstable; urgency=low
 
   * Enabled atapicam driver (closes: bug#323155).
-  * Allow the kernel to execve ET_DYN files. 
+  * Allow the kernel to execve ET_DYN files.
 
  -- Aurelien Jarno <aurel32 at debian.org>  Wed, 17 Aug 2005 15:44:18 +0200
 
 kfreebsd-5 (5.3-4) unstable; urgency=low
 
-  * Added OSS_GETVERSION ioctl. Patch from Robert Millan (closes: 
+  * Added OSS_GETVERSION ioctl. Patch from Robert Millan (closes:
     bug#322197)
 
  -- Aurelien Jarno <aurel32 at debian.org>  Wed, 10 Aug 2005 00:56:00 +0200

Modified: trunk/kfreebsd-7/debian/control.flavor.in
===================================================================
--- trunk/kfreebsd-7/debian/control.flavor.in	2011-05-25 08:52:01 UTC (rev 3311)
+++ trunk/kfreebsd-7/debian/control.flavor.in	2011-05-25 17:50:19 UTC (rev 3312)
@@ -5,7 +5,7 @@
 Provides: kfreebsd-image- at major@, kfreebsd-image
 Recommends: @recommends@
 Description: kernel of FreeBSD @version@ image
- This package provides the binary image and pre-built loadable modules for 
+ This package provides the binary image and pre-built loadable modules for
  the kernel of FreeBSD @version@, base of a GNU/kFreeBSD system.
  .
  This package is compiled for a @flavor at -class machine.
@@ -22,10 +22,10 @@
 Provides: kfreebsd-headers- at major@
 Depends: kfreebsd-headers- at version@- at abiname@ (= ${binary:Version}), ${misc:Depends}
 Description: header files for kernel of FreeBSD @version@
- This package provides the header files for kernel of FreeBSD @version@, generally 
- used for building out-of-tree kernel modules. These files are going to be 
- installed into /usr/src/kfreebsd-headers- at version@- at abiname@- at flavor@, and can be 
- used for building modules that load into the kernel provided by the 
+ This package provides the header files for kernel of FreeBSD @version@, generally
+ used for building out-of-tree kernel modules. These files are going to be
+ installed into /usr/src/kfreebsd-headers- at version@- at abiname@- at flavor@, and can be
+ used for building modules that load into the kernel provided by the
  kfreebsd-image- at version@- at abiname@- at flavor@ package.
 
 Package: kfreebsd-headers- at major@- at flavor@
@@ -34,4 +34,3 @@
 Description: header files for kernel of FreeBSD @major@
  This package depends on the latest header files for kernel of FreeBSD @major@ on
  @flavor at -class machines.
-  

Modified: trunk/kfreebsd-7/debian/control.in
===================================================================
--- trunk/kfreebsd-7/debian/control.in	2011-05-25 08:52:01 UTC (rev 3311)
+++ trunk/kfreebsd-7/debian/control.in	2011-05-25 17:50:19 UTC (rev 3312)
@@ -16,16 +16,16 @@
 Recommends: freebsd-buildutils (>= 7)
 Provides: kfreebsd-source- at major@, kfreebsd-source
 Description: source code for kernel of FreeBSD @version@ with Debian patches
- This package provides the source code for kernel of FreeBSD @version@, base of 
+ This package provides the source code for kernel of FreeBSD @version@, base of
  a GNU/kFreeBSD system.
 
 Package: kfreebsd-headers- at version@- at abiname@
 Architecture: kfreebsd-any
 Depends: ${misc:Depends}
 Description: Common architecture-specific header files for kernel of FreeBSD @version@
- This package provides the architecture-specific common kernel header files for 
- kernel of FreeBSD @version@, generally used for building out-of-tree kernel 
- modules. To obtain a complete set of headers you also need to install the 
+ This package provides the architecture-specific common kernel header files for
+ kernel of FreeBSD @version@, generally used for building out-of-tree kernel
+ modules. To obtain a complete set of headers you also need to install the
  kfreebsd-headers- at version@- at abiname@-(flavour) package, matching the flavour of the
  kernel you intend the build for. To obtain such a set for the currently running
  kernel it is sufficient to run a command
@@ -33,4 +33,3 @@
  apt-get install kfreebsd-headers-$(uname -r)
  .
  and it will be unpacked in /usr/src/kfreebsd-headers- at version@- at abiname@-(flavour)
-

Modified: trunk/kfreebsd-7/debian/copyright
===================================================================
--- trunk/kfreebsd-7/debian/copyright	2011-05-25 08:52:01 UTC (rev 3311)
+++ trunk/kfreebsd-7/debian/copyright	2011-05-25 17:50:19 UTC (rev 3312)
@@ -2547,7 +2547,7 @@
 --
   CDDL license
     338 files are licensed under this license:
-    sys/cddl/*  
+    sys/cddl/*
 
   |   COMMON DEVELOPMENT AND DISTRIBUTION LICENSE Version 1.0
   | 
@@ -3785,4 +3785,3 @@
 Copyright: (C) 2003 Hifn Inc.
 Copyright: (C) 2000 Sergey A. Babkin
 Copyright: (C) Hannes Gredler <hannes at juniper.net>
-

Modified: trunk/kfreebsd-7/debian/kfreebsd-image.README.Debian
===================================================================
--- trunk/kfreebsd-7/debian/kfreebsd-image.README.Debian	2011-05-25 08:52:01 UTC (rev 3311)
+++ trunk/kfreebsd-7/debian/kfreebsd-image.README.Debian	2011-05-25 17:50:19 UTC (rev 3312)
@@ -3,13 +3,13 @@
 
 This package contain the FreeBSD kernel and various modules. Among them
 ext2fs.ko, reiserfs.ko and xfs.ko distributed under the terms of the GPL
-version 2. zfs.ko is distributed  under the terms of the CDDL. Both 
+version 2. zfs.ko is distributed  under the terms of the CDDL. Both
 licenses are not compatible according to the Free Software Fondation.
 
-While it is legaly possible to distribute both modules (they are not 
+While it is legaly possible to distribute both modules (they are not
 linked together), it may not be legaly possible to load them at the same
 time (dynamic linking).
 
 [1] http://www.gnu.org/licenses/license-list.html
- 
- -- Aurelien Jarno <aurel32 at debian.org>  Mon, 10 Aug 2009 10:51:55 +0200 
+
+ -- Aurelien Jarno <aurel32 at debian.org>  Mon, 10 Aug 2009 10:51:55 +0200

Modified: trunk/kfreebsd-7/debian/kfreebsd-image.postinst.in
===================================================================
--- trunk/kfreebsd-7/debian/kfreebsd-image.postinst.in	2011-05-25 08:52:01 UTC (rev 3311)
+++ trunk/kfreebsd-7/debian/kfreebsd-image.postinst.in	2011-05-25 17:50:19 UTC (rev 3312)
@@ -34,7 +34,7 @@
             done
 
 	    mkdir -p /boot/kernel
-    
+
             if [ "$(readlink -f /boot/kernel/kernel.gz)" != "/boot/kfreebsd-$RELEASE.gz" ] ; then
                 rm -f /boot/kernel/kernel.old.gz
                 if [ -L /boot/kernel/kernel.gz ] ; then
@@ -42,7 +42,7 @@
                 fi
                 ln -s /boot/kfreebsd-$RELEASE.gz /boot/kernel/kernel.gz
             fi
-    
+
             # on i386 acpi MUST be within kfreebsd-loader reach
             if [ "${RELEASE%%-[456]86}" != "${RELEASE}" ] ; then
                 if [ "$(readlink -f /boot/kernel/acpi.ko)" != "/lib/modules/$RELEASE/acpi.ko" ] ; then
@@ -51,7 +51,7 @@
                         mv /boot/kernel/acpi.ko /boot/kernel/acpi.ko.old
                     fi
                     ln -s /lib/modules/$RELEASE/acpi.ko /boot/kernel/acpi.ko
-                fi    
+                fi
             fi
         fi
 
@@ -65,7 +65,7 @@
         # Run /etc/kernel-img.conf postinst hook if defined
         postinst_hook=$(sed '/^\s*postinst_hook/!d;s/.*=\s*//' $KERNEL_IMG_CONF 2>/dev/null || true)
         if [ -n "$postinst_hook" ] ; then
-            echo "Running postinst hook script $postinst_hook." 1>&2 
+            echo "Running postinst hook script $postinst_hook." 1>&2
             $postinst_hook "$RELEASE" "/boot/kfreebsd-$RELEASE.gz"
         fi
 
@@ -77,7 +77,7 @@
                 /etc/kernel/postinst.d
         fi
     ;;
-   
+
     abort-upgrade|abort-remove|abort-deconfigure)
     ;;
 
@@ -93,5 +93,3 @@
 #DEBHELPER#
 
 exit 0
-
-

Modified: trunk/kfreebsd-7/debian/kfreebsd-image.postrm.in
===================================================================
--- trunk/kfreebsd-7/debian/kfreebsd-image.postrm.in	2011-05-25 08:52:01 UTC (rev 3311)
+++ trunk/kfreebsd-7/debian/kfreebsd-image.postrm.in	2011-05-25 17:50:19 UTC (rev 3312)
@@ -35,7 +35,7 @@
         # Run /etc/kernel-img.conf postrm hook if defined
         postrm_hook=$(sed '/^\s*postrm_hook/!d;s/.*=\s*//' $KERNEL_IMG_CONF 2>/dev/null || true)
         if [ -n "$postrm_hook" ] ; then
-            echo "Running postrm hook script $postrm_hook." 1>&2 
+            echo "Running postrm hook script $postrm_hook." 1>&2
             $postrm_hook "$RELEASE" "/boot/kfreebsd-$RELEASE.gz"
         fi
 
@@ -48,7 +48,7 @@
                 /etc/kernel/postrm.d
         fi
     ;;
-    
+
     purge|upgrade|failed-upgrade|abort-install|abort-upgrade|disappear)
     ;;
 

Modified: trunk/kfreebsd-7/debian/kfreebsd-image.preinst.in
===================================================================
--- trunk/kfreebsd-7/debian/kfreebsd-image.preinst.in	2011-05-25 08:52:01 UTC (rev 3311)
+++ trunk/kfreebsd-7/debian/kfreebsd-image.preinst.in	2011-05-25 17:50:19 UTC (rev 3312)
@@ -30,7 +30,7 @@
         # Run preinst hook if defined
         preinst_hook=$(sed '/^\s*preinst_hook/!d;s/.*=\s*//' $KERNEL_IMG_CONF 2>/dev/null || true)
         if [ -n "$preinst_hook" ] ; then
-            echo "Running preinst hook script $preinst_hook." 1>&2 
+            echo "Running preinst hook script $preinst_hook." 1>&2
             $preinst_hook "$RELEASE" "/boot/kfreebsd-$RELEASE.gz"
         fi
 

Modified: trunk/kfreebsd-7/debian/kfreebsd-image.prerm.in
===================================================================
--- trunk/kfreebsd-7/debian/kfreebsd-image.prerm.in	2011-05-25 08:52:01 UTC (rev 3311)
+++ trunk/kfreebsd-7/debian/kfreebsd-image.prerm.in	2011-05-25 17:50:19 UTC (rev 3312)
@@ -33,7 +33,7 @@
         # Run prerm hook if defined
         prerm_hook=$(sed '/^\s*prerm_hook/!d;s/.*=\s*//g' $KERNEL_IMG_CONF 2>/dev/null || true)
         if [ -n "$prerm_hook" ] ; then
-            echo "Running prerm hook script $prerm_hook." 1>&2 
+            echo "Running prerm hook script $prerm_hook." 1>&2
             $prerm_hook "$RELEASE" "/boot/kfreebsd-$RELEASE.gz"
         fi
 

Modified: trunk/kfreebsd-7/debian/rules
===================================================================
--- trunk/kfreebsd-7/debian/rules	2011-05-25 08:52:01 UTC (rev 3311)
+++ trunk/kfreebsd-7/debian/rules	2011-05-25 17:50:19 UTC (rev 3312)
@@ -44,12 +44,14 @@
 control: clean
 	sed -e "s/@major@/$(major)/g" -e "s/@version@/$(version)/g" -e "s/@abiname@/$(abiname)/g" -e "s/@flavor@/$$flavor/g" \
 		$(CURDIR)/debian/control.in > $(CURDIR)/debian/control
+	echo >> $(CURDIR)/debian/control
 	for arch in `ls $(CURDIR)/debian/arch/` ; do \
 		for config in `ls $(CURDIR)/debian/arch/$$arch/ | grep \.config` ; do \
 			flavor=$${config/.config/} ; \
 			test -f $(CURDIR)/debian/arch/$$arch/$$flavor.defines && recommends=`awk '/^Recommends: / {print $$2}' $(CURDIR)/debian/arch/$$arch/$$flavor.defines` ; \
 			sed -e "s/@major@/$(major)/g" -e "s/@version@/$(version)/g" -e "s/@abiname@/$(abiname)/g" -e "s/@flavor@/$$flavor/g" -e "s/@arch@/$$arch/g" -e "s/@recommends@/$$recommends/g" \
 				$(CURDIR)/debian/control.flavor.in >> $(CURDIR)/debian/control ; \
+			echo >> $(CURDIR)/debian/control ; \
 		done ; \
 	done
 
@@ -133,7 +135,7 @@
 
 	# Set /lib/modules/${RELEASE} as module dir
 	sed -i -e 's,^KODIR?=.*,KODIR="/lib/modules/$(version)-$(abiname)-$*",g' $(FLAVOR_DIR)-$*/sys/conf/kern.pre.mk
-	sed -i -e '/^static char linker_path/s,".*","/lib/modules/$(version)-$(abiname)-$*",g' $(FLAVOR_DIR)-$*/sys/kern/kern_linker.c 
+	sed -i -e '/^static char linker_path/s,".*","/lib/modules/$(version)-$(abiname)-$*",g' $(FLAVOR_DIR)-$*/sys/kern/kern_linker.c
 
 	# Configure the kernel
 	cp debian/arch/$(cpu)/$*.config $(FLAVOR_DIR)-$*/sys/$(cpu)/conf/
@@ -177,7 +179,7 @@
 	install -o root -g root -m 644 \
 		$(FLAVOR_DIR)-$*/sys/boot/forth/loader.conf \
 		$(IMAGE_PACKAGE)-$*/boot/defaults/loader.conf
-	
+
 	# install the config file
 	install -o root -g root -m 644 \
 		$(FLAVOR_DIR)-$*/sys/$(cpu)/conf/$*.config \
@@ -276,4 +278,3 @@
 
 .PHONY: clean build build-indep
 .PHONY: binary-indep binary-arch binary-indep binary-arch binary
-

Modified: trunk/kfreebsd-8/debian/changelog
===================================================================
--- trunk/kfreebsd-8/debian/changelog	2011-05-25 08:52:01 UTC (rev 3311)
+++ trunk/kfreebsd-8/debian/changelog	2011-05-25 17:50:19 UTC (rev 3312)
@@ -45,10 +45,10 @@
 
 kfreebsd-8 (8.1+dfsg-7) unstable; urgency=low
 
-  [ Robert Millan ] 
+  [ Robert Millan ]
   * Add 917_track_alignment.diff to remove obsolete warning about track
     alignment in MSDOS partitions. Closes: #603380.
-  
+
   [ Petr Salinger ]
   * Add 918_delete_key.diff to conform to Debian Policy,
     9.8 Keyboard configuration. Closes: #605065.
@@ -62,10 +62,10 @@
   * Drop non-free firmware. Closes: #594940.
     - prune .orig.tar.gz
     - disable firmware in kernel via 999_config.diff
-    - drop firmware even as modules inside 999_firmware.diff 
+    - drop firmware even as modules inside 999_firmware.diff
   * Re-enable ulpt in kernel. Closes: #598417.
   * Raise NKPT on amd64 via 916_NKPT_amd64.diff. Closes: #596577.
-  
+
   [ Aurelien Jarno ]
   * Replace 106_teken_op.diff by upstream patch.
   * Add 108_teken_utf8_table.diff to be able to display upper case vowels
@@ -75,7 +75,7 @@
 
 kfreebsd-8 (8.1-5) unstable; urgency=medium
 
-  * Correctly update a root filesystem to read/write when the mount 
+  * Correctly update a root filesystem to read/write when the mount
     options are passed as flags instead of iovec, like in busybox.
   * Fix Coda filesystem kernel memory disclosure (CVE-2010-3014).
   * Disable TEKEN_XTERM as TEKEN_UTF8 is enough to get UTF-8 support
@@ -88,7 +88,7 @@
   [ Petr Salinger ]
   * Report i686 instead of i386 on amd64 machine for 32-bit binaries.
   * Teach how to handle orig_pair ESC sequence for TERM=cons25.
-    Closes: #559364.    
+    Closes: #559364.
   * enable VESA also for 64-bit kernel, similarly as for 32-bits
     kernels since 8.0-3
 
@@ -99,7 +99,7 @@
   [ Aurelien Jarno ]
   * Backport adaptive_machine_arch support from -CURRENT, change an amd64
     machine into i386 for 32-bit binaries.
-  * Call postinst/postrm hooks as defined by the "Policy for Linux kernel, 
+  * Call postinst/postrm hooks as defined by the "Policy for Linux kernel,
     initramfs, boot loader update process".
 
   [ Guillem Jover ]
@@ -132,7 +132,7 @@
   [ Guillem Jover ]
   * Use kfreebsd-any instead of explicit architecture list.
   * Fold Build-Depends field into several lines.
-  
+
   [ Aurelien Jarno ]
   * debian/control.in: bump Standards-Version to 3.9.1 (no changes).
 
@@ -140,7 +140,7 @@
 
 kfreebsd-8 (8.0-11) unstable; urgency=medium
 
-  * Also disable -fstack-protector for modules, now that 
+  * Also disable -fstack-protector for modules, now that
     freebsd-buildutils enable it by default. Closes: #587630.
 
  -- Aurelien Jarno <aurel32 at debian.org>  Tue, 20 Jul 2010 00:00:55 +0200
@@ -196,7 +196,7 @@
       - 105_pts.diff
 
   * Merge packaging changes from kfreebsd-7
-      debian/control: add ${misc:Depends} to all packages. 
+      debian/control: add ${misc:Depends} to all packages.
 
  -- Aurelien Jarno <aurel32 at debian.org>  Thu, 08 Apr 2010 13:41:21 +0200
 
@@ -297,7 +297,7 @@
 
   [ Aurelien Jarno ]
   * Really build the ZFS module.
-  * Enable TMPFS, it is need early in the boot process. 
+  * Enable TMPFS, it is need early in the boot process.
   * Add debian/README.source.
   * Align modules load address on pages.
 
@@ -360,7 +360,7 @@
 
   [ Aurelien Jarno ]
   * Keep sources of ZFS but don't enable them.
-  * Remove alternative build-depends on freebsd6-buildutils. 
+  * Remove alternative build-depends on freebsd6-buildutils.
   * Remove compat flavours as we are going to the official archive.
   * Move ndiswrapper modules to kfreebsd-image, the same way the Linux
     modules are in main in the Debian.
@@ -369,8 +369,8 @@
 
 kfreebsd-7 (7.1-4) unstable; urgency=low
 
-  * debian/control.flavor.in: depends on kldutils instead of 
-    module-init-tools. 
+  * debian/control.flavor.in: depends on kldutils instead of
+    module-init-tools.
 
  -- Aurelien Jarno <aurel32 at debian.org>  Mon, 13 Apr 2009 21:27:55 +0200
 
@@ -382,7 +382,7 @@
   * debian/rules: make sure ~/.quiltrc or /etc/quilt.quiltrc is not used.
   * 000_ktimer.diff: fix local privilege escalation (CVE-2009-1041 /
     FreeBSD-SA-09:06.ktimer).
-  * 000_kenv.diff: fix kernel panic when dumping environment 
+  * 000_kenv.diff: fix kernel panic when dumping environment
     (FreeBSD-EN-09:01.kenv).
 
  -- Aurelien Jarno <aurel32 at debian.org>  Mon, 23 Mar 2009 19:00:14 +0100
@@ -411,9 +411,9 @@
   * Do not specify SMP in GENERIC, it is enabled on per flavour basis
   * Ship config file used for building corresponding flavour
   * redefine POLL_HUP to be distinct from POLL_ERR
-  
+
   [ Aurelien Jarno ]
-  * debian/patches/*: convert to patchlevel p1 as requested by the new 
+  * debian/patches/*: convert to patchlevel p1 as requested by the new
     dpkg-source.
   * debian/control.compat.in, debian/control.flavor.in: set section of
     images to admin.
@@ -443,11 +443,11 @@
 
 kfreebsd-7 (7.0-5) unstable; urgency=high
 
-  * Fix amd64 swapgs local privilege escalation 
+  * Fix amd64 swapgs local privilege escalation
     (FreeBSD-SA-08:07.amd64 / CVE-2008-3890).
-  * Fix nmount(2) local arbitrary code execution 
+  * Fix nmount(2) local arbitrary code execution
     (FreeBSD-SA-08:08.nmount / CVE-2008-3531).
-  * Fix remote kernel panics on IPv6 connections 
+  * Fix remote kernel panics on IPv6 connections
     (FreeBSD-SA-08:09.icmp6 /CVE-2008-3530).
 
  -- Aurelien Jarno <aurel32 at debian.org>  Thu, 04 Sep 2008 11:49:44 +0200
@@ -493,7 +493,7 @@
 
   [ Aurelien Jarno ]
   * Refresh all patches.
-  * Bumped Standards-Version to 3.7.3 (no changes). 
+  * Bumped Standards-Version to 3.7.3 (no changes).
 
  -- Aurelien Jarno <aurel32 at debian.org>  Mon, 07 Jan 2008 11:48:14 +0100
 
@@ -556,7 +556,7 @@
   * New upstream version (RELENG_6_2_0_RELEASE)
      - drop obsolete 000_kmem, 000_net, 000_ppp, 000_smbfs,
                      002_glibc_dev_isp, 006_proc_mounts patches
-     - update 009_disable_duped_modules, 
+     - update 009_disable_duped_modules,
               903_disable_non-free_drivers,
               999_config patches
 
@@ -601,7 +601,7 @@
 
 kfreebsd-6 (6.1-0.3) unreleased; urgency=low
 
-  * Relax the conflict with kfreebsd-loader to (<< 5.4-1.3). 
+  * Relax the conflict with kfreebsd-loader to (<< 5.4-1.3).
 
  -- Aurelien Jarno <aurel32 at debian.org>  Thu, 12 Oct 2006 16:19:38 +0200
 
@@ -631,7 +631,7 @@
   * Do not load directly executed shared library (e.g. ld.so) at base addr 0
 
   [ Aurelien Jarno ]
-  * Bumped Standards-Version to 3.7.2 (no changes). 
+  * Bumped Standards-Version to 3.7.2 (no changes).
 
  -- Aurelien Jarno <aurel32 at debian.org>  Tue, 25 Jul 2006 00:58:48 +0200
 
@@ -747,13 +747,13 @@
 kfreebsd-5 (5.3-5) unstable; urgency=low
 
   * Enabled atapicam driver (closes: bug#323155).
-  * Allow the kernel to execve ET_DYN files. 
+  * Allow the kernel to execve ET_DYN files.
 
  -- Aurelien Jarno <aurel32 at debian.org>  Wed, 17 Aug 2005 15:44:18 +0200
 
 kfreebsd-5 (5.3-4) unstable; urgency=low
 
-  * Added OSS_GETVERSION ioctl. Patch from Robert Millan (closes: 
+  * Added OSS_GETVERSION ioctl. Patch from Robert Millan (closes:
     bug#322197)
 
  -- Aurelien Jarno <aurel32 at debian.org>  Wed, 10 Aug 2005 00:56:00 +0200

Modified: trunk/kfreebsd-8/debian/control.flavor.in
===================================================================
--- trunk/kfreebsd-8/debian/control.flavor.in	2011-05-25 08:52:01 UTC (rev 3311)
+++ trunk/kfreebsd-8/debian/control.flavor.in	2011-05-25 17:50:19 UTC (rev 3312)
@@ -5,7 +5,7 @@
 Provides: kfreebsd-image- at major@, kfreebsd-image
 Recommends: @recommends@
 Description: kernel of FreeBSD @version@ image
- This package provides the binary image and pre-built loadable modules for 
+ This package provides the binary image and pre-built loadable modules for
  the kernel of FreeBSD @version@, base of a GNU/kFreeBSD system.
  .
  This package is compiled for a @flavor at -class machine.
@@ -22,10 +22,10 @@
 Provides: kfreebsd-headers- at major@
 Depends: kfreebsd-headers- at version@- at abiname@ (= ${binary:Version}), ${misc:Depends}
 Description: header files for kernel of FreeBSD @version@
- This package provides the header files for kernel of FreeBSD @version@, generally 
- used for building out-of-tree kernel modules. These files are going to be 
- installed into /usr/src/kfreebsd-headers- at version@- at abiname@- at flavor@, and can be 
- used for building modules that load into the kernel provided by the 
+ This package provides the header files for kernel of FreeBSD @version@, generally
+ used for building out-of-tree kernel modules. These files are going to be
+ installed into /usr/src/kfreebsd-headers- at version@- at abiname@- at flavor@, and can be
+ used for building modules that load into the kernel provided by the
  kfreebsd-image- at version@- at abiname@- at flavor@ package.
 
 Package: kfreebsd-headers- at major@- at flavor@
@@ -34,4 +34,3 @@
 Description: header files for kernel of FreeBSD @major@
  This package depends on the latest header files for kernel of FreeBSD @major@ on
  @flavor at -class machines.
-  

Modified: trunk/kfreebsd-8/debian/control.in
===================================================================
--- trunk/kfreebsd-8/debian/control.in	2011-05-25 08:52:01 UTC (rev 3311)
+++ trunk/kfreebsd-8/debian/control.in	2011-05-25 17:50:19 UTC (rev 3312)
@@ -17,16 +17,16 @@
 Recommends: freebsd-buildutils (>= 7)
 Provides: kfreebsd-source- at major@, kfreebsd-source
 Description: source code for kernel of FreeBSD @version@ with Debian patches
- This package provides the source code for kernel of FreeBSD @version@, base of 
+ This package provides the source code for kernel of FreeBSD @version@, base of
  a GNU/kFreeBSD system.
 
 Package: kfreebsd-headers- at version@- at abiname@
 Architecture: any
 Depends: ${misc:Depends}
 Description: Common architecture-specific header files for kernel of FreeBSD @version@
- This package provides the architecture-specific common kernel header files for 
- kernel of FreeBSD @version@, generally used for building out-of-tree kernel 
- modules. To obtain a complete set of headers you also need to install the 
+ This package provides the architecture-specific common kernel header files for
+ kernel of FreeBSD @version@, generally used for building out-of-tree kernel
+ modules. To obtain a complete set of headers you also need to install the
  kfreebsd-headers- at version@- at abiname@-(flavour) package, matching the flavour of the
  kernel you intend the build for. To obtain such a set for the currently running
  kernel it is sufficient to run a command
@@ -34,4 +34,3 @@
  apt-get install kfreebsd-headers-$(uname -r)
  .
  and it will be unpacked in /usr/src/kfreebsd-headers- at version@- at abiname@-(flavour)
-

Modified: trunk/kfreebsd-8/debian/copyright
===================================================================
--- trunk/kfreebsd-8/debian/copyright	2011-05-25 08:52:01 UTC (rev 3311)
+++ trunk/kfreebsd-8/debian/copyright	2011-05-25 17:50:19 UTC (rev 3312)
@@ -2547,7 +2547,7 @@
 --
   CDDL license
     338 files are licensed under this license:
-    sys/cddl/*  
+    sys/cddl/*
 
   |   COMMON DEVELOPMENT AND DISTRIBUTION LICENSE Version 1.0
   | 
@@ -3785,4 +3785,3 @@
 Copyright: (C) 2003 Hifn Inc.
 Copyright: (C) 2000 Sergey A. Babkin
 Copyright: (C) Hannes Gredler <hannes at juniper.net>
-

Modified: trunk/kfreebsd-8/debian/kfreebsd-image.README.Debian
===================================================================
--- trunk/kfreebsd-8/debian/kfreebsd-image.README.Debian	2011-05-25 08:52:01 UTC (rev 3311)
+++ trunk/kfreebsd-8/debian/kfreebsd-image.README.Debian	2011-05-25 17:50:19 UTC (rev 3312)
@@ -3,13 +3,13 @@
 
 This package contain the FreeBSD kernel and various modules. Among them
 ext2fs.ko, reiserfs.ko and xfs.ko distributed under the terms of the GPL
-version 2. zfs.ko is distributed  under the terms of the CDDL. Both 
+version 2. zfs.ko is distributed  under the terms of the CDDL. Both
 licenses are not compatible according to the Free Software Fondation.
 
-While it is legaly possible to distribute both modules (they are not 
+While it is legaly possible to distribute both modules (they are not
 linked together), it may not be legaly possible to load them at the same
 time (dynamic linking).
 
 [1] http://www.gnu.org/licenses/license-list.html
- 
- -- Aurelien Jarno <aurel32 at debian.org>  Mon, 10 Aug 2009 10:51:55 +0200 
+
+ -- Aurelien Jarno <aurel32 at debian.org>  Mon, 10 Aug 2009 10:51:55 +0200

Modified: trunk/kfreebsd-8/debian/kfreebsd-image.postinst.in
===================================================================
--- trunk/kfreebsd-8/debian/kfreebsd-image.postinst.in	2011-05-25 08:52:01 UTC (rev 3311)
+++ trunk/kfreebsd-8/debian/kfreebsd-image.postinst.in	2011-05-25 17:50:19 UTC (rev 3312)
@@ -34,7 +34,7 @@
             done
 
 	    mkdir -p /boot/kernel
-    
+
             if [ "$(readlink -f /boot/kernel/kernel.gz)" != "/boot/kfreebsd-$RELEASE.gz" ] ; then
                 rm -f /boot/kernel/kernel.old.gz
                 if [ -L /boot/kernel/kernel.gz ] ; then
@@ -42,7 +42,7 @@
                 fi
                 ln -s /boot/kfreebsd-$RELEASE.gz /boot/kernel/kernel.gz
             fi
-    
+
             # on i386 acpi MUST be within kfreebsd-loader reach
             if [ "${RELEASE%%-[456]86}" != "${RELEASE}" ] ; then
                 if [ "$(readlink -f /boot/kernel/acpi.ko)" != "/lib/modules/$RELEASE/acpi.ko" ] ; then
@@ -51,7 +51,7 @@
                         mv /boot/kernel/acpi.ko /boot/kernel/acpi.ko.old
                     fi
                     ln -s /lib/modules/$RELEASE/acpi.ko /boot/kernel/acpi.ko
-                fi    
+                fi
             fi
         fi
 
@@ -65,7 +65,7 @@
         # Run /etc/kernel-img.conf postinst hook if defined
         postinst_hook=$(sed '/^\s*postinst_hook/!d;s/.*=\s*//' $KERNEL_IMG_CONF 2>/dev/null || true)
         if [ -n "$postinst_hook" ] ; then
-            echo "Running postinst hook script $postinst_hook." 1>&2 
+            echo "Running postinst hook script $postinst_hook." 1>&2
             $postinst_hook "$RELEASE" "/boot/kfreebsd-$RELEASE.gz"
         fi
 
@@ -77,7 +77,7 @@
                 /etc/kernel/postinst.d
         fi
     ;;
-   
+
     abort-upgrade|abort-remove|abort-deconfigure)
     ;;
 
@@ -93,5 +93,3 @@
 #DEBHELPER#
 
 exit 0
-
-

Modified: trunk/kfreebsd-8/debian/kfreebsd-image.postrm.in
===================================================================
--- trunk/kfreebsd-8/debian/kfreebsd-image.postrm.in	2011-05-25 08:52:01 UTC (rev 3311)
+++ trunk/kfreebsd-8/debian/kfreebsd-image.postrm.in	2011-05-25 17:50:19 UTC (rev 3312)
@@ -35,7 +35,7 @@
         # Run /etc/kernel-img.conf postrm hook if defined
         postrm_hook=$(sed '/^\s*postrm_hook/!d;s/.*=\s*//' $KERNEL_IMG_CONF 2>/dev/null || true)
         if [ -n "$postrm_hook" ] ; then
-            echo "Running postrm hook script $postrm_hook." 1>&2 
+            echo "Running postrm hook script $postrm_hook." 1>&2
             $postrm_hook "$RELEASE" "/boot/kfreebsd-$RELEASE.gz"
         fi
 
@@ -48,7 +48,7 @@
                 /etc/kernel/postrm.d
         fi
     ;;
-    
+
     purge|upgrade|failed-upgrade|abort-install|abort-upgrade|disappear)
     ;;
 

Modified: trunk/kfreebsd-8/debian/kfreebsd-image.preinst.in
===================================================================
--- trunk/kfreebsd-8/debian/kfreebsd-image.preinst.in	2011-05-25 08:52:01 UTC (rev 3311)
+++ trunk/kfreebsd-8/debian/kfreebsd-image.preinst.in	2011-05-25 17:50:19 UTC (rev 3312)
@@ -30,7 +30,7 @@
         # Run preinst hook if defined
         preinst_hook=$(sed '/^\s*preinst_hook/!d;s/.*=\s*//' $KERNEL_IMG_CONF 2>/dev/null || true)
         if [ -n "$preinst_hook" ] ; then
-            echo "Running preinst hook script $preinst_hook." 1>&2 
+            echo "Running preinst hook script $preinst_hook." 1>&2
             $preinst_hook "$RELEASE" "/boot/kfreebsd-$RELEASE.gz"
         fi
 

Modified: trunk/kfreebsd-8/debian/kfreebsd-image.prerm.in
===================================================================
--- trunk/kfreebsd-8/debian/kfreebsd-image.prerm.in	2011-05-25 08:52:01 UTC (rev 3311)
+++ trunk/kfreebsd-8/debian/kfreebsd-image.prerm.in	2011-05-25 17:50:19 UTC (rev 3312)
@@ -33,7 +33,7 @@
         # Run prerm hook if defined
         prerm_hook=$(sed '/^\s*prerm_hook/!d;s/.*=\s*//g' $KERNEL_IMG_CONF 2>/dev/null || true)
         if [ -n "$prerm_hook" ] ; then
-            echo "Running prerm hook script $prerm_hook." 1>&2 
+            echo "Running prerm hook script $prerm_hook." 1>&2
             $prerm_hook "$RELEASE" "/boot/kfreebsd-$RELEASE.gz"
         fi
 

Modified: trunk/kfreebsd-8/debian/rules
===================================================================
--- trunk/kfreebsd-8/debian/rules	2011-05-25 08:52:01 UTC (rev 3311)
+++ trunk/kfreebsd-8/debian/rules	2011-05-25 17:50:19 UTC (rev 3312)
@@ -54,6 +54,7 @@
 control: clean
 	sed -e "s/@major@/$(major)/g" -e "s/@version@/$(version)/g" -e "s/@abiname@/$(abiname)/g" -e "s/@flavor@/$$flavor/g" \
 		$(CURDIR)/debian/control.in > $(CURDIR)/debian/control
+	echo >> $(CURDIR)/debian/control
 	for arch in `ls $(CURDIR)/debian/arch/` ; do \
 		for config in `ls $(CURDIR)/debian/arch/$$arch/ | grep \.config` ; do \
 			flavor=$${config/.config/} ; \
@@ -61,6 +62,7 @@
 			test -f $(CURDIR)/debian/arch/$$arch/$$flavor.defines && recommends=`awk '/^Recommends: / {print $$2}' $(CURDIR)/debian/arch/$$arch/$$flavor.defines` ; \
 			sed -e "s/@major@/$(major)/g" -e "s/@version@/$(version)/g" -e "s/@abiname@/$(abiname)/g" -e "s/@flavor@/$$flavor/g" -e "s/@arch@/$$arch/g" -e "s/@recommends@/$$recommends/g" \
 				$(CURDIR)/debian/control.flavor.in >> $(CURDIR)/debian/control ; \
+			echo >> $(CURDIR)/debian/control ; \
 		done ; \
 	done
 
@@ -147,7 +149,7 @@
 
 	# Set /lib/modules/${RELEASE} as module dir
 	sed -i -e 's,^KODIR?=.*,KODIR="/lib/modules/$(version)-$(abiname)-$*",g' $(FLAVOR_DIR)-$*/sys/conf/kern.pre.mk
-	sed -i -e '/^static char linker_path/s,".*","/lib/modules/$(version)-$(abiname)-$*",g' $(FLAVOR_DIR)-$*/sys/kern/kern_linker.c 
+	sed -i -e '/^static char linker_path/s,".*","/lib/modules/$(version)-$(abiname)-$*",g' $(FLAVOR_DIR)-$*/sys/kern/kern_linker.c
 
 	# Always set explicit link target to match with ld's implicit target (needed
 	# to build on non-kFreeBSD)
@@ -198,7 +200,7 @@
 	install -o root -g root -m 644 \
 		$(FLAVOR_DIR)-$*/sys/boot/forth/loader.conf \
 		$(IMAGE_PACKAGE)-$*/boot/defaults/loader.conf
-	
+
 	# install the config file
 	install -o root -g root -m 644 \
 		$(FLAVOR_DIR)-$*/sys/$(kfreebsd_cpu)/conf/$*.config \
@@ -292,4 +294,3 @@
 
 .PHONY: clean build build-indep
 .PHONY: binary-indep binary-arch binary-indep binary-arch binary
-

Modified: trunk/kfreebsd-9/debian/control.flavor.in
===================================================================
--- trunk/kfreebsd-9/debian/control.flavor.in	2011-05-25 08:52:01 UTC (rev 3311)
+++ trunk/kfreebsd-9/debian/control.flavor.in	2011-05-25 17:50:19 UTC (rev 3312)
@@ -5,7 +5,7 @@
 Provides: kfreebsd-image- at major@, kfreebsd-image
 Recommends: @recommends@
 Description: kernel of FreeBSD @version@ image
- This package provides the binary image and pre-built loadable modules for 
+ This package provides the binary image and pre-built loadable modules for
  the kernel of FreeBSD @version@, base of a GNU/kFreeBSD system.
  .
  This package is compiled for a @flavor at -class machine.
@@ -22,10 +22,10 @@
 Provides: kfreebsd-headers- at major@
 Depends: kfreebsd-headers- at version@- at abiname@ (= ${binary:Version}), ${misc:Depends}
 Description: header files for kernel of FreeBSD @version@
- This package provides the header files for kernel of FreeBSD @version@, generally 
- used for building out-of-tree kernel modules. These files are going to be 
- installed into /usr/src/kfreebsd-headers- at version@- at abiname@- at flavor@, and can be 
- used for building modules that load into the kernel provided by the 
+ This package provides the header files for kernel of FreeBSD @version@, generally
+ used for building out-of-tree kernel modules. These files are going to be
+ installed into /usr/src/kfreebsd-headers- at version@- at abiname@- at flavor@, and can be
+ used for building modules that load into the kernel provided by the
  kfreebsd-image- at version@- at abiname@- at flavor@ package.
 
 Package: kfreebsd-headers- at major@- at flavor@
@@ -34,4 +34,3 @@
 Description: header files for kernel of FreeBSD @major@
  This package depends on the latest header files for kernel of FreeBSD @major@ on
  @flavor at -class machines.
-  

Modified: trunk/kfreebsd-9/debian/control.in
===================================================================
--- trunk/kfreebsd-9/debian/control.in	2011-05-25 08:52:01 UTC (rev 3311)
+++ trunk/kfreebsd-9/debian/control.in	2011-05-25 17:50:19 UTC (rev 3312)
@@ -17,16 +17,16 @@
 Recommends: freebsd-buildutils (>= 7)
 Provides: kfreebsd-source- at major@, kfreebsd-source
 Description: source code for kernel of FreeBSD @version@ with Debian patches
- This package provides the source code for kernel of FreeBSD @version@, base of 
+ This package provides the source code for kernel of FreeBSD @version@, base of
  a GNU/kFreeBSD system.
 
 Package: kfreebsd-headers- at version@- at abiname@
 Architecture: any
 Depends: ${misc:Depends}
 Description: Common architecture-specific header files for kernel of FreeBSD @version@
- This package provides the architecture-specific common kernel header files for 
- kernel of FreeBSD @version@, generally used for building out-of-tree kernel 
- modules. To obtain a complete set of headers you also need to install the 
+ This package provides the architecture-specific common kernel header files for
+ kernel of FreeBSD @version@, generally used for building out-of-tree kernel
+ modules. To obtain a complete set of headers you also need to install the
  kfreebsd-headers- at version@- at abiname@-(flavour) package, matching the flavour of the
  kernel you intend the build for. To obtain such a set for the currently running
  kernel it is sufficient to run a command
@@ -34,4 +34,3 @@
  apt-get install kfreebsd-headers-$(uname -r)
  .
  and it will be unpacked in /usr/src/kfreebsd-headers- at version@- at abiname@-(flavour)
-

Modified: trunk/kfreebsd-9/debian/copyright
===================================================================
--- trunk/kfreebsd-9/debian/copyright	2011-05-25 08:52:01 UTC (rev 3311)
+++ trunk/kfreebsd-9/debian/copyright	2011-05-25 17:50:19 UTC (rev 3312)
@@ -2547,7 +2547,7 @@
 --
   CDDL license
     338 files are licensed under this license:
-    sys/cddl/*  
+    sys/cddl/*
 
   |   COMMON DEVELOPMENT AND DISTRIBUTION LICENSE Version 1.0
   | 
@@ -3785,4 +3785,3 @@
 Copyright: (C) 2003 Hifn Inc.
 Copyright: (C) 2000 Sergey A. Babkin
 Copyright: (C) Hannes Gredler <hannes at juniper.net>
-

Modified: trunk/kfreebsd-9/debian/kfreebsd-image.README.Debian
===================================================================
--- trunk/kfreebsd-9/debian/kfreebsd-image.README.Debian	2011-05-25 08:52:01 UTC (rev 3311)
+++ trunk/kfreebsd-9/debian/kfreebsd-image.README.Debian	2011-05-25 17:50:19 UTC (rev 3312)
@@ -3,13 +3,13 @@
 
 This package contain the FreeBSD kernel and various modules. Among them
 ext2fs.ko, reiserfs.ko and xfs.ko distributed under the terms of the GPL
-version 2. zfs.ko is distributed  under the terms of the CDDL. Both 
+version 2. zfs.ko is distributed  under the terms of the CDDL. Both
 licenses are not compatible according to the Free Software Fondation.
 
-While it is legaly possible to distribute both modules (they are not 
+While it is legaly possible to distribute both modules (they are not
 linked together), it may not be legaly possible to load them at the same
 time (dynamic linking).
 
 [1] http://www.gnu.org/licenses/license-list.html
- 
- -- Aurelien Jarno <aurel32 at debian.org>  Mon, 10 Aug 2009 10:51:55 +0200 
+
+ -- Aurelien Jarno <aurel32 at debian.org>  Mon, 10 Aug 2009 10:51:55 +0200

Modified: trunk/kfreebsd-9/debian/kfreebsd-image.postinst.in
===================================================================
--- trunk/kfreebsd-9/debian/kfreebsd-image.postinst.in	2011-05-25 08:52:01 UTC (rev 3311)
+++ trunk/kfreebsd-9/debian/kfreebsd-image.postinst.in	2011-05-25 17:50:19 UTC (rev 3312)
@@ -34,7 +34,7 @@
             done
 
 	    mkdir -p /boot/kernel
-    
+
             if [ "$(readlink -f /boot/kernel/kernel.gz)" != "/boot/kfreebsd-$RELEASE.gz" ] ; then
                 rm -f /boot/kernel/kernel.old.gz
                 if [ -L /boot/kernel/kernel.gz ] ; then
@@ -42,7 +42,7 @@
                 fi
                 ln -s /boot/kfreebsd-$RELEASE.gz /boot/kernel/kernel.gz
             fi
-    
+
             # on i386 acpi MUST be within kfreebsd-loader reach
             if [ "${RELEASE%%-[456]86}" != "${RELEASE}" ] ; then
                 if [ "$(readlink -f /boot/kernel/acpi.ko)" != "/lib/modules/$RELEASE/acpi.ko" ] ; then
@@ -51,7 +51,7 @@
                         mv /boot/kernel/acpi.ko /boot/kernel/acpi.ko.old
                     fi
                     ln -s /lib/modules/$RELEASE/acpi.ko /boot/kernel/acpi.ko
-                fi    
+                fi
             fi
         fi
 
@@ -65,7 +65,7 @@
         # Run /etc/kernel-img.conf postinst hook if defined
         postinst_hook=$(sed '/^\s*postinst_hook/!d;s/.*=\s*//' $KERNEL_IMG_CONF 2>/dev/null || true)
         if [ -n "$postinst_hook" ] ; then
-            echo "Running postinst hook script $postinst_hook." 1>&2 
+            echo "Running postinst hook script $postinst_hook." 1>&2
             $postinst_hook "$RELEASE" "/boot/kfreebsd-$RELEASE.gz"
         fi
 
@@ -77,7 +77,7 @@
                 /etc/kernel/postinst.d
         fi
     ;;
-   
+
     abort-upgrade|abort-remove|abort-deconfigure)
     ;;
 
@@ -93,5 +93,3 @@
 #DEBHELPER#
 
 exit 0
-
-

Modified: trunk/kfreebsd-9/debian/kfreebsd-image.postrm.in
===================================================================
--- trunk/kfreebsd-9/debian/kfreebsd-image.postrm.in	2011-05-25 08:52:01 UTC (rev 3311)
+++ trunk/kfreebsd-9/debian/kfreebsd-image.postrm.in	2011-05-25 17:50:19 UTC (rev 3312)
@@ -35,7 +35,7 @@
         # Run /etc/kernel-img.conf postrm hook if defined
         postrm_hook=$(sed '/^\s*postrm_hook/!d;s/.*=\s*//' $KERNEL_IMG_CONF 2>/dev/null || true)
         if [ -n "$postrm_hook" ] ; then
-            echo "Running postrm hook script $postrm_hook." 1>&2 
+            echo "Running postrm hook script $postrm_hook." 1>&2
             $postrm_hook "$RELEASE" "/boot/kfreebsd-$RELEASE.gz"
         fi
 
@@ -48,7 +48,7 @@
                 /etc/kernel/postrm.d
         fi
     ;;
-    
+
     purge|upgrade|failed-upgrade|abort-install|abort-upgrade|disappear)
     ;;
 

Modified: trunk/kfreebsd-9/debian/kfreebsd-image.preinst.in
===================================================================
--- trunk/kfreebsd-9/debian/kfreebsd-image.preinst.in	2011-05-25 08:52:01 UTC (rev 3311)
+++ trunk/kfreebsd-9/debian/kfreebsd-image.preinst.in	2011-05-25 17:50:19 UTC (rev 3312)
@@ -30,7 +30,7 @@
         # Run preinst hook if defined
         preinst_hook=$(sed '/^\s*preinst_hook/!d;s/.*=\s*//' $KERNEL_IMG_CONF 2>/dev/null || true)
         if [ -n "$preinst_hook" ] ; then
-            echo "Running preinst hook script $preinst_hook." 1>&2 
+            echo "Running preinst hook script $preinst_hook." 1>&2
             $preinst_hook "$RELEASE" "/boot/kfreebsd-$RELEASE.gz"
         fi
 

Modified: trunk/kfreebsd-9/debian/kfreebsd-image.prerm.in
===================================================================
--- trunk/kfreebsd-9/debian/kfreebsd-image.prerm.in	2011-05-25 08:52:01 UTC (rev 3311)
+++ trunk/kfreebsd-9/debian/kfreebsd-image.prerm.in	2011-05-25 17:50:19 UTC (rev 3312)
@@ -33,7 +33,7 @@
         # Run prerm hook if defined
         prerm_hook=$(sed '/^\s*prerm_hook/!d;s/.*=\s*//g' $KERNEL_IMG_CONF 2>/dev/null || true)
         if [ -n "$prerm_hook" ] ; then
-            echo "Running prerm hook script $prerm_hook." 1>&2 
+            echo "Running prerm hook script $prerm_hook." 1>&2
             $prerm_hook "$RELEASE" "/boot/kfreebsd-$RELEASE.gz"
         fi
 

Modified: trunk/kfreebsd-9/debian/prune.sh
===================================================================
--- trunk/kfreebsd-9/debian/prune.sh	2011-05-25 08:52:01 UTC (rev 3311)
+++ trunk/kfreebsd-9/debian/prune.sh	2011-05-25 17:50:19 UTC (rev 3312)
@@ -2,7 +2,7 @@
 rm -vf `find sys -name *.uu`
 rm -vf sys/contrib/dev/ral/rt2661_ucode.h
 rm -vf sys/gnu/dev/sound/pci/csaimg.h
-rm -vf sys/gnu/dev/sound/pci/maestro3_dsp.h 
+rm -vf sys/gnu/dev/sound/pci/maestro3_dsp.h
 rm -vf sys/dev/drm/mga_ucode.h
 rm -vf sys/dev/drm/r128_cce.c
 rm -vf sys/dev/drm/r600_microcode.h

Modified: trunk/kfreebsd-9/debian/rules
===================================================================
--- trunk/kfreebsd-9/debian/rules	2011-05-25 08:52:01 UTC (rev 3311)
+++ trunk/kfreebsd-9/debian/rules	2011-05-25 17:50:19 UTC (rev 3312)
@@ -55,6 +55,7 @@
 control: clean
 	sed -e "s/@major@/$(major)/g" -e "s/@version@/$(version)/g" -e "s/@abiname@/$(abiname)/g" -e "s/@flavor@/$$flavor/g" \
 		$(CURDIR)/debian/control.in > $(CURDIR)/debian/control
+	echo >> $(CURDIR)/debian/control
 	for arch in `ls $(CURDIR)/debian/arch/` ; do \
 		for config in `ls $(CURDIR)/debian/arch/$$arch/ | grep \.config` ; do \
 			flavor=$${config/.config/} ; \
@@ -62,6 +63,7 @@
 			test -f $(CURDIR)/debian/arch/$$arch/$$flavor.defines && recommends=`awk '/^Recommends: / {print $$2}' $(CURDIR)/debian/arch/$$arch/$$flavor.defines` ; \
 			sed -e "s/@major@/$(major)/g" -e "s/@version@/$(version)/g" -e "s/@abiname@/$(abiname)/g" -e "s/@flavor@/$$flavor/g" -e "s/@arch@/$$arch/g" -e "s/@recommends@/$$recommends/g" \
 				$(CURDIR)/debian/control.flavor.in >> $(CURDIR)/debian/control ; \
+			echo >> $(CURDIR)/debian/control ; \
 		done ; \
 	done
 
@@ -148,7 +150,7 @@
 
 	# Set /lib/modules/${RELEASE} as module dir
 	sed -i -e 's,^KODIR?=.*,KODIR="/lib/modules/$(version)-$(abiname)-$*",g' $(FLAVOR_DIR)-$*/sys/conf/kern.pre.mk
-	sed -i -e '/^static char linker_path/s,".*","/lib/modules/$(version)-$(abiname)-$*",g' $(FLAVOR_DIR)-$*/sys/kern/kern_linker.c 
+	sed -i -e '/^static char linker_path/s,".*","/lib/modules/$(version)-$(abiname)-$*",g' $(FLAVOR_DIR)-$*/sys/kern/kern_linker.c
 
 	# Always set explicit link target to match with ld's implicit target (needed
 	# to build on non-kFreeBSD)
@@ -199,7 +201,7 @@
 	install -o root -g root -m 644 \
 		$(FLAVOR_DIR)-$*/sys/boot/forth/loader.conf \
 		$(IMAGE_PACKAGE)-$*/boot/defaults/loader.conf
-	
+
 	# install the config file
 	install -o root -g root -m 644 \
 		$(FLAVOR_DIR)-$*/sys/$(kfreebsd_cpu)/conf/$*.config \
@@ -293,4 +295,3 @@
 
 .PHONY: clean build build-indep
 .PHONY: binary-indep binary-arch binary-indep binary-arch binary
-

Modified: trunk/kfreebsd-kernel-headers/debian/changelog
===================================================================
--- trunk/kfreebsd-kernel-headers/debian/changelog	2011-05-25 08:52:01 UTC (rev 3311)
+++ trunk/kfreebsd-kernel-headers/debian/changelog	2011-05-25 17:50:19 UTC (rev 3312)
@@ -38,7 +38,7 @@
 
 kfreebsd-kernel-headers (0.50) unstable; urgency=low
 
-  * Add <sys/sdt.h> (closes: bug#590628). 
+  * Add <sys/sdt.h> (closes: bug#590628).
 
  -- Aurelien Jarno <aurel32 at debian.org>  Wed, 28 Jul 2010 20:15:24 +0200
 
@@ -50,14 +50,14 @@
 
   [ Aurelien Jarno ]
   * Bump Standards-Version to 3.9.1.
-  * Update debian/copyright. 
+  * Update debian/copyright.
 
  -- Aurelien Jarno <aurel32 at debian.org>  Tue, 27 Jul 2010 16:42:07 +0200
 
 kfreebsd-kernel-headers (0.48) unstable; urgency=low
 
   * Add #include <stdint.h> into <net80211/_ieee80211.h> (closes: bug#
-    569628). 
+    569628).
 
  -- Aurelien Jarno <aurel32 at debian.org>  Sat, 13 Feb 2010 13:27:11 +0100
 
@@ -125,12 +125,12 @@
 
 kfreebsd-kernel-headers (0.40) unstable; urgency=low
 
-  * Install <sys/kenv.h> at the right location. 
+  * Install <sys/kenv.h> at the right location.
 
  -- Aurelien Jarno <aurel32 at debian.org>  Mon, 31 Aug 2009 14:43:56 +0200
 
 kfreebsd-kernel-headers (0.39) unstable; urgency=low
- 
+
   [ Aurelien Jarno ]
   * export <sys/kenv.h>.
 
@@ -187,7 +187,7 @@
   * Based on kfreebsd-source-7.2
   * define types cpuwhich_t, cpulevel_t, cpusetid_t
   * add Vcs-* fields into debian/control.
-  
+
   [ Aurelien Jarno ]
   * Install <sys/bitstring.h>.
   * debian/control: switch to section kernel.
@@ -199,7 +199,7 @@
 
 kfreebsd-kernel-headers (0.32) unstable; urgency=low
 
-  * Upload to unstable. 
+  * Upload to unstable.
   * Switch to debhelper 5.
 
  -- Aurelien Jarno <aurel32 at debian.org>  Sun, 05 Apr 2009 15:58:50 +0200
@@ -272,7 +272,7 @@
 
 kfreebsd-kernel-headers (0.24) unreleased; urgency=low
 
-  * Small fix for kfreebsd-amd64. 
+  * Small fix for kfreebsd-amd64.
 
  -- Aurelien Jarno <aurel32 at debian.org>  Wed, 13 Dec 2006 20:25:40 +0100
 
@@ -310,7 +310,7 @@
   * fix <sys/buf.h>, <net80211/ieee80211.h>
 
   [ Aurelien Jarno ]
-  * Bumped Standards-Version to 3.7.2 (no changes). 
+  * Bumped Standards-Version to 3.7.2 (no changes).
 
  -- Aurelien Jarno <aurel32 at debian.org>  Tue,  5 Sep 2006 01:04:45 +0200
 
@@ -364,13 +364,13 @@
 
 kfreebsd-kernel-headers (0.14) unreleased; urgency=low
 
-  * Remove sys/dirent.h 
+  * Remove sys/dirent.h.
 
  -- Aurelien Jarno <aurel32 at debian.org>  Wed, 18 Jan 2006 11:36:20 +0100
 
 kfreebsd-kernel-headers (0.13) unreleased; urgency=low
 
-  * Remove a lot of file from netinet6/in6.h. 
+  * Remove a lot of file from netinet6/in6.h.
 
  -- Aurelien Jarno <aurel32 at debian.org>  Mon, 16 Jan 2006 20:31:01 +0100
 
@@ -389,7 +389,7 @@
 
 kfreebsd-kernel-headers (0.10) unreleased; urgency=low
 
-  * Removed some parts of the sys/_types.h patch that are now included 
+  * Removed some parts of the sys/_types.h patch that are now included
     in the glibc.
 
  -- Aurelien Jarno <aurel32 at debian.org>  Wed, 11 Jan 2006 23:17:01 +0100
@@ -410,7 +410,7 @@
 
 kfreebsd-kernel-headers (0.08) unreleased; urgency=low
 
-  * Added sys/nlist_aout.h. 
+  * Added sys/nlist_aout.h.
 
  -- Aurelien Jarno <aurel32 at debian.org>  Tue, 20 Dec 2005 22:09:00 +0100
 
@@ -436,7 +436,7 @@
 
 kfreebsd-kernel-headers (0.04) unreleased; urgency=low
 
-  * Added 017_ip_packed.diff. 
+  * Added 017_ip_packed.diff.
 
  -- Aurelien Jarno <aurel32 at debian.org>  Thu, 22 Sep 2005 01:17:45 +0200
 
@@ -463,4 +463,3 @@
   * New package replacing kfreebsd-headers.
 
  -- Aurelien Jarno <aurel32 at debian.org>  Mon,  1 Aug 2005 23:48:55 +0200
-

Modified: trunk/kfreebsd-kernel-headers/debian/control
===================================================================
--- trunk/kfreebsd-kernel-headers/debian/control	2011-05-25 08:52:01 UTC (rev 3311)
+++ trunk/kfreebsd-kernel-headers/debian/control	2011-05-25 17:50:19 UTC (rev 3312)
@@ -10,7 +10,7 @@
 
 Package: kfreebsd-kernel-headers
 Architecture: kfreebsd-any
-Depends: ${misc:Depends} 
+Depends: ${misc:Depends}
 Replaces: kfreebsd-headers, libc0.1-dev (<= 2.3.6.ds1-8)
 Conflicts: kfreebsd-headers
 Description: kernel of FreeBSD headers for development

Modified: trunk/kfreebsd-kernel-headers/debian/copyright
===================================================================
--- trunk/kfreebsd-kernel-headers/debian/copyright	2011-05-25 08:52:01 UTC (rev 3311)
+++ trunk/kfreebsd-kernel-headers/debian/copyright	2011-05-25 17:50:19 UTC (rev 3312)
@@ -3,14 +3,18 @@
 
 It was downloaded from FreeBSD CVS (http://www.freebsd.org/)
 
-Upstream Author: The FreeBSD Project
+Upstream Author:
 
+  The FreeBSD Project
+
 Copyright:
+
   Copyright (c) 1992-2008 The FreeBSD Project.
   Copyright (c) 1979, 1980, 1983, 1986, 1988, 1989, 1991, 1992, 1993, 1994
          The Regents of the University of California. All rights reserved.
 
 License:
+
   Redistribution and use in source and binary forms, with or without
   modification, are permitted provided that the following conditions
   are met:
@@ -31,4 +35,3 @@
   LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
   OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
   SUCH DAMAGE.
-

Modified: trunk/kfreebsd-kernel-headers/debian/generate-asm.sh
===================================================================
--- trunk/kfreebsd-kernel-headers/debian/generate-asm.sh	2011-05-25 08:52:01 UTC (rev 3311)
+++ trunk/kfreebsd-kernel-headers/debian/generate-asm.sh	2011-05-25 17:50:19 UTC (rev 3312)
@@ -89,4 +89,3 @@
 	fi
 
 done
-

Modified: trunk/kfreebsd-kernel-headers/debian/install
===================================================================
--- trunk/kfreebsd-kernel-headers/debian/install	2011-05-25 08:52:01 UTC (rev 3311)
+++ trunk/kfreebsd-kernel-headers/debian/install	2011-05-25 17:50:19 UTC (rev 3312)
@@ -114,7 +114,7 @@
 sys/netinet/in_gif.h                    usr/include/netinet
 sys/netinet/in_pcb.h                    usr/include/netinet
 sys/netinet/in_var.h                    usr/include/netinet
-sys/netinet/ip_carp.h                   usr/include/netinet 
+sys/netinet/ip_carp.h                   usr/include/netinet
 sys/netinet/ip_dummynet.h               usr/include/netinet
 sys/netinet/ip_ecn.h                    usr/include/netinet
 sys/netinet/ip_encap.h                  usr/include/netinet
@@ -197,7 +197,7 @@
 sys/sys/elf64.h                         usr/include/sys
 sys/sys/elf_common.h                    usr/include/sys
 sys/sys/elf_generic.h                   usr/include/sys
-sys/sys/endian.h			usr/include/sys
+sys/sys/endian.h                        usr/include/sys
 sys/sys/event.h                         usr/include/sys
 sys/sys/eventhandler.h                  usr/include/sys
 sys/sys/eventvar.h                      usr/include/sys
@@ -218,7 +218,7 @@
 sys/sys/jail.h                          usr/include/sys
 sys/sys/joystick.h                      usr/include/sys
 sys/sys/kbio.h                          usr/include/sys
-sys/sys/kenv.h				usr/include/sys
+sys/sys/kenv.h                          usr/include/sys
 sys/sys/kernel.h                        usr/include/sys
 sys/sys/kerneldump.h                    usr/include/sys
 sys/sys/kobj.h                          usr/include/sys
@@ -258,7 +258,7 @@
 sys/sys/protosw.h                       usr/include/sys
 sys/sys/ptio.h                          usr/include/sys
 sys/sys/random.h                        usr/include/sys
-sys/sys/refcount.h			usr/include/sys
+sys/sys/refcount.h                      usr/include/sys
 sys/sys/resourcevar.h                   usr/include/sys
 sys/sys/rman.h                          usr/include/sys
 sys/sys/rtprio.h                        usr/include/sys

Modified: trunk/kfreebsd-kernel-headers/debian/rules
===================================================================
--- trunk/kfreebsd-kernel-headers/debian/rules	2011-05-25 08:52:01 UTC (rev 3311)
+++ trunk/kfreebsd-kernel-headers/debian/rules	2011-05-25 17:50:19 UTC (rev 3312)
@@ -20,13 +20,13 @@
 	dh_testdir
 	dh_testroot
 	rm -f *-stamp
-	rm -rf kfreebsd-source-* 
+	rm -rf kfreebsd-source-*
 	dh_clean
 
 build: build-stamp
 build-stamp:
 	dh_testdir
-	
+
 	tar xfJ $(SRC_TAR) --strip-components=1
 
 	QUILT_PATCHES=$(CURDIR)/debian/patches quilt push -a
@@ -67,12 +67,12 @@
 #	dh_installlogrotate
 #	dh_installemacsen
 #	dh_installpam
-#	dh_installmime	
+#	dh_installmime
 #	dh_installinit
 #	dh_installcron
 #	dh_installman
 #	dh_installinfo
-	dh_installchangelogs 
+	dh_installchangelogs
 	dh_link
 	dh_strip
 	dh_compress

Modified: trunk/libbsd/debian/changelog
===================================================================
--- trunk/libbsd/debian/changelog	2011-05-25 08:52:01 UTC (rev 3311)
+++ trunk/libbsd/debian/changelog	2011-05-25 17:50:19 UTC (rev 3312)
@@ -35,7 +35,7 @@
 libbsd (0.1.5-2) unstable; urgency=low
 
   * Restrict the udeb package to kfreebsd-*, as requested by Otavio
-    Salvador. 
+    Salvador.
 
  -- Aurelien Jarno <aurel32 at debian.org>  Mon, 20 Jul 2009 23:21:10 +0200
 
@@ -157,4 +157,3 @@
   * Initial release.
 
  -- Hector Garcia <hector at debian.org>  Sun, 17 Jul 2005 16:17:35 +0200
-

Modified: trunk/libbsd/debian/control
===================================================================
--- trunk/libbsd/debian/control	2011-05-25 08:52:01 UTC (rev 3311)
+++ trunk/libbsd/debian/control	2011-05-25 17:50:19 UTC (rev 3312)
@@ -70,4 +70,3 @@
 Description: utility functions from BSD systems - debugging symbols
  This library provides some functions commonly available on BSD systems
  but not on others like GNU systems.
-

Modified: trunk/libbsd/debian/copyright
===================================================================
--- trunk/libbsd/debian/copyright	2011-05-25 08:52:01 UTC (rev 3311)
+++ trunk/libbsd/debian/copyright	2011-05-25 17:50:19 UTC (rev 3312)
@@ -417,4 +417,3 @@
     this stuff is worth it, you can buy me a beer in return.   Poul-Henning Kamp
 
     --
-

Modified: trunk/libbsd/debian/rules
===================================================================
--- trunk/libbsd/debian/rules	2011-05-25 08:52:01 UTC (rev 3311)
+++ trunk/libbsd/debian/rules	2011-05-25 17:50:19 UTC (rev 3312)
@@ -20,7 +20,7 @@
 
 build-arch:
 	dh_testdir
-	
+
 	$(MAKE)
 
 build: build-indep build-arch
@@ -28,9 +28,9 @@
 clean:
 	dh_testdir
 	dh_testroot
-	
+
 	$(MAKE) clean
-	
+
 	dh_clean
 
 install-arch: build-arch
@@ -38,7 +38,7 @@
 	dh_testroot
 	dh_prep
 	dh_installdirs
-	
+
 	$(MAKE) install DESTDIR=$(CURDIR)/debian/tmp
 
 binary-indep:
@@ -66,4 +66,3 @@
 
 .PHONY: install-arch
 .PHONY: clean build-indep build-arch build binary-indep binary-arch binary
-

Modified: trunk/posixtestsuite/debian/changelog
===================================================================
--- trunk/posixtestsuite/debian/changelog	2011-05-25 08:52:01 UTC (rev 3311)
+++ trunk/posixtestsuite/debian/changelog	2011-05-25 17:50:19 UTC (rev 3312)
@@ -86,4 +86,3 @@
   * Initial Release. (Closes: #269483)
 
  -- Robert Millan <rmh at debian.org>  Wed,  1 Sep 2004 14:20:24 +0200
-

Modified: trunk/posixtestsuite/debian/control
===================================================================
--- trunk/posixtestsuite/debian/control	2011-05-25 08:52:01 UTC (rev 3311)
+++ trunk/posixtestsuite/debian/control	2011-05-25 17:50:19 UTC (rev 3312)
@@ -21,4 +21,3 @@
  .
  This is a dummy package.  If you want to run the testsuite, use the source
  package of the same name (e.g. apt-get source posixtestsuite).
-

Modified: trunk/posixtestsuite/debian/copyright
===================================================================
--- trunk/posixtestsuite/debian/copyright	2011-05-25 08:52:01 UTC (rev 3311)
+++ trunk/posixtestsuite/debian/copyright	2011-05-25 17:50:19 UTC (rev 3312)
@@ -34,4 +34,3 @@
 
 On Debian systems, the complete text of the GNU General
 Public License can be found in '/usr/share/common-licenses/GPL-2'.
-

Modified: trunk/posixtestsuite/debian/rules
===================================================================
--- trunk/posixtestsuite/debian/rules	2011-05-25 08:52:01 UTC (rev 3311)
+++ trunk/posixtestsuite/debian/rules	2011-05-25 17:50:19 UTC (rev 3312)
@@ -2,7 +2,7 @@
 
 build-indep:
 	dh_testdir
-	
+
 	$(MAKE)
 
 build-arch:
@@ -12,9 +12,9 @@
 clean:
 	dh_testdir
 	dh_testroot
-	
+
 	$(MAKE) clean
-	
+
 	dh_clean
 
 install-indep: build-indep
@@ -22,7 +22,7 @@
 	dh_testroot
 	dh_prep
 	dh_installdirs
-	
+
 #	$(MAKE) install DESTDIR=$(CURDIR)/debian/posixtestsuite
 
 binary-indep: install-indep
@@ -50,4 +50,3 @@
 
 .PHONY: clean install
 .PHONY: build build-indep build-arch binary-indep binary-arch binary
-

Modified: trunk/ufsutils/debian/TODO
===================================================================
--- trunk/ufsutils/debian/TODO	2011-05-25 08:52:01 UTC (rev 3311)
+++ trunk/ufsutils/debian/TODO	2011-05-25 17:50:19 UTC (rev 3312)
@@ -7,4 +7,3 @@
 - userland fs manipulation utils (ala hfsutils).
 - ufs snapshot support.
 - alternative to bsd sysctl.
-

Modified: trunk/ufsutils/debian/changelog
===================================================================
--- trunk/ufsutils/debian/changelog	2011-05-25 08:52:01 UTC (rev 3311)
+++ trunk/ufsutils/debian/changelog	2011-05-25 17:50:19 UTC (rev 3312)
@@ -12,7 +12,7 @@
 
   [ Petr Salinger ]
   * New upstream version (RELENG_7_3_0_RELEASE)
-  * Use intmax_t cast in fsbtodb() to fix aborts when 
+  * Use intmax_t cast in fsbtodb() to fix aborts when
     making a filesystem larger than one terabyte. Closes: #559647.
 
   [ Aurelien Jarno ]
@@ -43,7 +43,7 @@
 
 ufsutils (7.2-1) unstable; urgency=low
 
-  [ Guillem Jover ] 
+  [ Guillem Jover ]
   * Use $(filter ...) instead of $(findstring ...) to extract space separated
     options from DEB_BUILD_OPTIONS in debian/rules.
   * Remove commented out lines in debian/rules.
@@ -83,7 +83,7 @@
 
 ufsutils (7.0-1) unstable; urgency=low
 
-  [Petr Salinger]
+  [ Petr Salinger ]
   * Add build-dependency on quilt, and use quilt in debian/rules
   * Based on upstream version 7.0
   * Include all needed sources in debian/upstream.sh
@@ -195,4 +195,3 @@
   * Added fsck.ufs -a support. Thanks to Robert Millan <rmh at debian.org>.
 
  -- Guillem Jover <guillem at debian.org>  Sun, 16 May 2004 23:37:00 +0200
-

Modified: trunk/ufsutils/debian/copyright
===================================================================
--- trunk/ufsutils/debian/copyright	2011-05-25 08:52:01 UTC (rev 3311)
+++ trunk/ufsutils/debian/copyright	2011-05-25 17:50:19 UTC (rev 3312)
@@ -50,4 +50,3 @@
 
 On Debian systems, the complete text of the BSD License can be
 found in `/usr/share/common-licenses/BSD'.
-

Modified: trunk/ufsutils/debian/rules
===================================================================
--- trunk/ufsutils/debian/rules	2011-05-25 08:52:01 UTC (rev 3311)
+++ trunk/ufsutils/debian/rules	2011-05-25 17:50:19 UTC (rev 3312)
@@ -33,17 +33,17 @@
 
 build: patch
 	dh_testdir
-	
+
 	CFLAGS="$(CFLAGS)" LDADD="$(LDADD)" $(MAKE)
 
 clean:
 	dh_testdir
 	dh_testroot
-	
+
 	[ ! -f Makefile ] || $(MAKE) clean
-	
+
 	$(this) unpatch
-	
+
 	dh_clean
 
 install: build
@@ -51,11 +51,11 @@
 	dh_testroot
 	dh_prep
 	dh_installdirs
-	
+
 	mkdir -p $(DESTDIR)/lib
 	mkdir -p $(DESTDIR)/sbin
 	mkdir -p $(DESTDIR)/usr/share/man/man8
-	
+
 	$(MAKE) install DESTDIR=$(DESTDIR) prefix=/usr exec_prefix=/
 
 # Build architecture-independent files here.
@@ -83,4 +83,3 @@
 binary: binary-indep binary-arch
 
 .PHONY: build clean binary-indep binary-arch binary install
-

Modified: trunk/zfsutils/debian/changelog
===================================================================
--- trunk/zfsutils/debian/changelog	2011-05-25 08:52:01 UTC (rev 3311)
+++ trunk/zfsutils/debian/changelog	2011-05-25 17:50:19 UTC (rev 3312)
@@ -8,7 +8,7 @@
 
   [ Aurelien Jarno ]
   * Fix build with recent binutils versions.
-  * Add zdb, zinject and ztest, based on a patch from Arno Töll.  
+  * Add zdb, zinject and ztest, based on a patch from Arno Töll.
     Closes: #618592.
   * Bump to Standards-Version 3.9.2 (no changes).
 
@@ -28,7 +28,7 @@
 
 zfsutils (8.1-3) unstable; urgency=low
 
-  * Create /etc/zfs so that zfs can store its configuration. Closes: 
+  * Create /etc/zfs so that zfs can store its configuration. Closes:
     bug#591921.
   * Update init script to also start/stop zvol and mount swap on zvol.
     Closes: bug#591909.
@@ -37,7 +37,7 @@
 
 zfsutils (8.1-2) unstable; urgency=low
 
-  * Create a /boot/zfs/ directory so that zpool.cache can be created 
+  * Create a /boot/zfs/ directory so that zpool.cache can be created
     there. Closes: bug#591820.
   * Add an initscript to mount/umount filesystems. Closes: bug#591823.
 
@@ -45,7 +45,7 @@
 
 zfsutils (8.1-1) unstable; urgency=low
 
-  [ Tuco Xyz / Petr Salinger / Aurelien Jarno ]
+  [ Tuco Xyz / Petr Salinger / Aurelien Jarno ]
   * Initial release.
 
  -- Aurelien Jarno <aurel32 at debian.org>  Thu, 29 Jul 2010 20:53:23 +0200

Modified: trunk/zfsutils/debian/control
===================================================================
--- trunk/zfsutils/debian/control	2011-05-25 08:52:01 UTC (rev 3311)
+++ trunk/zfsutils/debian/control	2011-05-25 17:50:19 UTC (rev 3312)
@@ -124,7 +124,7 @@
 Architecture: kfreebsd-any
 Depends: ${shlibs:Depends}, ${misc:Depends}
 Description: OpenSolaris name-value pair library
- This package contains the OpenSolaris libumem library, to detect 
+ This package contains the OpenSolaris libumem library, to detect
  memory management bugs in applications
 
 Package: libumem-dev
@@ -141,7 +141,7 @@
 Architecture: kfreebsd-any
 Depends: ${shlibs:Depends}, ${misc:Depends}
 Description: OpenSolaris name-value pair library
- This package contains the OpenSolaris libumem library, to detect 
+ This package contains the OpenSolaris libumem library, to detect
  memory management bugs in applications
 
 
@@ -171,4 +171,3 @@
  This package contains the OpenSolaris libzpool library.
  .
  This is a minimal package for use in debian-installer.
-

Modified: trunk/zfsutils/debian/rules
===================================================================
--- trunk/zfsutils/debian/rules	2011-05-25 08:52:01 UTC (rev 3311)
+++ trunk/zfsutils/debian/rules	2011-05-25 17:50:19 UTC (rev 3312)
@@ -17,14 +17,14 @@
 	CFLAGS += -O2
 endif
 
-VERSION=$(shell dpkg-parsechangelog | sed -e '/^Version:/!d' -e 's/^Version: //g' -e 's/-.*//g')
-SVN=http://svn.freebsd.org/base/release/$(VERSION).0
-ORIGDIR=zfsutils-$(VERSION)
-PATH:=/usr/lib/freebsd:$(PATH)
-DESTDIR=$(CURDIR)/debian/tmp
-PMAKE=COPTS="$(CFLAGS)" CFLAGS="$(CFLAGS)" NO_WERROR=1 NOGCCERROR=1 NOSHARED=NO NO_SHARED=NO DESTDIR=$(DESTDIR) make
-export SHLIB_MAJOR=0
-export SHLIBDIR=./
+VERSION = $(shell dpkg-parsechangelog | sed -e '/^Version:/!d' -e 's/^Version: //g' -e 's/-.*//g')
+SVN = http://svn.freebsd.org/base/release/$(VERSION).0
+ORIGDIR = zfsutils-$(VERSION)
+PATH := /usr/lib/freebsd:$(PATH)
+DESTDIR = $(CURDIR)/debian/tmp
+PMAKE = COPTS="$(CFLAGS)" CFLAGS="$(CFLAGS)" NO_WERROR=1 NOGCCERROR=1 NOSHARED=NO NO_SHARED=NO DESTDIR=$(DESTDIR) make
+export SHLIB_MAJOR = 0
+export SHLIBDIR = ./
 
 get-orig-source:
 	rm -rf $(ORIGDIR)
@@ -106,8 +106,8 @@
 	$(PMAKE) -C $(CURDIR)/cddl/sbin/zfs
 
 	$(PMAKE) -C $(CURDIR)/cddl/usr.sbin/zdb
-	$(PMAKE) -C $(CURDIR)/cddl/usr.bin/zinject 
-	$(PMAKE) -C $(CURDIR)/cddl/usr.bin/ztest/   
+	$(PMAKE) -C $(CURDIR)/cddl/usr.bin/zinject
+	$(PMAKE) -C $(CURDIR)/cddl/usr.bin/ztest/
 	touch $@
 
 clean:
@@ -121,8 +121,7 @@
 
 	$(PMAKE) -C $(CURDIR)/cddl/sbin/zpool clean
 	$(PMAKE) -C $(CURDIR)/cddl/sbin/zfs clean
-	
-	
+
 	$(PMAKE) -C $(CURDIR)/cddl/lib/libumem clean
 	$(PMAKE) -C $(CURDIR)/cddl/lib/libzpool clean
 	$(PMAKE) -C $(CURDIR)/cddl/lib/libavl clean

Modified: trunk/zfsutils/debian/zfsutils.zfs.init
===================================================================
--- trunk/zfsutils/debian/zfsutils.zfs.init	2011-05-25 08:52:01 UTC (rev 3311)
+++ trunk/zfsutils/debian/zfsutils.zfs.init	2011-05-25 17:50:19 UTC (rev 3312)
@@ -2,7 +2,7 @@
 ### BEGIN INIT INFO
 # Provides:          zvol zfs
 # Required-Start:
-# Required-Stop: 
+# Required-Stop:
 # Default-Start:     S
 # Default-Stop:      0 6
 # Short-Description: Start/stop ZFS subsystem.


