[Glibc-bsd-commits] r1711 - trunk/freebsd-utils/debian

[Aurelien Jarno]

Author: aurel32
Date: 2006-11-08 01:06:43 +0100 (Wed, 08 Nov 2006)
New Revision: 1711

Added:
   trunk/freebsd-utils/debian/net-tools.manpages
Modified:
   trunk/freebsd-utils/debian/changelog
   trunk/freebsd-utils/debian/control
   trunk/freebsd-utils/debian/freebsd-utils.links
   trunk/freebsd-utils/debian/kbdcontrol.templates.in
   trunk/freebsd-utils/debian/rules
Log:
+  * Enable net-tools.



Modified: trunk/freebsd-utils/debian/changelog
===================================================================
--- trunk/freebsd-utils/debian/changelog	2006-11-07 23:41:16 UTC (rev 1710)
+++ trunk/freebsd-utils/debian/changelog	2006-11-08 00:06:43 UTC (rev 1711)
@@ -4,6 +4,7 @@
   * module-init-tools: don't conflict (only replace), so that apt 
     is able to resolve the dependency loop.
   * Add manpages.
+  * Enable net-tools.
 
  -- Aurelien Jarno <aurel32 at debian.org>  Tue,  7 Nov 2006 19:01:10 +0100
 

Modified: trunk/freebsd-utils/debian/control
===================================================================
--- trunk/freebsd-utils/debian/control	2006-11-07 23:41:16 UTC (rev 1710)
+++ trunk/freebsd-utils/debian/control	2006-11-08 00:06:43 UTC (rev 1711)
@@ -15,8 +15,8 @@
 Priority: required
 Essential: yes
 Architecture: kfreebsd-i386 kfreebsd-amd64
-Depends: ${shlibs:Depends}, net-tools | freebsd-hackedutils
-Replaces: freebsd-hackedutils (<= 5.2.1-29)
+Depends: ${shlibs:Depends}, net-tools, freebsd-hackedutils
+Replaces: freebsd-hackedutils (<= 5.2.1-30)
 Description: FreeBSD utilities needed for GNU/kFreeBSD.
  This package contains FreeBSD utilities needed for GNU/kFreeBSD.
 
@@ -45,21 +45,20 @@
  Original FreeBSD command to set keyboard layout and the FreeBSD possible
  keyboards.
 
-#Package: net-tools
-#Section: net
-#Priority: important
-#Architecture: kfreebsd-i386 kfreebsd-amd64
-#Depends: ${shlibs:Depends}
-#Replaces: freebsd-utils (<< 5.4), freebsd-hackedutils (<= 5.2.1-29)
-#Description: FreeBSD networking tools
-# This package contains the FreeBSD tools needed to manage networking on
-# GNU/kFreeBSD.
+Package: net-tools
+Section: net
+Priority: important
+Architecture: kfreebsd-i386 kfreebsd-amd64
+Depends: ${shlibs:Depends}
+Replaces: freebsd-utils (<< 5.4), freebsd-hackedutils (<= 5.2.1-30)
+Description: FreeBSD networking tools
+ This package contains the FreeBSD tools needed to manage networking on
+ GNU/kFreeBSD.
 
 # FIXME:
-# - add ktrace (ktrace, kdump)
+# - add kdump
 # - add jail
 # - add ppp (ppp, pppctl, pppd)
-# - add ccdconfig (ccdconfig + /etc/ccdconfig.conf)
 # - add pf (pfctl + authpf + /etc stuff + init.d script)
 # - add ipfw (???)
 # - add devfs

