diff options
Diffstat (limited to 'debian')
| -rw-r--r-- | debian/changelog | 14 | ||||
| -rw-r--r-- | debian/control | 1 | ||||
| -rw-r--r-- | debian/patches/aarch64.diff | 18 | ||||
| -rw-r--r-- | debian/patches/fix-ftbfs-shared-symbols.diff | 46 | ||||
| -rw-r--r-- | debian/patches/glibc-version.patch | 40 | ||||
| -rw-r--r-- | debian/patches/series | 3 |
6 files changed, 122 insertions, 0 deletions
diff --git a/debian/changelog b/debian/changelog index b84052c1..6171635e 100644 --- a/debian/changelog +++ b/debian/changelog @@ -12,6 +12,20 @@ hardinfo (0.5.1+git20170605-1) UNRELEASED; urgency=medium * Rewrite and modernize debian/copyright, keeping the copyright for the previous maintainer. * Add Homepage and Vcs-* fields in debian/control. + * Merge changes from Ubuntu: + - Drop the following patches (either because they have been upstreamed or + they are no longer needed): + + 00-makefile-lib.patch - no longer needed because of new build system + + 01-truncated_description.patch - upstreamed + + 02-fix-distro-crash.patch - upstreamed + + 03-detect-lxde.patch - concept upstreamed + - Refresh the following patches: + + fix-ftbfs-shared-symbols.diff (renamed from + 04-fix-ftbfs-shared-symbols.diff) + + glibc-version.patch + + aarch64.diff (rewritten for the new build system based off of Matthias + Klose's initial patch) + - Recommend lm-sensors in order to read information from sensors. -- Simon Quigley <tsimonq2@ubuntu.com> Sun, 18 Jun 2017 22:25:05 -0500 diff --git a/debian/control b/debian/control index 5ded9167..e91ff983 100644 --- a/debian/control +++ b/debian/control @@ -18,6 +18,7 @@ Vcs-Git: https://anonscm.debian.org/git/collab-maint/hardinfo.git Package: hardinfo Architecture: any Depends: pciutils (>= 1:2.1.11-10), ${misc:Depends}, ${shlibs:Depends} +Recommends: lm-sensors Suggests: mesa-utils Description: Displays system information HardInfo is a small application that displays information about your diff --git a/debian/patches/aarch64.diff b/debian/patches/aarch64.diff new file mode 100644 index 00000000..655bcf54 --- /dev/null +++ b/debian/patches/aarch64.diff @@ -0,0 +1,18 @@ +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/fix-ftbfs-shared-symbols.diff b/debian/patches/fix-ftbfs-shared-symbols.diff new file mode 100644 index 00000000..a25b3321 --- /dev/null +++ b/debian/patches/fix-ftbfs-shared-symbols.diff @@ -0,0 +1,46 @@ +Description: Make the strend function accessible + This patch makes the strend function accessible by removing the `inline` + prefix. +Author: Simon Quigley <tsimonq2@ubuntu.com> +Last-Update: 2017-06-19 +--- +This patch header follows DEP-3: http://dep.debian.net/deps/dep3/ +--- +--- a/hardinfo/util.c ++++ b/hardinfo/util.c +@@ -113,7 +113,7 @@ gchar *seconds_to_string(unsigned int se + return g_strdup_printf(wdays, whours, wminutes); + } + +-inline gchar *size_human_readable(gfloat size) ++gchar *size_human_readable(gfloat size) + { + if (size < KiB) + return g_strdup_printf(_("%.1f B"), size); +@@ -129,7 +129,7 @@ inline gchar *size_human_readable(gfloat + return g_strdup_printf(_("%.1f PiB"), size / PiB); + } + +-inline char *strend(gchar * str, gchar chr) ++char *strend(gchar * str, gchar chr) + { + if (!str) + return NULL; +@@ -141,7 +141,7 @@ inline char *strend(gchar * str, gchar c + return str; + } + +-inline void remove_quotes(gchar * str) ++void remove_quotes(gchar * str) + { + if (!str) + return; +@@ -152,7 +152,7 @@ inline void remove_quotes(gchar * str) + strend(str, '"'); + } + +-inline void remove_linefeed(gchar * str) ++void remove_linefeed(gchar * str) + { + strend(str, '\n'); + } diff --git a/debian/patches/glibc-version.patch b/debian/patches/glibc-version.patch new file mode 100644 index 00000000..92c1b252 --- /dev/null +++ b/debian/patches/glibc-version.patch @@ -0,0 +1,40 @@ +Description: Fix checking for GLIBC version + Use ldconfig -V instead of trying to call libc.so.6 directly, and update the + string mangling in the process. +Author: Mathieu Trudel-Lapierre <cyphermox@ubuntu.com> +Bug-Ubuntu: https://pad.lv/1473142 +Last-Update: 2017-06-19 +--- +This patch header follows DEP-3: http://dep.debian.net/deps/dep3/ +--- a/modules/computer/os.c ++++ b/modules/computer/os.c +@@ -27,8 +27,7 @@ get_libc_version(void) + FILE *libc; + gchar buf[256], *tmp, *p; + char *libc_paths[] = { +- "/lib/ld-uClibc.so.0", "/lib64/ld-uClibc.so.0", +- "/lib/libc.so.6", "/lib64/libc.so.6" ++ "ldconfig -V" + }; + int i; + +@@ -47,15 +46,13 @@ get_libc_version(void) + (void)fgets(buf, 256, libc); + if (pclose(libc)) goto err; + +- tmp = strstr(buf, "version "); +- if (!tmp) goto err; ++ buf[strlen(buf) - 1] = '\0'; + +- p = strchr(tmp, ','); +- if (p) *p = '\0'; +- else goto err; ++ tmp = strstr(buf, " "); ++ if (!tmp) goto err; + + return g_strdup_printf(_("GNU C Library version %s (%sstable)"), +- strchr(tmp, ' ') + 1, ++ tmp + 1, + strstr(buf, " stable ") ? "" : _("un")); + err: + return g_strdup(_("Unknown")); diff --git a/debian/patches/series b/debian/patches/series new file mode 100644 index 00000000..7e547b96 --- /dev/null +++ b/debian/patches/series @@ -0,0 +1,3 @@ +aarch64.diff +fix-ftbfs-shared-symbols.diff +glibc-version.patch |