Import Debian changes 0.4-2

hardinfo (0.4-2) unstable; urgency=low

  * Limited supported architectures. (Closes: #368582)

12 files changed, 390 insertions, 9 deletions

diff --git a/Makefile b/Makefile
index b8d8ea19..f786edaf 100644
--- a/Makefile
+++ b/Makefile
@@ -56,13 +56,13 @@ install:	all
 	mkdir -p ${DESTDIR}/usr/bin
 	cp hardinfo ${DESTDIR}/usr/bin/hardinfo
 	mkdir -p ${DESTDIR}/usr/share/hardinfo/modules
-	cp -rv modules/*.so ${DESTDIR}/usr/share/hardinfo/modules
+	mkdir -p ${DESTDIR}/usr/lib/hardinfo/modules
+	cp -rv modules/*.so ${DESTDIR}/usr/lib/hardinfo/modules
 	mkdir -p ${DESTDIR}/usr/share/hardinfo/pixmaps
 	cp -rv pixmaps/* ${DESTDIR}/usr/share/hardinfo/pixmaps
 	cp uidefs.xml ${DESTDIR}/usr/share/hardinfo
 	cp modules.conf ${DESTDIR}/usr/share/hardinfo
 	cp benchmark.conf ${DESTDIR}/usr/share/hardinfo
 	cp benchmark.data ${DESTDIR}/usr/share/hardinfo
-	chmod -R 755 ${DESTDIR}/usr/share/hardinfo
 	chmod 755 ${DESTDIR}/usr/bin/hardinfo
 
diff --git a/Makefile.in b/Makefile.in
index c4ac1fa1..ba6de62a 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -50,13 +50,13 @@ install:	all
 	mkdir -p ${DESTDIR}/usr/bin
 	cp hardinfo ${DESTDIR}/usr/bin/hardinfo
 	mkdir -p ${DESTDIR}/usr/share/hardinfo/modules
-	cp -rv modules/*.so ${DESTDIR}/usr/share/hardinfo/modules
+	mkdir -p ${DESTDIR}/usr/lib/hardinfo/modules
+	cp -rv modules/*.so ${DESTDIR}/usr/lib/hardinfo/modules
 	mkdir -p ${DESTDIR}/usr/share/hardinfo/pixmaps
 	cp -rv pixmaps/* ${DESTDIR}/usr/share/hardinfo/pixmaps
 	cp uidefs.xml ${DESTDIR}/usr/share/hardinfo
 	cp modules.conf ${DESTDIR}/usr/share/hardinfo
 	cp benchmark.conf ${DESTDIR}/usr/share/hardinfo
 	cp benchmark.data ${DESTDIR}/usr/share/hardinfo
-	chmod -R 755 ${DESTDIR}/usr/share/hardinfo
 	chmod 755 ${DESTDIR}/usr/bin/hardinfo
 
diff --git a/config.h b/config.h
index ecd46b44..626701dd 100644
--- a/config.h
+++ b/config.h
@@ -6,8 +6,9 @@
 #define ARCH_i386
 #define PLATFORM "Linux"
 #define KERNEL   "2.6.16-1-686"
-#define HOSTNAME "comanche.linuxhome.com.br"
+#define HOSTNAME "lxadm03.intranet.dasa"
 #define PREFIX "/usr/share/hardinfo/"
+#define PREFIX_LIBS "/usr/lib/hardinfo/"
 #define DEBUG 1
 
 #endif	/* __CONFIG_H__ */
diff --git a/configure b/configure
index 77f64686..d0c209c8 100755
--- a/configure
+++ b/configure
@@ -142,6 +142,7 @@ echo "#define KERNEL   \"`uname -r`\"" >> config.h
 echo "#define HOSTNAME \"`hostname`\"" >> config.h
 
 echo "#define PREFIX \"/usr/share/hardinfo/\"" >> config.h
+echo "#define PREFIX_LIBS \"/usr/lib/hardinfo/\"" >> config.h
 echo "#define DEBUG 1" >> config.h
 
 echo -e "\n#endif	/* __CONFIG_H__ */" >> config.h
diff --git a/debian/changelog b/debian/changelog
index 861c1360..dfdcc7c8 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+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
diff --git a/debian/configure-debian.desktop b/debian/configure-debian.desktop
new file mode 100644
index 00000000..798a3845
--- /dev/null
+++ b/debian/configure-debian.desktop
@@ -0,0 +1,9 @@
+[Desktop Entry]
+Name=Configure-Debian
+Comment=Reconfigure Your Packages
+Exec=/usr/sbin/su-to-root -p root -c /usr/sbin/configure-debian
+Icon=/usr/share/pixmaps/configure-debian-48x48.png
+Terminal=true
+MultipleArgs=false
+Type=Application
+Categories=Application;System;
diff --git a/debian/control b/debian/control
index 2f7e2e62..3d8650dc 100644
--- a/debian/control
+++ b/debian/control
@@ -6,7 +6,7 @@ Build-Depends: debhelper (>> 4.0.0), libgtk2.0-dev, pciutils (>=1:2.1.11-10)
 Standards-Version: 3.7.2.0
 
 Package: hardinfo
-Architecture: any
+Architecture: i386 mips powerpc mipsel hppa sparc amd64
 Depends: ${shlibs:Depends}, pciutils (>=1:2.1.11-10)
 Description: Displays system information
  HardInfo is a small application that displays information about your
diff --git a/debian/hardinfo.desktop b/debian/hardinfo.desktop
new file mode 100644
index 00000000..09e12180
--- /dev/null
+++ b/debian/hardinfo.desktop
@@ -0,0 +1,9 @@
+[Desktop Entry]
+Name=Hardinfo
+Comment=Displays system information
+Exec=/usr/bin/hardinfo
+Icon=/usr/share/pixmaps/hardinfo.xpm
+Terminal=false
+MultipleArgs=false
+Type=Application
+Categories=Application;System;
diff --git a/debian/hardinfo.xpm b/debian/hardinfo.xpm
new file mode 100644
index 00000000..851393fc
--- /dev/null
+++ b/debian/hardinfo.xpm
@@ -0,0 +1,349 @@
+/* XPM */
+static char * hardinfo_xpm[] = {
+"32 32 314 2",
+"  	c None",
+". 	c #F3F3F3",
+"+ 	c #F2F2F2",
+"@ 	c #F1F1F1",
+"# 	c #F0F0F0",
+"$ 	c #EFEFEF",
+"% 	c #EEEEEE",
+"& 	c #ECECEC",
+"* 	c #EAEAEA",
+"= 	c #E8E8E8",
+"- 	c #E7E7E7",
+"; 	c #E3E3E3",
+"> 	c #AEAEAE",
+", 	c #F4F4F4",
+"' 	c #DCDCDC",
+") 	c #D8D8D8",
+"! 	c #D6D6D6",
+"~ 	c #D5D5D5",
+"{ 	c #D3D3D3",
+"] 	c #D1D1D1",
+"^ 	c #D0D0D0",
+"/ 	c #CFCFCF",
+"( 	c #CECECE",
+"_ 	c #CCCCCC",
+": 	c #CBCBCB",
+"< 	c #CDCDCD",
+"[ 	c #626262",
+"} 	c #898989",
+"| 	c #383838",
+"1 	c #373737",
+"2 	c #363636",
+"3 	c #353535",
+"4 	c #343434",
+"5 	c #424242",
+"6 	c #E2E2E2",
+"7 	c #D9D9D9",
+"8 	c #3F3F3F",
+"9 	c #6E6E6E",
+"0 	c #888682",
+"a 	c #E2E2DF",
+"b 	c #EDEAE6",
+"c 	c #DFDED9",
+"d 	c #C9CAC7",
+"e 	c #BFC0BD",
+"f 	c #C4C1BA",
+"g 	c #C1BCB2",
+"h 	c #B8B4AA",
+"i 	c #ABA69C",
+"j 	c #919089",
+"k 	c #7D7C76",
+"l 	c #282724",
+"m 	c #E5E5E5",
+"n 	c #D7D7D7",
+"o 	c #9A9793",
+"p 	c #EEF0F1",
+"q 	c #FFFFFF",
+"r 	c #EDEDEC",
+"s 	c #D8DADA",
+"t 	c #D0D2D2",
+"u 	c #CAC7C1",
+"v 	c #C1BDB3",
+"w 	c #AAA49B",
+"x 	c #797E7F",
+"y 	c #89846E",
+"z 	c #2C2B27",
+"A 	c #E4E4E4",
+"B 	c #6D6D6D",
+"C 	c #96948F",
+"D 	c #F7F6F5",
+"E 	c #FAF9F8",
+"F 	c #EEECEA",
+"G 	c #EBE9E6",
+"H 	c #E7E5E1",
+"I 	c #D0CDC5",
+"J 	c #C0BCB2",
+"K 	c #B8B3A9",
+"L 	c #A8A399",
+"M 	c #9D9685",
+"N 	c #8C7D76",
+"O 	c #2B2926",
+"P 	c #EBEBEB",
+"Q 	c #6C6C6C",
+"R 	c #908E89",
+"S 	c #F3F2F0",
+"T 	c #F4F2F1",
+"U 	c #ECEAE7",
+"V 	c #E9E7E4",
+"W 	c #E6E3DF",
+"X 	c #CECBC4",
+"Y 	c #BEBAB0",
+"Z 	c #B7B2A8",
+"` 	c #A6A197",
+" .	c #937162",
+"..	c #8B6863",
+"+.	c #2A2826",
+"@.	c #D2D2D2",
+"#.	c #464C52",
+"$.	c #49525D",
+"%.	c #3F4954",
+"&.	c #3E4852",
+"*.	c #4D545B",
+"=.	c #8E8F90",
+"-.	c #C8C8C6",
+";.	c #E5E3DF",
+">.	c #E5E2DF",
+",.	c #E2DFDB",
+"'.	c #CAC7BE",
+").	c #BAB5AC",
+"!.	c #B3ADA4",
+"~.	c #A39E94",
+"{.	c #928E84",
+"].	c #928E86",
+"^.	c #2A2825",
+"/.	c #E1E1E1",
+"(.	c #6F7A86",
+"_.	c #8397AB",
+":.	c #7D96B2",
+"<.	c #7B95B1",
+"[.	c #758CA7",
+"}.	c #637282",
+"|.	c #5B5F63",
+"1.	c #BAB9B6",
+"2.	c #D8D6D3",
+"3.	c #DAD8D3",
+"4.	c #C3BFB7",
+"5.	c #B3AEA4",
+"6.	c #ACA79D",
+"7.	c #9D988E",
+"8.	c #8F8A80",
+"9.	c #908B84",
+"0.	c #292724",
+"a.	c #E0E0E0",
+"b.	c #41464D",
+"c.	c #7D8A98",
+"d.	c #8199B4",
+"e.	c #7590AE",
+"f.	c #849CB7",
+"g.	c #A3B5C9",
+"h.	c #94A9C0",
+"i.	c #7892AF",
+"j.	c #778BA1",
+"k.	c #585D60",
+"l.	c #A6A4A1",
+"m.	c #C7C4C0",
+"n.	c #B3AFA7",
+"o.	c #A5A097",
+"p.	c #9E998F",
+"q.	c #928D83",
+"r.	c #858077",
+"s.	c #8A867F",
+"t.	c #272623",
+"u.	c #DFDFDF",
+"v.	c #606A75",
+"w.	c #8097B1",
+"x.	c #D1DAE4",
+"y.	c #627182",
+"z.	c #676868",
+"A.	c #B4B2AF",
+"B.	c #AFABA5",
+"C.	c #A6A29A",
+"D.	c #A09C94",
+"E.	c #97938B",
+"F.	c #908C85",
+"G.	c #8D8A83",
+"H.	c #272522",
+"I.	c #DEDEDE",
+"J.	c #C9C9C9",
+"K.	c #222528",
+"L.	c #7C8EA2",
+"M.	c #7892B0",
+"N.	c #B2C1D2",
+"O.	c #6B84A0",
+"P.	c #394048",
+"Q.	c #54514C",
+"R.	c #5D5A55",
+"S.	c #5C5A54",
+"T.	c #5A5852",
+"U.	c #54514B",
+"V.	c #4F4C47",
+"W.	c #474540",
+"X.	c #151413",
+"Y.	c #C6C6C6",
+"Z.	c #33373C",
+"`.	c #889FB8",
+" +	c #708AA7",
+".+	c #3D4752",
+"++	c #838383",
+"@+	c #989898",
+"#+	c #9C9C9C",
+"$+	c #9B9B9B",
+"%+	c #C4C4C4",
+"&+	c #393F44",
+"*+	c #89A0BA",
+"=+	c #E0E6ED",
+"-+	c #718BA8",
+";+	c #35404B",
+">+	c #B0B0B0",
+",+	c #D4D4D4",
+"'+	c #D7D4C3",
+")+	c #E2DAA9",
+"!+	c #B5B5B5",
+"~+	c #BCBCBC",
+"{+	c #3E3E3E",
+"]+	c #5F5F5F",
+"^+	c #3B3F45",
+"/+	c #6F89A6",
+"(+	c #999999",
+"_+	c #CACACA",
+":+	c #C0BDAC",
+"<+	c #A09766",
+"[+	c #A5A5A5",
+"}+	c #7D7D7D",
+"|+	c #323232",
+"1+	c #9E9E9E",
+"2+	c #8394A6",
+"3+	c #7A94B1",
+"4+	c #5B7188",
+"5+	c #262B31",
+"6+	c #3A3A3A",
+"7+	c #404040",
+"8+	c #454545",
+"9+	c #434343",
+"0+	c #2E2E2E",
+"a+	c #1E1E1E",
+"b+	c #797979",
+"c+	c #565F69",
+"d+	c #8198B1",
+"e+	c #738DAB",
+"f+	c #3D4B5A",
+"g+	c #16181A",
+"h+	c #1D1D1D",
+"i+	c #222222",
+"j+	c #212121",
+"k+	c #262626",
+"l+	c #242424",
+"m+	c #252525",
+"n+	c #202020",
+"o+	c #090909",
+"p+	c #6B7580",
+"q+	c #748FAD",
+"r+	c #6A829E",
+"s+	c #465668",
+"t+	c #0B0D10",
+"u+	c #000000",
+"v+	c #535353",
+"w+	c #515A65",
+"x+	c #76889C",
+"y+	c #7D95B0",
+"z+	c #748EAA",
+"A+	c #6E87A4",
+"B+	c #5F758D",
+"C+	c #3E4A58",
+"D+	c #575A5F",
+"E+	c #808080",
+"F+	c #969696",
+"G+	c #A2A2A2",
+"H+	c #A3A3A3",
+"I+	c #F5F5F5",
+"J+	c #5B5B5B",
+"K+	c #7F7F80",
+"L+	c #7E8083",
+"M+	c #494D52",
+"N+	c #464B51",
+"O+	c #484B4F",
+"P+	c #7A7A7A",
+"Q+	c #A1A1A1",
+"R+	c #BBBBBB",
+"S+	c #C5C5C5",
+"T+	c #A9A9A9",
+"U+	c #C0C0C0",
+"V+	c #B6B6B6",
+"W+	c #606060",
+"X+	c #727272",
+"Y+	c #7E7E7E",
+"Z+	c #ABABAB",
+"`+	c #AFAFAF",
+" @	c #B4B4B4",
+".@	c #C3C3C3",
+"+@	c #B8B8B8",
+"@@	c #A0A0A0",
+"#@	c #929292",
+"$@	c #525252",
+"%@	c #515151",
+"&@	c #DADADA",
+"*@	c #BDBDBD",
+"=@	c #555555",
+"-@	c #111111",
+";@	c #B7B7B7",
+">@	c #BFBFBF",
+",@	c #DDDDDD",
+"'@	c #9D9D9D",
+")@	c #2B2B2B",
+"!@	c #9A9A9A",
+"~@	c #979797",
+"{@	c #939393",
+"]@	c #919191",
+"^@	c #959595",
+"/@	c #848484",
+"(@	c #7C7C7C",
+"_@	c #757575",
+":@	c #8E8E8E",
+"<@	c #646464",
+"[@	c #6A6A6A",
+"}@	c #696969",
+"|@	c #686868",
+"1@	c #676767",
+"2@	c #666666",
+"3@	c #656565",
+"4@	c #636363",
+"5@	c #5E5E5E",
+"6@	c #5D5D5D",
+"7@	c #5A5A5A",
+"8@	c #585858",
+"9@	c #575757",
+"                                                                ",
+"                                                                ",
+"                                                                ",
+"            . . . + @ @ # $ % % & & * * = - ; >                 ",
+"            , @ ' ) ! ~ { { ] ^ / ( _ : < ! ' : [               ",
+"            , @ } | 1 1 2 2 3 3 3 3 3 4 1 5 6 7 8               ",
+"            . $ 9 0 a b c d e f g h i j k l m n |               ",
+"            . $ 9 o p q r s t u v h w x y z A ! |               ",
+"            . % B C D E F G H I J K L M N O ; { |               ",
+"            @ P Q R S T U V W X Y Z `  ...+.6 @.|               ",
+"          #.$.%.&.*.=.-.;.>.,.'.).!.~.{.].^././ |               ",
+"        (._.:.:.<.[.}.|.1.2.3.4.5.6.7.8.9.0.a.< |               ",
+"    b.c.d.e.f.g.h.e.i.j.k.l.m.n.o.p.q.r.s.t.u.: |               ",
+"    v.w.e.e.g.q x.e.e.i.y.z.A.B.C.D.E.F.G.H.I.J.|               ",
+"  K.L.M.e.e.h.x.N.e.e.e.O.P.Q.R.S.T.U.V.W.X.' Y.|               ",
+"  Z.`.e.e.e.x.x.N.e.e.e. +.+++@+#+#+$+$+$+@+' %+|               ",
+"  &+*+e.e.e.=+q x.e.e.e.-+;+>+: ,+@.( _ '+)+!+~+{+]+            ",
+"  ^+`.e.e.e.g.q x.e.e.e./+$.(+~+@.^ < _+:+<+[+}+|+3   1+        ",
+"    2+3+e.e.g.q x.e.e.e.4+5+6+7+8+8+5 8+9+9+0+a+      1+b+      ",
+"    c+d+e.e.g.q x.e.e.e+f+g+h+i+j+k+j+l+m+n+o+        1+b+      ",
+"      p+d+3+e.e.e.q+r+s+t+u+u+u+u+u+u+u+u+u+u+        1+v+      ",
+"        w+x+y+z+A+B+C+D+E+F+G+H+H+H+H+H+H+H+H+@.I+#+  1+J+      ",
+"        K+L+M+N+N+O+P+Q+R+! @.~ S+%+! { Y._ T+U+V+W+X+Y+        ",
+"        : 7 Z+`+ @Z+.@R+) _ S+%+Y.] ~++@T+`+F+Z+@@#@$@%@        ",
+"        @ /.) ~ ) { &@^ { *@n J._ ( ^ S+_+/ !+R+ @#+=@-@        ",
+"      I+# _ ^ &@a.= ' - ,+a.! > ~+;@>@S+,@; _+'@T+U+[ )@        ",
+"      % R+.@= @.[+H+'@!@~@{@]@`+@. @G+~+^@/@(@_@T+:@Z+<@        ",
+"      (@[@[@[@}@}@|@1@1@2@3@<@<@4@[ W+]+5@6@J+7@8@9@=@1 u+      ",
+"            u+u+u+u+u+u+u+u+u+u+u+u+u+u+u+u+u+u+u+u+u+u+        ",
+"                                                                ",
+"                                                                ",
+"                                                                "};
diff --git a/debian/menu b/debian/menu
index 4a3ff6d4..f6d6d3be 100644
--- a/debian/menu
+++ b/debian/menu
@@ -2,5 +2,5 @@
 needs="X11" \
 section="Apps/System" \
 title="System Information" command="/usr/bin/hardinfo" \
-icon="/usr/share/hardinfo/pixmaps/logo.xpm"
+icon="/usr/share/pixmaps/hardinfo.xpm"
 
diff --git a/debian/rules b/debian/rules
index 3bc037af..9b3c802f 100755
--- a/debian/rules
+++ b/debian/rules
@@ -54,7 +54,12 @@ install: build
 
 	# Add here commands to install the package into debian/hardinfo.
 	$(MAKE) install DESTDIR=$(CURDIR)/debian/hardinfo
-
+	install -d `pwd`/debian/hardinfo/usr/share/pixmaps
+	install -m 644 debian/hardinfo.xpm \
+		`pwd`/debian/hardinfo/usr/share/pixmaps
+	install -d `pwd`/debian/hardinfo/usr/share/applications
+	install -m 644 debian/hardinfo.desktop  \
+		`pwd`/debian/hardinfo/usr/share/applications
 
 # Build architecture-independent files here.
 binary-indep: build install
@@ -65,6 +70,7 @@ binary-arch: build install
 	dh_testdir
 	dh_testroot
 	#dh_installchangelogs ChangeLog
+	dh_installchangelogs
 	dh_installdocs
 #	dh_installexamples
 	dh_install
diff --git a/shell.c b/shell.c
index e8ac1f5e..fd4c286e 100644
--- a/shell.c
+++ b/shell.c
@@ -312,7 +312,7 @@ shell_tree_modules_load(ShellTree * shelltree)
 	module->icon = icon_cache_get_pixbuf(tmp);
 	g_free(tmp);
 
-	tmp = g_strdup_printf(PREFIX "modules/%s.so", iname);
+	tmp = g_strdup_printf(PREFIX_LIBS "modules/%s.so", iname);
 	module->dll = g_module_open(tmp, G_MODULE_BIND_LAZY);
 	g_free(tmp);