From d81bcfe870261ef939c28c7b585b17a36c61619f Mon Sep 17 00:00:00 2001
From: Thierry Vignaud <tvignaud@mandriva.org>
Date: Mon, 2 Sep 2002 15:43:26 +0000
Subject: 29mdk: add harddrake icons

---
 perl-install/Makefile.drakxtools |  8 +++++++-
 perl-install/drakxtools.spec     | 13 ++++++++++++-
 2 files changed, 19 insertions(+), 2 deletions(-)

(limited to 'perl-install')

diff --git a/perl-install/Makefile.drakxtools b/perl-install/Makefile.drakxtools
index 35513c907..e719d9cc8 100644
--- a/perl-install/Makefile.drakxtools
+++ b/perl-install/Makefile.drakxtools
@@ -7,7 +7,9 @@ DIRS = $(INLIBDEST_DIRS) $(HAVEINST_DIRS) ddcprobe serial_probe harddrake
 NAME = libDrakX
 PREFIX = 
 LIBDIR = $(PREFIX)/usr/lib
+MENUDIR= $(LIBDEST)/menu
 DATADIR = $(PREFIX)/usr/share
+ICONSDIR= $(DATADIR)/icons
 BINDEST = $(PREFIX)/usr/bin
 SBINDEST = $(PREFIX)/usr/sbin
 ETCDEST = $(PREFIX)/etc/gtk
@@ -26,7 +28,7 @@ $(DIRS):
 	[ ! -e $@/Makefile ] || $(MAKE) -C $@
 
 install:
-	mkdir -p $(BINDEST) $(ETCDEST) $(SBINDEST) $(DATADIR)/{harddrake,pixmaps} $(BINX11DEST) $(LIBX11DEST) $(PIXDIR) $(INITDIR)
+	mkdir -p $(BINDEST) $(ETCDEST) $(SBINDEST) $(DATADIR)/{harddrake,pixmaps,icons/{large,mini}} $(BINX11DEST) $(LIBX11DEST) $(PIXDIR) $(INITDIR) $(MENUDIR)
 	install -d $(INLIBDEST_DIRS:%=$(LIBDEST)/%)
 	install $(STANDALONEPMS) $(SBINDEST)
 	install -s rpcinfo-flushed ddcprobe/ddcxinfos serial_probe/serial_probe $(SBINDEST)
@@ -49,6 +51,10 @@ install:
 
 	find auto -follow -name .exists -o -name "*.bs" | xargs rm -f
 	cp -rfL auto standalone/icons $(LIBDEST)
+	mv $(LIBDEST)/icons/harddrake2/menu/harddrake-menu32.png $(ICONSDIR)/harddrake.png
+	mv $(LIBDEST)/icons/harddrake2/menu/harddrake-menu48.png $(ICONSDIR)/large/harddrake.png
+	mv $(LIBDEST)/icons/harddrake2/menu/harddrake-menu16.png $(ICONSDIR)/mini/harddrake.png
+	rmdir $(LIBDEST)/icons/harddrake2/menu
 	mv $(LIBDEST)/icons/harddrake2/ $(DATADIR)/pixmaps/
 	mv $(SBINDEST)/service_harddrake.sh $(INITDIR)/harddrake
 	mv $(SBINDEST)/service_harddrake $(DATADIR)/harddrake/
diff --git a/perl-install/drakxtools.spec b/perl-install/drakxtools.spec
index d19db33ad..7f011100d 100644
--- a/perl-install/drakxtools.spec
+++ b/perl-install/drakxtools.spec
@@ -1,7 +1,7 @@
 Summary: The drakxtools (XFdrake, diskdrake, keyboarddrake, mousedrake...)
 Name:    drakxtools
 Version: 1.1.9
-Release: 28mdk
+Release: 29mdk
 Url: http://www.linux-mandrake.com/en/drakx.php3
 Source0: %name-%version.tar.bz2
 License: GPL
@@ -255,6 +255,10 @@ file /etc/sysconfig/harddrake2/previous_hw | fgrep -q perl && %_sbindir/convert-
 %_sbindir/harddrake2
 %_datadir/pixmaps/harddrake2
 %_menudir/harddrake-ui
+%_iconsdir/large/harddrake.png
+%_iconsdir/mini/harddrake.png
+%_iconsdir/harddrake.png
+
 
 %files http -f %{name}-http.list
 %defattr(-,root,root)
@@ -266,6 +270,13 @@ file /etc/sysconfig/harddrake2/previous_hw | fgrep -q perl && %_sbindir/convert-
 %config(noreplace) %_sysconfdir/logrotate.d/drakxtools-http
 
 %changelog 
+* Mon Sep  2 2002 Thierry Vignaud <tvignaud@mandrakesoft.com> 1.1.9-29mdk
+- harddrake:
+  o use new icons
+  o add menu icon
+- mcc: ensure all binaries're there
+- ugtk: remove all glib warnings
+
 * Mon Sep  2 2002 Thierry Vignaud <tvignaud@mandrakesoft.com> 1.1.9-28mdk
 - tinyfirewall is now drakfirewall (daouda)
 
-- 
cgit v1.2.1