Changeset 4885


Ignore:
Timestamp:
Jul 25, 2011, 6:26:53 PM (9 years ago)
Author:
pmmf
Message:

Add icon, fix package install, hide interactive window

Location:
packages/cm16/caixamagica-recovery
Files:
4 added
2 edited

Legend:

Unmodified
Added
Removed
  • packages/cm16/caixamagica-recovery/cmiffy/cmiffy

    r4854 r4885  
    3838# RENAME_DIRS = {'debian/old_name1/' : 'debian/new_name1/'}
    3939
    40 FILES_ADD = {}
     40FILES_ADD = {'dell-dvd.svg':'gtk/dell-dvd.svg'}
    4141FILES_DEL = []
    4242RENAME_DIRS = {}
     
    5959  * casper/scripts/99dell_bootstrap, grub/: Disable automatic for debug
    6060    purpose
    61   * casper/: use caixamagica-recovery package and change lang to pt"""
     61  * casper/: use caixamagica-recovery package and change lang to pt
     62  * ubiquity/dell-bootstrap.py: Don't show interactive recovery
     63  * gtk/dell-recovery: use our logo"""
    6264#If we need to change the package source to magicbox
    6365RENAME_PACKAGE="True"
  • packages/cm16/caixamagica-recovery/cmiffy/debdiff.patch

    r4861 r4885  
    418418diff -Nru dell-recovery-0.98.1/debian/changelog caixamagica-recovery-0.98.1xcm1/debian/changelog
    419419--- dell-recovery-0.98.1/debian/changelog       2011-04-27 02:23:14.000000000 +0100
    420 +++ caixamagica-recovery-0.98.1xcm1/debian/changelog    2011-07-18 15:10:06.000000000 +0100
    421 @@ -1,3 +1,13 @@
     420+++ caixamagica-recovery-0.98.1xcm1/debian/changelog    2011-07-25 18:24:50.000000000 +0100
     421@@ -1,3 +1,15 @@
    422422+caixamagica-recovery (0.98.1xcm1) horn; urgency=low
    423423+
     
    427427+    purpose
    428428+  * casper/: use caixamagica-recovery package and change lang to pt
     429+  * ubiquity/dell-bootstrap.py: Don't show interactive recovery
     430+  * gtk/dell-recovery: use our logo
    429431+
    430432+ -- Pedro Fragoso <pedro.fragoso@caixamagica.pt>  Wed, 13 Jul 2011 15:02:07 +0100
     
    84148416diff -Nru dell-recovery-0.98.1/ubiquity/dell-bootstrap.py caixamagica-recovery-0.98.1xcm1/ubiquity/dell-bootstrap.py
    84158417--- dell-recovery-0.98.1/ubiquity/dell-bootstrap.py     2011-04-27 01:47:50.000000000 +0100
    8416 +++ caixamagica-recovery-0.98.1xcm1/ubiquity/dell-bootstrap.py  2011-07-20 16:00:44.000000000 +0100
    8417 @@ -1499,7 +1499,7 @@
     8418+++ caixamagica-recovery-0.98.1xcm1/ubiquity/dell-bootstrap.py  2011-07-25 18:24:16.000000000 +0100
     8419@@ -230,7 +230,8 @@
     8420         if value == "automatic":
     8421             self.automated_recovery.set_active(True)
     8422         elif value == "interactive":
     8423-            self.interactive_recovery.set_active(True)
     8424+            self.interactive_recovery.set_active(False)
     8425+            self.interactive_recovery_box.hide() #We don't need user interaction
     8426         elif value == "factory":
     8427             self.plugin_widgets.hide()
     8428         else:
     8429@@ -1499,7 +1500,7 @@
    84188430         bto_version = self.xml_obj.fetch_node_contents('iso')
    84198431         bto_date = self.xml_obj.fetch_node_contents('date')
     
    84248436             self.xml_obj.replace_node_contents('bootstrap', dr_version)
    84258437             self.xml_obj.replace_node_contents('ubiquity' , ubi_version)
    8426 @@ -1825,7 +1825,7 @@
     8438@@ -1825,7 +1826,7 @@
    84278439 
    84288440         if dual:
     
    84338445                     to_install.remove(package)
    84348446                     to_remove.append(package)
    8435 @@ -1841,7 +1841,7 @@
     8447@@ -1841,7 +1842,7 @@
    84368448 
    84378449         #install dell-recovery in non dual mode only if there is an RP
    84388450         elif rec_part:
    84398451-            to_install.append('dell-recovery')
    8440 +            to_install.append('caixamagica-recovery')
     8452+            #to_install.append('caixamagica-recovery')
    84418453 
    84428454             #block os-prober in grub-installer
Note: See TracChangeset for help on using the changeset viewer.