Changeset 4854


Ignore:
Timestamp:
Jul 19, 2011, 3:06:06 PM (9 years ago)
Author:
pmmf
Message:

Fix package install on oem

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

Legend:

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

    r4818 r4854  
    5858  * Dell/recovery_common.py: vendor is dell so work for everything else
    5959  * casper/scripts/99dell_bootstrap, grub/: Disable automatic for debug
    60     purpose"""
    61 
     60    purpose
     61  * casper/: use caixamagica-recovery package and change lang to pt"""
    6262#If we need to change the package source to magicbox
    6363RENAME_PACKAGE="True"
  • packages/cm16/caixamagica-recovery/cmiffy/debdiff.patch

    r4819 r4854  
    11diff -Nru dell-recovery-0.98.1/casper/scripts/99dell_bootstrap caixamagica-recovery-0.98.1xcm1/casper/scripts/99dell_bootstrap
    22--- dell-recovery-0.98.1/casper/scripts/99dell_bootstrap        2011-03-30 19:58:31.000000000 +0100
    3 +++ caixamagica-recovery-0.98.1xcm1/casper/scripts/99dell_bootstrap     2011-07-13 16:12:38.000000000 +0100
     3+++ caixamagica-recovery-0.98.1xcm1/casper/scripts/99dell_bootstrap     2011-07-18 15:09:16.000000000 +0100
    44@@ -62,7 +62,8 @@
    55 
     
    1212 
    1313 #Build custom pool (static and dynamic)
     14@@ -73,7 +74,7 @@
     15 chroot /root /usr/share/dell/scripts/pool.sh
     16 
     17 #install if not installed, otherwise this will upgrade
     18-chroot /root apt-get install dell-recovery -y --no-install-recommends
     19+chroot /root apt-get install caixamagica-recovery -y --no-install-recommends
     20 
     21 #only if we are in factory or bto-a
     22 if chroot /root apt-cache show fist 2>/dev/null 1>/dev/null; then
     23diff -Nru dell-recovery-0.98.1/casper/seeds/ubuntu.seed caixamagica-recovery-0.98.1xcm1/casper/seeds/ubuntu.seed
     24--- dell-recovery-0.98.1/casper/seeds/ubuntu.seed       2011-03-02 20:02:50.000000000 +0000
     25+++ caixamagica-recovery-0.98.1xcm1/casper/seeds/ubuntu.seed    2011-07-18 15:09:38.000000000 +0100
     26@@ -36,10 +36,10 @@
     27 ### Localization
     28 
     29 # Locale sets language and country.
     30- d-i debian-installer/locale string en
     31+ d-i debian-installer/locale string pt
     32 
     33 # Keyboard selection.
     34- d-i keyboard-configuration/layoutcode string us
     35+ d-i keyboard-configuration/layoutcode string pt
     36  d-i keyboard-configuration/variantcode string
     37 
     38 ### Time zone setup
     39@@ -137,7 +137,7 @@
     40 # General stuff
     41 
     42  ubiquity ubiquity/custom_title_text string Dell Recovery
     43- tasksel tasksel/first multiselect ubuntu-desktop
     44+ tasksel tasksel/first multiselect caixamagica-desktop
     45  d-i finish-install/reboot_in_progress note
     46  ubiquity ubiquity/summary note
     47 
    1448diff -Nru dell-recovery-0.98.1/CHANGES caixamagica-recovery-0.98.1xcm1/CHANGES
    1549--- dell-recovery-0.98.1/CHANGES        2011-04-27 02:23:14.000000000 +0100
    16 +++ caixamagica-recovery-0.98.1xcm1/CHANGES     2011-07-13 16:12:38.000000000 +0100
     50+++ caixamagica-recovery-0.98.1xcm1/CHANGES     2011-07-13 16:44:19.000000000 +0100
    1751@@ -1,3 +1,12 @@
    1852+caixamagica-recovery (0.98.1xcm1) horn; urgency=low
     
    3064diff -Nru dell-recovery-0.98.1/debian/caixamagica-recovery-bootloader.dirs caixamagica-recovery-0.98.1xcm1/debian/caixamagica-recovery-bootloader.dirs
    3165--- dell-recovery-0.98.1/debian/caixamagica-recovery-bootloader.dirs    1970-01-01 01:00:00.000000000 +0100
    32 +++ caixamagica-recovery-0.98.1xcm1/debian/caixamagica-recovery-bootloader.dirs 2011-07-13 16:12:38.000000000 +0100
     66+++ caixamagica-recovery-0.98.1xcm1/debian/caixamagica-recovery-bootloader.dirs 2011-07-13 16:44:19.000000000 +0100
    3367@@ -0,0 +1 @@
    3468+var/lib/caixamagica-recovery
    3569diff -Nru dell-recovery-0.98.1/debian/caixamagica-recovery-bootloader.postinst caixamagica-recovery-0.98.1xcm1/debian/caixamagica-recovery-bootloader.postinst
    3670--- dell-recovery-0.98.1/debian/caixamagica-recovery-bootloader.postinst        1970-01-01 01:00:00.000000000 +0100
    37 +++ caixamagica-recovery-0.98.1xcm1/debian/caixamagica-recovery-bootloader.postinst     2011-07-13 16:12:38.000000000 +0100
     71+++ caixamagica-recovery-0.98.1xcm1/debian/caixamagica-recovery-bootloader.postinst     2011-07-13 16:44:19.000000000 +0100
    3872@@ -0,0 +1,40 @@
    3973+#!/bin/sh -e
     
    79113diff -Nru dell-recovery-0.98.1/debian/caixamagica-recovery-bootloader.postrm caixamagica-recovery-0.98.1xcm1/debian/caixamagica-recovery-bootloader.postrm
    80114--- dell-recovery-0.98.1/debian/caixamagica-recovery-bootloader.postrm  1970-01-01 01:00:00.000000000 +0100
    81 +++ caixamagica-recovery-0.98.1xcm1/debian/caixamagica-recovery-bootloader.postrm       2011-07-13 16:12:38.000000000 +0100
     115+++ caixamagica-recovery-0.98.1xcm1/debian/caixamagica-recovery-bootloader.postrm       2011-07-13 16:44:19.000000000 +0100
    82116@@ -0,0 +1,12 @@
    83117+#!/bin/sh
     
    95129diff -Nru dell-recovery-0.98.1/debian/caixamagica-recovery-casper.links caixamagica-recovery-0.98.1xcm1/debian/caixamagica-recovery-casper.links
    96130--- dell-recovery-0.98.1/debian/caixamagica-recovery-casper.links       1970-01-01 01:00:00.000000000 +0100
    97 +++ caixamagica-recovery-0.98.1xcm1/debian/caixamagica-recovery-casper.links    2011-07-13 16:12:38.000000000 +0100
     131+++ caixamagica-recovery-0.98.1xcm1/debian/caixamagica-recovery-casper.links    2011-07-13 16:44:19.000000000 +0100
    98132@@ -0,0 +1 @@
    99133+usr/share/dell/casper/hooks/dell-bootstrap usr/share/initramfs-tools/hooks/dell-bootstrap
    100134diff -Nru dell-recovery-0.98.1/debian/caixamagica-recovery.install caixamagica-recovery-0.98.1xcm1/debian/caixamagica-recovery.install
    101135--- dell-recovery-0.98.1/debian/caixamagica-recovery.install    1970-01-01 01:00:00.000000000 +0100
    102 +++ caixamagica-recovery-0.98.1xcm1/debian/caixamagica-recovery.install 2011-07-13 16:12:38.000000000 +0100
     136+++ caixamagica-recovery-0.98.1xcm1/debian/caixamagica-recovery.install 2011-07-13 16:44:19.000000000 +0100
    103137@@ -0,0 +1,3 @@
    104138+etc
     
    107141diff -Nru dell-recovery-0.98.1/debian/caixamagica-recovery.manpages caixamagica-recovery-0.98.1xcm1/debian/caixamagica-recovery.manpages
    108142--- dell-recovery-0.98.1/debian/caixamagica-recovery.manpages   1970-01-01 01:00:00.000000000 +0100
    109 +++ caixamagica-recovery-0.98.1xcm1/debian/caixamagica-recovery.manpages        2011-07-13 16:12:38.000000000 +0100
     143+++ caixamagica-recovery-0.98.1xcm1/debian/caixamagica-recovery.manpages        2011-07-13 16:44:19.000000000 +0100
    110144@@ -0,0 +1 @@
    111145+dell-recovery.1
    112146diff -Nru dell-recovery-0.98.1/debian/caixamagica-recovery.postinst caixamagica-recovery-0.98.1xcm1/debian/caixamagica-recovery.postinst
    113147--- dell-recovery-0.98.1/debian/caixamagica-recovery.postinst   1970-01-01 01:00:00.000000000 +0100
    114 +++ caixamagica-recovery-0.98.1xcm1/debian/caixamagica-recovery.postinst        2011-07-13 16:12:38.000000000 +0100
     148+++ caixamagica-recovery-0.98.1xcm1/debian/caixamagica-recovery.postinst        2011-07-13 16:44:19.000000000 +0100
    115149@@ -0,0 +1,27 @@
    116150+#!/bin/sh -e
     
    143177diff -Nru dell-recovery-0.98.1/debian/caixamagica-recovery.preinst caixamagica-recovery-0.98.1xcm1/debian/caixamagica-recovery.preinst
    144178--- dell-recovery-0.98.1/debian/caixamagica-recovery.preinst    1970-01-01 01:00:00.000000000 +0100
    145 +++ caixamagica-recovery-0.98.1xcm1/debian/caixamagica-recovery.preinst 2011-07-13 16:12:38.000000000 +0100
     179+++ caixamagica-recovery-0.98.1xcm1/debian/caixamagica-recovery.preinst 2011-07-13 16:44:19.000000000 +0100
    146180@@ -0,0 +1,34 @@
    147181+#!/bin/sh
     
    181215diff -Nru dell-recovery-0.98.1/debian/caixamagica-recovery.templates caixamagica-recovery-0.98.1xcm1/debian/caixamagica-recovery.templates
    182216--- dell-recovery-0.98.1/debian/caixamagica-recovery.templates  1970-01-01 01:00:00.000000000 +0100
    183 +++ caixamagica-recovery-0.98.1xcm1/debian/caixamagica-recovery.templates       2011-07-13 16:12:38.000000000 +0100
     217+++ caixamagica-recovery-0.98.1xcm1/debian/caixamagica-recovery.templates       2011-07-13 16:44:19.000000000 +0100
    184218@@ -0,0 +1,199 @@
    185219+Template: dell-recovery/destination
     
    384418diff -Nru dell-recovery-0.98.1/debian/changelog caixamagica-recovery-0.98.1xcm1/debian/changelog
    385419--- dell-recovery-0.98.1/debian/changelog       2011-04-27 02:23:14.000000000 +0100
    386 +++ caixamagica-recovery-0.98.1xcm1/debian/changelog    2011-07-13 16:12:38.000000000 +0100
    387 @@ -1,3 +1,12 @@
     420+++ caixamagica-recovery-0.98.1xcm1/debian/changelog    2011-07-18 15:10:06.000000000 +0100
     421@@ -1,3 +1,13 @@
    388422+caixamagica-recovery (0.98.1xcm1) horn; urgency=low
    389423+
     
    392426+  * casper/scripts/99dell_bootstrap, grub/: Disable automatic for debug
    393427+    purpose
     428+  * casper/: use caixamagica-recovery package and change lang to pt
    394429+
    395430+ -- Pedro Fragoso <pedro.fragoso@caixamagica.pt>  Wed, 13 Jul 2011 15:02:07 +0100
     
    400435diff -Nru dell-recovery-0.98.1/debian/control caixamagica-recovery-0.98.1xcm1/debian/control
    401436--- dell-recovery-0.98.1/debian/control 2011-04-14 21:37:37.000000000 +0100
    402 +++ caixamagica-recovery-0.98.1xcm1/debian/control      2011-07-13 16:12:38.000000000 +0100
     437+++ caixamagica-recovery-0.98.1xcm1/debian/control      2011-07-13 16:44:19.000000000 +0100
    403438@@ -1,4 +1,4 @@
    404439-Source: dell-recovery
     
    806841diff -Nru dell-recovery-0.98.1/debian/lintian-overrides caixamagica-recovery-0.98.1xcm1/debian/lintian-overrides
    807842--- dell-recovery-0.98.1/debian/lintian-overrides       2010-02-26 23:08:33.000000000 +0000
    808 +++ caixamagica-recovery-0.98.1xcm1/debian/lintian-overrides    2011-07-13 16:12:38.000000000 +0100
     843+++ caixamagica-recovery-0.98.1xcm1/debian/lintian-overrides    2011-07-13 16:44:19.000000000 +0100
    809844@@ -1,3 +1,3 @@
    810845-dell-recovery: no-debconf-config
     
    815850diff -Nru dell-recovery-0.98.1/debian/po/bg.po caixamagica-recovery-0.98.1xcm1/debian/po/bg.po
    816851--- dell-recovery-0.98.1/debian/po/bg.po        2011-02-04 00:44:17.000000000 +0000
    817 +++ caixamagica-recovery-0.98.1xcm1/debian/po/bg.po     2011-07-13 16:12:38.000000000 +0100
     852+++ caixamagica-recovery-0.98.1xcm1/debian/po/bg.po     2011-07-13 16:44:19.000000000 +0100
    818853@@ -1,12 +1,12 @@
    819854-# Bulgarian translation for dell-recovery
     
    10581093diff -Nru dell-recovery-0.98.1/debian/po/cs.po caixamagica-recovery-0.98.1xcm1/debian/po/cs.po
    10591094--- dell-recovery-0.98.1/debian/po/cs.po        2011-02-04 00:44:17.000000000 +0000
    1060 +++ caixamagica-recovery-0.98.1xcm1/debian/po/cs.po     2011-07-13 16:12:38.000000000 +0100
     1095+++ caixamagica-recovery-0.98.1xcm1/debian/po/cs.po     2011-07-13 16:44:19.000000000 +0100
    10611096@@ -1,12 +1,12 @@
    10621097-# Czech translation for dell-recovery
     
    12951330diff -Nru dell-recovery-0.98.1/debian/po/da.po caixamagica-recovery-0.98.1xcm1/debian/po/da.po
    12961331--- dell-recovery-0.98.1/debian/po/da.po        2011-02-04 00:44:17.000000000 +0000
    1297 +++ caixamagica-recovery-0.98.1xcm1/debian/po/da.po     2011-07-13 16:12:38.000000000 +0100
     1332+++ caixamagica-recovery-0.98.1xcm1/debian/po/da.po     2011-07-13 16:44:19.000000000 +0100
    12981333@@ -1,12 +1,12 @@
    12991334-# Danish translation for dell-recovery
     
    15321567diff -Nru dell-recovery-0.98.1/debian/po/de.po caixamagica-recovery-0.98.1xcm1/debian/po/de.po
    15331568--- dell-recovery-0.98.1/debian/po/de.po        2011-02-04 00:44:17.000000000 +0000
    1534 +++ caixamagica-recovery-0.98.1xcm1/debian/po/de.po     2011-07-13 16:12:38.000000000 +0100
     1569+++ caixamagica-recovery-0.98.1xcm1/debian/po/de.po     2011-07-13 16:44:19.000000000 +0100
    15351570@@ -1,12 +1,12 @@
    15361571-# German translation for dell-recovery
     
    17791814diff -Nru dell-recovery-0.98.1/debian/po/es.po caixamagica-recovery-0.98.1xcm1/debian/po/es.po
    17801815--- dell-recovery-0.98.1/debian/po/es.po        2011-02-04 00:44:17.000000000 +0000
    1781 +++ caixamagica-recovery-0.98.1xcm1/debian/po/es.po     2011-07-13 16:12:38.000000000 +0100
     1816+++ caixamagica-recovery-0.98.1xcm1/debian/po/es.po     2011-07-13 16:44:19.000000000 +0100
    17821817@@ -1,12 +1,12 @@
    17831818-# Spanish translation for dell-recovery
     
    20182053diff -Nru dell-recovery-0.98.1/debian/po/et.po caixamagica-recovery-0.98.1xcm1/debian/po/et.po
    20192054--- dell-recovery-0.98.1/debian/po/et.po        2011-02-04 00:44:17.000000000 +0000
    2020 +++ caixamagica-recovery-0.98.1xcm1/debian/po/et.po     2011-07-13 16:12:38.000000000 +0100
     2055+++ caixamagica-recovery-0.98.1xcm1/debian/po/et.po     2011-07-13 16:44:19.000000000 +0100
    20212056@@ -1,12 +1,12 @@
    20222057-# Estonian translation for dell-recovery
     
    22542289diff -Nru dell-recovery-0.98.1/debian/po/fi.po caixamagica-recovery-0.98.1xcm1/debian/po/fi.po
    22552290--- dell-recovery-0.98.1/debian/po/fi.po        2011-02-04 00:44:17.000000000 +0000
    2256 +++ caixamagica-recovery-0.98.1xcm1/debian/po/fi.po     2011-07-13 16:12:38.000000000 +0100
     2291+++ caixamagica-recovery-0.98.1xcm1/debian/po/fi.po     2011-07-13 16:44:19.000000000 +0100
    22572292@@ -1,12 +1,12 @@
    22582293-# Finnish translation for dell-recovery
     
    24952530diff -Nru dell-recovery-0.98.1/debian/po/fr.po caixamagica-recovery-0.98.1xcm1/debian/po/fr.po
    24962531--- dell-recovery-0.98.1/debian/po/fr.po        2011-02-04 00:44:17.000000000 +0000
    2497 +++ caixamagica-recovery-0.98.1xcm1/debian/po/fr.po     2011-07-13 16:12:38.000000000 +0100
     2532+++ caixamagica-recovery-0.98.1xcm1/debian/po/fr.po     2011-07-13 16:44:19.000000000 +0100
    24982533@@ -1,12 +1,12 @@
    24992534-# French translation for dell-recovery
     
    27322767diff -Nru dell-recovery-0.98.1/debian/po/ga.po caixamagica-recovery-0.98.1xcm1/debian/po/ga.po
    27332768--- dell-recovery-0.98.1/debian/po/ga.po        2011-02-04 00:44:17.000000000 +0000
    2734 +++ caixamagica-recovery-0.98.1xcm1/debian/po/ga.po     2011-07-13 16:12:38.000000000 +0100
     2769+++ caixamagica-recovery-0.98.1xcm1/debian/po/ga.po     2011-07-13 16:44:19.000000000 +0100
    27352770@@ -1,12 +1,12 @@
    27362771-# Irish translation for dell-recovery
     
    29693004diff -Nru dell-recovery-0.98.1/debian/po/gl.po caixamagica-recovery-0.98.1xcm1/debian/po/gl.po
    29703005--- dell-recovery-0.98.1/debian/po/gl.po        2011-02-04 00:44:17.000000000 +0000
    2971 +++ caixamagica-recovery-0.98.1xcm1/debian/po/gl.po     2011-07-13 16:12:38.000000000 +0100
     3006+++ caixamagica-recovery-0.98.1xcm1/debian/po/gl.po     2011-07-13 16:44:19.000000000 +0100
    29723007@@ -1,12 +1,12 @@
    29733008-# Galician translation for dell-recovery
     
    32103245diff -Nru dell-recovery-0.98.1/debian/po/hr.po caixamagica-recovery-0.98.1xcm1/debian/po/hr.po
    32113246--- dell-recovery-0.98.1/debian/po/hr.po        2011-02-04 00:44:17.000000000 +0000
    3212 +++ caixamagica-recovery-0.98.1xcm1/debian/po/hr.po     2011-07-13 16:12:38.000000000 +0100
     3247+++ caixamagica-recovery-0.98.1xcm1/debian/po/hr.po     2011-07-13 16:44:19.000000000 +0100
    32133248@@ -1,12 +1,12 @@
    32143249-# Croatian translation for dell-recovery
     
    34483483diff -Nru dell-recovery-0.98.1/debian/po/hu.po caixamagica-recovery-0.98.1xcm1/debian/po/hu.po
    34493484--- dell-recovery-0.98.1/debian/po/hu.po        2011-02-04 00:44:17.000000000 +0000
    3450 +++ caixamagica-recovery-0.98.1xcm1/debian/po/hu.po     2011-07-13 16:12:38.000000000 +0100
     3485+++ caixamagica-recovery-0.98.1xcm1/debian/po/hu.po     2011-07-13 16:44:19.000000000 +0100
    34513486@@ -1,12 +1,12 @@
    34523487-# Hungarian translation for dell-recovery
     
    36883723diff -Nru dell-recovery-0.98.1/debian/po/is.po caixamagica-recovery-0.98.1xcm1/debian/po/is.po
    36893724--- dell-recovery-0.98.1/debian/po/is.po        2011-02-04 00:44:17.000000000 +0000
    3690 +++ caixamagica-recovery-0.98.1xcm1/debian/po/is.po     2011-07-13 16:12:38.000000000 +0100
     3725+++ caixamagica-recovery-0.98.1xcm1/debian/po/is.po     2011-07-13 16:44:19.000000000 +0100
    36913726@@ -1,12 +1,12 @@
    36923727-# Icelandic translation for dell-recovery
     
    39253960diff -Nru dell-recovery-0.98.1/debian/po/it.po caixamagica-recovery-0.98.1xcm1/debian/po/it.po
    39263961--- dell-recovery-0.98.1/debian/po/it.po        2011-02-04 00:44:17.000000000 +0000
    3927 +++ caixamagica-recovery-0.98.1xcm1/debian/po/it.po     2011-07-13 16:12:38.000000000 +0100
     3962+++ caixamagica-recovery-0.98.1xcm1/debian/po/it.po     2011-07-13 16:44:19.000000000 +0100
    39283963@@ -1,12 +1,12 @@
    39293964-# Italian translation for dell-recovery
     
    41694204diff -Nru dell-recovery-0.98.1/debian/po/lt.po caixamagica-recovery-0.98.1xcm1/debian/po/lt.po
    41704205--- dell-recovery-0.98.1/debian/po/lt.po        2011-02-04 00:44:17.000000000 +0000
    4171 +++ caixamagica-recovery-0.98.1xcm1/debian/po/lt.po     2011-07-13 16:12:38.000000000 +0100
     4206+++ caixamagica-recovery-0.98.1xcm1/debian/po/lt.po     2011-07-13 16:44:19.000000000 +0100
    41724207@@ -1,12 +1,12 @@
    41734208-# Lithuanian translation for dell-recovery
     
    44064441diff -Nru dell-recovery-0.98.1/debian/po/lv.po caixamagica-recovery-0.98.1xcm1/debian/po/lv.po
    44074442--- dell-recovery-0.98.1/debian/po/lv.po        2011-02-04 00:44:17.000000000 +0000
    4408 +++ caixamagica-recovery-0.98.1xcm1/debian/po/lv.po     2011-07-13 16:12:38.000000000 +0100
     4443+++ caixamagica-recovery-0.98.1xcm1/debian/po/lv.po     2011-07-13 16:44:19.000000000 +0100
    44094444@@ -1,12 +1,12 @@
    44104445-# Latvian translation for dell-recovery
     
    46454680diff -Nru dell-recovery-0.98.1/debian/po/ms.po caixamagica-recovery-0.98.1xcm1/debian/po/ms.po
    46464681--- dell-recovery-0.98.1/debian/po/ms.po        2011-02-04 00:44:17.000000000 +0000
    4647 +++ caixamagica-recovery-0.98.1xcm1/debian/po/ms.po     2011-07-13 16:12:38.000000000 +0100
     4682+++ caixamagica-recovery-0.98.1xcm1/debian/po/ms.po     2011-07-13 16:44:19.000000000 +0100
    46484683@@ -1,12 +1,12 @@
    46494684-# Malay translation for dell-recovery
     
    48824917diff -Nru dell-recovery-0.98.1/debian/po/nb.po caixamagica-recovery-0.98.1xcm1/debian/po/nb.po
    48834918--- dell-recovery-0.98.1/debian/po/nb.po        2011-02-04 00:44:17.000000000 +0000
    4884 +++ caixamagica-recovery-0.98.1xcm1/debian/po/nb.po     2011-07-13 16:12:38.000000000 +0100
     4919+++ caixamagica-recovery-0.98.1xcm1/debian/po/nb.po     2011-07-13 16:44:19.000000000 +0100
    48854920@@ -1,12 +1,12 @@
    48864921-# Norwegian Bokmal translation for dell-recovery
     
    51195154diff -Nru dell-recovery-0.98.1/debian/po/nl.po caixamagica-recovery-0.98.1xcm1/debian/po/nl.po
    51205155--- dell-recovery-0.98.1/debian/po/nl.po        2011-02-04 00:44:17.000000000 +0000
    5121 +++ caixamagica-recovery-0.98.1xcm1/debian/po/nl.po     2011-07-13 16:12:38.000000000 +0100
     5156+++ caixamagica-recovery-0.98.1xcm1/debian/po/nl.po     2011-07-13 16:44:19.000000000 +0100
    51225157@@ -1,12 +1,12 @@
    51235158-# Dutch translation for dell-recovery
     
    53565391diff -Nru dell-recovery-0.98.1/debian/po/pl.po caixamagica-recovery-0.98.1xcm1/debian/po/pl.po
    53575392--- dell-recovery-0.98.1/debian/po/pl.po        2011-02-04 00:44:17.000000000 +0000
    5358 +++ caixamagica-recovery-0.98.1xcm1/debian/po/pl.po     2011-07-13 16:12:38.000000000 +0100
     5393+++ caixamagica-recovery-0.98.1xcm1/debian/po/pl.po     2011-07-13 16:44:19.000000000 +0100
    53595394@@ -1,12 +1,12 @@
    53605395-# Polish translation for dell-recovery
     
    55935628diff -Nru dell-recovery-0.98.1/debian/po/POTFILES.in caixamagica-recovery-0.98.1xcm1/debian/po/POTFILES.in
    55945629--- dell-recovery-0.98.1/debian/po/POTFILES.in  2011-01-04 20:48:31.000000000 +0000
    5595 +++ caixamagica-recovery-0.98.1xcm1/debian/po/POTFILES.in       2011-07-13 16:12:38.000000000 +0100
     5630+++ caixamagica-recovery-0.98.1xcm1/debian/po/POTFILES.in       2011-07-13 16:44:19.000000000 +0100
    55965631@@ -1,2 +1,2 @@
    55975632-[type: gettext/rfc822deb] dell-recovery.templates
     
    56005635diff -Nru dell-recovery-0.98.1/debian/po/pt_BR.po caixamagica-recovery-0.98.1xcm1/debian/po/pt_BR.po
    56015636--- dell-recovery-0.98.1/debian/po/pt_BR.po     2011-02-04 00:44:17.000000000 +0000
    5602 +++ caixamagica-recovery-0.98.1xcm1/debian/po/pt_BR.po  2011-07-13 16:12:38.000000000 +0100
     5637+++ caixamagica-recovery-0.98.1xcm1/debian/po/pt_BR.po  2011-07-13 16:44:19.000000000 +0100
    56035638@@ -1,12 +1,12 @@
    56045639-# Brazilian Portuguese translation for dell-recovery
     
    58375872diff -Nru dell-recovery-0.98.1/debian/po/pt.po caixamagica-recovery-0.98.1xcm1/debian/po/pt.po
    58385873--- dell-recovery-0.98.1/debian/po/pt.po        2011-02-04 00:44:17.000000000 +0000
    5839 +++ caixamagica-recovery-0.98.1xcm1/debian/po/pt.po     2011-07-13 16:12:38.000000000 +0100
     5874+++ caixamagica-recovery-0.98.1xcm1/debian/po/pt.po     2011-07-13 16:44:19.000000000 +0100
    58405875@@ -1,12 +1,12 @@
    58415876-# Portuguese translation for dell-recovery
     
    60746109diff -Nru dell-recovery-0.98.1/debian/po/ru.po caixamagica-recovery-0.98.1xcm1/debian/po/ru.po
    60756110--- dell-recovery-0.98.1/debian/po/ru.po        2011-02-10 06:16:41.000000000 +0000
    6076 +++ caixamagica-recovery-0.98.1xcm1/debian/po/ru.po     2011-07-13 16:12:38.000000000 +0100
     6111+++ caixamagica-recovery-0.98.1xcm1/debian/po/ru.po     2011-07-13 16:44:19.000000000 +0100
    60776112@@ -1,11 +1,11 @@
    60786113-# Russian translation for dell-recovery
     
    63096344diff -Nru dell-recovery-0.98.1/debian/po/sk.po caixamagica-recovery-0.98.1xcm1/debian/po/sk.po
    63106345--- dell-recovery-0.98.1/debian/po/sk.po        2011-02-04 00:44:17.000000000 +0000
    6311 +++ caixamagica-recovery-0.98.1xcm1/debian/po/sk.po     2011-07-13 16:12:38.000000000 +0100
     6346+++ caixamagica-recovery-0.98.1xcm1/debian/po/sk.po     2011-07-13 16:44:19.000000000 +0100
    63126347@@ -1,12 +1,12 @@
    63136348-# Slovak translation for dell-recovery
     
    65466581diff -Nru dell-recovery-0.98.1/debian/po/sq.po caixamagica-recovery-0.98.1xcm1/debian/po/sq.po
    65476582--- dell-recovery-0.98.1/debian/po/sq.po        2011-02-04 00:44:17.000000000 +0000
    6548 +++ caixamagica-recovery-0.98.1xcm1/debian/po/sq.po     2011-07-13 16:12:38.000000000 +0100
     6583+++ caixamagica-recovery-0.98.1xcm1/debian/po/sq.po     2011-07-13 16:44:19.000000000 +0100
    65496584@@ -1,12 +1,12 @@
    65506585-# Albanian translation for dell-recovery
     
    67836818diff -Nru dell-recovery-0.98.1/debian/po/sv.po caixamagica-recovery-0.98.1xcm1/debian/po/sv.po
    67846819--- dell-recovery-0.98.1/debian/po/sv.po        2011-02-04 00:44:17.000000000 +0000
    6785 +++ caixamagica-recovery-0.98.1xcm1/debian/po/sv.po     2011-07-13 16:12:38.000000000 +0100
     6820+++ caixamagica-recovery-0.98.1xcm1/debian/po/sv.po     2011-07-13 16:44:19.000000000 +0100
    67866821@@ -1,12 +1,12 @@
    67876822-# Swedish translation for dell-recovery
     
    70287063diff -Nru dell-recovery-0.98.1/debian/po/templates.pot caixamagica-recovery-0.98.1xcm1/debian/po/templates.pot
    70297064--- dell-recovery-0.98.1/debian/po/templates.pot        2011-01-11 01:55:37.000000000 +0000
    7030 +++ caixamagica-recovery-0.98.1xcm1/debian/po/templates.pot     2011-07-13 16:12:38.000000000 +0100
     7065+++ caixamagica-recovery-0.98.1xcm1/debian/po/templates.pot     2011-07-13 16:44:19.000000000 +0100
    70317066@@ -7,7 +7,7 @@
    70327067 msgid ""
     
    72567291diff -Nru dell-recovery-0.98.1/debian/po/tr.po caixamagica-recovery-0.98.1xcm1/debian/po/tr.po
    72577292--- dell-recovery-0.98.1/debian/po/tr.po        2011-02-04 00:44:17.000000000 +0000
    7258 +++ caixamagica-recovery-0.98.1xcm1/debian/po/tr.po     2011-07-13 16:12:38.000000000 +0100
     7293+++ caixamagica-recovery-0.98.1xcm1/debian/po/tr.po     2011-07-13 16:44:19.000000000 +0100
    72597294@@ -1,12 +1,12 @@
    72607295-# Turkish translation for dell-recovery
     
    75017536diff -Nru dell-recovery-0.98.1/debian/po/uk.po caixamagica-recovery-0.98.1xcm1/debian/po/uk.po
    75027537--- dell-recovery-0.98.1/debian/po/uk.po        2011-02-04 00:44:17.000000000 +0000
    7503 +++ caixamagica-recovery-0.98.1xcm1/debian/po/uk.po     2011-07-13 16:12:38.000000000 +0100
     7538+++ caixamagica-recovery-0.98.1xcm1/debian/po/uk.po     2011-07-13 16:44:19.000000000 +0100
    75047539@@ -1,12 +1,12 @@
    75057540-# Ukrainian translation for dell-recovery
     
    77517786diff -Nru dell-recovery-0.98.1/debian/po/zh_CN.po caixamagica-recovery-0.98.1xcm1/debian/po/zh_CN.po
    77527787--- dell-recovery-0.98.1/debian/po/zh_CN.po     2011-02-04 00:44:17.000000000 +0000
    7753 +++ caixamagica-recovery-0.98.1xcm1/debian/po/zh_CN.po  2011-07-13 16:12:38.000000000 +0100
     7788+++ caixamagica-recovery-0.98.1xcm1/debian/po/zh_CN.po  2011-07-13 16:44:19.000000000 +0100
    77547789@@ -1,12 +1,12 @@
    77557790-# Simplified Chinese translation for dell-recovery
     
    79968031diff -Nru dell-recovery-0.98.1/debian/po/zh_TW.po caixamagica-recovery-0.98.1xcm1/debian/po/zh_TW.po
    79978032--- dell-recovery-0.98.1/debian/po/zh_TW.po     2011-02-04 00:44:17.000000000 +0000
    7998 +++ caixamagica-recovery-0.98.1xcm1/debian/po/zh_TW.po  2011-07-13 16:12:38.000000000 +0100
     8033+++ caixamagica-recovery-0.98.1xcm1/debian/po/zh_TW.po  2011-07-13 16:44:19.000000000 +0100
    79998034@@ -1,12 +1,12 @@
    80008035-# Chinese (Traditional) translation for dell-recovery
     
    82338268diff -Nru dell-recovery-0.98.1/Dell/recovery_advanced_gtk.py caixamagica-recovery-0.98.1xcm1/Dell/recovery_advanced_gtk.py
    82348269--- dell-recovery-0.98.1/Dell/recovery_advanced_gtk.py  2011-02-10 22:20:35.000000000 +0000
    8235 +++ caixamagica-recovery-0.98.1xcm1/Dell/recovery_advanced_gtk.py       2011-07-13 16:24:00.000000000 +0100
     8270+++ caixamagica-recovery-0.98.1xcm1/Dell/recovery_advanced_gtk.py       2011-07-13 16:44:19.000000000 +0100
    82368271@@ -615,7 +615,7 @@
    82378272                         self.builder_fid_overlay) or self.add_dell_recovery_deb:
     
    82548289diff -Nru dell-recovery-0.98.1/Dell/recovery_backend.py caixamagica-recovery-0.98.1xcm1/Dell/recovery_backend.py
    82558290--- dell-recovery-0.98.1/Dell/recovery_backend.py       2011-04-07 23:41:38.000000000 +0100
    8256 +++ caixamagica-recovery-0.98.1xcm1/Dell/recovery_backend.py    2011-07-13 16:26:06.000000000 +0100
     8291+++ caixamagica-recovery-0.98.1xcm1/Dell/recovery_backend.py    2011-07-13 16:47:40.000000000 +0100
    82578292@@ -292,15 +292,15 @@
    82588293             from debian_bundle import debian_support
     
    82748309         else:
    82758310             logging.debug("_test_for_new_dell_recovery: RP Distro %s doesn't match our distro %s, not injecting updated package", rp_distro, package_distro)
     8311@@ -540,7 +540,7 @@
     8312                 os.makedirs(dest)
     8313             if 'dpkg-repack' in dell_recovery_package:
     8314                 logging.debug("Repacking dell-recovery using dpkg-repack")
     8315-                call = subprocess.Popen(['dpkg-repack', 'dell-recovery'], cwd=dest)
     8316+                call = subprocess.Popen(['dpkg-repack', 'caixamagica-recovery'], cwd=dest)
     8317                 (out, err) = call.communicate()
     8318             else:
     8319                 logging.debug("Adding manually included dell-recovery package, %s", dell_recovery_package)
    82768320@@ -712,7 +712,7 @@
    82778321         def check_mentions(feed):
     
    83128356diff -Nru dell-recovery-0.98.1/Dell/recovery_common.py caixamagica-recovery-0.98.1xcm1/Dell/recovery_common.py
    83138357--- dell-recovery-0.98.1/Dell/recovery_common.py        2011-04-25 18:53:26.000000000 +0100
    8314 +++ caixamagica-recovery-0.98.1xcm1/Dell/recovery_common.py     2011-07-13 16:12:38.000000000 +0100
    8315 @@ -144,7 +144,8 @@
     8358+++ caixamagica-recovery-0.98.1xcm1/Dell/recovery_common.py     2011-07-13 17:08:45.000000000 +0100
     8359@@ -144,12 +144,13 @@
    83168360     """Checks to make sure that the app is running on Dell HW"""
    83178361     if os.path.exists('/sys/class/dmi/id/bios_vendor'):
     
    83238367         vendor = ''
    83248368     return ((vendor == 'dell') or (vendor == 'alienware'))
     8369 
     8370-def check_version(package='dell-recovery'):
     8371+def check_version(package='caixamagica-recovery'):
     8372     """Queries the package management system for the current tool version"""
     8373     try:
     8374         import apt.cache
    83258375diff -Nru dell-recovery-0.98.1/grub/99_dell_recovery caixamagica-recovery-0.98.1xcm1/grub/99_dell_recovery
    83268376--- dell-recovery-0.98.1/grub/99_dell_recovery  2011-01-07 23:23:21.000000000 +0000
    8327 +++ caixamagica-recovery-0.98.1xcm1/grub/99_dell_recovery       2011-07-13 16:12:38.000000000 +0100
     8377+++ caixamagica-recovery-0.98.1xcm1/grub/99_dell_recovery       2011-07-13 16:44:19.000000000 +0100
    83288378@@ -8,7 +8,7 @@
    83298379         if [ -s /boot/grub/common.cfg ]; then
     
    83378387diff -Nru dell-recovery-0.98.1/grub/common.cfg caixamagica-recovery-0.98.1xcm1/grub/common.cfg
    83388388--- dell-recovery-0.98.1/grub/common.cfg        2011-03-02 20:03:30.000000000 +0000
    8339 +++ caixamagica-recovery-0.98.1xcm1/grub/common.cfg     2011-07-13 16:12:38.000000000 +0100
     8389+++ caixamagica-recovery-0.98.1xcm1/grub/common.cfg     2011-07-13 16:44:19.000000000 +0100
    83408390@@ -1 +1 @@
    83418391-set options="boot=casper automatic-ubiquity noprompt quiet splash nomodeset -- #EXTRA#"
     
    83438393diff -Nru dell-recovery-0.98.1/grub/recovery_partition.cfg caixamagica-recovery-0.98.1xcm1/grub/recovery_partition.cfg
    83448394--- dell-recovery-0.98.1/grub/recovery_partition.cfg    2011-02-10 23:33:20.000000000 +0000
    8345 +++ caixamagica-recovery-0.98.1xcm1/grub/recovery_partition.cfg 2011-07-13 16:12:38.000000000 +0100
     8395+++ caixamagica-recovery-0.98.1xcm1/grub/recovery_partition.cfg 2011-07-13 16:44:19.000000000 +0100
    83468396@@ -39,7 +39,7 @@
    83478397     if [ -s /boot/grub/common.cfg ]; then
Note: See TracChangeset for help on using the changeset viewer.