Import Debian changes 0.0+r4067-2

dfu-util (0.0+r4067-2) unstable; urgency=low
.
  * Do not install the dfu-util_static binary, it's not needed in Debian.
  * debian/copyright: Convert to the machine-readable format described at
    http://wiki.debian.org/Proposals/CopyrightFormat.

3 files changed, 28 insertions, 26 deletions

diff --git a/debian/changelog b/debian/changelog
index 69c32d9..a52acbc 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,5 +1,13 @@
+dfu-util (0.0+r4067-2) unstable; urgency=low
+
+  * Do not install the dfu-util_static binary, it's not needed in Debian.
+  * debian/copyright: Convert to the machine-readable format described at
+    http://wiki.debian.org/Proposals/CopyrightFormat.
+
+ -- Uwe Hermann <uwe@debian.org>  Wed, 27 Feb 2008 21:24:42 +0100
+
 dfu-util (0.0+r4067-1) unstable; urgency=low
 
   * Initial release (Closes: #465896).
 
- -- Uwe Hermann <uwe@debian.org>  Fri, 15 Feb 2008 15:33:24 +0100
+ -- Uwe Hermann <uwe@debian.org>  Wed, 27 Feb 2008 16:45:28 +0100
diff --git a/debian/copyright b/debian/copyright
index a893fa2..ba4f39b 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -6,35 +6,26 @@ It was downloaded from:
     http://wiki.openmoko.org/wiki/Dfu-util
     http://svn.openmoko.org/trunk/src/host/dfu-util/
 
-Upstream Authors: 
+Upstream authors: 
 
     Weston Schmidt <weston_schmidt@yahoo.com>
     Harald Welte <hwelte@hmw-consulting.de>
 
-Copyright: 
+-------------------------------------------------------------------------------
 
-    Copyright (C) 2005-2007 Weston Schmidt <weston_schmidt@yahoo.com>
-    Copyright (C) 2006-2007 Harald Welte <hwelte@hmw-consulting.de>
-
-License:
-
-    This package is free software; you can redistribute it and/or modify
-    it under the terms of the GNU General Public License as published by
-    the Free Software Foundation; either version 2 of the License, or
-    (at your option) any later version.
- 
-    This package is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU General Public License for more details.
- 
-    You should have received a copy of the GNU General Public License
-    along with this package; if not, write to the Free Software
-    Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
+Files: *
+Copyright: © 2005-2007 Weston Schmidt <weston_schmidt@yahoo.com>
+           © 2006-2007 Harald Welte <hwelte@hmw-consulting.de>
+License: GPL-2+
 
 On Debian systems, the complete text of the GNU General
 Public License can be found in `/usr/share/common-licenses/GPL'.
 
-The Debian packaging is (C) 2008, Uwe Hermann <uwe@debian.org> and
-is licensed under the GPL (version 2 or later), see above.
+-------------------------------------------------------------------------------
+
+Files: debian/*
+Copyright: © 2008 Uwe Hermann <uwe@debian.org>
+License: GPL-2+
+   The Debian packaging is (C) 2008, Uwe Hermann <uwe@debian.org> and
+   is licensed under the GPL (version 2 or later), see above.
 
diff --git a/debian/rules b/debian/rules
index 3796420..8bddfcf 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,15 +1,18 @@
 #!/usr/bin/make -f
-  
+
 include /usr/share/cdbs/1/rules/debhelper.mk
 include /usr/share/cdbs/1/class/autotools.mk
-# include /usr/share/cdbs/1/rules/simple-patchsys.mk
 
-# We must first call ./bootstrap to generate the autotools stuff.
+# We must first call ./autogen.sh to generate the autotools stuff.
 post-patches:: debian/stamp-autothings-update
 debian/stamp-autothings-update:
 	./autogen.sh
 	touch $@
 
+# Do not install the dfu-util_static binary, it's not needed in Debian.
+binary-post-install/dfu-util::
+	rm -f debian/dfu-util/usr/bin/dfu-util_static
+
 clean::
 	rm -f debian/stamp-autothings-update