Import Debian changes 0.4.2.1-1

hardinfo (0.4.2.1-1) unstable; urgency=low

  * New upstream release.
  * Fixed segfault on device entry (Closes: #387955)

1 files changed, 0 insertions, 203 deletions

diff --git a/arch/linux/common/.svn/text-base/os.h.svn-base b/arch/linux/common/.svn/text-base/os.h.svn-base
deleted file mode 100644
index 0f7b59e3..00000000
--- a/arch/linux/common/.svn/text-base/os.h.svn-base
+++ /dev/null
@@ -1,203 +0,0 @@
-/*
- *    HardInfo - Displays System Information
- *    Copyright (C) 2003-2006 Leandro A. F. Pereira <leandro@linuxmag.com.br>
- *
- *    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, version 2.
- *
- *    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 program; if not, write to the Free Software
- *    Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
- */
-
-static gchar *
-get_libc_version(void)
-{
-    FILE *libc;
-    gchar buf[256], *tmp, *p;
-    
-    libc = popen("/lib/libc.so.6", "r");
-    if (!libc) goto err;
-    
-    fgets(buf, 256, libc);
-    if (pclose(libc)) goto err;
-    
-    tmp = strstr(buf, "version ");
-    if (!tmp) goto err;
-    
-    p = strchr(tmp, ',');
-    if (p) *p = '\0';
-    else goto err;
-    
-    return g_strdup_printf("GNU C Library version %s (%sstable)",
-                           strchr(tmp, ' ') + 1,
-                           strstr(buf, " stable ") ? "" : "un");
-  err:
-    return g_strdup("Unknown");
-}
-
-static gchar *
-get_os_compiled_date(void)
-{
-    FILE *procversion;
-    gchar buf[512];
-
-    procversion = fopen("/proc/sys/kernel/version", "r");
-    if (!procversion)
-	return g_strdup("Unknown");
-
-    fgets(buf, 512, procversion);
-    fclose(procversion);
-
-    return g_strdup(buf);
-}
-
-
-#include <gdk/gdkx.h>
-
-void
-detect_desktop_environment(OperatingSystem * os)
-{
-    const gchar *tmp = g_getenv("GNOME_DESKTOP_SESSION_ID");
-    FILE *version;
-    int maj, min;
-
-    if (tmp) {
-	/* FIXME: this might not be true, as the gnome-panel in path
-	   may not be the one that's running.
-	   see where the user's running panel is and run *that* to
-	   obtain the version. */
-	version = popen("gnome-panel --version", "r");
-	if (version) {
-	    fscanf(version, "Gnome gnome-panel %d.%d", &maj, &min);
-	    if (pclose(version))
-	        goto unknown;
-	} else {
-	    goto unknown;
-	}
-
-	os->desktop =
-	    g_strdup_printf("GNOME %d.%d (session name: %s)", maj, min,
-			    tmp);
-    } else if (g_getenv("KDE_FULL_SESSION")) {
-	version = popen("kcontrol --version", "r");
-	if (version) {
-	    char buf[32];
-
-	    fgets(buf, 32, version);
-
-	    fscanf(version, "KDE: %d.%d", &maj, &min);
-	    if (pclose(version))
-	        goto unknown;
-	} else {
-	    goto unknown;
-	}
-
-	os->desktop = g_strdup_printf("KDE %d.%d", maj, min);
-    } else {
-      unknown:
-	if (!g_getenv("DISPLAY")) {
-	    os->desktop = g_strdup("Terminal");
-	} else {
-            const gchar *windowman;
-            GdkScreen *screen = gdk_screen_get_default();
-
-            windowman = gdk_x11_screen_get_window_manager_name(screen);
-            
-            if (g_str_equal(windowman, "Xfwm4")) {
-                /* FIXME: check if xprop -root | grep XFCE_DESKTOP_WINDOW
-                   is defined */
-                os->desktop = g_strdup("XFCE 4");
-            } else {
-  	        os->desktop = g_strdup_printf("Unknown (Window Manager: %s)",
-  	                                      windowman);
-            }
-	}
-    }
-}
-
-static OperatingSystem *
-computer_get_os(void)
-{
-    struct utsname utsbuf;
-    OperatingSystem *os;
-    int i;
-
-    os = g_new0(OperatingSystem, 1);
-
-    os->compiled_date = get_os_compiled_date();
-
-    /* Attempt to get the Distribution name; try using /etc/lsb-release first,
-       then doing the legacy method (checking for /etc/$DISTRO-release files) */
-    if (g_file_test("/etc/lsb-release", G_FILE_TEST_EXISTS)) {
-	FILE *release;
-	gchar buffer[128];
-
-	release = popen("lsb_release -d", "r");
-	fgets(buffer, 128, release);
-	pclose(release);
-
-	os->distro = buffer;
-	os->distro = g_strdup(os->distro + strlen("Description:\t"));
-    }
-
-    for (i = 0;; i++) {
-	if (distro_db[i].file == NULL) {
-	    os->distrocode = g_strdup("unk");
-	    os->distro = g_strdup("Unknown distribution");
-	    break;
-	}
-
-	if (g_file_test(distro_db[i].file, G_FILE_TEST_EXISTS)) {
-
-
-	    FILE *distro_ver;
-	    char buf[128];
-
-	    distro_ver = fopen(distro_db[i].file, "r");
-	    fgets(buf, 128, distro_ver);
-	    fclose(distro_ver);
-
-	    buf[strlen(buf) - 1] = 0;
-
-	    if (!os->distro) {
-		/*
-		 * HACK: Some Debian systems doesn't include
-		 * the distribuition name in /etc/debian_release,
-		 * so add them here. 
-		 */
-		if (!strncmp(distro_db[i].codename, "deb", 3) &&
-		    ((buf[0] >= '0' && buf[0] <= '9') || buf[0] != 'D')) {
-		    os->distro = g_strdup_printf
-			("Debian GNU/Linux %s", buf);
-		} else {
-		    os->distro = g_strdup(buf);
-		}
-	    }
-	    os->distrocode = g_strdup(distro_db[i].codename);
-
-	    break;
-	}
-    }
-
-    /* Kernel and hostname info */
-    uname(&utsbuf);
-    os->kernel = g_strdup_printf("%s %s (%s)", utsbuf.sysname,
-				 utsbuf.release, utsbuf.machine);
-    os->hostname = g_strdup(utsbuf.nodename);
-    os->language = g_strdup(g_getenv("LC_MESSAGES"));
-    os->homedir = g_strdup(g_get_home_dir());
-    os->username = g_strdup_printf("%s (%s)",
-				   g_get_user_name(), g_get_real_name());
-    os->libc = get_libc_version();
-    scan_languages(os);
-    detect_desktop_environment(os);
-
-    return os;
-}