aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAgney Lopes Roth Ferraz <agney@debian.org>2007-09-20 16:59:20 -0400
committerSimon Quigley <tsimonq2@ubuntu.com>2017-06-19 14:38:44 -0500
commit401ee3a8ee846998cf0fa3ebadcc81cffe1da3ed (patch)
tree5004e14806622caa356b3b49897d8ff882341162
parent3eae6bf97fc67b00ba9852a9f5f67cbab9bda264 (diff)
Import Debian changes 0.4.2.2-3
hardinfo (0.4.2.2-3) unstable; urgency=low * Fixed FTBFS on s390. (Closes: #443293)
-rw-r--r--Makefile2
-rw-r--r--config.h4
-rwxr-xr-xconfigure2
-rw-r--r--debian/changelog6
4 files changed, 10 insertions, 4 deletions
diff --git a/Makefile b/Makefile
index d1d87cc4..c6f183af 100644
--- a/Makefile
+++ b/Makefile
@@ -1,4 +1,4 @@
-GTK_LIBS = -lgtk-x11-2.0 -lgdk-x11-2.0 -latk-1.0 -lgdk_pixbuf-2.0 -lm -lpangocairo-1.0 -lfontconfig -lXext -lXrender -lXinerama -lXi -lXrandr -lXcursor -lXfixes -lpango-1.0 -lcairo -lX11 -lgobject-2.0 -lgmodule-2.0 -ldl -lglib-2.0
+GTK_LIBS = -lgtk-x11-2.0 -lgdk-x11-2.0 -latk-1.0 -lgdk_pixbuf-2.0 -lm -lpangocairo-1.0 -lfontconfig -lXext -lXrender -lXinerama -lXi -lXrandr -lXcursor -lXcomposite -lXdamage -lpango-1.0 -lcairo -lX11 -lXfixes -lgobject-2.0 -lgmodule-2.0 -ldl -lglib-2.0
GTK_CFLAGS = -I/usr/include/gtk-2.0 -I/usr/lib/gtk-2.0/include -I/usr/include/atk-1.0 -I/usr/include/cairo -I/usr/include/pango-1.0 -I/usr/include/glib-2.0 -I/usr/lib/glib-2.0/include -I/usr/include/freetype2 -I/usr/include/libpng12
SOUP_LIBS = -lsoup-2.2 -lglib-2.0 -lxml2 -lz -lm -lgnutls -ltasn1 -lgcrypt
SOUP_CFLAGS = -I/usr/include/libsoup-2.2 -I/usr/include/glib-2.0 -I/usr/lib/glib-2.0/include -I/usr/include/libxml2
diff --git a/config.h b/config.h
index f1282f8b..fa5beebe 100644
--- a/config.h
+++ b/config.h
@@ -6,8 +6,8 @@
#define ARCH_i386
#define ARCH "ARCH_i386"
#define PLATFORM "Linux"
-#define KERNEL "2.6.21-2-686"
-#define HOSTNAME "lxmaster.intranet.dasa"
+#define KERNEL "2.6.22-1-686"
+#define HOSTNAME "mirage"
#define PREFIX "/usr/share/hardinfo/"
#define LIBPREFIX "/usr/lib/hardinfo/"
#define HAS_LIBSOUP
diff --git a/configure b/configure
index 42dfa9ad..7b68c426 100755
--- a/configure
+++ b/configure
@@ -73,7 +73,7 @@ case $PROC in
alpha)
ln -sf linux/alpha arch/this
ARCH="ARCH_ALPHA" ;;
- s390)
+ s390*)
ln -sf linux/s390 arch/this
ARCH="ARCH_S390" ;;
m68k)
diff --git a/debian/changelog b/debian/changelog
index 5bf41225..2b6886c2 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+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)