Merge branch 'release/debian/3.2-1'debian/3.2-1

5 files changed, 21 insertions, 8 deletions

diff --git a/debian/changelog b/debian/changelog
index 327746b..409a1d5 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,15 @@
+dmidecode (3.2-1) unstable; urgency=medium
+
+  * New upstream release:
+    - Refresh patches.
+  * Declare compliance with Debian Policy 4.2.1 (No changes needed).
+  * debian/dmidecode.docs:
+    - Add README.
+  * debian/copyright:
+    - Add year 2018 to * for Jean Delvare <jdelvare@suse.de>.
+
+ -- Jörg Frings-Fürst <debian@jff.email>  Sun, 07 Oct 2018 06:05:15 +0200
+
 dmidecode (3.1-2) unstable; urgency=medium
 
   * debian/control:
diff --git a/debian/control b/debian/control
index 57a2b9a..57e69fe 100644
--- a/debian/control
+++ b/debian/control
@@ -3,12 +3,11 @@ Section: utils
 Priority: optional
 Maintainer: Jörg Frings-Fürst <debian@jff.email>
 Build-Depends: debhelper (>= 11)
-Standards-Version: 4.1.5
+Standards-Version: 4.2.1
 Vcs-Git: git://jff.email/opt/git/dmidecode.git
 Vcs-Browser: https://jff.email/cgit/dmidecode.git/
 Homepage: https://nongnu.org/dmidecode/
 
-
 Package: dmidecode
 Priority: important
 Architecture: any-amd64 arm64 armhf ia64 any-i386
diff --git a/debian/copyright b/debian/copyright
index 27c20ae..a822abc 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-2017 Jean Delvare <jdelvare@suse.de>
+Copyright: 2002-2018 Jean Delvare <jdelvare@suse.de>
            2002      Alan Cox <alan@redhat.com>
            2010      Anton Arapov <anton@redhat.com>
            2015      Xie XiuQi <xiexiuqi@huawei.com>
diff --git a/debian/dmidecode.docs b/debian/dmidecode.docs
index 62deb04..6f12db5 100644
--- a/debian/dmidecode.docs
+++ b/debian/dmidecode.docs
@@ -1 +1,2 @@
 AUTHORS
+README
diff --git a/debian/patches/0100-ansi-c.patch b/debian/patches/0100-ansi-c.patch
index fecd6bb..9a2345c 100644
--- a/debian/patches/0100-ansi-c.patch
+++ b/debian/patches/0100-ansi-c.patch
@@ -3,13 +3,14 @@ Description:
  Make sure the code compiles when using -ansi. Renames non-ANSI C 'inline' to
  '__inline'.
 
-diff -Naurp dmidecode.orig/types.h dmidecode/types.h
---- dmidecode.orig/types.h	2011-09-27 17:09:22.211059414 +0200
-+++ dmidecode/types.h	2011-09-27 17:21:35.362694344 +0200
-@@ -32,7 +32,7 @@ typedef struct {
+Index: trunk/types.h
+===================================================================
+--- trunk.orig/types.h
++++ trunk/types.h
+@@ -31,7 +31,7 @@ typedef struct {
  #endif
  
- #ifdef ALIGNMENT_WORKAROUND
+ #if defined(ALIGNMENT_WORKAROUND) || defined(BIGENDIAN)
 -static inline u64 U64(u32 low, u32 high)
 +static __inline u64 U64(u32 low, u32 high)
  {