add tv icon

4 files changed, 41 insertions, 3 deletions

diff --git a/ChangeLog b/ChangeLog
index af9709b9..24f4df74 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,34 @@
+2002-09-04 16:21  tvignaud
+
+	* control-center: don't crash app by disabling logs while there're
+	pending apps
+
+2002-09-04 15:19  pablo
+
+	* po/: cy.po, drakconf.pot: updated po file
+
+2002-09-04 14:18  tvignaud
+
+	* control-center: add hint for gtk+2 port
+
+2002-09-04 13:50  daouda
+
+	* clock.pl: - detect automatically timezone.
+
+2002-09-04 11:29  fcrozat
+
+	* data/: Hardware.directory.in, MountPoints.directory.in,
+	NetworkInternet.directory.in, SoftwareManagement.directory.in,
+	System.directory.in, XFDrake-Resolution.desktop.in,
+	clock.desktop.in, drakbackup.desktop.in, drakcronat.desktop.in,
+	drakfirewall.desktop.in, drakxtv.desktop.in, webdav.desktop.in: Fix
+	icons Add missing applications Move SoftwareManagement.directory.in
+	from rpmdrake to drakconf
+
+2002-09-04 09:42  tvignaud
+
+	* ChangeLog, drakconf.spec: 23mdk
+
 2002-09-04 09:22  tvignaud
 
 	* control-center: embbed drakcronat
diff --git a/control-center b/control-center
index 48e5fa0d..1e1b4f00 100755
--- a/control-center
+++ b/control-center
@@ -175,7 +175,7 @@ my @tree =
       [_("Monitor"),'XFdrake-mdk'],
       [_("Resolution"),'resolution-mdk'],
       [_("Graphical server configuration"),'XFdrake-mdk'],
-      [_("TV Cards"),'XFdrake-mdk'],
+      [_("TV Cards"),'tv-mdk'],
       [_("Keyboard"), 'keyboard-mdk'],
       [_("Mouse"), 'mousedrake-mdk'],
       [_("Printer"),'printer-mdk'],
diff --git a/drakconf.spec b/drakconf.spec
index de6d0253..5e6af059 100644
--- a/drakconf.spec
+++ b/drakconf.spec
@@ -5,7 +5,7 @@
 Summary:	The Mandrake Control Center 
 Name:		drakconf
 Version:	%version
-Release:	0.23mdk
+Release:	0.25mdk
 # get the source from our cvs repository (see
 # http://www.linuxmandrake.com/en/cvs.php3)
 Source0:	%name-%version.tar.bz2
@@ -17,7 +17,7 @@ Group:		System/Configuration/Other
 Url:		http://www.mandrakelinux.com/en/cvs.php3
 Obsoletes:	DrakConf
 Provides:	DrakConf
-Requires:	mandrake-release, drakxtools >= 1.1.9-32mdk, gtk+mdk >= 0.1.6-10mdk
+Requires:	mandrake-release, drakxtools >= 1.1.9-33mdk, gtk+mdk >= 0.1.6-10mdk
 Requires:	menudrake >= 0.6.5-2mdk, harddrake-ui >= 1.1.8-16mdk
 Requires:	perl-GTK, perl-GTK-GdkImlib, usermode
 Requires:	popt >= 1.6.3-9mdk
@@ -104,6 +104,13 @@ rm -rf $RPM_BUILD_ROOT
 %_datadir/mcc/themes/kde
 
 %changelog
+* Wed Sep  4 2002 Thierry Vignaud <tvignaud@mandrakesoft.com> 9.0-0.25mdk
+- add tv icon
+
+* Wed Sep  4 2002 Thierry Vignaud <tvignaud@mandrakesoft.com> 9.0-0.24mdk
+- add drakperm in Security
+- don't crash apps by disabling logs while there're pending apps
+
 * Wed Sep  4 2002 Thierry Vignaud <tvignaud@mandrakesoft.com> 9.0-0.23mdk
 - embbed drakbackup, drakcronat, draksec
 - requires embbeded aware  drakcronat, draksec and drakxtools
diff --git a/pixmaps/default/tv-mdk.png b/pixmaps/default/tv-mdk.png
new file mode 100644
index 00000000..790a87d0
--- /dev/null
+++ b/pixmaps/default/tv-mdk.png