Update packaging to reflect update to latest upstream Git commit.

3 files changed, 4 insertions, 52 deletions

diff --git a/debian/changelog b/debian/changelog
index d8ff8509..ab6931c4 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,12 +1,12 @@
-hardinfo (0.5.1+git20170605-1) UNRELEASED; urgency=medium
+hardinfo (0.5.1+git20170619-1) UNRELEASED; urgency=medium
 
   * Change myself to the Maintainer in debian/control (Closes: #852525).
   * Fix whitespace and run wrap-and-sort.
   * Bump Standards-version to 4.0.0. No changes needed.
   * Bump debhelper version to 10.
   * Add source/format file to make the package use quilt.
-  * Update to latest Git snapshot to fix a few issues and modernize it a bit,
-    as upstream hasn't tagged a new version since 2009.
+  * Update to latest upstream Git commit (02de5fa) to fix a few issues and
+    modernize it a bit, as upstream hasn't tagged a new version since 2009.
   * Rewrite and modernize debian/rules, make it build with cmake.
   * Add ${misc:Depends} to hardinfo's dependencies.
   * Rewrite and modernize debian/copyright, keeping the copyright for
@@ -19,9 +19,8 @@ hardinfo (0.5.1+git20170605-1) UNRELEASED; urgency=medium
       + 01-truncated_description.patch - upstreamed (Closes: #554783)
       + 02-fix-distro-crash.patch - upstreamed
       + 03-detect-lxde.patch - concept upstreamed
+      + 04-fix-ftbfs-shared-symbols.diff - 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) (Closes: #779465)
diff --git a/debian/patches/fix-ftbfs-shared-symbols.diff b/debian/patches/fix-ftbfs-shared-symbols.diff
deleted file mode 100644
index a25b3321..00000000
--- a/debian/patches/fix-ftbfs-shared-symbols.diff
+++ /dev/null
@@ -1,46 +0,0 @@
-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/series b/debian/patches/series
index 7e547b96..52041061 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,3 +1,2 @@
 aarch64.diff
-fix-ftbfs-shared-symbols.diff
 glibc-version.patch