upload to unstabledebian/2.9.6-1

3 files changed, 33 insertions, 27 deletions

diff --git a/debian/changelog b/debian/changelog
index be68ce5..f15bbaf 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,20 +1,5 @@
-ipmiutil (2.9.6-1) UNRELEASED; urgency=medium
-
-  * New upstream release.
-    - Remove debian/patches/100-out-of-bounds.patch.
-  * Remove debian/source/options because compression xz is standard now.
-  * debian/watch:
-    - Remove "debian uupdate".
-  * debian/copyright:
-    - Add year 2015.
-  * Refresh patches:
-    - debian/patches/005-init.patch.
-    - debian/patches/003-typo-man.patch.
-
- -- Jörg Frings-Fürst <debian@jff-webhosting.net>  Wed, 12 Nov 2014 17:12:39 +0100
-
-ipmiutil (2.9.4-1) unstable; urgency=low
+ipmiutil (2.9.6-1) unstable; urgency=low
 
   * Initial release (Closes: #753881).
 
- -- Jörg Frings-Fürst <debian@jff-webhosting.net>  Wed, 29 Oct 2014 16:12:18 +0100
+ -- Jörg Frings-Fürst <debian@jff-webhosting.net>  Fri, 29 May 2015 08:27:28 +0200
diff --git a/debian/copyright b/debian/copyright
index e12b048..28115ba 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -13,6 +13,20 @@ Files: debian/*
 Copyright: 2014-2015 Jörg Frings-Fürst <debian@jff-webhosting.net>
 License: BSD-3-clause
 
+Files: kern/bmcpanic-2.4.*
+       kern/bmcpanic-2.5.*
+Copyright: 2003      Intel Corporation
+License: GPL-2+
+
+Files: kern/ipmi_kcs.patch
+Copyright: 2000      San Mehat <nettwerk@valinux.com>
+License: GPL-2+
+
+Files: kern/linux-ipmi-*
+       kern/openipmi*
+Copyright: 2002      MontaVista Software Inc.
+License: GPL-2+
+
 Files: util/AnsiTerm.*
 Copyright: 2009 Robert Nelson <robertnelson@users.sourceforge.net>
 License: BSD-2-clause
@@ -251,6 +265,23 @@ License: BSD-2-clause
  OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  SUCH DAMAGE.
 
+License: GPL-2+
+ This program 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 program 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 program. If not, see <http://www.gnu.org/licenses/>.
+ .
+ The complete text of the GNU General Public License
+ can be found in /usr/share/common-licenses/GPL-2 file.
+
 License: GPL-2+ with OpenSSL exception
  This program is free software; you can redistribute it and/or
  modify it under the terms of the GNU General Public License as
diff --git a/debian/rules b/debian/rules
index 6ed560b..8c11f8a 100755
--- a/debian/rules
+++ b/debian/rules
@@ -32,13 +32,3 @@ override_dh_installinit:
 	dh_installinit --name=ipmiutil_asy
 	dh_installinit --name=ipmiutil_evt
 	dh_installinit --name=ipmiutil_wdt
-
-#
-# remove unwanted files from upstream
-#
-override_dh_auto_clean:
-	dh_auto_clean
-	rm -f $(CURDIR)/debian/files
-	rm -f $(CURDIR)/debian/dirs
-	rm -f $(CURDIR)/debian/ipmiutil.lintian-overrides
-	rm -f $(CURDIR)/debian/ipmiutil.substvars