On Sat, Feb 20, 2010 at 12:10:25PM +0100, Olivier Berger wrote:
> 
> Btw, there's a new version upstream that may fix the existing build problems.
> 

FYI, I've tried and apply the libsmbios_2.0.3.dfsg-1.diff.gz source package to 
the upstream 2.2.19 sources and have obtained the attached changes.

It appears that upstream has implemented quite a lot of the old tools as Python 
scripts using a lib, so there would be more changes needed.

Maybe this will be helpful anyway.

Best regards,
reverted:
--- libsmbios-2.0.3.dfsg/build/config.guess
+++ libsmbios-2.0.3.dfsg.orig/build/config.guess
@@ -4,7 +4,7 @@
 #   2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008
 #   Free Software Foundation, Inc.
 
+timestamp='2008-01-08'
-timestamp='2008-01-23'
 
 # This file is free software; you can redistribute it and/or modify it
 # under the terms of the GNU General Public License as published by
@@ -1484,9 +1484,9 @@
 the operating system you are using. It is advised that you
 download the most up to date version of the config scripts from
 
+  http://savannah.gnu.org/cgi-bin/viewcvs/*checkout*/config/config/config.guess
-  http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.guess;hb=HEAD
 and
+  http://savannah.gnu.org/cgi-bin/viewcvs/*checkout*/config/config/config.sub
-  http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.sub;hb=HEAD
 
 If the version you run ($0) is already up to date, please
 send the following data and any information you think might be
diff -u libsmbios-2.0.3.dfsg/debian/libsmbios-doc.install libsmbios-2.2.19/debian/libsmbios-doc.install
--- libsmbios-2.0.3.dfsg/debian/libsmbios-doc.install
+++ libsmbios-2.2.19/debian/libsmbios-doc.install
@@ -1,2 +1,3 @@
-doc/full/html  usr/share/doc/libsmbios-doc
+out/libsmbios_c++/html  usr/share/doc/libsmbios-doc/libsmbios_c++/html
+out/libsmbios_c/html  usr/share/doc/libsmbios-doc/libsmbios_c/html
 doc/visio/*.jpg usr/share/doc/libsmbios-doc/diagrams
diff -u libsmbios-2.0.3.dfsg/debian/libsmbios-bin.install libsmbios-2.2.19/debian/libsmbios-bin.install
--- libsmbios-2.0.3.dfsg/debian/libsmbios-bin.install
+++ libsmbios-2.2.19/debian/libsmbios-bin.install
@@ -1,0 +2 @@
+debian/tmp/usr/share/smbios-utils
diff -u libsmbios-2.0.3.dfsg/debian/rules libsmbios-2.2.19/debian/rules
--- libsmbios-2.0.3.dfsg/debian/rules
+++ libsmbios-2.2.19/debian/rules
@@ -47,7 +47,7 @@
 	$(MAKE) install DESTDIR=$(CURDIR)/debian/tmp
 	# get rid of RPATH on 64-bits arches (usually caused by broken upstream
 	# libtool)
-	cd debian/tmp/usr/sbin; ls | grep -v '\.sh$$' | xargs chrpath -d
+	cd debian/tmp/usr/sbin; file -i debian/tmp/usr/sbin/* | grep "application/x-executable" | sed 's/:.*//g' | xargs chrpath -d
 
 binary-indep: build install
 	dh_testdir
diff -u libsmbios-2.0.3.dfsg/debian/changelog libsmbios-2.2.19/debian/changelog
--- libsmbios-2.0.3.dfsg/debian/changelog
+++ libsmbios-2.2.19/debian/changelog
@@ -1,3 +1,9 @@
+libsmbios (2.2.19-1) unstable; urgency=low
+
+  * New upstream release
+
+ -- Olivier Berger <olivier.ber...@it-sudparis.eu>  Sat, 20 Feb 2010 22:39:05 +0100
+
 libsmbios (2.0.3.dfsg-1) unstable; urgency=low
 
   [ Jose Luis Tallon ]
diff -u libsmbios-2.0.3.dfsg/debian/libsmbios-dev.install libsmbios-2.2.19/debian/libsmbios-dev.install
--- libsmbios-2.0.3.dfsg/debian/libsmbios-dev.install
+++ libsmbios-2.2.19/debian/libsmbios-dev.install
@@ -3 +3 @@
-include/smbios usr/include
+src/include/smbios usr/include
diff -u libsmbios-2.0.3.dfsg/debian/libsmbios2.install libsmbios-2.2.19/debian/libsmbios2.install
--- libsmbios-2.0.3.dfsg/debian/libsmbios2.install
+++ libsmbios-2.2.19/debian/libsmbios2.install
@@ -1,0 +2 @@
+debian/tmp/usr/lib/libsmbios_c.so.*
only in patch2:
unchanged:
--- libsmbios-2.2.19.orig/src/libsmbios_c++/systeminfo/out_libsmbios_la-IdByte.loT
+++ libsmbios-2.2.19/src/libsmbios_c++/systeminfo/out_libsmbios_la-IdByte.loT
@@ -0,0 +1,9 @@
+# src/libsmbios_c++/systeminfo/out_libsmbios_la-IdByte.lo - a libtool object file
+# Generated by ltmain.sh - GNU libtool 1.5.24 (1.1220.2.456 2007/06/24 02:25:32)
+#
+# Please DO NOT delete this file!
+# It is necessary for linking the library.
+
+# Name of the PIC object.
+pic_object='.libs/out_libsmbios_la-IdByte.o'
+

Reply via email to