Merge pull request #73 from jsuchome/openSUSE-13_1

- yast2-mouse was dropped, do not call its components (bnc#841960)
yast · Sep 27, 2013 · 245050a · 245050a
2 parents 18ee86f + 75b1cdb
commit 245050a
Show file tree

Hide file tree

Showing 5 changed files with 7 additions and 9 deletions.
diff --git a/VERSION b/VERSION
@@ -1 +1 @@
-3.0.6
+3.0.7
diff --git a/control/control.openSUSE.xml b/control/control.openSUSE.xml
@@ -492,10 +492,6 @@ is the most appropriate desktop for you.</label></desktop_dialog>
 		    <name>hwinfo</name>
 		    <presentation_order>80</presentation_order>
 		</proposal_module>
-		<proposal_module>
-		    <name>mouse</name>
-		    <presentation_order>90</presentation_order>
-		</proposal_module>
 		<!-- software proposal should be computed almost at the end -->
 		<proposal_module>
 		    <name>software</name>
@@ -532,7 +528,6 @@ is the most appropriate desktop for you.</label></desktop_dialog>
                     <proposal_modules config:type="list">
                         <proposal_module>hwinfo</proposal_module>
                         <proposal_module>keyboard</proposal_module>
-                        <proposal_module>mouse</proposal_module>
                         <proposal_module>partitions</proposal_module>
                         <proposal_module>software</proposal_module>
                         <proposal_module>bootloader</proposal_module>

diff --git a/control/control.xml b/control/control.xml
@@ -78,7 +78,6 @@ textdomain="control"
             <proposal_modules config:type="list">
                 <proposal_module>hwinfo</proposal_module>
                 <proposal_module>keyboard</proposal_module>
-                <proposal_module>mouse</proposal_module>
                 <proposal_module>partitions</proposal_module>
 		<proposal_module>add-on</proposal_module>
                 <proposal_module>software</proposal_module>
@@ -101,7 +100,6 @@ textdomain="control"
                     <proposal_modules config:type="list">
                         <proposal_module>hwinfo</proposal_module>
                         <proposal_module>keyboard</proposal_module>
-                        <proposal_module>mouse</proposal_module>
                         <proposal_module>partitions</proposal_module>
 			<proposal_module>add-on</proposal_module>
                         <proposal_module>software</proposal_module>

diff --git a/package/yast2-installation.changes b/package/yast2-installation.changes
@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Fri Sep 27 13:52:26 CEST 2013 - jsuchome@suse.cz
+
+- yast2-mouse was dropped, do not call its components (bnc#841960)
+- 3.0.7 
+
 -------------------------------------------------------------------
 Thu Sep 26 10:47:32 CEST 2013 - jsuchome@suse.cz
 

diff --git a/src/clients/inst_finish.rb b/src/clients/inst_finish.rb
@@ -126,7 +126,6 @@ def main
           "label" => _("Copy files to installed system"),
           "steps" => [
             "autoinst_scripts1",
-            "mouse",
             "copy_files",
             "copy_systemfiles",
             # For live installer only