Package: zd1211-firmware
Severity: normal
Tags: patch

The attached patch implements the transition to the firmware-(driver)
namespace that is nowadays used in Debian. It also slightly upgrades
the packaging to use a simplified debian/rules. Please feel free to
apply it and then upload the updated package to Debian.
diff -u zd1211-firmware-2.21.0.0/debian/control zd1211-firmware-2.21.0.0/debian/control
--- zd1211-firmware-2.21.0.0/debian/control
+++ zd1211-firmware-2.21.0.0/debian/control
@@ -1,15 +1,16 @@
 Source: zd1211-firmware
 Section: non-free/misc
-Priority: extra
+Priority: optional
+Homepage: http://zd1211.wiki.sourceforge.net/
 Maintainer: Christian Kastner <deb...@kvr.at>
-Build-Depends: debhelper (>= 7)
+Build-Depends: debhelper (>= 7.0.0~)
 Standards-Version: 3.8.4
-Homepage: http://zd1211.wiki.sourceforge.net/
 
-Package: zd1211-firmware
+Package: firmware-zd1211
 Architecture: all
 Depends: ${misc:Depends}
-Description: Firmware images for the zd1211rw wireless driver
+Suggests: initramfs-tools, linux-image
+Description: firmware images for the zd1211rw wireless driver
  This package contains the firmware to be used with the zd1211rw Linux kernel
  driver for USB wireless dongles based on the following chipsets:
  .
@@ -21,0 +23,9 @@
+
+Package: zd1211-firmware
+Section: non-free/oldlibs
+Priority: extra
+Architecture: all
+Depends: firmware-zd1211, ${misc:Depends}
+Description: firmware images for the zd1211rw wireless driver (dummy transitional package)
+ This package contains the firmware to be used with the zd1211rw Linux kernel
+ driver for USB wireless dongles based on the following chipsets:
reverted:
--- zd1211-firmware-2.21.0.0/debian/zd1211-firmware.install
+++ zd1211-firmware-2.21.0.0.orig/debian/zd1211-firmware.install
@@ -1 +0,0 @@
-zd1211* /lib/firmware/zd1211/
reverted:
--- zd1211-firmware-2.21.0.0/debian/zd1211-firmware.docs
+++ zd1211-firmware-2.21.0.0.orig/debian/zd1211-firmware.docs
@@ -1 +0,0 @@
-README
diff -u zd1211-firmware-2.21.0.0/debian/changelog zd1211-firmware-2.21.0.0/debian/changelog
--- zd1211-firmware-2.21.0.0/debian/changelog
+++ zd1211-firmware-2.21.0.0/debian/changelog
@@ -1,3 +1,13 @@
+zd1211-firmware (2.21.0.0-2) unstable; urgency=low
+
+  [ Martin-Éric Racine ]
+  * Renamed the binary target to firmware-zd1211.
+    + Renamed debian/*.[dirs|docs|install] to match.
+  * Made zd1211-firmware into a transitional package.
+  * Migrated debian/rules to a single debhelper 7 'dh' command.
+
+ -- Christian Kastner <deb...@kvr.at>  Wed, 20 Jun 2012 02:19:04 +0300
+
 zd1211-firmware (2.21.0.0-1) unstable; urgency=low
 
   * New maintainer. Closes: #573468
diff -u zd1211-firmware-2.21.0.0/debian/rules zd1211-firmware-2.21.0.0/debian/rules
--- zd1211-firmware-2.21.0.0/debian/rules
+++ zd1211-firmware-2.21.0.0/debian/rules
@@ -2,37 +2,11 @@
-# -*- makefile -*-
-# Sample debian/rules that uses debhelper.
-# This file was originally written by Joey Hess and Craig Small.
-# As a special exception, when this file is copied by dh-make into a
-# dh-make output file, you may use that output file without restriction.
-# This special exception was added by Craig Small in version 0.37 of dh-make.
-
-# Uncomment this to turn on verbose mode.
-#export DH_VERBOSE=1
-
-build:
-
-clean:
-	dh_testdir
-	dh_clean
-
-install:
-	dh_testdir
-	dh_testroot
-	dh_installdirs
-	dh_install
-	dh_installdocs
-	dh_installchangelogs
-	dh_compress
-	dh_fixperms
-#	dh_installdeb
-	dh_gencontrol
-	dh_md5sums
-	dh_builddeb
-
-binary-indep: install
-
-binary-arch:
-
-binary: binary-indep binary-arch
-
-.PHONY: build clean binary-indep binary-arch binary install
+#
+# debhelper-7 [debian/rules] for src:zd1211-firmware
+#
+## COPYRIGHT © 2012 Martin-Éric Racine <martin-eric.rac...@iki.fi>
+#
+## LICENSE
+#  GPLv2+: GNU GPL version 2 or later <http://gnu.org/licenses/gpl.html>
+#
+%:
+	dh $@
+#EOF
reverted:
--- zd1211-firmware-2.21.0.0/debian/zd1211-firmware.dirs
+++ zd1211-firmware-2.21.0.0.orig/debian/zd1211-firmware.dirs
@@ -1 +0,0 @@
-/lib/firmware/zd1211/
only in patch2:
unchanged:
--- zd1211-firmware-2.21.0.0.orig/debian/firmware-zd1211.install
+++ zd1211-firmware-2.21.0.0/debian/firmware-zd1211.install
@@ -0,0 +1 @@
+zd1211* /lib/firmware/zd1211/
only in patch2:
unchanged:
--- zd1211-firmware-2.21.0.0.orig/debian/firmware-zd1211.docs
+++ zd1211-firmware-2.21.0.0/debian/firmware-zd1211.docs
@@ -0,0 +1 @@
+README
only in patch2:
unchanged:
--- zd1211-firmware-2.21.0.0.orig/debian/firmware-zd1211.dirs
+++ zd1211-firmware-2.21.0.0/debian/firmware-zd1211.dirs
@@ -0,0 +1 @@
+/lib/firmware/zd1211/

Reply via email to