diff options
| author | Jörg Frings-Fürst <debian@jff-webhosting.net> | 2018-10-03 08:18:38 +0200 |
|---|---|---|
| committer | Jörg Frings-Fürst <debian@jff-webhosting.net> | 2018-10-03 08:18:38 +0200 |
| commit | b74b05f4235b07a6332736eb0892aac03d6adb3b (patch) | |
| tree | 265532e1b5f02c2d434153ac9d0aa643d169e384 /debian | |
| parent | 85e233a539b5450d6bfc9ebd18142527a7114ffe (diff) | |
| parent | d04c43164be5f5a87a52c523fe77b728ea6f3228 (diff) | |
Merge branch 'feature/upstream' into develop
Diffstat (limited to 'debian')
| -rw-r--r-- | debian/changelog | 7 | ||||
| -rw-r--r-- | debian/patches/0100-ansi-c.patch | 11 |
2 files changed, 13 insertions, 5 deletions
diff --git a/debian/changelog b/debian/changelog index 327746b..981dc03 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,10 @@ +dmidecode (3.2-1) UNRELEASED; urgency=medium + + * New upstream release: + - Refresh patches. + + -- Jörg Frings-Fürst <debian@jff.email> Wed, 03 Oct 2018 08:06:08 +0200 + dmidecode (3.1-2) unstable; urgency=medium * debian/control: 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) { |