Changeset 9697


Ignore:
Timestamp:
Jun 14, 2013, 12:31:52 PM (6 years ago)
Author:
fasma
Message:

For CM20

File:
1 edited

Legend:

Unmodified
Added
Removed
  • soft/wubi/cmiffy/caixamagica.patch

    r8694 r9697  
    11diff -Naur wubi_orig/data/custom-installation/hooks/failure-command.sh wubi_patched/data/custom-installation/hooks/failure-command.sh
    2 --- wubi_orig/data/custom-installation/hooks/failure-command.sh 2013-01-31 15:14:04.705964000 +0000
    3 +++ wubi_patched/data/custom-installation/hooks/failure-command.sh      2013-01-31 15:14:05.611697354 +0000
     2--- wubi_orig/data/custom-installation/hooks/failure-command.sh 2013-06-14 12:27:02.813926000 +0100
     3+++ wubi_patched/data/custom-installation/hooks/failure-command.sh      2013-06-14 12:27:03.671649925 +0100
    44@@ -1,14 +1,14 @@
    55 #!/bin/sh
     
    2323 elif [ -x /usr/bin/kdialog ]; then
    2424diff -Naur wubi_orig/data/custom-installation/hooks/success-command.sh wubi_patched/data/custom-installation/hooks/success-command.sh
    25 --- wubi_orig/data/custom-installation/hooks/success-command.sh 2013-01-31 15:14:04.705964000 +0000
    26 +++ wubi_patched/data/custom-installation/hooks/success-command.sh      2013-01-31 15:14:05.611697354 +0000
     25--- wubi_orig/data/custom-installation/hooks/success-command.sh 2013-06-14 12:27:02.813926000 +0100
     26+++ wubi_patched/data/custom-installation/hooks/success-command.sh      2013-06-14 12:27:03.671649925 +0100
    2727@@ -29,7 +29,7 @@
    2828 fi
     
    3737 
    3838diff -Naur wubi_orig/data/isolist.ini wubi_patched/data/isolist.ini
    39 --- wubi_orig/data/isolist.ini  2013-01-31 15:14:04.705964000 +0000
    40 +++ wubi_patched/data/isolist.ini       2013-01-31 15:32:29.755738339 +0000
     39--- wubi_orig/data/isolist.ini  2013-06-14 12:27:02.813926000 +0100
     40+++ wubi_patched/data/isolist.ini       2013-06-14 12:32:33.203662156 +0100
    4141@@ -1,5 +1,5 @@
    4242 [DEFAULT]
    4343-version=13.04
    44 +version=19
     44+version=20
    4545 info_file=.disk/info
    4646 kernel=casper/vmlinuz
    4747 initrd=casper/initrd.lz
    48 @@ -9,140 +9,64 @@
     48@@ -9,137 +9,28 @@
    4949 metalink_md5sums_signature=MD5SUMS-metalink.gpg
    5050 size=0
     
    5656-support=http://www.ubuntu.com/support
    5757-installation_dir=ubuntu
    58 +support=http://suporte.caixamagica.pt
     58+support=http://suorte.caixamagica.pt
    5959+installation_dir=caixamagica
    6060 #NOTE: installation_dir must also be changed in data/wubildr.cfg
     
    6868-#metalink=http://releases.ubuntu.com/13.04/ubuntu-13.04-beta-desktop-i386.metalink
    6969-metalink2=http://cdimage.ubuntu.com/daily-live/current/raring-desktop-i386.metalink
    70 -diskimage=http://releases.ubuntu.com/13.04/ubuntu-13.04-wubi-i386.tar.xz
    71 -diskimage2=http://cdimage.ubuntu.com/wubi/current/i386.tar.xz
    7270-website=http://www.ubuntu.com
    7371+name=CaixaMagica
    7472+packages=caixamagica-desktop
    75 +metalink=http://ftp.caixamagica.pt/19/oficial/iso/caixamagica-19-desktop-i386-gnome-dvd.metalink
    76 +metalink2=ftp://ftp.caixamagica.pt/19/oficial/iso/caixamagica-19-desktop-i386-gnome-dvd.metalink
     73+metalink=http://ftp.caixamagica.pt/20/oficial/iso/caixamagica-20-desktop-i386-gnome-dvd.metalink
     74+metalink2=ftp://ftp.caixamagica.pt/20/oficial/iso/caixamagica-20-desktop-i386-gnome-dvd.metalink
    7775+website=http://www.caixamagica.pt
    7876 ordering=1
     
    8381-name=Ubuntu
    8482-packages=ubuntu-desktop
     83-kernel=casper/vmlinuz.efi
    8584-metalink=http://releases.ubuntu.com/13.04/ubuntu-13.04-desktop-amd64.metalink
    8685-#metalink=http://releases.ubuntu.com/13.04/ubuntu-13.04-beta-desktop-amd64.metalink
    8786-metalink2=http://cdimage.ubuntu.com/daily-live/current/raring-desktop-amd64.metalink
    88 -diskimage=http://releases.ubuntu.com/13.04/ubuntu-13.04-wubi-amd64.tar.xz
    89 -diskimage2=http://cdimage.ubuntu.com/wubi/current/amd64.tar.xz
    9087-website=http://www.ubuntu.com
    9188+name=CaixaMagica
    9289+packages=caixamagica-desktop
    93 +metalink=http://ftp.caixamagica.pt/19/oficial/iso/caixamagica-19-desktop-amd64-gnome-dvd.metalink
    94 +metalink2=ftp://ftp.caixamagica.pt/19/oficial/iso/caixamagica-19-desktop-amd64-gnome-dvd.metalink
     90+metalink=http://ftp.caixamagica.pt/20/oficial/iso/caixamagica-20-desktop-amd64-gnome-dvd.metalink
     91+metalink2=ftp://ftp.caixamagica.pt/20/oficial/iso/caixamagica-20-desktop-amd64-gnome-dvd.metalink
    9592+website=http://www.caixamagica.pt
    9693 ordering=1
    9794 
    9895-[Kubuntu-i386]
    99 +[CaixaMagicaKDE-i386]
    100  arch=i386
     96-arch=i386
    10197-name=Kubuntu
    10298-packages=kubuntu-desktop
     
    104100-metalink2=http://cdimage.ubuntu.com/kubuntu/daily-live/current/raring-desktop-i386.metalink
    105101-website=http://www.kubuntu.org
    106 +name=CaixaMagicaKDE
    107 +packages=caixamagicakde-desktop
    108 +metalink=http://ftp.caixamagica.pt/19/oficial/iso/caixamagica-19-desktop-i386-kde-dvd.metalink
    109 +metalink2=ftp://ftp.caixamagica.pt/19/oficial/iso/caixamagica-19-desktop-i386-kde-dvd.metalink
    110 +website=http://www.caixamagica.pt
    111  ordering=3
    112  
     102-ordering=3
     103-
    113104-[Kubuntu-amd64]
    114 +[CaixaMagicaKDE-amd64]
    115  arch=amd64
     105-arch=amd64
    116106-name=Kubuntu
    117107-packages=kubuntu-desktop
     
    119109-metalink2=http://cdimage.ubuntu.com/kubuntu/daily-live/current/raring-desktop-amd64.metalink
    120110-website=http://www.kubuntu.org
    121 +name=CaixaMagicaKDE
    122 +packages=caixamagicakde-desktop
    123 +metalink=http://ftp.caixamagica.pt/19/oficial/iso/caixamagica-19-desktop-amd64-kde-dvd.metalink
    124 +metalink2=ftp://ftp.caixamagica.pt/19/oficial/iso/caixamagica-19-desktop-amd64-kde-dvd.metalink
    125 +website=http://www.caixamagica.pt
    126  ordering=3
    127  
     111-ordering=3
     112-
    128113-[Mythbuntu-i386]
    129 +[CaixaMagicaLXDE-i386]
    130  arch=i386
     114-arch=i386
    131115-name=Mythbuntu
    132116-packages=ubuntu-standard
     
    178162-metalink2=http://cdimage.ubuntu.com/lubuntu/daily-live/current/raring-desktop-i386.metalink
    179163-website=http://lubuntu.net
    180 +name=CaixaMagicaLXDE
    181 +packages=caixamagicalxde-desktop
    182 +metalink=http://ftp.caixamagica.pt/19/oficial/iso/caixamagica-19-desktop-i386-lxde-dvd.metalink
    183 +metalink2=ftp://ftp.caixamagica.pt/19/oficial/iso/caixamagica-19-desktop-i386-lxde-dvd.metalink
    184 +website=http://www.caixamagica.pt
    185  ordering=7
    186  
     164-ordering=7
     165-
    187166-[Lubuntu-amd64]
    188 +[CaixaMagicaLXDE-amd64]
    189  arch=amd64
     167-arch=amd64
    190168-name=Lubuntu
    191169-packages=lubuntu-desktop
     
    193171-metalink2=http://cdimage.ubuntu.com/lubuntu/daily-live/current/raring-desktop-amd64.metalink
    194172-website=http://lubuntu.net
    195 +name=CaixaMagicaLXDE
    196 +packages=caixamagicalxde-desktop
    197 +metalink=http://ftp.caixamagica.pt/19/oficial/iso/caixamagica-19-desktop-amd64-lxde-dvd.metalink
    198 +metalink2=ftp://ftp.caixamagica.pt/19/oficial/iso/caixamagica-19-desktop-amd64-lxde-dvd.metalink
    199 +website=http://www.caixamagica.pt
    200  ordering=7
    201  
    202 -[Ubuntu-Studio-i386]
     173-ordering=7
     174-
     175-[Ubuntu Studio-i386]
    203176-min_iso_size=1500000000
    204177-max_iso_size=3500000000
     
    206179-min_memory_mb=512
    207180-arch=i386
    208 -name=Ubuntu-Studio
     181-name=Ubuntu Studio
    209182-packages=ubuntustudio-desktop
    210183-metalink=http://cdimage.ubuntu.com/ubuntustudio/releases/13.04/release/ubuntustudio-13.04-dvd-i386.metalink
     
    213186-ordering=8
    214187-
    215 -[Ubuntu-Studio-amd64]
     188-[Ubuntu Studio-amd64]
    216189-min_iso_size=1500000000
    217190-max_iso_size=3500000000
     
    219192-min_memory_mb=512
    220193-arch=amd64
    221 -name=Ubuntu-Studio
     194-name=Ubuntu Studio
    222195-packages=ubuntustudio-desktop
    223196-metalink=http://cdimage.ubuntu.com/ubuntustudio/releases/13.04/release/ubuntustudio-13.04-dvd-amd64.metalink
     
    227200-
    228201diff -Naur wubi_orig/data/menu.winboot wubi_patched/data/menu.winboot
    229 --- wubi_orig/data/menu.winboot 2013-01-31 15:14:04.705964000 +0000
    230 +++ wubi_patched/data/menu.winboot      2013-01-31 15:14:05.611697354 +0000
     202--- wubi_orig/data/menu.winboot 2013-06-14 12:27:02.813926000 +0100
     203+++ wubi_patched/data/menu.winboot      2013-06-14 12:27:03.675649925 +0100
    231204@@ -4,14 +4,14 @@
    232205 timeout 0
     
    252225diff -Naur wubi_orig/data/preseed.caixamagicamyth wubi_patched/data/preseed.caixamagicamyth
    253226--- wubi_orig/data/preseed.caixamagicamyth      1970-01-01 01:00:00.000000000 +0100
    254 +++ wubi_patched/data/preseed.caixamagicamyth   2013-01-31 15:14:05.611697354 +0000
     227+++ wubi_patched/data/preseed.caixamagicamyth   2013-06-14 12:27:03.675649925 +0100
    255228@@ -0,0 +1,104 @@
    256229+## LOCALE
     
    359332+
    360333diff -Naur wubi_orig/data/preseed.disk wubi_patched/data/preseed.disk
    361 --- wubi_orig/data/preseed.disk 2013-01-31 15:14:04.705964000 +0000
    362 +++ wubi_patched/data/preseed.disk      2013-01-31 15:14:05.611697354 +0000
     334--- wubi_orig/data/preseed.disk 2013-06-14 12:27:02.813926000 +0100
     335+++ wubi_patched/data/preseed.disk      2013-06-14 12:27:03.675649925 +0100
    363336@@ -4,7 +4,7 @@
    364337 d-i passwd/username string $(username)
     
    371344 d-i keyboard-configuration/variantcode string $(keyboard_variant)
    372345diff -Naur wubi_orig/data/preseed.lupin wubi_patched/data/preseed.lupin
    373 --- wubi_orig/data/preseed.lupin        2013-01-31 15:14:04.705964000 +0000
    374 +++ wubi_patched/data/preseed.lupin     2013-01-31 15:18:21.627706855 +0000
     346--- wubi_orig/data/preseed.lupin        2013-06-14 12:27:02.813926000 +0100
     347+++ wubi_patched/data/preseed.lupin     2013-06-14 12:27:03.675649925 +0100
    375348@@ -8,8 +8,8 @@
    376349 d-i netcfg/choose_interface select auto
     
    394367 $(partitioning)
    395368diff -Naur wubi_orig/data/wubildr.cfg wubi_patched/data/wubildr.cfg
    396 --- wubi_orig/data/wubildr.cfg  2013-01-31 15:14:04.705964000 +0000
    397 +++ wubi_patched/data/wubildr.cfg       2013-01-31 15:14:05.611697354 +0000
     369--- wubi_orig/data/wubildr.cfg  2013-06-14 12:27:02.813926000 +0100
     370+++ wubi_patched/data/wubildr.cfg       2013-06-14 12:27:03.675649925 +0100
    398371@@ -1,7 +1,7 @@
    399372 set show_panic_message=true
     
    440413     echo "Then try again."
    441414diff -Naur wubi_orig/data/wubildr-disk.cfg wubi_patched/data/wubildr-disk.cfg
    442 --- wubi_orig/data/wubildr-disk.cfg     2013-01-31 15:14:04.705964000 +0000
    443 +++ wubi_patched/data/wubildr-disk.cfg  2013-01-31 15:14:05.611697354 +0000
     415--- wubi_orig/data/wubildr-disk.cfg     2013-06-14 12:27:02.813926000 +0100
     416+++ wubi_patched/data/wubildr-disk.cfg  2013-06-14 12:27:03.675649925 +0100
    444417@@ -1,7 +1,7 @@
    445418-loopback loop0 /ubuntu/disks/root.disk
     
    454427 boot
    455428diff -Naur wubi_orig/debian/control wubi_patched/debian/control
    456 --- wubi_orig/debian/control    2013-01-31 15:14:04.705964000 +0000
    457 +++ wubi_patched/debian/control 2013-01-31 15:14:05.611697354 +0000
     429--- wubi_orig/debian/control    2013-06-14 12:27:02.813926000 +0100
     430+++ wubi_patched/debian/control 2013-06-14 12:27:03.675649925 +0100
    458431@@ -11,4 +11,4 @@
    459432 Depends: ${python:Depends}, ${shlibs:Depends}
     
    463436+Description: Wubi is the Windows Ubuntu/Caixa Magica Installer
    464437diff -Naur wubi_orig/debian/control.autoppa wubi_patched/debian/control.autoppa
    465 --- wubi_orig/debian/control.autoppa    2013-01-31 15:14:04.705964000 +0000
    466 +++ wubi_patched/debian/control.autoppa 2013-01-31 15:14:05.611697354 +0000
     438--- wubi_orig/debian/control.autoppa    2013-06-14 12:27:02.813926000 +0100
     439+++ wubi_patched/debian/control.autoppa 2013-06-14 12:27:03.675649925 +0100
    467440@@ -12,4 +12,4 @@
    468441 Depends: ${python:Depends}, ${shlibs:Depends}
     
    472445+Description: Wubi is the Windows Ubuntu/Caixa Magica Installer
    473446diff -Naur wubi_orig/po/pt.po wubi_patched/po/pt.po
    474 --- wubi_orig/po/pt.po  2013-01-31 15:14:04.705964000 +0000
    475 +++ wubi_patched/po/pt.po       2013-01-31 15:14:05.615697353 +0000
     447--- wubi_orig/po/pt.po  2013-06-14 12:27:02.813926000 +0100
     448+++ wubi_patched/po/pt.po       2013-06-14 12:27:03.675649925 +0100
    476449@@ -51,7 +51,7 @@
    477450 
     
    641614 msgid "Please wait"
    642615diff -Naur wubi_orig/README wubi_patched/README
    643 --- wubi_orig/README    2013-01-31 15:14:04.705964000 +0000
    644 +++ wubi_patched/README 2013-01-31 15:14:05.615697353 +0000
     616--- wubi_orig/README    2013-06-14 12:27:02.813926000 +0100
     617+++ wubi_patched/README 2013-06-14 12:27:03.675649925 +0100
    645618@@ -1,6 +1,6 @@
    646619 == Introduction ==
     
    663636  * add your signing key to data/trustedkeys.gpg
    664637diff -Naur wubi_orig/src/wubi/backends/common/backend.py wubi_patched/src/wubi/backends/common/backend.py
    665 --- wubi_orig/src/wubi/backends/common/backend.py       2013-01-31 15:14:04.705964000 +0000
    666 +++ wubi_patched/src/wubi/backends/common/backend.py    2013-01-31 15:14:05.615697353 +0000
     638--- wubi_orig/src/wubi/backends/common/backend.py       2013-06-14 12:27:02.813926000 +0100
     639+++ wubi_patched/src/wubi/backends/common/backend.py    2013-06-14 12:27:03.675649925 +0100
    667640@@ -739,7 +739,7 @@
    668641             kernel = unix_path(self.info.kernel),
     
    675648             safe_graphic_mode_title = "Safe graphic mode",
    676649diff -Naur wubi_orig/tests/test_backend.py wubi_patched/tests/test_backend.py
    677 --- wubi_orig/tests/test_backend.py     2013-01-31 15:14:04.705964000 +0000
    678 +++ wubi_patched/tests/test_backend.py  2013-01-31 15:14:05.615697353 +0000
     650--- wubi_orig/tests/test_backend.py     2013-06-14 12:27:02.813926000 +0100
     651+++ wubi_patched/tests/test_backend.py  2013-06-14 12:27:03.675649925 +0100
    679652@@ -22,16 +22,16 @@
    680653             ('HKEY_LOCAL_MACHINE', 'registry-key', 'UninstallString',
Note: See TracChangeset for help on using the changeset viewer.