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

Robert Millan rmh at costa.debian.org
Mon Mar 20 12:31:39 UTC 2006


Author: rmh
Date: 2006-03-20 12:31:38 +0000 (Mon, 20 Mar 2006)
New Revision: 1374

Added:
   trunk/freebsd-utils/debian/kbdcontrol.dirs
   trunk/freebsd-utils/debian/kbdcontrol.install
Modified:
   trunk/freebsd-utils/debian/changelog
   trunk/freebsd-utils/debian/control
   trunk/freebsd-utils/debian/install
   trunk/freebsd-utils/debian/rules
   trunk/freebsd-utils/fetch
Log:
  * Add netstat, ktrace/kdump, kbdcontrol, jail, ppp*, fdisk, mdconfig,
    ccdconfig, bsdlabel, ipfw and pfctl (out of which only mdconfig and
    kbdcontrol are enabled).

Modified: trunk/freebsd-utils/debian/changelog
===================================================================
--- trunk/freebsd-utils/debian/changelog	2006-03-20 11:58:42 UTC (rev 1373)
+++ trunk/freebsd-utils/debian/changelog	2006-03-20 12:31:38 UTC (rev 1374)
@@ -1,3 +1,11 @@
+freebsd-utils (5.4+2-0.1) UNRELEASED; urgency=low
+
+  * Add netstat, ktrace/kdump, kbdcontrol, jail, ppp*, fdisk, mdconfig,
+    ccdconfig, bsdlabel, ipfw and pfctl (out of which only mdconfig and
+    kbdcontrol are enabled).
+
+ -- Robert Millan <rmh at aybabtu.com>  Mon, 20 Mar 2006 13:20:58 +0100
+
 freebsd-utils (5.4+1-0.1) unreleased; urgency=low
 
   * Add kldutils and (disabled) net-tools.

Modified: trunk/freebsd-utils/debian/control
===================================================================
--- trunk/freebsd-utils/debian/control	2006-03-20 11:58:42 UTC (rev 1373)
+++ trunk/freebsd-utils/debian/control	2006-03-20 12:31:38 UTC (rev 1374)
@@ -3,7 +3,7 @@
 Priority: required
 Maintainer: GNU/kFreeBSD Maintainers <debian-bsd at lists.debian.org>
 Uploaders: Aurelien Jarno <aurel32 at debian.org>, Guillem Jover <guillem at debian.org>
-Build-Depends: cdbs, debhelper (>= 4.1.0), freebsd5-buildutils, libkvm-dev, libbsd-dev (>= 0.0-1.2+r1367), libc0.1-dev (>= 2.3.6-3+kbsd.r1365)
+Build-Depends: cdbs, debhelper (>= 4.1.0), freebsd5-buildutils, libkvm-dev, libbsd-dev (>= 0.0-1.2+r1367), libc0.1-dev (>= 2.3.6-3+kbsd.r1365), flex | flex-old, kfreebsd-kernel-headers (>= 0.16)
 Standards-Version: 3.6.0
 
 Package: freebsd-utils
@@ -21,6 +21,22 @@
  This package contains a set of programs for loading, inserting, and
  removing kernel modules for kFreeBSD.
 
+Package: kbdcontrol
+Architecture: kfreebsd-i386 kfreebsd-amd64
+Depends: ${shlibs:Depends}
+Description: Command line tool to change keyboard layout
+ Original FreeBSD command to set keyboard layout and the FreeBSD possible
+ keyboards.
+
+# FIXME:
+# - enable net-tools
+# - add ktrace (ktrace, kdump)
+# - add jail
+# - add ppp (ppp, pppctl, pppd)
+# - add ccdconfig (ccdconfig + /etc/ccdconfig.conf)
+# - add pf (pfctl + /etc stuff + init.d script)
+# - add ipfw (???)
+
 #Package: net-tools
 #Section: net
 #Priority: important

Modified: trunk/freebsd-utils/debian/install
===================================================================
--- trunk/freebsd-utils/debian/install	2006-03-20 11:58:42 UTC (rev 1373)
+++ trunk/freebsd-utils/debian/install	2006-03-20 12:31:38 UTC (rev 1374)
@@ -11,6 +11,7 @@
 scripts/sbin/swapon			/sbin
 scripts/sbin/swapoff			/sbin
 
+build-tree/src/sbin/mdconfig/mdconfig			/sbin
 build-tree/src/sbin/mount_std/mount_std			/sbin
 build-tree/src/sbin/mount_autofs/mount_autofs		/sbin
 build-tree/src/sbin/mount_ext2fs/mount_ext2fs		/sbin

