[Glibc-bsd-commits] r2554 - trunk/kfreebsd-7/debian

[Aurelien Jarno]

Author: aurel32
Date: 2009-05-31 19:34:14 +0000 (Sun, 31 May 2009)
New Revision: 2554

Modified:
   trunk/kfreebsd-7/debian/changelog
   trunk/kfreebsd-7/debian/control.flavor.in
   trunk/kfreebsd-7/debian/control.in
   trunk/kfreebsd-7/debian/rules
Log:
  * Move ndiswrapper modules to kfreebsd-image, the same way the Linux
    modules are in main in the Debian.



Modified: trunk/kfreebsd-7/debian/changelog
===================================================================
--- trunk/kfreebsd-7/debian/changelog	2009-05-31 19:28:18 UTC (rev 2553)
+++ trunk/kfreebsd-7/debian/changelog	2009-05-31 19:34:14 UTC (rev 2554)
@@ -10,6 +10,8 @@
   * Keep sources of ZFS but don't enable them.
   * 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.
 
  -- Aurelien Jarno <aurel32 at debian.org>  Sun, 31 May 2009 21:27:54 +0200
 

Modified: trunk/kfreebsd-7/debian/control.flavor.in
===================================================================
--- trunk/kfreebsd-7/debian/control.flavor.in	2009-05-31 19:28:18 UTC (rev 2553)
+++ trunk/kfreebsd-7/debian/control.flavor.in	2009-05-31 19:34:14 UTC (rev 2554)
@@ -10,15 +10,6 @@
  .
  This package is compiled for a @flavor at -class machine.
 
-Package: ndiswrapper-modules- at version@- at abiname@- at flavor@
-Architecture: kfreebsd- at arch@
-Section: contrib/net
-Priority: optional
-Depends: kfreebsd-image- at version@- at abiname@- at flavor@
-Description: Ndiswrapper kFreeBSD module
- This package contains the ndiswrapper loadable kernel modules for the
- kfreebsd-image- at version@- at abiname@- at flavor@ package.
-
 Package: kfreebsd-image- at major@- at flavor@
 Architecture: kfreebsd- at arch@
 Depends: kfreebsd-image- at version@- at abiname@- at flavor@

Modified: trunk/kfreebsd-7/debian/control.in
===================================================================
--- trunk/kfreebsd-7/debian/control.in	2009-05-31 19:28:18 UTC (rev 2553)
+++ trunk/kfreebsd-7/debian/control.in	2009-05-31 19:34:14 UTC (rev 2554)
@@ -5,7 +5,7 @@
 Uploaders: Aurelien Jarno <aurel32 at debian.org>, Guillem Jover <guillem at debian.org>
 Vcs-Browser: http://svn.debian.org/wsvn/glibc-bsd/trunk/kfreebsd-@major@/
 Vcs-Svn: svn://svn.debian.org/glibc-bsd/trunk/kfreebsd-@major@/
-Build-Depends: debhelper (>= 5.0.0), bzip2, quilt, freebsd-buildutils (>= @major@) [kfreebsd-i386 kfreebsd-amd64] | freebsd6-buildutils (>=  6.2) [kfreebsd-i386 kfreebsd-amd64], libdb-dev, flex-old | flex, libbsd-dev [kfreebsd-i386 kfreebsd-amd64], gcc-4.3 [kfreebsd-i386 kfreebsd-amd64], sharutils
+Build-Depends: debhelper (>= 5.0.0), bzip2, quilt, freebsd-buildutils (>= @major@) [kfreebsd-i386 kfreebsd-amd64], libdb-dev, flex-old | flex, libbsd-dev [kfreebsd-i386 kfreebsd-amd64], gcc-4.3 [kfreebsd-i386 kfreebsd-amd64], sharutils
 Standards-Version: 3.8.1
 
 Package: kfreebsd-source- at version@

Modified: trunk/kfreebsd-7/debian/rules
===================================================================
--- trunk/kfreebsd-7/debian/rules	2009-05-31 19:28:18 UTC (rev 2553)
+++ trunk/kfreebsd-7/debian/rules	2009-05-31 19:34:14 UTC (rev 2554)
@@ -21,7 +21,6 @@
 SOURCE_PACKAGE	:= $(CURDIR)/debian/kfreebsd-source-$(version)
 IMAGE_PACKAGE	:= $(CURDIR)/debian/kfreebsd-image-$(version)-$(abiname)
 HEADERS_PACKAGE	:= $(CURDIR)/debian/kfreebsd-headers-$(version)-$(abiname)
-NDIS_PACKAGE	:= $(CURDIR)/debian/ndiswrapper-modules-$(version)-$(abiname)
 SRC_TAR		:= kfreebsd-source-$(version).tar.bz2
 SRC_DIR		:= kfreebsd-source-$(version)
 HEADERS_DIR	:= kfreebsd-headers-$(version)-$(abiname)
@@ -191,11 +190,6 @@
 		debian/kfreebsd-image.overrides \
 		$(IMAGE_PACKAGE)-$*/usr/share/lintian/overrides/kfreebsd-image-$(version)-$(abiname)-$*
 
-	# move ndis modules to their own package
-	mkdir -p $(NDIS_PACKAGE)-$*/lib/modules/$(version)-$(abiname)-$*
-	mv $(IMAGE_PACKAGE)-$*/lib/modules/$(version)-$(abiname)-$*/ndis.ko $(IMAGE_PACKAGE)-$*/lib/modules/$(version)-$(abiname)-$*/if_ndis.ko \
-		$(NDIS_PACKAGE)-$*/lib/modules/$(version)-$(abiname)-$*/
-
 	# scripts
 	sed -e "s/@RELEASE@/$(version)-$(abiname)-$*/g" debian/kfreebsd-image.postinst.in \
 		> debian/kfreebsd-image-$(version)-$(abiname)-$*.postinst