diff options
| -rw-r--r-- | debian/changelog | 311 | ||||
| -rw-r--r-- | debian/compat | 1 | ||||
| -rw-r--r-- | debian/control | 26 | ||||
| -rw-r--r-- | debian/copyright | 111 | ||||
| -rw-r--r-- | debian/hardinfo.1 | 35 | ||||
| -rw-r--r-- | debian/hardinfo.lintian-overrides | 2 | ||||
| -rw-r--r-- | debian/hardinfo.manpages | 1 | ||||
| -rw-r--r-- | debian/patches/fix-ppc64el-ftbfs.patch | 18 | ||||
| -rw-r--r-- | debian/patches/glibc-version.patch | 40 | ||||
| -rw-r--r-- | debian/patches/make-build-reproducable.patch | 31 | ||||
| -rw-r--r-- | debian/patches/series | 3 | ||||
| -rwxr-xr-x | debian/rules | 5 | ||||
| -rw-r--r-- | debian/source/format | 1 | ||||
| -rw-r--r-- | debian/watch | 3 |
14 files changed, 588 insertions, 0 deletions
diff --git a/debian/changelog b/debian/changelog new file mode 100644 index 00000000..3fb0b10c --- /dev/null +++ b/debian/changelog @@ -0,0 +1,311 @@ +hardinfo (0.5.1+git20170620-2) unstable; urgency=medium + + * Fix build on ppc64el (Closes: #865776). + * Update FSF address to new one in debian/changelog's LGPL-2.1+ stanza. + * Make the build reproducible (Closes: #833379). + + -- Simon Quigley <tsimonq2@ubuntu.com> Fri, 14 Jul 2017 06:04:21 -0500 + +hardinfo (0.5.1+git20170620-1) unstable; urgency=medium + + * Update to latest upstream Git commit (1f791f3) to fix a few issues. + - Fix build on arm64 (Closes: #779465). + * Adopt the package (Closes: #852525). + * Fix whitespace and run wrap-and-sort. + * Bump Standards-version to 4.0.0. No changes needed. + * Bump debhelper compat version to 10. + * Use source format 3.0 (quilt). + * Rewrite and use the dh sequencer in debian/rules, build with cmake. + * Add ${misc:Depends} to hardinfo's dependencies. + * Rewrite debian/copyright to use copyright-format 1.0. + * Add Homepage and Vcs-* fields in debian/control. + * Merge changes from Ubuntu (Closes: #696407, #554783): + - Add glibc-version.patch for compatibility with a different glibc + location. + - 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 + a company. + + -- Simon Quigley <tsimonq2@ubuntu.com> Fri, 23 Jun 2017 03:36:18 -0500 + +hardinfo (0.5.1-1.5) unstable; urgency=medium + + * Non-maintainer upload. + * Fix "FTBFS with clang instead of gcc": + patch Makefile* to add "-std=gnu89" to CFLAGS. + (Closes: #757525) + + -- gregor herrmann <gregoa@debian.org> Wed, 22 Jul 2015 17:51:45 +0200 + +hardinfo (0.5.1-1.4) unstable; urgency=medium + + * Non-maintainer upload. + * fix FTBFS "ld: cannot find -lselinux" by adding a build-dep on + libselinux1-dev [!kfreebsd-i386 !kfreebsd-amd64 !hurd-i386] + (Closes: #747059). + + -- HIGUCHI Daisuke (VDR dai) <dai@debian.org> Wed, 07 May 2014 21:12:18 +0900 + +hardinfo (0.5.1-1.3) unstable; urgency=medium + + * Non-maintainer upload. + * Fix FTBFS "ld: cannot find -llzma" by adding a build-dep on liblzma-dev. + (Closes: #713717) + + -- Vincent Cheng <vcheng@debian.org> Tue, 25 Mar 2014 15:47:36 -0700 + +hardinfo (0.5.1-1.2) unstable; urgency=low + + * Non-maintainer upload. + * Fix "FTBFS: ld: cannot find -lffi": + add patch from Ubuntu / Julien Lavergne: + + debian/control: + - Build-depends on libffi-dev to fix FTBFS (LP: #831185) + (Closes: #652179) + + -- gregor herrmann <gregoa@debian.org> Thu, 05 Jan 2012 16:14:54 +0100 + +hardinfo (0.5.1-1.1) unstable; urgency=low + + * Non-maintainer upload. + * [cd677eda] Move files from /usr/lib64 to /usr/lib. (Closes: #557569) + - thanks to Kurt Roeckx + + -- Bernd Zeimetz <bzed@debian.org> Fri, 22 Jan 2010 21:22:24 +0100 + +hardinfo (0.5.1-1) unstable; urgency=low + + * New upstream version. (Closes: #530290, #517591) + + -- Agney Lopes Roth Ferraz <agney@debian.org> Thu, 24 Sep 2009 15:13:54 -0300 + +hardinfo (0.5c-1) unstable; urgency=low + + * New upstream version. + (Closes: #517591, #511237, #457703, #519256, #449250, #457820, #497758) + + -- Agney Lopes Roth Ferraz <agney@debian.org> Sat, 28 Mar 2009 22:55:02 -0300 + +hardinfo (0.4.2.3-5) unstable; urgency=low + + * Fixed location on menu. (Closes: #487569) + + -- Agney Lopes Roth Ferraz <agney@debian.org> Sun, 06 Jul 2008 19:01:51 -0300 + +hardinfo (0.4.2.3-4) unstable; urgency=low + + * Fixed LSPCIPATH on configure. (Closes: #482381) + + -- Agney Lopes Roth Ferraz <agney@debian.org> Tue, 27 May 2008 21:17:23 -0300 + +hardinfo (0.4.2.3-3) unstable; urgency=low + + * changed modules install dir for amd64 + (thanks to ucko@d.o). (Closes: #468105) + + -- Agney Lopes Roth Ferraz <agney@debian.org> Tue, 26 Feb 2008 23:52:45 -0300 + +hardinfo (0.4.2.3-2) unstable; urgency=low + + * fixed desktop file, thanks to Kjell Braden. (Closes: #466587) + + -- Agney Lopes Roth Ferraz <agney@debian.org> Sun, 24 Feb 2008 23:35:44 -0300 + +hardinfo (0.4.2.3-1) unstable; urgency=low + + * New upstream release.(Closes: #454947) + + -- Agney Lopes Roth Ferraz <agney@debian.org> Sun, 09 Dec 2007 05:03:40 -0400 + +hardinfo (0.4.2.2-3) unstable; urgency=low + + * Fixed FTBFS on s390. (Closes: #443293) + + -- Agney Lopes Roth Ferraz <agney@debian.org> Thu, 20 Sep 2007 16:59:20 -0400 + +hardinfo (0.4.2.2-2) unstable; urgency=low + + * Fixed FTBFS. (Closes: #442594) + + -- Agney Lopes Roth Ferraz <agney@debian.org> Mon, 17 Sep 2007 15:51:12 -0300 + +hardinfo (0.4.2.2-1) unstable; urgency=low + + * New upstream release. + * hardinfo now suggests mesa-utils (Closes: #435793) + + + -- Agney Lopes Roth Ferraz <agney@debian.org> Tue, 11 Sep 2007 14:53:15 -0300 + +hardinfo (0.4.2.1.svn30042007-1) unstable; urgency=low + + * Fixed FTBFS on SVN version (Closes: #419587) + + -- Agney Lopes Roth Ferraz <agney@debian.org> Mon, 30 Apr 2007 14:52:35 -0300 + +hardinfo (0.4.2.1-1) unstable; urgency=low + + * New upstream release. + * Fixed segfault on device entry (Closes: #387955) + + -- Agney Lopes Roth Ferraz <agney@debian.org> Mon, 09 Apr 2007 11:45:31 -0300 + +hardinfo (0.4.1-9) unstable; urgency=low + + * Fixed segfaults on powerpc (Closes: #408050) + + -- Agney Lopes Roth Ferraz <agney@debian.org> Wed, 21 Feb 2007 21:10:57 -0200 + +hardinfo (0.4.1-8) unstable; urgency=low + + * Fixed errors on processor.h on ia64 and alpha. + + -- Agney Lopes Roth Ferraz <agney@debian.org> Tue, 12 Dec 2006 09:30:53 -0300 + +hardinfo (0.4.1-7) unstable; urgency=low + + * Fixed FTBFS on s390, ia64 and alpha. + + -- Agney Lopes Roth Ferraz <agney@debian.org> Mon, 11 Dec 2006 20:40:14 -0200 + +hardinfo (0.4.1-6) unstable; urgency=low + + * Changed configure script to reconize m68k machines + + -- Agney Lopes Roth Ferraz <agney@debian.org> Sun, 10 Dec 2006 18:38:14 -0200 + +hardinfo (0.4.1-3) unstable; urgency=low + + * Changed libz path (Closes: #391963) + * added support to alpha arm ia64 m68k s390 + + -- Agney Lopes Roth Ferraz <agney@debian.org> Wed, 11 Oct 2006 23:56:11 -0300 + +hardinfo (0.4.1-2) unstable; urgency=low + + * fixed debian/watch file. + + -- Agney Lopes Roth Ferraz <agney@debian.org> Fri, 23 Jun 2006 00:35:08 -0300 + +hardinfo (0.4.1-1) unstable; urgency=low + + * New upstream release. + + -- Agney Lopes Roth Ferraz <agney@debian.org> Wed, 21 Jun 2006 22:18:24 -0300 + +hardinfo (0.4-3) unstable; urgency=low + + * Updated project's homepage, old is unreachable. (Closes: #370797) + * upated printers.h (Closes: #370363) + + -- Agney Lopes Roth Ferraz <agney@debian.org> Fri, 9 Jun 2006 08:51:12 -0300 + +hardinfo (0.4-2) unstable; urgency=low + + * Limited supported architectures. (Closes: #368582) + + -- Agney Lopes Roth Ferraz <agney@debian.org> Thu, 25 May 2006 22:13:49 -0300 + +hardinfo (0.4-1) unstable; urgency=low + + * new upstream release + + -- Agney Lopes Roth Ferraz <agney@debian.org> Mon, 22 May 2006 19:43:53 -0300 + +hardinfo (0.3.7pre-4) unstable; urgency=low + + * added ia64 support. (Closes: #362175) + + -- Agney Lopes Roth Ferraz <agney@debian.org> Sat, 20 May 2006 16:31:36 -0300 + +hardinfo (0.3.7pre-3) unstable; urgency=low + + * added mips64 support. (Closes: #361640) + + -- Agney Lopes Roth Ferraz <agney@users.sourceforge.net> Sun, 9 Apr 2006 15:34:14 -0300 + +hardinfo (0.3.7pre-2) unstable; urgency=low + + * Fixed FTBFS (file intl.c updated). Thanks to Andreas Jochens. (Closes: #326033) + + -- Agney Lopes Roth Ferraz <agney@users.sourceforge.net> Fri, 9 Sep 2005 18:30:09 -0300 + +hardinfo (0.3.7pre-1) unstable; urgency=low + + * New upstream release. (Closes: #280694, #300114, #233033) + + -- Agney Lopes Roth Ferraz <agney@users.sourceforge.net> Mon, 13 Jun 2005 18:34:20 -0300 + +hardinfo (0.3.6-5) unstable; urgency=high + + * Add Amd64 support (closes: #253935). + Thanks to Kurt Roeckx <Q@ping.be> + * Close duplicate "doesn't work with newer pciutils" bug (closes: #254018). + + -- Leandro Pereira <leandro@linuxmag.com.br> Sat, 14 Jun 2004 21:33:25 -0300 + +hardinfo (0.3.6-4) unstable; urgency=high + + * Fixed segfault on startup (closes: #242843). + Thanks to Remco van de Meent <remco@debian.org> + + -- Leandro Pereira <leandro@linuxmag.com.br> Sat, 05 Jun 2004 20:35:12 -0300 + +hardinfo (0.3.6-3) unstable; urgency=high + + * Added Debian menu entry icon. + * Fixed some misc packaging bugs. + * Changed package description. + + -- Leandro Pereira <leandro@linuxmag.com.br> Sun, 17 Dec 2003 10:52:45 -0300 + +hardinfo (0.3.6-2) unstable; urgency=low + + * Sync with upstream sources. + * Disabled "Network" tab. + + -- Leandro Pereira <leandro@linuxmag.com.br> Sun, 17 Dec 2003 10:31:23 -0300 + +hardinfo (0.3.6-1) unstable; urgency=high + + * Sync with upstream sources. + + -- Leandro Pereira <leandro@linuxmag.com.br> Sun, 18 Jul 2003 10:07:58 -0300 + +hardinfo (0.3.5-1) unstable; urgency=high + + * Sync with upstream sources. + + -- Leandro Pereira <leandro@linuxmag.com.br> Sun, 23 Jun 2003 15:55:22 -0300 + +hardinfo (0.3.4-1) unstable; urgency=high + + * Sync with upstream sources. + + -- Leandro Pereira <leandro@linuxmag.com.br> Sun, 22 Jun 2003 21:45:15 -0300 + +hardinfo (0.3.3-1) unstable; urgency=low + + * Sync with upstream sources. + + -- Leandro Pereira <leandro@linuxmag.com.br> Sun, 18 Jun 2003 22:15:34 -0300 + +hardinfo (0.3.2-1) unstable; urgency=low + + * Sync with upstream sources. + + -- Leandro Pereira <leandro@linuxmag.com.br> Sun, 17 Jun 2003 10:50:34 -0300 + +hardinfo (0.3.1-1) unstable; urgency=low + + * Sync with upstream sources. + + -- Leandro Pereira <leandro@linuxmag.com.br> Sun, 15 Jun 2003 21:32:14 -0300 + +hardinfo (0.3-1) unstable; urgency=low + + * Initial Release. + + -- Leandro Pereira <leandro@linuxmag.com.br> Sun, 15 Jun 2003 11:13:14 -0300 + diff --git a/debian/compat b/debian/compat new file mode 100644 index 00000000..f599e28b --- /dev/null +++ b/debian/compat @@ -0,0 +1 @@ +10 diff --git a/debian/control b/debian/control new file mode 100644 index 00000000..9a571de4 --- /dev/null +++ b/debian/control @@ -0,0 +1,26 @@ +Source: hardinfo +Section: x11 +Priority: optional +Maintainer: Simon Quigley <tsimonq2@ubuntu.com> +Build-Depends: cmake, + debhelper (>= 10), + libffi-dev, + libgtk2.0-dev, + liblzma-dev, + libselinux1-dev [!kfreebsd-i386 !kfreebsd-amd64 !hurd-i386], + libsoup2.4-dev, + pciutils (>= 1:2.1.11-10) +Standards-Version: 4.0.0 +Homepage: http://hardinfo.org +Vcs-Browser: https://anonscm.debian.org/git/collab-maint/hardinfo.git +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 + hardware and operating system. Currently it knows about PCI, ISA PnP, USB, + IDE, SCSI, Serial and parallel port devices. diff --git a/debian/copyright b/debian/copyright new file mode 100644 index 00000000..eabebbc1 --- /dev/null +++ b/debian/copyright @@ -0,0 +1,111 @@ +Format: https://www.debian.org/doc/packaging-manuals/copyright-format/1.0/ +Upstream-Name: HardInfo +Upstream-Contact: Leandro Pereira <leandro@hardinfo.org> +Source: https://github.com/lpereira/hardinfo + +Files: * +Copyright: 1975-2010 Ulla Upstream + 2003-2009, 2010, 2012 Leandro A. F. Pereira <leandro@hardinfo.org> +License: GPL-2 + +Files: debian/* +Copyright: 2006 Agney Lopes Roth Ferraz <agney@debian.org> + 2017 Simon Quigley <tsimonq2@ubuntu.com> +License: GPL-2 + +Files: hardinfo/binreloc.c + includes/binreloc.h + includes/sha1.h + includes/md5.h + modules/benchmark/sha1.c + modules/benchmark/fftbench.c + modules/benchmark/md5.c +Copyright: <no copyright holders> +License: public-domain + This file is in the public domain. + +Files: includes/blowfish.h + modules/benchmark/blowfish.c +Copyright: 1997 Paul Kocher +License: LGPL-2.1+ + +Files: includes/egg-markdown.h +Copyright: 2008 Richard Hughes <richard@hughsie.com> + 2009 Leandro Pereira <leandro@hardinfo.org> +License: GPL-2 + +Files: includes/markdown-text-view.h +Copyright: 2009 Leandro Pereira <leandro@hardinfo.org> + 2007-2008 Richard Hughes <richard@hughsie.com> +License: GPL-2 + +Files: modules/devices/arm/arm_data.c + modules/devices/arm/arm_data.h +Copyright: 2017 Burt P. <pburt0@gmail.com> +License: GPL-2 + +Files: cmake/GNUInstallDirs.cmake +Copyright: 2011 Nikita Krupen'ko <krnekit@gmail.com> + 2011 Kitware, Inc. +License: BSD-3-clause + +License: GPL-2 + This program is free software; you can redistribute it + and/or modify it under the terms of the GNU General Public + License as published by the Free Software Foundation; either + version 2 of the License, or (at your option) any later + version. + . + This program is distributed in the hope that it will be + useful, but WITHOUT ANY WARRANTY; without even the implied + warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR + PURPOSE. See the GNU General Public License for more + details. + . + You should have received a copy of the GNU General Public + License along with this package; if not, write to the Free + Software Foundation, Inc., 51 Franklin St, Fifth Floor, + Boston, MA 02110-1301 USA + . + On Debian systems, the full text of the GNU General Public + License version 2 can be found in the file + `/usr/share/common-licenses/GPL-2'. + +License: BSD-3-clause + Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met: + . + 1. Redistributions of source code must retain the above copyright notice, this list of conditions and the following disclaimer. + . + 2. Redistributions in binary form must reproduce the above copyright notice, this list of conditions and the following disclaimer in the documentation and/or other materials provided with the distribution. + . + 3. Neither the name of the copyright holder nor the names of its contributors may be used to endorse or promote products derived from this software without specific prior written permission. + . + THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS ``AS IS'' + AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE + IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE + DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR + ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES + (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; + LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND + ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT + (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS + SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + +License: LGPL-2.1+ + This library is free software; you can redistribute it + and/or modify it under the terms of the GNU Lesser General Public + License as published by the Free Software Foundation; either + version 2.1 of the License, or (at your option) any later version. + . + This library is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + Lesser General Public License for more details. + . + You should have received a copy of the GNU Lesser General Public + License along with this library; if not, write to the Free Software + Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA. + . + On Debian systems, the full text of the GNU Lesser General Public + License version 2.1 can be found in the file + `/usr/share/common-licenses/LGPL'. diff --git a/debian/hardinfo.1 b/debian/hardinfo.1 new file mode 100644 index 00000000..e3f492f8 --- /dev/null +++ b/debian/hardinfo.1 @@ -0,0 +1,35 @@ +.\" Hey, EMACS: -*- nroff -*- +.\" First parameter, NAME, should be all caps +.\" Second parameter, SECTION, should be 1-8, maybe w/ subsection +.\" other parameters are allowed: see man(7), man(1) +.TH HARDINFO 1 "June 15, 2003" +.\" Please adjust this date whenever revising the manpage. +.\" +.\" Some roff macros, for reference: +.\" .nh disable hyphenation +.\" .hy enable hyphenation +.\" .ad l left justify +.\" .ad b justify to both left and right margins +.\" .nf disable filling +.\" .fi enable filling +.\" .br insert line break +.\" .sp <n> insert n+1 empty lines +.\" for manpage-specific macros, see man(7) +.SH NAME +hardinfo \- shows hardware information in a GTK+ window +.SH SYNOPSIS +.B hardinfo +.SH DESCRIPTION +.B hardinfo +parses some files in /proc and displays their information in a +user-friendly window. + +This manual page was written for the Debian distribution +because the original program does not have a manual page. +.PP +.\" TeX users may be more comfortable with the \fB<whatever>\fP and +.\" \fI<whatever>\fP escape sequences to invode bold face and italics, +.\" respectively. +.SH AUTHOR +This manual page was written by Leandro Pereira <leandro@linuxmag.com.br>, +for the Debian project (but may be used by others). diff --git a/debian/hardinfo.lintian-overrides b/debian/hardinfo.lintian-overrides new file mode 100644 index 00000000..20c3fa0b --- /dev/null +++ b/debian/hardinfo.lintian-overrides @@ -0,0 +1,2 @@ +## Synopsys is the name of a company, not a spelling error. +hardinfo binary: spelling-error-in-binary usr/lib/hardinfo/modules/devices.so Synopsys Synopsis diff --git a/debian/hardinfo.manpages b/debian/hardinfo.manpages new file mode 100644 index 00000000..ce2f5f77 --- /dev/null +++ b/debian/hardinfo.manpages @@ -0,0 +1 @@ +debian/hardinfo.1 diff --git a/debian/patches/fix-ppc64el-ftbfs.patch b/debian/patches/fix-ppc64el-ftbfs.patch new file mode 100644 index 00000000..cf0516fb --- /dev/null +++ b/debian/patches/fix-ppc64el-ftbfs.patch @@ -0,0 +1,18 @@ +Description: Fix FTBFS on ppc64el. + This is a proper fix adding support for ppc64el in CMakeLists.txt. +Author: Frédéric Bonnard <frediz@linux.vnet.ibm.com> +Bug-Debian: https://bugs.debian.org/865776 +Last-Update: 2017-07-05 +--- +This patch header follows DEP-3: http://dep.debian.net/deps/dep3/ +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -21,7 +21,7 @@ if(${CMAKE_HOST_SYSTEM_PROCESSOR} MATCHE + set(HARDINFO_ARCH "x86") + elseif(${CMAKE_HOST_SYSTEM_PROCESSOR} MATCHES "x86_64") + set(HARDINFO_ARCH "x86_64") +-elseif(${CMAKE_HOST_SYSTEM_PROCESSOR} MATCHES "ppc{32,64}") ++elseif(${CMAKE_HOST_SYSTEM_PROCESSOR} MATCHES "(ppc32|ppc64|ppc64le)") + set(HARDINFO_ARCH "ppc") + elseif(${CMAKE_HOST_SYSTEM_PROCESSOR} MATCHES "mips") + set(HARDINFO_ARCH "mips") 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/make-build-reproducable.patch b/debian/patches/make-build-reproducable.patch new file mode 100644 index 00000000..5ad40597 --- /dev/null +++ b/debian/patches/make-build-reproducable.patch @@ -0,0 +1,31 @@ +Description: Make HardInfo reproducable. + This patch removes the "Compiled on:" text when running "hardinfo --version" + because it does not show any useful information at the moment, and causes + HardInfo to fail reproducibility tests. +Author: Simon Quigley <tsimonq2@ubuntu.com> +Bug-Debian: https://bugs.debian.org/833379 +Reviewed-by: Mattia Rizzolo <mattia@debian.org> +Last-Update: 2017-07-14 +--- a/config.h.cmake ++++ b/config.h.cmake +@@ -5,9 +5,6 @@ + + #define ARCH "ARCH_@HARDINFO_ARCH@" + #define OS "@HARDINFO_OS@" +-#define PLATFORM OS "-" ARCH +-#define KERNEL "@CMAKE_SYSTEM_VERSION@" +-#define HOSTNAME "" + #define ARCH_@HARDINFO_ARCH@ + + #define LIBDIR "@CMAKE_INSTALL_LIBDIR@" +--- a/hardinfo/hardinfo.c ++++ b/hardinfo/hardinfo.c +@@ -55,7 +55,7 @@ int main(int argc, char **argv) + " Compiled on: %s %s (%s)\n"), + RELEASE ? _("Yes") : "No (" VERSION ")", ARCH, + ENABLE_BINRELOC ? _("Yes") : _("No"), +- PREFIX, LIBPREFIX, PLATFORM, KERNEL, HOSTNAME); ++ PREFIX, LIBPREFIX, "", "", ""); + + DEBUG(" Debugging is enabled."); + diff --git a/debian/patches/series b/debian/patches/series new file mode 100644 index 00000000..0f96bc2c --- /dev/null +++ b/debian/patches/series @@ -0,0 +1,3 @@ +make-build-reproducable.patch +fix-ppc64el-ftbfs.patch +glibc-version.patch diff --git a/debian/rules b/debian/rules new file mode 100755 index 00000000..f3542e38 --- /dev/null +++ b/debian/rules @@ -0,0 +1,5 @@ +#!/usr/bin/make -f +#export DH_VERBOSE=1 + +%: + dh ${@} --buildsystem cmake diff --git a/debian/source/format b/debian/source/format new file mode 100644 index 00000000..163aaf8d --- /dev/null +++ b/debian/source/format @@ -0,0 +1 @@ +3.0 (quilt) diff --git a/debian/watch b/debian/watch new file mode 100644 index 00000000..85ca29ab --- /dev/null +++ b/debian/watch @@ -0,0 +1,3 @@ +version=4 +opts=filenamemangle=s/.+\/release-?(\d\S+)\.tar\.gz/hardinfo_$1\.orig\.tar\.gz/ \ + https://github.com/lpereira/hardinfo/tags .*/release-?(\d\S+)\.tar\.gz |