--- debian/changelog | 9 ++++++++ debian/control | 32 +++++++++++++++++------------- debian/control.modules.in | 2 +- debian/loadndisdriver | 24 ----------------------- debian/loadndisdriver.8 | 19 ------------------ debian/ndiswrapper | 18 ----------------- debian/ndiswrapper-common.README.debian | 17 ---------------- debian/ndiswrapper-common.dirs | 3 -- debian/ndiswrapper-common.install | 2 - debian/ndiswrapper-common.manpages | 2 - debian/ndiswrapper-utils.README.debian | 17 ++++++++++++++++ debian/ndiswrapper-utils.dirs | 3 ++ debian/ndiswrapper-utils.manpages | 2 + debian/ndiswrapper.8 | 19 ------------------ debian/rules | 24 ++++------------------ 15 files changed, 55 insertions(+), 138 deletions(-) delete mode 100644 debian/loadndisdriver delete mode 100644 debian/loadndisdriver.8 delete mode 100644 debian/ndiswrapper delete mode 100644 debian/ndiswrapper-common.README.debian delete mode 100644 debian/ndiswrapper-common.dirs delete mode 100644 debian/ndiswrapper-common.install delete mode 100644 debian/ndiswrapper-common.manpages create mode 100644 debian/ndiswrapper-utils.README.debian create mode 100644 debian/ndiswrapper-utils.dirs create mode 100644 debian/ndiswrapper-utils.manpages delete mode 100644 debian/ndiswrapper.8
diff --git a/debian/changelog b/debian/changelog
index 9b2ec66..f9210ba 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,11 +1,20 @@
ndiswrapper (1.52+svn20080313.r2642-1) UNRELEASED; urgency=low
+ [ Kel Modderman ]
* (NOT RELEASED YET) New upstream release
* Include driver/*.sh in debianized ndiswrapper module tarball.
* The distclean Makefile target no longer exists, use clean instead.
* No longer need to define KSRC in debian/rules/modules, upstream Makefile
requires only the KBUILD variable.
+ [ Julian Andres Klode ]
+ * Drop wrappers and their manpages (ndiswrapper-common package)
+ * Rename ndiswrapper-utils-1.9 to ndiswrapper-utils
+ * Produce transition packages depending on the new package (Closes: #470774)
+ - ndiswrapper-common
+ - ndiswrapper-utils-1.9
+ - ndiswrapper-utils-1.1
+
-- Kel Modderman <[EMAIL PROTECTED]> Thu, 13 Mar 2008 15:20:25 +1000
ndiswrapper (1.52-1) unstable; urgency=low
diff --git a/debian/control b/debian/control
index 7207f1d..3cbe584 100644
--- a/debian/control
+++ b/debian/control
@@ -11,23 +11,27 @@ Homepage: http://ndiswrapper.sourceforge.net/
Package: ndiswrapper-common
Architecture: all
-Depends: ${misc:Depends}
-Replaces: ndiswrapper-utils
-Suggests: ndiswrapper-source
-Description: Common scripts required to use the utilities for ndiswrapper
- Some vendors do not release specifications of the hardware or provide a
- Linux driver for their wireless network cards. This project implements
- Windows kernel API and NDIS (Network Driver Interface Specification) API
- within Linux kernel. A Windows driver for wireless network card is then
- linked to this implementation so that the driver runs natively, as though
- it is in Windows, without binary emulation.
- .
- This package contains wrapper scripts to call out to the proper
- versions of whatever -utils-X.X package is installed.
+Depends: ndiswrapper-utils
+Description: Transitional package
+ This package is a transitional package for the ndiswrapper-utils rename.
+
+Package: ndiswrapper-utils-1.1
+Architecture: all
+Depends: ndiswrapper-utils
+Description: Transitional package
+ This package is a transitional package for the ndiswrapper-utils rename.
Package: ndiswrapper-utils-1.9
+Architecture: all
+Depends: ndiswrapper-utils
+Description: Transitional package
+ This package is a transitional package for the ndiswrapper-utils rename.
+
+Package: ndiswrapper-utils
Architecture: i386 amd64
-Depends: ${shlibs:Depends}, ${misc:Depends}, ndiswrapper-common
+Depends: ${shlibs:Depends}, ${misc:Depends}
+Replaces: ndiswrapper-common, ndiswrapper-utils-1.1, ndiswrapper-utils-1.9
+Conflicts: ndiswrapper-common, ndiswrapper-utils-1.1, ndiswrapper-utils-1.9
Suggests: ndiswrapper-source
Description: Userspace utilities for the ndiswrapper Linux kernel module
Some vendors do not release specifications of the hardware or provide a
diff --git a/debian/control.modules.in b/debian/control.modules.in
index 9ac50d6..3ea3582 100644
--- a/debian/control.modules.in
+++ b/debian/control.modules.in
@@ -8,7 +8,7 @@ Standards-Version: 3.7.3
Package: ndiswrapper-modules-_KVERS_
Architecture: i386 amd64
-Depends: ndiswrapper-utils-1.9
+Depends: ndiswrapper-utils
Recommends: linux-modules-_KVERS_ | linux-image-_KVERS_, wireless-tools
Description: ndiswrapper Linux kernel module
This package contains the ndiswrapper loadable kernel modules for the
diff --git a/debian/loadndisdriver b/debian/loadndisdriver
deleted file mode 100644
index 9607016..0000000
--- a/debian/loadndisdriver
+++ /dev/null
@@ -1,24 +0,0 @@
-#!/bin/sh
-
-set -e
-
-latest_loadndisdriver () {
- for file in /sbin/loadndisdriver-[\.0-9][\.0-9]*; do
- echo $file
- done | sort -n -t - -k 2 | tail -1
-}
-
-if [ "$#" -ge "3" ]; then
- # /sbin/loadndisdriver <ioctl command> <debug value> <utils version> \
- # <vendor> <device> <subdevice> <subvendor> <bus>
- exec /sbin/loadndisdriver-$3 "$@"
-elif [ "$1" = "-v" ]; then
- # report version number of most recent loadndisdriver binary
- LOADNDISDRIVER=$(latest_loadndisdriver)
- if [ -x "$LOADNDISDRIVER" ]; then
- exec $LOADNDISDRIVER -v
- else
- echo "Error: unable to find latest loadndisdriver!" 1>&2
- exit 1
- fi
-fi
diff --git a/debian/loadndisdriver.8 b/debian/loadndisdriver.8
deleted file mode 100644
index ad5d6fd..0000000
--- a/debian/loadndisdriver.8
+++ /dev/null
@@ -1,19 +0,0 @@
-.TH LOADNDISDRIVER 8 "April 2006"
-.SH NAME
-loadndisdriver \- load ndis driver (wrapper)
-.SH SYNOPSIS
-.B loadndisdriver
-.RI [ options ]
-.SH DESCRIPTION
-This manual page documents briefly the
-.B loadndisdriver
-command.
-.PP
-\fBloadndisdriver\fP is a wrapper for the version-specific
-\fBloadndisdriver-X.X\fP programs (where -X.X is the version number of the
-utils; ie, \fBloadndisdriver-1.8\fP). It simply figures out which
-version should be called, and calls the appropriate binary. Each
-version's man page contains its usage details.
-.SH AUTHOR
-This manual page was written by Andres Salomon <[EMAIL PROTECTED]>,
-for the Debian project (but may be used by others).
diff --git a/debian/ndiswrapper b/debian/ndiswrapper
deleted file mode 100644
index 656b5af..0000000
--- a/debian/ndiswrapper
+++ /dev/null
@@ -1,18 +0,0 @@
-#!/bin/sh
-
-set -e
-
-latest_ndiswrapper () {
- for file in /usr/sbin/ndiswrapper-[\.0-9][\.0-9]*; do
- echo $file
- done | sort -n -t - -k 2 | tail -1
-}
-
-
-NDISWRAPPER=$(latest_ndiswrapper)
-if [ -x "$NDISWRAPPER" ]; then
- exec $NDISWRAPPER "$@"
-else
- echo "Error: no ndiswrapper utils found!" 1>&2
- exit 1
-fi
diff --git a/debian/ndiswrapper-common.README.debian
b/debian/ndiswrapper-common.README.debian
deleted file mode 100644
index 35c427d..0000000
--- a/debian/ndiswrapper-common.README.debian
+++ /dev/null
@@ -1,17 +0,0 @@
-ndiswrapper for Debian
-----------------------
-
-Please see ./README for a description of the ndiswrapper software.
-
-I use the following setup of ndiswrapper:
-
-Add this to your /etc/networking/interfaces::
-
- iface wlan0 inet dhcp
- pre-up modprobe ndiswrapper
- post-down rmmod ndiswrapper
-
-If you have several wlan adapters in your computer you may need to change
-wlan0 to something else.
-
- -- Erik Rigtorp <[EMAIL PROTECTED]>, Mon, 24 Feb 2004 17:19:13 +0100
diff --git a/debian/ndiswrapper-common.dirs b/debian/ndiswrapper-common.dirs
deleted file mode 100644
index edd1440..0000000
--- a/debian/ndiswrapper-common.dirs
+++ /dev/null
@@ -1,3 +0,0 @@
-/sbin
-/usr/sbin
-/etc/ndiswrapper
diff --git a/debian/ndiswrapper-common.install
b/debian/ndiswrapper-common.install
deleted file mode 100644
index 3e8a121..0000000
--- a/debian/ndiswrapper-common.install
+++ /dev/null
@@ -1,2 +0,0 @@
-debian/loadndisdriver /sbin
-debian/ndiswrapper /usr/sbin
diff --git a/debian/ndiswrapper-common.manpages
b/debian/ndiswrapper-common.manpages
deleted file mode 100644
index 5e3c690..0000000
--- a/debian/ndiswrapper-common.manpages
+++ /dev/null
@@ -1,2 +0,0 @@
-debian/ndiswrapper.8
-debian/loadndisdriver.8
diff --git a/debian/ndiswrapper-utils.README.debian
b/debian/ndiswrapper-utils.README.debian
new file mode 100644
index 0000000..35c427d
--- /dev/null
+++ b/debian/ndiswrapper-utils.README.debian
@@ -0,0 +1,17 @@
+ndiswrapper for Debian
+----------------------
+
+Please see ./README for a description of the ndiswrapper software.
+
+I use the following setup of ndiswrapper:
+
+Add this to your /etc/networking/interfaces::
+
+ iface wlan0 inet dhcp
+ pre-up modprobe ndiswrapper
+ post-down rmmod ndiswrapper
+
+If you have several wlan adapters in your computer you may need to change
+wlan0 to something else.
+
+ -- Erik Rigtorp <[EMAIL PROTECTED]>, Mon, 24 Feb 2004 17:19:13 +0100
diff --git a/debian/ndiswrapper-utils.dirs b/debian/ndiswrapper-utils.dirs
new file mode 100644
index 0000000..edd1440
--- /dev/null
+++ b/debian/ndiswrapper-utils.dirs
@@ -0,0 +1,3 @@
+/sbin
+/usr/sbin
+/etc/ndiswrapper
diff --git a/debian/ndiswrapper-utils.manpages
b/debian/ndiswrapper-utils.manpages
new file mode 100644
index 0000000..07ff205
--- /dev/null
+++ b/debian/ndiswrapper-utils.manpages
@@ -0,0 +1,2 @@
+ndiswrapper.8
+loadndisdriver.8
diff --git a/debian/ndiswrapper.8 b/debian/ndiswrapper.8
deleted file mode 100644
index f266542..0000000
--- a/debian/ndiswrapper.8
+++ /dev/null
@@ -1,19 +0,0 @@
-.TH NDISWRAPPER 8 "April 2006"
-.SH NAME
-ndiswrapper \- install/modify/remove ndis driver (wrapper)
-.SH SYNOPSIS
-.B ndiswrapper
-.RI [ options ]
-.SH DESCRIPTION
-This manual page documents briefly the
-.B ndiswrapper
-command.
-.PP
-\fBndiswrapper\fP is a wrapper for the version-specific
-\fBndiswrapper-X.X\fP programs (where -X.X is the version number of the
-utils; ie, \fBndiswrapper-1.8\fP). It simply figures out which version
-should be called, and calls the appropriate binary. Each version's man
-page contains its usage details.
-.SH AUTHOR
-This manual page was written by Andres Salomon <[EMAIL PROTECTED]>,
-for the Debian project (but may be used by others).
diff --git a/debian/rules b/debian/rules
index a4b7628..18b17cb 100755
--- a/debian/rules
+++ b/debian/rules
@@ -5,12 +5,7 @@
#include /usr/share/quilt/quilt.make
-build: build-indep build-arch
-
-build-indep: build-indep-stamp
-#build-indep-stamp: $(QUILT_STAMPFN)
-build-indep-stamp:
- touch $@
+build: build-arch
build-arch: build-arch-stamp
#build-arch-stamp: $(QUILT_STAMPFN)
@@ -58,20 +53,11 @@ install-arch:
dh_testdir
dh_testroot
dh_clean -k -s
-
- install -D -m755 utils/loadndisdriver \
- debian/ndiswrapper-utils-1.9/sbin/loadndisdriver-1.9
- install -D -m755 utils/ndiswrapper \
- debian/ndiswrapper-utils-1.9/usr/sbin/ndiswrapper-1.9
- install -D -m644 loadndisdriver.8 \
-
debian/ndiswrapper-utils-1.9/usr/share/man/man8/loadndisdriver-1.9.8
- install -D -m644 ndiswrapper.8 \
-
debian/ndiswrapper-utils-1.9/usr/share/man/man8/ndiswrapper-1.9.8
-
-binary-indep: build-indep install-indep
+ $(MAKE) -C utils install DESTDIR=$(CURDIR)/debian/ndiswrapper-utils
+
+binary-indep: install-indep
dh_testdir -i
dh_testroot -i
- dh_installman -i
dh_installdocs -i
dh_installchangelogs -i ChangeLog
dh_compress -i
@@ -97,4 +83,4 @@ binary-arch: build-arch install-arch
dh_builddeb -s
binary: binary-indep binary-arch
-.PHONY: build build-indep build-arch clean install install-indep install-arch
binary-indep binary-arch binary
+.PHONY: build build-arch clean install install-indep install-arch binary-indep
binary-arch binary
--
1.5.3.8
signature.asc
Description: Digital signature
