8 files changed, 58 insertions, 27 deletions
diff --git a/debian/README.source b/debian/README.source
new file mode 100644
index 0000000..e4f2b3d
--- /dev/null
+++ b/debian/README.source
@@ -0,0 +1,18 @@
+Hello,
+
+now I use the branching model from Vincent Driessen[1].
+
+I use the gitflow-avh[2]. with the Documentation[3].
+The Debian package can be found here[4].
+
+Please upload unattended uploads use a branch feature/<your title>.
+
+
+Many thanks.
+
+ -- Jörg Frings-Fürst <debian@jff-webhosting.net>  Fri, 02 Jun 2017 19:00:40 +0200
+
+[1] http://nvie.com/posts/a-successful-git-branching-model/
+[2] https://github.com/petervanderdoes/gitflow-avh
+[3] https://github.com/petervanderdoes/gitflow-avh/wiki
+[4] https://tracker.debian.org/pkg/git-flow
diff --git a/debian/changelog b/debian/changelog
index 207b2f0..708188a 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,29 @@
+dmidecode (3.1-1) unstable; urgency=medium
+
+  * New upstream release (LP: #1688162) (Closes: #860897):
+    - Remove applied patches:
+      + debian/patches/0110-nosysfs.patch
+      + debian/patches/0115-no_smbios_DMI_entry_point.patch
+      + debian/patches/0120-return_actual_data_size.patch
+      + debian/patches/0125-use_read_file_to_read_DMI_table_from_sysfs.patch
+      + debian/patches/0130-use_DWORD_for_table_max_size.patch
+      + debian/patches/0135-hide_fixup_msg.patch
+  * debian/copyright:
+    - Add year 2017.
+    - Change upstream email address.
+  * debian/control:
+    - Change Homepage.
+  * Migrate to debhelper 10:
+    - Change debian/compat to 10.
+    - Bump minimum debhelper version in debian/control to >= 10.
+  * Use the automatic debug symbol packages:
+    - Remove dmidecode-dbg section from debian/control.
+    - Remove override_dh_strip from debian/rules.
+  * New README.source to explain the branching model used.
+  * Declare compliance with Debian Policy 4.0.0. (No changes needed).
+
+ -- Jörg Frings-Fürst <debian@jff-webhosting.net>  Sat, 24 Jun 2017 23:21:09 +0200
+
 dmidecode (3.0-4) unstable; urgency=medium
 
   * debian/rules: Fix FTCBFS to pass suitable CC to make. (Closes: #835921).
diff --git a/debian/compat b/debian/compat
index ec63514..f599e28 100644
--- a/debian/compat
+++ b/debian/compat
@@ -1 +1 @@
-9
+10
diff --git a/debian/control b/debian/control
index 0cf55dc..b078c61 100644
--- a/debian/control
+++ b/debian/control
@@ -2,11 +2,11 @@ Source: dmidecode
 Section: utils
 Priority: optional
 Maintainer: Jörg Frings-Fürst <debian@jff-webhosting.net>
-Build-Depends: debhelper (>= 9)
-Standards-Version: 3.9.8
+Build-Depends: debhelper (>= 10)
+Standards-Version: 4.0.0
 Vcs-Browser: https://anonscm.debian.org/cgit/collab-maint/dmidecode.git
 Vcs-Git: https://anonscm.debian.org/cgit/collab-maint/dmidecode.git
-Homepage: https://dmidecode.nongnu.org/
+Homepage: http://nongnu.org/dmidecode/
 
 Package: dmidecode
 Priority: important
@@ -26,17 +26,6 @@ Description: SMBIOS/DMI table decoder
  Beware that DMI data have proven to be too unreliable to be blindly trusted.
  Dmidecode does not scan the hardware, it only reports what the BIOS told it to.
 
-Package: dmidecode-dbg
-Section: debug
-Priority: extra
-Architecture: any-amd64 arm64 armhf ia64 any-i386
-Depends: ${misc:Depends}, dmidecode (= ${binary:Version})
-Description: SMBIOS/DMI table decoder (debug)
- Dmidecode reports information about the system's hardware as described in the
- system BIOS according to the SMBIOS/DMI standard.
- .
- This package contains the debugging symbols.
-
 Package: dmidecode-udeb
 Section: debian-installer
 Architecture: any-amd64 arm64 armhf ia64 any-i386
diff --git a/debian/copyright b/debian/copyright
index 6432a7c..d17d1db 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -4,7 +4,7 @@ Upstream-Contact: dmidecode-devel@nongnu.org
 Source: http://download.savannah.gnu.org/releases/demidecode/
 
 Files: *
-Copyright: 2002-2016 Jean Delvare <khali@linux-fr.org>
+Copyright: 2002-2017 Jean Delvare <jdelvare@suse.de>
            2002      Alan Cox <alan@redhat.com>
            2010      Anton Arapov <anton@redhat.com>
            2015      Xie XiuQi <xiexiuqi@huawei.com>
@@ -13,7 +13,7 @@ License: GPL-2+
 Files: debian/*
 Copyright: 2003-2007 Petter Reinholdtsen <pere@debian.org>
            2011-2012 Daniel Baumann <daniel.baumann@progress-technologies.net>
-           2014-2016 Jörg Frings-Fürst <debian@jff-webhosting.net>
+           2014-2017 Jörg Frings-Fürst <debian@jff-webhosting.net>
 License: GPL-2+
 
 License: GPL-2+
diff --git a/debian/files b/debian/files
new file mode 100644
index 0000000..628e131
--- /dev/null
+++ b/debian/files
@@ -0,0 +1 @@
+dmidecode_3.1-1_source.buildinfo utils optional
diff --git a/debian/patches/series b/debian/patches/series
index 1916e4c..e06432c 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,10 +1,10 @@
 0100-ansi-c.patch
 0001-hurd.patch
 0005-build.patch
-0105-dmidecode-avoid-sigbus.patch
-0110-nosysfs.patch
-0115-no_smbios_DMI_entry_point.patch
-0120-return_actual_data_size.patch
-0125-use_read_file_to_read_DMI_table_from_sysfs.patch
-0130-use_DWORD_for_table_max_size.patch
-0135-hide_fixup_msg.patch
+#0105-dmidecode-avoid-sigbus.patch
+#0110-nosysfs.patch
+#0115-no_smbios_DMI_entry_point.patch
+#0120-return_actual_data_size.patch
+#0125-use_read_file_to_read_DMI_table_from_sysfs.patch
+#0130-use_DWORD_for_table_max_size.patch
+#0135-hide_fixup_msg.patch
diff --git a/debian/rules b/debian/rules
index fce1c6c..a0cbc4d 100755
--- a/debian/rules
+++ b/debian/rules
@@ -22,6 +22,3 @@ override_dh_auto_install:
 
 override_dh_install:
 	dh_install --fail-missing
-
-override_dh_strip:
-	dh_strip --dbg-package=dmidecode-dbg