Modified: trunk/freebsd-utils/debian/freebsd-utils.links
===================================================================
--- trunk/freebsd-utils/debian/freebsd-utils.links	2006-11-07 23:41:16 UTC (rev 1710)
+++ trunk/freebsd-utils/debian/freebsd-utils.links	2006-11-08 00:06:43 UTC (rev 1711)
@@ -1,10 +1,18 @@
-/sbin/mount_std		/sbin/mount_devfs
-/sbin/mount_std		/sbin/mount_fdescfs
-/sbin/mount_std		/sbin/mount_linprocfs
-/sbin/mount_std		/sbin/mount_procfs
+/sbin/mount_std				/sbin/mount_devfs
+/usr/share/man/man8/mount_std.8.gz	/usr/share/man/man8/mount_devfs.8.gz
+/sbin/mount_std				/sbin/mount_fdescfs
+/usr/share/man/man8/mount_std.8.gz	/usr/share/man/man8/mount_fdescfs.8.gz
+/sbin/mount_std				/sbin/mount_linprocfs
+/usr/share/man/man8/mount_std.8.gz	/usr/share/man/man8/mount_linprocfs.8.gz
+/sbin/mount_std				/sbin/mount_procfs
+/usr/share/man/man8/mount_std.8.gz	/usr/share/man/man8/mount_procfs.8.gz
 
-/sbin/mount_ext2fs	/sbin/mount_ext2
-/sbin/mount_ext2fs	/sbin/mount_ext3
+/sbin/mount_ext2fs			/sbin/mount_ext2
+/usr/share/man/man8/mount_ext2fs.8.gz	/usr/share/man/man8/mount_ext2.8.gz
+/sbin/mount_ext2fs			/sbin/mount_ext3
+/usr/share/man/man8/mount_ext2fs.8.gz	/usr/share/man/man8/mount_ext3.8.gz
 
-/sbin/swapon		/sbin/swapoff
-/sbin/swapon		/sbin/swapctl
+/sbin/swapon				/sbin/swapoff
+/usr/share/man/man8/swapon.8.gz 	/usr/share/man/man8/swapoff.8.gz
+/sbin/swapon				/sbin/swapctl
+/usr/share/man/man8/swapon.8.gz 	/usr/share/man/man8/swapctl.8.gz

Modified: trunk/freebsd-utils/debian/kbdcontrol.templates.in
===================================================================
--- trunk/freebsd-utils/debian/kbdcontrol.templates.in	2006-11-07 23:41:16 UTC (rev 1710)
+++ trunk/freebsd-utils/debian/kbdcontrol.templates.in	2006-11-08 00:06:43 UTC (rev 1711)
@@ -2,8 +2,8 @@
 Type: select
 Choices: none, @choices@
 Default: none
-Description: Select keyboard map:
- Select a map file for your keyboard.
+Description: Keymap:
+ You can choose a keymap in the list.
  .
  Note: If you don't know, don't select any yet.  You can always come back to
  this question with "dpkg-reconfigure kbdcontrol".

Added: trunk/freebsd-utils/debian/net-tools.manpages
===================================================================
--- trunk/freebsd-utils/debian/net-tools.manpages	2006-11-07 23:41:16 UTC (rev 1710)
+++ trunk/freebsd-utils/debian/net-tools.manpages	2006-11-08 00:06:43 UTC (rev 1711)
@@ -0,0 +1,2 @@
+build-tree/src/sbin/ifconfig/ifconfig.8
+build-tree/src/sbin/route/route.8

Modified: trunk/freebsd-utils/debian/rules
===================================================================
--- trunk/freebsd-utils/debian/rules	2006-11-07 23:41:16 UTC (rev 1710)
+++ trunk/freebsd-utils/debian/rules	2006-11-08 00:06:43 UTC (rev 1711)
@@ -14,8 +14,9 @@
 export LDADD=-lbsd -lfreebsd
 
 build/freebsd-utils:: apply-patches
-	set -e ; for i in sbin/{dmesg,mdconfig,mount,mount_std,umount,swapon,sysctl} usr.sbin/rpc.umntall \
+	set -e ; for i in sbin/{ccdconfig,dmesg,mdconfig,mount,mount_std,umount,swapon,sysctl} usr.sbin/rpc.umntall \
 		sbin/mount_{autofs,cd9660,ext2fs,hpfs,msdosfs,ntfs,nullfs,reiserfs,udf,umapfs,unionfs} \
+		usr.bin/ktrace \
 	; do \
 		$(PMAKE) -C $(DEB_SRCDIR)/$$i ; \
 	done