Author: locilka Date: Tue Oct 30 17:25:26 2007 New Revision: 41650 URL: http://svn.opensuse.org/viewcvs/yast?rev=41650&view=rev Log: - Modules Hotplug and HwStatus moved here from yast2-installation to remove yast2-storage dependency on yast2-installation. - Adjusted RPM dependencies. Added: trunk/yast2/library/system/src/Hotplug.ycp - copied unchanged from r41630, trunk/installation/src/modules/Hotplug.ycp trunk/yast2/library/system/src/HwStatus.ycp - copied unchanged from r41649, trunk/installation/src/modules/HwStatus.ycp Modified: trunk/yast2/library/network/src/yast2-services-translations.ycp trunk/yast2/library/system/src/Makefile.am trunk/yast2/package/yast2.changes trunk/yast2/yast2.spec.in Modified: trunk/yast2/library/network/src/yast2-services-translations.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/yast2/library/network/src/yast2-services-translations.ycp?rev=41650&r1=41649&r2=41650&view=diff ============================================================================== --- trunk/yast2/library/network/src/yast2-services-translations.ycp (original) +++ trunk/yast2/library/network/src/yast2-services-translations.ycp Tue Oct 30 17:25:26 2007 @@ -89,7 +89,13 @@ tmpstring = _("lighttpd"); // TRANSLATORS: Description of a Service (rpm: lighttpd), used as a common label or an item in table - tmpstring = _("Open ports for lighttpd including the HTTPS port."); + tmpstring = _("Open the http port for lighttpd."); + + // TRANSLATORS: Name of Service (rpm: lighttpd-ssl), can be used as check box, item in multiple selection box... + tmpstring = _("lighttpd"); + + // TRANSLATORS: Description of a Service (rpm: lighttpd-ssl), used as a common label or an item in table + tmpstring = _("Open the https port for lighttpd."); // TRANSLATORS: Name of Service (rpm: mysql), can be used as check box, item in multiple selection box... tmpstring = _("MySQL server"); @@ -118,6 +124,12 @@ // TRANSLATORS: Description of a Service (rpm: sendmail), used as a common label or an item in table tmpstring = _("Firewall Configuration file for postfix"); + // TRANSLATORS: Name of Service (rpm: squid), can be used as check box, item in multiple selection box... + tmpstring = _("Squid Service"); + + // TRANSLATORS: Description of a Service (rpm: squid), used as a common label or an item in table + tmpstring = _("Opens ports for Squid"); + // TRANSLATORS: Name of Service (rpm: sshd), can be used as check box, item in multiple selection box... tmpstring = _("Secure Shell Server"); Modified: trunk/yast2/library/system/src/Makefile.am URL: http://svn.opensuse.org/viewcvs/yast/trunk/yast2/library/system/src/Makefile.am?rev=41650&r1=41649&r2=41650&view=diff ============================================================================== --- trunk/yast2/library/system/src/Makefile.am (original) +++ trunk/yast2/library/system/src/Makefile.am Tue Oct 30 17:25:26 2007 @@ -1,6 +1,7 @@ # Makefile.am for yast2/library/modules -module_DATA = HWConfig.ycp Initrd.ycp Kernel.ycp ModuleLoading.ycp ModulesConf.ycp +#module_DATA = HWConfig.ycp Initrd.ycp Kernel.ycp ModuleLoading.ycp ModulesConf.ycp Hotplug.ycp HwStatus.ycp +module_DATA = $(wildcard [A-Z]*.ycp) yncludedir = @yncludedir@/hwinfo ynclude_DATA = classnames.ycp Modified: trunk/yast2/package/yast2.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/yast2/package/yast2.changes?rev=41650&r1=41649&r2=41650&view=diff ============================================================================== --- trunk/yast2/package/yast2.changes (original) +++ trunk/yast2/package/yast2.changes Tue Oct 30 17:25:26 2007 @@ -1,4 +1,11 @@ ------------------------------------------------------------------- +Tue Oct 30 17:24:06 CET 2007 - locilka@suse.cz + +- Modules Hotplug and HwStatus moved here from yast2-installation + to remove yast2-storage dependency on yast2-installation. +- Adjusted RPM dependencies. + +------------------------------------------------------------------- Tue Oct 23 08:10:22 CEST 2007 - jsrain@suse.cz - kernel-bigsmp renamed to kernel-pae Modified: trunk/yast2/yast2.spec.in URL: http://svn.opensuse.org/viewcvs/yast/trunk/yast2/yast2.spec.in?rev=41650&r1=41649&r2=41650&view=diff ============================================================================== --- trunk/yast2/yast2.spec.in (original) +++ trunk/yast2/yast2.spec.in Tue Oct 30 17:25:26 2007 @@ -26,7 +26,8 @@ Obsoletes: yast2-mail-aliases <= 2.14.0 Conflicts: yast2-storage < 2.15.20 Conflicts: yast2-network < 2.15.58 -Conflicts: yast2-installation < 2.15.41 +# Hotplug and HwStatus modules +Conflicts: yast2-installation < 2.16.2 Provides: yast2-lib-sequencer Obsoletes: yast2-lib-sequencer @@ -38,6 +39,8 @@ # moved here from another packages Provides: yast2-installation:/usr/share/YaST2/modules/Installation.ycp Provides: yast2-installation:/usr/share/YaST2/modules/Product.ycp +Provides: yast2-installation:/usr/share/YaST2/modules/Hotplug.ycp +Provides: yast2-installation:/usr/share/YaST2/modules/HwStatus.ycp Provides: yast2-mail-aliases Summary: Main YaST2 package -- To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org For additional commands, e-mail: yast-commit+help@opensuse.org