Added: trunk/freebsd-utils/debian/kbdcontrol.dirs
===================================================================
--- trunk/freebsd-utils/debian/kbdcontrol.dirs	2006-03-20 11:58:42 UTC (rev 1373)
+++ trunk/freebsd-utils/debian/kbdcontrol.dirs	2006-03-20 12:31:38 UTC (rev 1374)
@@ -0,0 +1 @@
+usr/share/syscons

Added: trunk/freebsd-utils/debian/kbdcontrol.install
===================================================================
--- trunk/freebsd-utils/debian/kbdcontrol.install	2006-03-20 11:58:42 UTC (rev 1373)
+++ trunk/freebsd-utils/debian/kbdcontrol.install	2006-03-20 12:31:38 UTC (rev 1374)
@@ -0,0 +1,2 @@
+build-tree/src/usr.sbin/kbdcontrol/kbdcontrol		/bin
+build-tree/src/share/syscons/keymaps			/usr/share/syscons

Modified: trunk/freebsd-utils/debian/rules
===================================================================
--- trunk/freebsd-utils/debian/rules	2006-03-20 11:58:42 UTC (rev 1373)
+++ trunk/freebsd-utils/debian/rules	2006-03-20 12:31:38 UTC (rev 1374)
@@ -14,25 +14,33 @@
 export LDADD=-lbsd
 
 build/freebsd-utils:: apply-patches
-	set -e ; for i in sbin/{dmesg,mount,mount_std,umount,swapon,sysctl} usr.sbin/rpc.umntall \
+	set -e ; for i in sbin/{dmesg,mdconfig,mount,mount_std,umount,swapon,sysctl} usr.sbin/rpc.umntall \
 		sbin/mount_{autofs,ext2fs,hpfs,nullfs,reiserfs,unionfs} \
 	; do \
 		$(PMAKE) -C $(DEB_SRCDIR)/$$i ; \
 	done
-# FIXME: add xfs,cd9660,msdosfs,nfs,nfs4,ntfs,udf,umapfs
+# FIXME: add mount_{xfs,cd9660,msdosfs,nfs,nfs4,ntfs,udf,umapfs},fdisk,bsdlabel
 
 build/kldutils:: apply-patches
 	set -e ; for i in sbin/kld{load,stat,unload} \
 	; do \
 		$(PMAKE) -C $(DEB_SRCDIR)/$$i ; \
 	done
+# FIXME: add kldconfig
 
 build/net-tools:: apply-patches
-	set -e ; for i in sbin/{ifconfig,route} \
+	set -e ; for i in sbin/{ifconfig,route,netstat} \
 	; do \
 		$(PMAKE) -C $(DEB_SRCDIR)/$$i ; \
 	done
+# FIXME: enable in debian/control
 
+build/kbdcontrol:: apply-patches
+	set -e ; for i in usr.sbin/kbdcontrol \
+	; do \
+		$(PMAKE) -C $(DEB_SRCDIR)/$$i ; \
+	done
+
 include /usr/share/cdbs/1/rules/tarball.mk
 pre-build:: $(_cdbs_tarball_stamps)
 	find $(DEB_SRCDIR) -type f | (set -e ; while read i ; do sed -i $$i \

Modified: trunk/freebsd-utils/fetch
===================================================================
--- trunk/freebsd-utils/fetch	2006-03-20 11:58:42 UTC (rev 1373)
+++ trunk/freebsd-utils/fetch	2006-03-20 12:31:38 UTC (rev 1374)
@@ -13,13 +13,15 @@
 fi
 
 for i in \
-    src/sbin/dmesg \
-    src/sbin/ifconfig src/sbin/route \
+    src/sbin/dmesg src/sbin/swapon src/sbin/sysctl \
+    src/sbin/ifconfig src/sbin/route src/usr.bin/netstat \
     src/sbin/kldconfig src/sbin/kldload src/sbin/kldstat src/sbin/kldunload \
     src/sbin/mount_std src/sbin/umount src/usr.sbin/rpc.umntall \
     src/sbin/mount_{cd9660,ext2fs,hpfs,msdosfs,nfs,nfs4,ntfs,nullfs,udf,umapfs,unionfs} \
-    src/sbin/swapon \
-    src/sbin/sysctl \
+    src/usr.bin/{ktrace,kdump} src/usr.sbin/jail src/usr.sbin/ppp{,ctl,d} \
+    src/sbin/{fdisk,mdconfig,ccdconfig,bsdlabel,ipfw} \
+    src/{contrib/pf,sbin/pfctl} \
+    src/usr.sbin/kbdcontrol src/share/syscons/keymaps \
   ; do
   cvs ${action} -r RELENG_5_4_0_RELEASE $i
   test -e $i




More information about the Glibc-bsd-commits mailing list