Changeset 7477

Timestamp:

03/05/11 23:54:05 (2 years ago)

Author:

alanbach-guest

Message:

• Sync'd with Debian 1.56-3

Location:

pkg/raul/main/ndiswrapper/trunk/debian

Files:

• changelog (modified) (1 diff)
• control (modified) (4 diffs)
• control.modules.in (modified) (1 diff)
• ndiswrapper-dkms.dkms.in (added)
• patches/linux-2.6.35 (added)
• patches/series (modified) (1 diff)
• rules (modified) (7 diffs)
• source (added)
• source/format (added)

pkg/raul/main/ndiswrapper/trunk/debian/changelog

@@ -1 @@
-ndiswrapper (1.56-parsix1) unstable; urgency=low
-
-  * New upstream bugfix release
-  * Dropped fix-2.6.31-build.patch, merged upstream
+ndiswrapper (1.56-parsix2) unstable; urgency=low
+
+  * Sync'd with Debian 1.56-3
+
+ -- Alan Baghumian <alan@technotux.org>  Sat, 05 Mar 2011 14:53:41 -0800
+
+ndiswrapper (1.56-3) unstable; urgency=low
+
+  * Use a reworked and working Linux 2.6.35 support patch (LP: #613796)
+
+ -- Julian Andres Klode <jak@debian.org>  Mon, 13 Sep 2010 19:59:08 +0200
+
+ndiswrapper (1.56-2) unstable; urgency=low
+
+  * Only suggest ndiswrapper-dkms on Ubuntu
+  * Add support for Linux 2.6.35 (LP: #590090)
+  * Set Standards-Version to 3.9.1
+
+ -- Julian Andres Klode <jak@debian.org>  Tue, 03 Aug 2010 14:21:33 +0200
+
+ndiswrapper (1.56-1) unstable; urgency=low
+
+  * Imported Upstream version 1.56
+  * Drop all patches, they are shipped upstream now.
   * debian/ndiswrapper.8, debian/loadnsisdriver.8: Escape the "-".
-  * Bump standards version to 3.8.4, no extra change is needed
-
- -- Alan Baghumian <alan@technotux.org>  Sun, 14 Feb 2010 13:00:17 -0800
-
-ndiswrapper (1.55-parsix2) unstable; urgency=low
-
-  * Added fix-2.6.31-build.patch to fix 2.6.31 build
-    More info: http://bugs.gentoo.org/show_bug.cgi?id=280057
-  * Dropped fix-typo-in-netdev-ops-struct.patch, merged upstream
-
- -- Alan Baghumian <alan@technotux.org>  Wed, 02 Dec 2009 19:30:02 -0800
-
-ndiswrapper (1.55-parsix1) unstable; urgency=low
-
-  * New upstream stable release
-    - bump standards version to 3.8.2, no extra change is needed
-    - disabled fix-typo-in-netdev-ops-struct.patch
-
- -- Alan Baghumian <alan@technotux.org>  Thu, 30 Jul 2009 17:33:12 -0700
-
-ndiswrapper (1.54-parsix1) unstable; urgency=low
-
-  * Sync'd with Debian 1.54-2
-
- -- Alan Baghumian <alan@technotux.org>  Sun, 26 Apr 2009 10:55:18 -0700
+
+ -- Julian Andres Klode <jak@debian.org>  Sun, 14 Feb 2010 14:28:28 +0100
+
+ndiswrapper (1.55-2) unstable; urgency=low
+
+  * use-conf-in-modprobe-d.diff: Use /etc/modprobe.d/ndiswrapper.conf,
+    not /etc/modprobe.d/ndiswrapper.
+  * fix-cmpxchg8b.diff: Fix compilation for kernel >= 2.6.31 on i386
+    (Closes: #568065).
+
+ -- Julian Andres Klode <jak@debian.org>  Tue, 02 Feb 2010 08:21:45 +0100
+
+ndiswrapper (1.55-1) unstable; urgency=low
+
+  * Imported Upstream version 1.55
+  * fix-typo-in-netdev-ops-struct.patch: Drop patch, now upstream.
+  * debian/control: Increase Standards-Version to 3.8.4.
+  * Create a ndiswrapper-dkms package, recommend it in ndiswrapper-
+    utils-1.9.
+  * debian/control: Add Vcs-Git and Vcs-Browser fields.
+  * debian/control: Add ${misc:Depends} to ndiswrapper-source
+    dependencies.
+  * Switch to 3.0 (quilt) source package format.
+
+ -- Julian Andres Klode <jak@debian.org>  Mon, 01 Feb 2010 18:35:25 +0100
 
 ndiswrapper (1.54-2) unstable; urgency=low

pkg/raul/main/ndiswrapper/trunk/debian/control

@@ -4 +4 @@
 Maintainer: Julian Andres Klode <jak@debian.org>
 Uploaders: Kel Modderman <kel@otaku42.de>
-Standards-Version: 3.8.4
-Build-Depends: debhelper (>= 5), bzip2, quilt
+Standards-Version: 3.9.1
+Build-Depends: debhelper (>= 5), bzip2, dkms
+Vcs-Git: git://git.debian.org/git/collab-maint/ndiswrapper.git
+Vcs-Browser: http://git.debian.org/?p=collab-maint/ndiswrapper.git;a=summary
 Homepage: http://ndiswrapper.sourceforge.net/
 
@@ -27 +29 @@
 Architecture: i386 amd64
 Depends: ${shlibs:Depends}, ${misc:Depends}, ndiswrapper-common
-Suggests: ndiswrapper-source
+Recommends: ${distro:Recommends}
+Suggests: ${distro:Suggests}, ndiswrapper-source
 Description: Userspace utilities for the ndiswrapper Linux kernel module
  Some vendors do not release specifications of the hardware or provide a
@@ -42 +45 @@
 Architecture: all
 Section: kernel
-Depends: module-assistant, debhelper (>= 5), bzip2
+Depends: ${misc:Depends}, module-assistant, debhelper (>= 5), bzip2
 Suggests: kernel-package
 Description: Source for the ndiswrapper Linux kernel module
@@ -52 +55 @@
  it is in Windows, without binary emulation.
  .
- This package provides the source code for the ndiswrapper kernel module. If
- you use a standard distribution kernel, you mostly will not need this, but use
- the pre-compiled modules instead.
+ This package provides the source code for the ndiswrapper kernel module.
+
+Package: ndiswrapper-dkms
+Architecture: all
+Section: kernel
+Depends: ${misc:Depends}
+Description: Source for the ndiswrapper Linux kernel module (DKMS)
+ 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 provides the source code for ndiswrapper kernel module to be
+ build with dkms.

pkg/raul/main/ndiswrapper/trunk/debian/control.modules.in

@@ -5 +5 @@
 Uploaders: Kel Modderman <kel@otaku42.de>
 Build-Depends: debhelper (>= 5), bzip2
-Standards-Version: 3.8.4
+Standards-Version: 3.8.0
 
 Package: ndiswrapper-modules-_KVERS_

pkg/raul/main/ndiswrapper/trunk/debian/patches/series

@@ +1 @@
+linux-2.6.35

pkg/raul/main/ndiswrapper/trunk/debian/rules

@@ -1 +1 @@
 #!/usr/bin/make -f
-include /usr/share/quilt/quilt.make
+version := $(shell dpkg-parsechangelog | sed -n 's/^Version: *\([^-]\+\)-.\+/\1/p')
+recommends := $(shell dpkg-vendor --derives-from Ubuntu || echo "ndiswrapper-dkms")
+suggests := $(shell dpkg-vendor --derives-from Ubuntu && echo "ndiswrapper-dkms" || true)
 # Uncomment this to turn on verbose mode.
 #export DH_VERBOSE=1
@@ -7 +9 @@
 
 build-indep: build-indep-stamp
-build-indep-stamp: $(QUILT_STAMPFN)
+build-indep-stamp:
         touch $@
 
 build-arch: build-arch-stamp
-build-arch-stamp: $(QUILT_STAMPFN)
+build-arch-stamp:
         dh_testdir
 
@@ -18 +20 @@
         touch $@
 
-clean: unpatch
+clean:
         dh_testdir
         dh_testroot
@@ -24 +26 @@
         $(MAKE) -C utils distclean
 
-        dh_clean build-arch-stamp build-indep-stamp
+        dh_clean build-arch-stamp build-indep-stamp debian/ndiswrapper-dkms.dkms
+
+debian/ndiswrapper-dkms.dkms: debian/ndiswrapper-dkms.dkms.in
+        sed s/@VERSION@/$(version)/g $< > $@
 
 install: install-indep install-arch
 
-install-indep: build-indep
+install-indep: build-indep debian/ndiswrapper-dkms.dkms
         dh_testdir
         dh_testroot
@@ -49 +54 @@
         tar jcf debian/ndiswrapper-source/usr/src/ndiswrapper.tar.bz2 \
                 -C debian/tmp modules
+
+        # Create the ndiswrapper-dkms package.
+        dh_install -pndiswrapper-dkms driver/Makefile usr/src/ndiswrapper-$(version)
+        dh_install -pndiswrapper-dkms driver/*.[chS]  usr/src/ndiswrapper-$(version)
+        dh_install -pndiswrapper-dkms driver/*.sh     usr/src/ndiswrapper-$(version)
+        dh_dkms -pndiswrapper-dkms
 
 install-arch: build-arch
@@ -73 +84 @@
         dh_fixperms -i
         dh_installdeb -i
-        dh_gencontrol -i
+        dh_gencontrol -i -- -Vdistro:Recommends=$(recommends) \
+                            -Vdistro:Suggests=$(suggests)
         dh_md5sums -i
         dh_builddeb -i
@@ -88 +100 @@
         dh_installdeb -s
         dh_shlibdeps -s
-        dh_gencontrol -s
+        dh_gencontrol -s -- -Vdistro:Recommends=$(recommends) \
+                            -Vdistro:Suggests=$(suggests)
         dh_md5sums -s
         dh_builddeb -s