Import Debian changes 0.4.2.1.svn30042007-1

hardinfo (0.4.2.1.svn30042007-1) unstable; urgency=low

  * Fixed FTBFS on SVN version (Closes: #419587)

10 files changed, 20 insertions, 7 deletions

diff --git a/Makefile b/Makefile
index fa4b3858..4bf1154b 100644
--- a/Makefile
+++ b/Makefile
@@ -1,8 +1,8 @@
 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_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 -lgnutls  
+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  
-PACKAGE = hardinfo-0.4.2.1
+PACKAGE = hardinfo-0.4.2.1.svn30042007
 ARCHOPTS = 
 
 CC = gcc -O3 $(ARCHOPTS) 
diff --git a/arch/linux/alpha/battery.h b/arch/linux/alpha/battery.h
new file mode 120000
index 00000000..ed7360e1
--- /dev/null
+++ b/arch/linux/alpha/battery.h
@@ -0,0 +1 @@
+../../../arch/linux/common/battery.h
\ No newline at end of file
diff --git a/arch/linux/ia64/battery.h b/arch/linux/ia64/battery.h
new file mode 120000
index 00000000..ed7360e1
--- /dev/null
+++ b/arch/linux/ia64/battery.h
@@ -0,0 +1 @@
+../../../arch/linux/common/battery.h
\ No newline at end of file
diff --git a/arch/linux/s390/battery.h b/arch/linux/s390/battery.h
new file mode 120000
index 00000000..ed7360e1
--- /dev/null
+++ b/arch/linux/s390/battery.h
@@ -0,0 +1 @@
+../../../arch/linux/common/battery.h
\ No newline at end of file
diff --git a/config.h b/config.h
index 8f1fc701..f49fe4da 100644
--- a/config.h
+++ b/config.h
@@ -1,12 +1,12 @@
 #ifndef __CONFIG_H__
 #define __CONFIG_H__
 
-#define VERSION "0.4.2.1"
+#define VERSION "0.4.2.1.svn30042007"
 #define LSPCI "/bin/lspci -v"
 #define ARCH_i386
 #define ARCH     "ARCH_i386"
 #define PLATFORM "Linux"
-#define KERNEL   "2.6.18-4-686"
+#define KERNEL   "2.6.20-1-686"
 #define HOSTNAME "comanche"
 #define PREFIX "/usr/share/hardinfo/"
 #define LIBPREFIX "/usr/lib/hardinfo/"
diff --git a/configure b/configure
index 80906b62..a5ac9eb8 100755
--- a/configure
+++ b/configure
@@ -154,8 +154,8 @@ for i in `which pkg-config`; do
 		--atleast-version=$MIN_VERSION > /dev/null
 	case $? in
 		0)
-			SOUP_FLAGS=`pkg-config libsoup-2.2 --cflags`
-			SOUP_LIBS=`pkg-config libsoup-2.2 --libs`
+			SOUP_FLAGS=`pkg-config libsoup-2.2 --cflags --static`
+			SOUP_LIBS=`pkg-config libsoup-2.2 --libs --static`
 			echo "found `pkg-config libsoup-2.2 --modversion`"
 			SOUP=1
 			break ;;
diff --git a/debian/changelog b/debian/changelog
index eb2e25e6..fb864c81 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+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.
diff --git a/shell.c b/shell.c
index 228ce9ee..6d4d469d 100644
--- a/shell.c
+++ b/shell.c
@@ -520,7 +520,6 @@ static void add_modules_to_gui(gpointer data, gpointer user_data)
     }
 }
 
-
 void shell_init(GSList * modules)
 {
     if (shell) {
diff --git a/syncmanager.c b/syncmanager.c
index 6602407a..7646990f 100644
--- a/syncmanager.c
+++ b/syncmanager.c
@@ -299,6 +299,10 @@ static void _action_call_function_got_response(SoupMessage *msg, gpointer user_d
 #endif
         g_free(filename);
     }
+    
+    if (sna->entry->callback) {
+        sna->entry->callback(sna->entry, string);
+    }
 
     g_free(string);
     g_main_quit(loop);
diff --git a/syncmanager.h b/syncmanager.h
index 9cd812d0..78ca2153 100644
--- a/syncmanager.h
+++ b/syncmanager.h
@@ -29,6 +29,7 @@ struct _SyncEntry {
   gchar	*save_to;
 
   gchar	*(*get_data)(void);
+  void   (*callback)(SyncEntry *entry, const gchar *response);
   
   gboolean selected;
 };