debian packaging improvements

* debian/iw.files and debian/iw.manpages are not needed
* debian/compat was set to 7, so must either build depend on debhelper >= 7
  or change debian/compat to 6, because package currently build depend on
  debhelper >= 6
* build-depend on debhelper >= 7, use the new fandangle dh command to shrink
  debian/rules down to something nice and small
* convert debian/copyright to nice new format which seem to be all the rage in
  Debian, making it nice and small.
  <http://wiki.debian.org/Proposals/CopyrightFormat>

diff --git a/debian/control b/debian/control
index dd243e183b5b1b95823459330d0cb109d26a15a3..65064be9eee2707176b21be0b49360135e1b547e 100644 (file)
--- a/debian/control
+++ b/debian/control
@@ -2,7 +2,7 @@ Source: iw
 Section: net
 Priority: optional
 Maintainer: Johannes Berg <johannes@sipsolutions.net>
-Build-Depends: debhelper (>= 6), libnl-dev (>= 1.1), pkg-config (>= 0.22)
+Build-Depends: debhelper (>= 7), libnl-dev (>= 1.1), pkg-config (>= 0.22)
 Standards-Version: 3.8.0
 Homepage: http://wireless.kernel.org/en/users/Documentation/iw
 

diff --git a/debian/copyright b/debian/copyright
index df5a422f2bfa281889ff9411bd9d90ae0483f581..41f27ec01818a2ba076280dee40ef37f6873592d 100644 (file)
--- a/debian/copyright
+++ b/debian/copyright
@@ -1,50 +1,12 @@
-This package was debianized by Johannes Berg <johannes@sipsolutions.net> on
-Tue, 16 September 2008 22:50:41 +0200.
-
-It was downloaded from http://git.sipsolutions.net/iw.git/
-
-Upstream Authors:
-
-    Johannes Berg <johannes@sipsolutions.net>
-    Andy Lutomirski
-    Mike Kershaw
-    Luis R. Rodriguez
-
-Copyright:
-
-    Copyright (c) 2007, 2008        Johannes Berg
-    Copyright (c) 2007              Andy Lutomirski
-    Copyright (c) 2007              Mike Kershaw
-    Copyright (c) 2008              Luis R. Rodriguez
-
-License:
-
-    All rights reserved.
-
-    Redistribution and use in source and binary forms, with or without
-    modification, are permitted provided that the following conditions
-    are met:
-    1. Redistributions of source code must retain the above copyright
-       notice, this list of conditions and the following disclaimer.
-    2. Redistributions in binary form must reproduce the above copyright
-       notice, this list of conditions and the following disclaimer in the
-       documentation and/or other materials provided with the distribution.
-    3. The name of the author may not be used to endorse or promote products
-       derived from this software without specific prior written permission.
-
-    THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
-    IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
-    OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
-    IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
-    INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
-    BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
-    LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED
-    AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
-    OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
-    OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
-    SUCH DAMAGE.
-
-The Debian packaging is licensed under the same license as above and has
-the following copyright:
-
-Copyright (C) 2008  Johannes Berg <johannes@sipsolutions.net>
+Upstream-Name: iw
+Upstream-Maintainer: Johannes Berg <johannes@sipsolutions.net>
+Upstream-Source: http://git.sipsolutions.net/iw.git/
+
+Files: *
+Copyright: Copyright (c) 2007, 2008        Johannes Berg
+Copyright: Copyright (c) 2007              Andy Lutomirski
+Copyright: Copyright (c) 2007              Mike Kershaw
+Copyright: Copyright (c) 2008              Luis R. Rodriguez
+License: BSD-3
+ On Debian GNU/Linux systems, the complete text of the BSD license can be
+ found at `/usr/share/common-licenses/BSD'.

diff --git a/debian/iw.files b/debian/iw.files
deleted file mode 100644 (file)
index 93af48c..0000000
--- a/debian/iw.files
+++ /dev/null
@@ -1 +0,0 @@
-usr/bin/iw

diff --git a/debian/iw.manpages b/debian/iw.manpages
deleted file mode 100644 (file)
index 0a77ace..0000000
--- a/debian/iw.manpages
+++ /dev/null
@@ -1 +0,0 @@
-iw.8

diff --git a/debian/rules b/debian/rules
index 17d26cf5ee75ff7c0ff09b8a26f345a3a02383e1..869de5a539629281bb4f597506fafc534e6e26af 100755 (executable)
--- a/debian/rules
+++ b/debian/rules
@@ -1,87 +1,24 @@
 #!/usr/bin/make -f
-# -*- 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.
-#
-# Modified to make a template file for a multi-binary package with separated
-# build-arch and build-indep targets  by Bill Allombert 2001
 
-# Uncomment this to turn on verbose mode.
-#export DH_VERBOSE=1
+build: build-stamp
+build-stamp:
+       dh build --before configure
+       grep -v PLUGINNAME < defconfig > .config
+       dh build --after  configure
+       touch build-stamp
 
-# This has to be exported to make some magic below work.
-export DH_OPTIONS
+clean:
+       dh clean
 
-PREFIX=$(CURDIR)/debian/iw/usr/
+install: build install-stamp
+install-stamp:
+       dh install
+       touch install-stamp
 
-configure: configure-stamp
-configure-stamp:
-       dh_testdir
-       cat defconfig | grep -v PLUGINNAME > .config
+binary-arch: install
+       dh binary-arch
 
-       touch configure-stamp
+binary-indep: install
+       dh binary-indep
 
-
-#Architecture 
-build: build-arch
-
-build-arch: build-arch-stamp
-build-arch-stamp: configure-stamp  
-       $(MAKE)
-
-clean: 
-       dh_testdir
-       dh_testroot
-       rm -f build-arch-stamp configure-stamp
-
-       rm -f .config
-
-       $(MAKE) clean
-
-       dh_clean 
-
-install: install-arch
-install-arch:
-       dh_testdir
-       dh_testroot
-       dh_clean -k -s 
-       dh_installdirs -s
-
-       mkdir -p $(PREFIX)/bin
-       mkdir -p $(PREFIX)/share/man/man8
-       $(MAKE) install PREFIX=$(PREFIX)
-
-       dh_install -s
-
-# Must not depend on anything. This is to be called by
-# binary-arch
-# in another 'make' thread.
-binary-common:
-       dh_testdir
-       dh_testroot
-       dh_installchangelogs 
-       dh_installdocs
-       dh_installexamples
-       dh_installman
-       dh_link
-       dh_strip
-       dh_compress 
-       dh_fixperms
-       dh_makeshlibs
-       dh_installdeb
-       dh_shlibdeps
-       dh_gencontrol
-       dh_md5sums
-       dh_builddeb
-
-binary-arch: build-arch install-arch
-       $(MAKE) -f debian/rules DH_OPTIONS=-s binary-common
-
-binary-indep:
-
-binary: binary-arch
-.PHONY: build clean binary-arch binary install install-arch configure
+binary: binary-arch binary-indep