diff options
| author | Simon Quigley <tsimonq2@ubuntu.com> | 2017-06-21 15:02:12 -0500 |
|---|---|---|
| committer | Simon Quigley <tsimonq2@ubuntu.com> | 2017-06-21 15:02:12 -0500 |
| commit | ff5e4b17abe1930f694834a7238706c03c0101da (patch) | |
| tree | 0c85076bb1365460d4cb9b5bf59bb36d7c9cc491 /debian | |
| parent | e5b8d2c840f1ec65ced213c69fc1260b2343f094 (diff) | |
Update changelog for new upstream Git snapshot, hopefully the last one before upload...
Diffstat (limited to 'debian')
| -rw-r--r-- | debian/changelog | 7 | ||||
| -rw-r--r-- | debian/patches/aarch64.diff | 18 | ||||
| -rw-r--r-- | debian/patches/series | 1 |
3 files changed, 3 insertions, 23 deletions
diff --git a/debian/changelog b/debian/changelog index e07f507f..d60b5e95 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,6 +1,7 @@ -hardinfo (0.5.1+git20170619-1) UNRELEASED; urgency=medium +hardinfo (0.5.1+git20170620-1) UNRELEASED; urgency=medium - * Update to latest upstream Git commit (02de5fa) to fix a few issues. + * Update to latest upstream Git commit (1f791f3) to fix a few issues + (Closes: #779465). * Adopt the package (Closes: #852525). * Fix whitespace and run wrap-and-sort. * Bump Standards-version to 4.0.0. No changes needed. @@ -13,8 +14,6 @@ hardinfo (0.5.1+git20170619-1) UNRELEASED; urgency=medium * Merge changes from Ubuntu (Closes: #696407, #554783): - Add glibc-version.patch for compatibility with a different glibc location. - - Add aarch64.diff (rewritten for the new build system based off of - Matthias Klose's initial patch) (Closes: #779465) - Recommend lm-sensors in order to read information from sensors. * Rewrite debian/watch to pull from new upstream location. * Override the spelling-error-in-binary Lintian tag because it's the name of diff --git a/debian/patches/aarch64.diff b/debian/patches/aarch64.diff deleted file mode 100644 index 655bcf54..00000000 --- a/debian/patches/aarch64.diff +++ /dev/null @@ -1,18 +0,0 @@ -Description: Build for AArch64, using the ARM configuration. Fixes FTBFS on arm64. - Inspired by Matthias Klose's initial patch fixing this problem. -Author: Simon Quigley <tsimonq2@ubuntu.com> -Bug-Debian: http://bugs.debian.org/779465 -Last-Update: 2017-06-19 ---- -This patch header follows DEP-3: http://dep.debian.net/deps/dep3/ ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -29,6 +29,8 @@ elseif(${CMAKE_HOST_SYSTEM_PROCESSOR} MA - set(HARDINFO_ARCH "parisc") - elseif(${CMAKE_HOST_SYSTEM_PROCESSOR} MATCHES "sparc{32,64}") - set(HARDINFO_ARCH "sparc") -+elseif(${CMAKE_HOST_SYSTEM_PROCESSOR} MATCHES "aarch64*") -+ set(HARDINFO_ARCH "aarch64") - elseif(${CMAKE_HOST_SYSTEM_PROCESSOR} MATCHES "arm.*") - set(HARDINFO_ARCH "arm") - elseif(${CMAKE_HOST_SYSTEM_PROCESSOR} MATCHES "ia64") diff --git a/debian/patches/series b/debian/patches/series index 52041061..10145d5a 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -1,2 +1 @@ -aarch64.diff glibc-version.patch |