Changeset 4824


Ignore:
Timestamp:
Jul 14, 2011, 12:20:41 PM (9 years ago)
Author:
fasma
Message:

Added ubiquity with lxde and xfce support

Location:
packages/cm16/ubiquity
Files:
4 added
3 deleted
3 edited

Legend:

Unmodified
Added
Removed
  • packages/cm16/ubiquity/cmiffy/cmiffy

    r4657 r4824  
    4444#Use this var we if want to hardcode the version
    4545#If you hardcode the version please add the xcm tag
    46 VERSION="2.6.10xcm1.10"
     46VERSION="2.6.10xcm1.11"
    4747
    4848# debdiff old.dsc new.dsc > cmiffy/debdiff.patch
     
    5050
    5151#Changelog stuff
    52 AUTHOR='Pedro Fragoso <pedro.fragoso@caixamagica.pt>'
     52AUTHOR='Flávio Moringa <flavio.moringa@caixamagica.pt>'
    5353DISTRO="horn"
    5454URGE="low"
  • packages/cm16/ubiquity/cmiffy/debdiff.patch

    r4657 r4824  
    1 diff -Nru ubiquity-2.6.10/bin/oem-config-remaster ubiquity-2.6.10xcm1/bin/oem-config-remaster
    2 --- ubiquity-2.6.10/bin/oem-config-remaster     2010-03-18 18:02:10.000000000 +0000
    3 +++ ubiquity-2.6.10xcm1/bin/oem-config-remaster 2011-05-31 17:25:44.000000000 +0100
     1diff -Naur ubiquity-2.6.10.orig//bin/oem-config-remaster ubiquity-2.6.10//bin/oem-config-remaster
     2--- ubiquity-2.6.10.orig//bin/oem-config-remaster       2010-03-18 18:02:10.000000000 +0000
     3+++ ubiquity-2.6.10//bin/oem-config-remaster    2011-07-14 11:53:35.827809194 +0100
    44@@ -1,6 +1,6 @@
    55 #!/bin/sh
     
    1010 #
    1111 # Copyright (C) 2010 Canonical Ltd.
     12@@ -108,7 +108,7 @@
     13 [ -n "$KEY_ID" ] && gpg_args="$gpg_args --default-key $KEY_ID"
     14 gpg $gpg_args -o $cd_writable/extra/Release.gpg $cd_writable/extra/Release
     15 gpg --export --armor $KEY_ID > $cd_writable/extra/key.pub
     16-cat >> $cd_writable/preseed/ubuntu.seed << EOF
     17+cat >> $cd_writable/preseed/caixamagica.seed << EOF
     18 oem-config     oem-config/key  string /cdrom/extra/key.pub
     19 oem-config     oem-config/repository   string $REPO
     20 oem-config     oem-config/extra_packages       string $pkgs
    1221@@ -117,5 +117,5 @@
    1322 EOF
     
    1726+mkisofs -D -r -V "${CD_TITLE:-CaixaMagica}" -cache-inodes -J -l -b isolinux/isolinux.bin -c isolinux/boot.cat -no-emul-boot -boot-load-size 4 -boot-info-table -o "$save/${CD_FILE:-custom.iso}" .
    1827 cd $save
    19 diff -Nru ubiquity-2.6.10/bin/oem-config-remove-gtk ubiquity-2.6.10xcm1/bin/oem-config-remove-gtk
    20 --- ubiquity-2.6.10/bin/oem-config-remove-gtk   2011-04-14 12:19:49.000000000 +0100
    21 +++ ubiquity-2.6.10xcm1/bin/oem-config-remove-gtk       2011-05-31 17:25:44.000000000 +0100
     28diff -Naur ubiquity-2.6.10.orig//bin/oem-config-remove ubiquity-2.6.10//bin/oem-config-remove
     29--- ubiquity-2.6.10.orig//bin/oem-config-remove 2011-04-20 15:08:31.000000000 +0100
     30+++ ubiquity-2.6.10//bin/oem-config-remove      2011-07-14 11:51:51.147809240 +0100
     31@@ -18,7 +18,7 @@
     32 
     33                debconf-apt-progress --from 0 --to 50 \
     34                        --logfile /var/log/oem-config.log -- \
     35-                       apt-get -y purge ubiquity ubiquity-casper ubiquity-ubuntu-artwork
     36+                       apt-get -y purge ubiquity ubiquity-casper ubiquity-caixamagica-artwork
     37                debconf-apt-progress --from 50 --to 75 \
     38                        --logfile /var/log/oem-config.log -- \
     39                        apt-get -y purge 'ubiquity-slideshow-*' || true
     40diff -Naur ubiquity-2.6.10.orig//bin/oem-config-remove-gtk ubiquity-2.6.10//bin/oem-config-remove-gtk
     41--- ubiquity-2.6.10.orig//bin/oem-config-remove-gtk     2011-04-14 12:19:49.000000000 +0100
     42+++ ubiquity-2.6.10//bin/oem-config-remove-gtk  2011-07-14 11:47:08.277809365 +0100
    2243@@ -60,8 +60,8 @@
    2344 def main():
     
    3152             purge.append(pkg)
    3253 
    33 diff -Nru ubiquity-2.6.10/bin/ubiquity ubiquity-2.6.10xcm1/bin/ubiquity
    34 --- ubiquity-2.6.10/bin/ubiquity        2011-04-12 23:08:46.000000000 +0100
    35 +++ ubiquity-2.6.10xcm1/bin/ubiquity    2011-05-31 17:25:44.000000000 +0100
     54diff -Naur ubiquity-2.6.10.orig//bin/ubiquity ubiquity-2.6.10//bin/ubiquity
     55--- ubiquity-2.6.10.orig//bin/ubiquity  2011-04-12 23:08:46.000000000 +0100
     56+++ ubiquity-2.6.10//bin/ubiquity       2011-07-14 11:47:08.277809365 +0100
    3657@@ -3,7 +3,7 @@
    3758 '''
     
    4364 help it to work, such as the frontend.
    4465 The way it works is simple. It detects the frontend to use, then
    45 diff -Nru ubiquity-2.6.10/bin/ubiquity-dm ubiquity-2.6.10xcm1/bin/ubiquity-dm
    46 --- ubiquity-2.6.10/bin/ubiquity-dm     2011-04-15 15:11:52.000000000 +0100
    47 +++ ubiquity-2.6.10xcm1/bin/ubiquity-dm 2011-05-31 17:25:44.000000000 +0100
     66diff -Naur ubiquity-2.6.10.orig//bin/ubiquity-dm ubiquity-2.6.10//bin/ubiquity-dm
     67--- ubiquity-2.6.10.orig//bin/ubiquity-dm       2011-04-15 15:11:52.000000000 +0100
     68+++ ubiquity-2.6.10//bin/ubiquity-dm    2011-07-14 11:52:59.077809210 +0100
    4869@@ -21,7 +21,7 @@
    4970 from ubiquity.casper import get_casper
     
    5576 def ck_open_session(uid):
    5677     import dbus
     78@@ -350,12 +350,12 @@
     79                 wm_cmd = ['xfwm4']
     80             elif osextras.find_on_path('matchbox-window-manager'):
     81                 wm_cmd = ['matchbox-window-manager']
     82-            elif osextras.find_on_path('openbox-lubuntu'):
     83-                wm_cmd = ['openbox-lubuntu']
     84+            elif osextras.find_on_path('openbox-caixamagicalxde'):
     85+                wm_cmd = ['openbox-caixamagicalxde']
     86             else:
     87                 raise MissingProgramError('No window manager found (tried '
     88                     'metacity, xfwm4, matchbox-window-manager, '
     89-                    'openbox-lubuntu)')
     90+                    'openbox-caixamagicalxde)')
     91             wm = subprocess.Popen(wm_cmd,
     92                 stdin=null, stdout=logfile, stderr=logfile,
     93                 preexec_fn=self.drop_privileges)
     94@@ -380,13 +380,13 @@
     95 
     96             if osextras.find_on_path('lxsession'):
     97                 proc = subprocess.Popen(
     98-                    ['lxsession','-s','Lubuntu', '-e', 'LXDE', '-a'],
     99+                    ['lxsession','-s','CaixaMagicaLXDE', '-e', 'LXDE', '-a'],
     100                     stdin=null, stdout=logfile, stderr=logfile,
     101                     preexec_fn=self.drop_privileges)
     102                 extras.append(proc)
     103 
     104             if os.path.exists('/usr/lib/ubiquity/panel') and "xfwm4" not in wm_cmd:
     105-                if  "openbox-lubuntu" not in wm_cmd:
     106+                if  "openbox-caixamagicalxde" not in wm_cmd:
     107                     extras.append(subprocess.Popen(
     108                         ['/usr/lib/ubiquity/panel'],
     109                         stdin=null, stdout=logfile, stderr=logfile,
    57110@@ -415,7 +415,7 @@
    58111             # Don't show the background image in v1 accessibility profile.
     
    64117                 if (os.access(path, os.R_OK)
    65118                     and not 'access=v1' in fp.readline()):
    66 diff -Nru ubiquity-2.6.10/bin/ubiquity-greeter-gtk ubiquity-2.6.10xcm1/bin/ubiquity-greeter-gtk
    67 --- ubiquity-2.6.10/bin/ubiquity-greeter-gtk    2010-02-22 16:32:48.000000000 +0000
    68 +++ ubiquity-2.6.10xcm1/bin/ubiquity-greeter-gtk        2011-05-31 17:25:44.000000000 +0100
     119diff -Naur ubiquity-2.6.10.orig//bin/ubiquity-greeter-gtk ubiquity-2.6.10//bin/ubiquity-greeter-gtk
     120--- ubiquity-2.6.10.orig//bin/ubiquity-greeter-gtk      2010-02-22 16:32:48.000000000 +0000
     121+++ ubiquity-2.6.10//bin/ubiquity-greeter-gtk   2011-07-14 11:47:08.277809365 +0100
    69122@@ -1,5 +1,4 @@
    70123 #! /usr/bin/python
     
    98151     fixed = gtk.Fixed()
    99152     window.add(fixed)
    100 diff -Nru ubiquity-2.6.10/debian/changelog ubiquity-2.6.10xcm1/debian/changelog
    101 --- ubiquity-2.6.10/debian/changelog    2011-04-22 21:03:11.000000000 +0100
    102 +++ ubiquity-2.6.10xcm1/debian/changelog        2011-05-31 17:25:44.000000000 +0100
     153diff -Naur ubiquity-2.6.10.orig//debian/changelog ubiquity-2.6.10//debian/changelog
     154--- ubiquity-2.6.10.orig//debian/changelog      2011-04-22 21:03:11.000000000 +0100
     155+++ ubiquity-2.6.10//debian/changelog   2011-07-14 11:47:08.277809365 +0100
    103156@@ -1,3 +1,11 @@
    104157+ubiquity (2.6.10xcm1) horn; urgency=low
     
    113166 
    114167   * Add __init__ methods to ubi-timezone's PageDebconf and
    115 diff -Nru ubiquity-2.6.10/debian/control ubiquity-2.6.10xcm1/debian/control
    116 --- ubiquity-2.6.10/debian/control      2011-04-22 21:01:13.000000000 +0100
    117 +++ ubiquity-2.6.10xcm1/debian/control  2011-05-31 17:25:44.000000000 +0100
     168diff -Naur ubiquity-2.6.10.orig//debian/control ubiquity-2.6.10//debian/control
     169--- ubiquity-2.6.10.orig//debian/control        2011-04-22 21:01:13.000000000 +0100
     170+++ ubiquity-2.6.10//debian/control     2011-07-14 11:47:08.277809365 +0100
    118171@@ -1,7 +1,7 @@
    119172 Source: ubiquity
     
    153206 
    154207 #Package: ubiquity-guadalinex-artwork
    155 diff -Nru ubiquity-2.6.10/debian/real-po/pt.po ubiquity-2.6.10xcm1/debian/real-po/pt.po
    156 --- ubiquity-2.6.10/debian/real-po/pt.po        2011-04-20 21:02:01.000000000 +0100
    157 +++ ubiquity-2.6.10xcm1/debian/real-po/pt.po    2011-05-31 17:25:44.000000000 +0100
     208diff -Naur ubiquity-2.6.10.orig//debian/real-po/pt.po ubiquity-2.6.10//debian/real-po/pt.po
     209--- ubiquity-2.6.10.orig//debian/real-po/pt.po  2011-04-20 21:02:01.000000000 +0100
     210+++ ubiquity-2.6.10//debian/real-po/pt.po       2011-07-14 11:47:08.277809365 +0100
    158211@@ -1568,6 +1568,8 @@
    159212 "Documents, music, and other personal files will be kept. You can choose "
     
    165218 #. Type: text
    166219 #. Description
    167 diff -Nru ubiquity-2.6.10/debian/rules ubiquity-2.6.10xcm1/debian/rules
    168 --- ubiquity-2.6.10/debian/rules        2011-04-13 01:16:59.000000000 +0100
    169 +++ ubiquity-2.6.10xcm1/debian/rules    2011-05-31 17:25:44.000000000 +0100
     220diff -Naur ubiquity-2.6.10.orig//debian/rules ubiquity-2.6.10//debian/rules
     221--- ubiquity-2.6.10.orig//debian/rules  2011-04-13 01:16:59.000000000 +0100
     222+++ ubiquity-2.6.10//debian/rules       2011-07-14 11:47:08.277809365 +0100
    170223@@ -212,6 +212,9 @@
    171224                cp desktop/hi$${size}-app-ubiquity.png debian/ubiquity-frontend-kde/usr/share/icons/hicolor/$${size}x$${size}/apps/ubiquity.png; \
     
    178231 ifeq (,$(filter nocheck,$(DEB_BUILD_OPTIONS)))
    179232        ./tests/run
    180 diff -Nru ubiquity-2.6.10/debian/ubiquity-caixamagica-artwork.install ubiquity-2.6.10xcm1/debian/ubiquity-caixamagica-artwork.install
    181 --- ubiquity-2.6.10/debian/ubiquity-caixamagica-artwork.install 1970-01-01 01:00:00.000000000 +0100
    182 +++ ubiquity-2.6.10xcm1/debian/ubiquity-caixamagica-artwork.install     2011-05-31 17:25:44.000000000 +0100
     233diff -Naur ubiquity-2.6.10.orig//debian/ubiquity-caixamagica-artwork.install ubiquity-2.6.10//debian/ubiquity-caixamagica-artwork.install
     234--- ubiquity-2.6.10.orig//debian/ubiquity-caixamagica-artwork.install   1970-01-01 01:00:00.000000000 +0100
     235+++ ubiquity-2.6.10//debian/ubiquity-caixamagica-artwork.install        2011-07-14 11:47:08.277809365 +0100
    183236@@ -0,0 +1,3 @@
    184237+desktop/ubiquity.png usr/share/pixmaps
    185238+pixmaps/ubuntu usr/share/ubiquity/pixmaps
    186239+pixmaps/timezone usr/share/ubiquity/pixmaps
    187 diff -Nru ubiquity-2.6.10/debian/ubiquity-frontend-gtk.install ubiquity-2.6.10xcm1/debian/ubiquity-frontend-gtk.install
    188 --- ubiquity-2.6.10/debian/ubiquity-frontend-gtk.install        2011-03-01 23:09:25.000000000 +0000
    189 +++ ubiquity-2.6.10xcm1/debian/ubiquity-frontend-gtk.install    2011-05-31 17:25:44.000000000 +0100
     240diff -Naur ubiquity-2.6.10.orig//debian/ubiquity-frontend-gtk.install ubiquity-2.6.10//debian/ubiquity-frontend-gtk.install
     241--- ubiquity-2.6.10.orig//debian/ubiquity-frontend-gtk.install  2011-03-01 23:09:25.000000000 +0000
     242+++ ubiquity-2.6.10//debian/ubiquity-frontend-gtk.install       2011-07-14 11:47:08.277809365 +0100
    190243@@ -4,7 +4,7 @@
    191244 gui/gtk/*.ui usr/share/ubiquity/gtk
     
    197250 
    198251 bin/ubiquity-greeter-gtk usr/bin
    199 diff -Nru ubiquity-2.6.10/debian/ubiquity-ubuntu-artwork.install ubiquity-2.6.10xcm1/debian/ubiquity-ubuntu-artwork.install
    200 --- ubiquity-2.6.10/debian/ubiquity-ubuntu-artwork.install      2009-11-09 17:39:45.000000000 +0000
    201 +++ ubiquity-2.6.10xcm1/debian/ubiquity-ubuntu-artwork.install  1970-01-01 01:00:00.000000000 +0100
     252diff -Naur ubiquity-2.6.10.orig//debian/ubiquity.ubiquity.upstart ubiquity-2.6.10//debian/ubiquity.ubiquity.upstart
     253--- ubiquity-2.6.10.orig//debian/ubiquity.ubiquity.upstart      2011-01-07 14:55:22.000000000 +0000
     254+++ ubiquity-2.6.10//debian/ubiquity.ubiquity.upstart   2011-07-14 12:03:29.357808932 +0100
     255@@ -1,10 +1,10 @@
     256-# ubiquity - Ubuntu live CD installer
     257+# ubiquity - Caixa Magica live CD installer
     258 #
     259-# Installs Ubuntu from a live CD. This only does anything if told to do so
     260+# Installs Caixa Magica from a live CD. This only does anything if told to do so
     261 # by parameters on the kernel command line; otherwise, the installer may be
     262 # started manually later.
     263 
     264-description    "Ubuntu live CD installer"
     265+description    "Caixa Magica live CD installer"
     266 author         "Ubuntu Installer Team <ubuntu-installer@lists.ubuntu.com>"
     267 
     268 start on (starting gdm
     269@@ -79,7 +79,7 @@
     270        plymouth quit || :
     271        exec ubiquity noninteractive $debug
     272     else
     273-       if ! ubiquity-dm vt7 :0 ubuntu /usr/bin/ubiquity $debug $automatic $choose --only $frontend; then
     274+       if ! ubiquity-dm vt7 :0 caixamagica /usr/bin/ubiquity $debug $automatic $choose --only $frontend; then
     275            # has X crashed, or has ubiquity?
     276             if [ "$automatic" ] && ! [ -f /var/log/installer/version ]; then
     277                 # in case we crashed before the X startup sequence
     278diff -Naur ubiquity-2.6.10.orig//debian/ubiquity-ubuntu-artwork.install ubiquity-2.6.10//debian/ubiquity-ubuntu-artwork.install
     279--- ubiquity-2.6.10.orig//debian/ubiquity-ubuntu-artwork.install        2009-11-09 17:39:45.000000000 +0000
     280+++ ubiquity-2.6.10//debian/ubiquity-ubuntu-artwork.install     1970-01-01 01:00:00.000000000 +0100
    202281@@ -1,3 +0,0 @@
    203282-desktop/ubiquity.png usr/share/pixmaps
    204283-pixmaps/ubuntu usr/share/ubiquity/pixmaps
    205284-pixmaps/timezone usr/share/ubiquity/pixmaps
    206 diff -Nru ubiquity-2.6.10/desktop/ubiquity-kdeui.desktop.in ubiquity-2.6.10xcm1/desktop/ubiquity-kdeui.desktop.in
    207 --- ubiquity-2.6.10/desktop/ubiquity-kdeui.desktop.in   2010-03-18 22:07:21.000000000 +0000
    208 +++ ubiquity-2.6.10xcm1/desktop/ubiquity-kdeui.desktop.in       2011-05-31 17:25:44.000000000 +0100
     285diff -Naur ubiquity-2.6.10.orig//desktop/ubiquity-kdeui.desktop.in ubiquity-2.6.10//desktop/ubiquity-kdeui.desktop.in
     286--- ubiquity-2.6.10.orig//desktop/ubiquity-kdeui.desktop.in     2010-03-18 22:07:21.000000000 +0000
     287+++ ubiquity-2.6.10//desktop/ubiquity-kdeui.desktop.in  2011-07-14 11:47:08.277809365 +0100
    209288@@ -9,4 +9,3 @@
    210289 Terminal=false
     
    212291 OnlyShowIn=KDE;
    213292-X-Ubuntu-Gettext-Domain=ubiquity-desktop
    214 diff -Nru ubiquity-2.6.10/d-i/manifest ubiquity-2.6.10xcm1/d-i/manifest
    215 --- ubiquity-2.6.10/d-i/manifest        2011-04-22 21:01:19.000000000 +0100
    216 +++ ubiquity-2.6.10xcm1/d-i/manifest    2011-05-31 17:25:44.000000000 +0100
     293diff -Naur ubiquity-2.6.10.orig//d-i/manifest ubiquity-2.6.10//d-i/manifest
     294--- ubiquity-2.6.10.orig//d-i/manifest  2011-04-22 21:01:19.000000000 +0100
     295+++ ubiquity-2.6.10//d-i/manifest       2011-07-14 11:47:08.277809365 +0100
    217296@@ -1,7 +1,7 @@
    218297-apt-setup 1:0.49ubuntu4
     
    234313 partman-base 147ubuntu1
    235314 partman-basicfilesystems 69ubuntu1
    236 diff -Nru ubiquity-2.6.10/d-i/source/apt-setup/debian/apt-mirror-setup.install ubiquity-2.6.10xcm1/d-i/source/apt-setup/debian/apt-mirror-setup.install
    237 --- ubiquity-2.6.10/d-i/source/apt-setup/debian/apt-mirror-setup.install        2011-01-18 15:44:55.000000000 +0000
    238 +++ ubiquity-2.6.10xcm1/d-i/source/apt-setup/debian/apt-mirror-setup.install    2011-05-31 17:25:44.000000000 +0100
     315diff -Naur ubiquity-2.6.10.orig//d-i/source/apt-setup/debian/apt-mirror-setup.install ubiquity-2.6.10//d-i/source/apt-setup/debian/apt-mirror-setup.install
     316--- ubiquity-2.6.10.orig//d-i/source/apt-setup/debian/apt-mirror-setup.install  2011-01-18 15:44:55.000000000 +0000
     317+++ ubiquity-2.6.10//d-i/source/apt-setup/debian/apt-mirror-setup.install       2011-07-14 11:47:08.277809365 +0100
    239318@@ -1,3 +1,4 @@
    240319 generators/50mirror.ubuntu usr/lib/apt-setup/generators
     
    242321+release-files/ftp.caixamagica.pt usr/share/apt-setup/release-files
    243322 release-files/security.ubuntu.com usr/share/apt-setup/release-files
    244 diff -Nru ubiquity-2.6.10/d-i/source/apt-setup/debian/apt-mirror-setup.templates-ubuntu ubiquity-2.6.10xcm1/d-i/source/apt-setup/debian/apt-mirror-setup.templates-ubuntu
    245 --- ubiquity-2.6.10/d-i/source/apt-setup/debian/apt-mirror-setup.templates-ubuntu       2011-01-18 15:44:55.000000000 +0000
    246 +++ ubiquity-2.6.10xcm1/d-i/source/apt-setup/debian/apt-mirror-setup.templates-ubuntu   2011-05-31 17:25:44.000000000 +0100
     323diff -Naur ubiquity-2.6.10.orig//d-i/source/apt-setup/debian/apt-mirror-setup.templates-ubuntu ubiquity-2.6.10//d-i/source/apt-setup/debian/apt-mirror-setup.templates-ubuntu
     324--- ubiquity-2.6.10.orig//d-i/source/apt-setup/debian/apt-mirror-setup.templates-ubuntu 2011-01-18 15:44:55.000000000 +0000
     325+++ ubiquity-2.6.10//d-i/source/apt-setup/debian/apt-mirror-setup.templates-ubuntu      2011-07-14 11:47:08.277809365 +0100
    247326@@ -1,7 +1,7 @@
    248327 Template: apt-setup/restricted
     
    321400  .
    322401  Please choose whether you want this software to be made available to you.
    323 diff -Nru ubiquity-2.6.10/d-i/source/apt-setup/debian/apt-setup-udeb.templates ubiquity-2.6.10xcm1/d-i/source/apt-setup/debian/apt-setup-udeb.templates
    324 --- ubiquity-2.6.10/d-i/source/apt-setup/debian/apt-setup-udeb.templates        2011-04-08 12:35:47.000000000 +0100
    325 +++ ubiquity-2.6.10xcm1/d-i/source/apt-setup/debian/apt-setup-udeb.templates    2011-05-31 17:25:44.000000000 +0100
     402diff -Naur ubiquity-2.6.10.orig//d-i/source/apt-setup/debian/apt-setup-udeb.templates ubiquity-2.6.10//d-i/source/apt-setup/debian/apt-setup-udeb.templates
     403--- ubiquity-2.6.10.orig//d-i/source/apt-setup/debian/apt-setup-udeb.templates  2011-04-08 12:35:47.000000000 +0100
     404+++ ubiquity-2.6.10//d-i/source/apt-setup/debian/apt-setup-udeb.templates       2011-07-14 11:47:08.277809365 +0100
    326405@@ -34,13 +34,13 @@
    327406 
     
    366445  The extras archive contains free software offered by third-party
    367446  application developers who want to ship their latest software.
    368 diff -Nru ubiquity-2.6.10/d-i/source/apt-setup/debian/changelog ubiquity-2.6.10xcm1/d-i/source/apt-setup/debian/changelog
    369 --- ubiquity-2.6.10/d-i/source/apt-setup/debian/changelog       2011-04-08 12:38:26.000000000 +0100
    370 +++ ubiquity-2.6.10xcm1/d-i/source/apt-setup/debian/changelog   2011-05-31 17:25:44.000000000 +0100
     447diff -Naur ubiquity-2.6.10.orig//d-i/source/apt-setup/debian/changelog ubiquity-2.6.10//d-i/source/apt-setup/debian/changelog
     448--- ubiquity-2.6.10.orig//d-i/source/apt-setup/debian/changelog 2011-04-08 12:38:26.000000000 +0100
     449+++ ubiquity-2.6.10//d-i/source/apt-setup/debian/changelog      2011-07-14 11:47:08.277809365 +0100
    371450@@ -1,3 +1,10 @@
    372451+apt-setup (1:0.49xcm4) horn; urgency=low
     
    380459 
    381460   * Disable partner by default again (accidentally enabled in
    382 diff -Nru ubiquity-2.6.10/d-i/source/apt-setup/debian/po/am.po ubiquity-2.6.10xcm1/d-i/source/apt-setup/debian/po/am.po
    383 --- ubiquity-2.6.10/d-i/source/apt-setup/debian/po/am.po        2011-01-18 15:44:55.000000000 +0000
    384 +++ ubiquity-2.6.10xcm1/d-i/source/apt-setup/debian/po/am.po    2011-05-31 17:25:44.000000000 +0100
     461diff -Naur ubiquity-2.6.10.orig//d-i/source/apt-setup/debian/po/am.po ubiquity-2.6.10//d-i/source/apt-setup/debian/po/am.po
     462--- ubiquity-2.6.10.orig//d-i/source/apt-setup/debian/po/am.po  2011-01-18 15:44:55.000000000 +0000
     463+++ ubiquity-2.6.10//d-i/source/apt-setup/debian/po/am.po       2011-07-14 11:47:08.277809365 +0100
    385464@@ -202,7 +202,7 @@
    386465 #| "Debian has two services that provide updates to releases: security and "
     
    565644 "want to ship their latest software."
    566645 msgstr ""
    567 diff -Nru ubiquity-2.6.10/d-i/source/apt-setup/debian/po/ar.po ubiquity-2.6.10xcm1/d-i/source/apt-setup/debian/po/ar.po
    568 --- ubiquity-2.6.10/d-i/source/apt-setup/debian/po/ar.po        2011-01-18 15:44:55.000000000 +0000
    569 +++ ubiquity-2.6.10xcm1/d-i/source/apt-setup/debian/po/ar.po    2011-05-31 17:25:44.000000000 +0100
     646diff -Naur ubiquity-2.6.10.orig//d-i/source/apt-setup/debian/po/ar.po ubiquity-2.6.10//d-i/source/apt-setup/debian/po/ar.po
     647--- ubiquity-2.6.10.orig//d-i/source/apt-setup/debian/po/ar.po  2011-01-18 15:44:55.000000000 +0000
     648+++ ubiquity-2.6.10//d-i/source/apt-setup/debian/po/ar.po       2011-07-14 11:47:08.277809365 +0100
    570649@@ -205,7 +205,7 @@
    571650 #| "Debian has two services that provide updates to releases: security and "
     
    830909ستخدÙ
    831910ي أؚونتو."
    832 diff -Nru ubiquity-2.6.10/d-i/source/apt-setup/debian/po/ast.po ubiquity-2.6.10xcm1/d-i/source/apt-setup/debian/po/ast.po
    833 --- ubiquity-2.6.10/d-i/source/apt-setup/debian/po/ast.po       2011-01-18 15:44:55.000000000 +0000
    834 +++ ubiquity-2.6.10xcm1/d-i/source/apt-setup/debian/po/ast.po   2011-05-31 17:25:44.000000000 +0100
     911diff -Naur ubiquity-2.6.10.orig//d-i/source/apt-setup/debian/po/ast.po ubiquity-2.6.10//d-i/source/apt-setup/debian/po/ast.po
     912--- ubiquity-2.6.10.orig//d-i/source/apt-setup/debian/po/ast.po 2011-01-18 15:44:55.000000000 +0000
     913+++ ubiquity-2.6.10//d-i/source/apt-setup/debian/po/ast.po      2011-07-14 11:47:08.287809365 +0100
    835914@@ -211,7 +211,7 @@
    836915 #| "Debian has two services that provide updates to releases: security and "
     
    10551134+"CaixaMagica y los sos respectivos proovedores como un serviciu a los usuarios "
    10561135+"d'Caixa Magica."
    1057 diff -Nru ubiquity-2.6.10/d-i/source/apt-setup/debian/po/be.po ubiquity-2.6.10xcm1/d-i/source/apt-setup/debian/po/be.po
    1058 --- ubiquity-2.6.10/d-i/source/apt-setup/debian/po/be.po        2011-01-18 15:44:55.000000000 +0000
    1059 +++ ubiquity-2.6.10xcm1/d-i/source/apt-setup/debian/po/be.po    2011-05-31 17:25:44.000000000 +0100
     1136diff -Naur ubiquity-2.6.10.orig//d-i/source/apt-setup/debian/po/be.po ubiquity-2.6.10//d-i/source/apt-setup/debian/po/be.po
     1137--- ubiquity-2.6.10.orig//d-i/source/apt-setup/debian/po/be.po  2011-01-18 15:44:55.000000000 +0000
     1138+++ ubiquity-2.6.10//d-i/source/apt-setup/debian/po/be.po       2011-07-14 11:47:08.287809365 +0100
    10601139@@ -219,7 +219,7 @@
    10611140 #| "Debian has two services that provide updates to releases: security and "
     
    12791358+"праграЌы Ме частка Caixa Magica, але прапаМуюцца каЌпаМіяй CaixaMagica і аЎпавеЎМыЌі "
    12801359+"пастаўшчыкаЌі як паслуга Ўля карыстальМікаў Caixa Magica."
    1281 diff -Nru ubiquity-2.6.10/d-i/source/apt-setup/debian/po/bg.po ubiquity-2.6.10xcm1/d-i/source/apt-setup/debian/po/bg.po
    1282 --- ubiquity-2.6.10/d-i/source/apt-setup/debian/po/bg.po        2011-01-18 15:44:55.000000000 +0000
    1283 +++ ubiquity-2.6.10xcm1/d-i/source/apt-setup/debian/po/bg.po    2011-05-31 17:25:44.000000000 +0100
     1360diff -Naur ubiquity-2.6.10.orig//d-i/source/apt-setup/debian/po/bg.po ubiquity-2.6.10//d-i/source/apt-setup/debian/po/bg.po
     1361--- ubiquity-2.6.10.orig//d-i/source/apt-setup/debian/po/bg.po  2011-01-18 15:44:55.000000000 +0000
     1362+++ ubiquity-2.6.10//d-i/source/apt-setup/debian/po/bg.po       2011-07-14 11:47:08.287809365 +0100
    12841363@@ -214,7 +214,7 @@
    12851364 #| "Debian has two services that provide updates to releases: security and "
     
    15051584+"сПфтуер. ТПй Ме е част Пт УбуМту, МП се преЎлага Пт CaixaMagica О съПтветМОте "
    15061585 "ЎПставчОцО в услуга Ма пПтребОтелОте Ма УбуМту."
    1507 diff -Nru ubiquity-2.6.10/d-i/source/apt-setup/debian/po/bn.po ubiquity-2.6.10xcm1/d-i/source/apt-setup/debian/po/bn.po
    1508 --- ubiquity-2.6.10/d-i/source/apt-setup/debian/po/bn.po        2011-01-18 15:44:55.000000000 +0000
    1509 +++ ubiquity-2.6.10xcm1/d-i/source/apt-setup/debian/po/bn.po    2011-05-31 17:25:44.000000000 +0100
     1586diff -Naur ubiquity-2.6.10.orig//d-i/source/apt-setup/debian/po/bn.po ubiquity-2.6.10//d-i/source/apt-setup/debian/po/bn.po
     1587--- ubiquity-2.6.10.orig//d-i/source/apt-setup/debian/po/bn.po  2011-01-18 15:44:55.000000000 +0000
     1588+++ ubiquity-2.6.10//d-i/source/apt-setup/debian/po/bn.po       2011-07-14 11:47:08.287809365 +0100
    15101589@@ -230,7 +230,7 @@
    15111590 #| "Debian has two services that provide updates to releases: security and "
     
    17161795àŠ‚àŠ¶à§€àŠŠàŠŸàŠ°à§€\" àŠ°àŠ¿àŠªà§‹àŠœàŠ¿àŠŸàŠ°àŠ¿ àŠ¥à§‡àŠ•à§‡ àŠ•àŠ¿àŠ›à§ àŠ
    17171796àŠ€àŠ¿àŠ°àŠ¿àŠ•à§àŠ€ àŠžàŠ«à§àŠŸàŠ“à§Ÿà§àŠ¯àŠŸàŠ° àŠªàŠŸàŠ“à§ŸàŠŸ àŠ¯àŠŸà§Ÿà¥€ àŠàŠ‡ "
    1718 diff -Nru ubiquity-2.6.10/d-i/source/apt-setup/debian/po/bs.po ubiquity-2.6.10xcm1/d-i/source/apt-setup/debian/po/bs.po
    1719 --- ubiquity-2.6.10/d-i/source/apt-setup/debian/po/bs.po        2011-01-18 15:44:55.000000000 +0000
    1720 +++ ubiquity-2.6.10xcm1/d-i/source/apt-setup/debian/po/bs.po    2011-05-31 17:25:44.000000000 +0100
     1797diff -Naur ubiquity-2.6.10.orig//d-i/source/apt-setup/debian/po/bs.po ubiquity-2.6.10//d-i/source/apt-setup/debian/po/bs.po
     1798--- ubiquity-2.6.10.orig//d-i/source/apt-setup/debian/po/bs.po  2011-01-18 15:44:55.000000000 +0000
     1799+++ ubiquity-2.6.10//d-i/source/apt-setup/debian/po/bs.po       2011-07-14 11:47:08.287809365 +0100
    17211800@@ -211,7 +211,7 @@
    17221801 #| "Debian has two services that provide updates to releases: security and "
     
    19031982 "want to ship their latest software."
    19041983 msgstr ""
    1905 diff -Nru ubiquity-2.6.10/d-i/source/apt-setup/debian/po/ca.po ubiquity-2.6.10xcm1/d-i/source/apt-setup/debian/po/ca.po
    1906 --- ubiquity-2.6.10/d-i/source/apt-setup/debian/po/ca.po        2011-01-18 15:44:55.000000000 +0000
    1907 +++ ubiquity-2.6.10xcm1/d-i/source/apt-setup/debian/po/ca.po    2011-05-31 17:25:44.000000000 +0100
     1984diff -Naur ubiquity-2.6.10.orig//d-i/source/apt-setup/debian/po/ca.po ubiquity-2.6.10//d-i/source/apt-setup/debian/po/ca.po
     1985--- ubiquity-2.6.10.orig//d-i/source/apt-setup/debian/po/ca.po  2011-01-18 15:44:55.000000000 +0000
     1986+++ ubiquity-2.6.10//d-i/source/apt-setup/debian/po/ca.po       2011-07-14 11:47:08.287809365 +0100
    19081987@@ -211,7 +211,7 @@
    19091988 #| "Debian has two services that provide updates to releases: security and "
     
    20902169 "want to ship their latest software."
    20912170 msgstr ""
    2092 diff -Nru ubiquity-2.6.10/d-i/source/apt-setup/debian/po/cs.po ubiquity-2.6.10xcm1/d-i/source/apt-setup/debian/po/cs.po
    2093 --- ubiquity-2.6.10/d-i/source/apt-setup/debian/po/cs.po        2011-01-18 15:44:55.000000000 +0000
    2094 +++ ubiquity-2.6.10xcm1/d-i/source/apt-setup/debian/po/cs.po    2011-05-31 17:25:44.000000000 +0100
     2171diff -Naur ubiquity-2.6.10.orig//d-i/source/apt-setup/debian/po/cs.po ubiquity-2.6.10//d-i/source/apt-setup/debian/po/cs.po
     2172--- ubiquity-2.6.10.orig//d-i/source/apt-setup/debian/po/cs.po  2011-01-18 15:44:55.000000000 +0000
     2173+++ ubiquity-2.6.10//d-i/source/apt-setup/debian/po/cs.po       2011-07-14 11:47:08.287809365 +0100
    20952174@@ -208,7 +208,7 @@
    20962175 #| "Debian has two services that provide updates to releases: security and "
     
    23142393+"software není součástí Caixa Magica, ale je poskytován CaixaMagicaem a přísluÅ¡nÃœmi "
    23152394+"partnery jako sluşba uşivatelům Caixa Magica."
    2316 diff -Nru ubiquity-2.6.10/d-i/source/apt-setup/debian/po/da.po ubiquity-2.6.10xcm1/d-i/source/apt-setup/debian/po/da.po
    2317 --- ubiquity-2.6.10/d-i/source/apt-setup/debian/po/da.po        2011-01-18 15:44:55.000000000 +0000
    2318 +++ ubiquity-2.6.10xcm1/d-i/source/apt-setup/debian/po/da.po    2011-05-31 17:25:44.000000000 +0100
     2395diff -Naur ubiquity-2.6.10.orig//d-i/source/apt-setup/debian/po/da.po ubiquity-2.6.10//d-i/source/apt-setup/debian/po/da.po
     2396--- ubiquity-2.6.10.orig//d-i/source/apt-setup/debian/po/da.po  2011-01-18 15:44:55.000000000 +0000
     2397+++ ubiquity-2.6.10//d-i/source/apt-setup/debian/po/da.po       2011-07-14 11:47:08.287809365 +0100
    23192398@@ -219,7 +219,7 @@
    23202399 #| "Debian has two services that provide updates to releases: security and "
     
    25382617+"programarkiv. Denne software er ikke en del af Caixa Magica, men bliver tilbudt af "
    25392618+"CaixaMagica og de forskellige leverandÞrer som en service til Caixa Magica-brugere."
    2540 diff -Nru ubiquity-2.6.10/d-i/source/apt-setup/debian/po/de.po ubiquity-2.6.10xcm1/d-i/source/apt-setup/debian/po/de.po
    2541 --- ubiquity-2.6.10/d-i/source/apt-setup/debian/po/de.po        2011-01-18 15:44:55.000000000 +0000
    2542 +++ ubiquity-2.6.10xcm1/d-i/source/apt-setup/debian/po/de.po    2011-05-31 17:25:44.000000000 +0100
     2619diff -Naur ubiquity-2.6.10.orig//d-i/source/apt-setup/debian/po/de.po ubiquity-2.6.10//d-i/source/apt-setup/debian/po/de.po
     2620--- ubiquity-2.6.10.orig//d-i/source/apt-setup/debian/po/de.po  2011-01-18 15:44:55.000000000 +0000
     2621+++ ubiquity-2.6.10//d-i/source/apt-setup/debian/po/de.po       2011-07-14 11:47:08.287809365 +0100
    25432622@@ -223,7 +223,7 @@
    25442623 #| "Debian has two services that provide updates to releases: security and "
     
    27622841+"Diese Software ist nicht Teil von Caixa Magica, wird jedoch von CaixaMagica und den "
    27632842+"jeweiligen Herstellern als Service fÃŒr die Caixa Magica-Benutzer angeboten."
    2764 diff -Nru ubiquity-2.6.10/d-i/source/apt-setup/debian/po/dz.po ubiquity-2.6.10xcm1/d-i/source/apt-setup/debian/po/dz.po
    2765 --- ubiquity-2.6.10/d-i/source/apt-setup/debian/po/dz.po        2011-01-18 15:44:55.000000000 +0000
    2766 +++ ubiquity-2.6.10xcm1/d-i/source/apt-setup/debian/po/dz.po    2011-05-31 17:25:44.000000000 +0100
     2843diff -Naur ubiquity-2.6.10.orig//d-i/source/apt-setup/debian/po/dz.po ubiquity-2.6.10//d-i/source/apt-setup/debian/po/dz.po
     2844--- ubiquity-2.6.10.orig//d-i/source/apt-setup/debian/po/dz.po  2011-01-18 15:44:55.000000000 +0000
     2845+++ ubiquity-2.6.10//d-i/source/apt-setup/debian/po/dz.po       2011-07-14 11:47:08.287809365 +0100
    27672846@@ -208,7 +208,7 @@
    27682847 #| "Debian has two services that provide updates to releases: security and "
     
    29503029 "want to ship their latest software."
    29513030 msgstr ""
    2952 diff -Nru ubiquity-2.6.10/d-i/source/apt-setup/debian/po/el.po ubiquity-2.6.10xcm1/d-i/source/apt-setup/debian/po/el.po
    2953 --- ubiquity-2.6.10/d-i/source/apt-setup/debian/po/el.po        2011-01-18 15:44:55.000000000 +0000
    2954 +++ ubiquity-2.6.10xcm1/d-i/source/apt-setup/debian/po/el.po    2011-05-31 17:25:44.000000000 +0100
     3031diff -Naur ubiquity-2.6.10.orig//d-i/source/apt-setup/debian/po/el.po ubiquity-2.6.10//d-i/source/apt-setup/debian/po/el.po
     3032--- ubiquity-2.6.10.orig//d-i/source/apt-setup/debian/po/el.po  2011-01-18 15:44:55.000000000 +0000
     3033+++ ubiquity-2.6.10//d-i/source/apt-setup/debian/po/el.po       2011-07-14 11:47:08.287809365 +0100
    29553034@@ -220,7 +220,7 @@
    29563035 #| "Debian has two services that provide updates to releases: security and "
     
    32223301+"χρήστες τοÏ
    32233302 Caixa Magica."
    3224 diff -Nru ubiquity-2.6.10/d-i/source/apt-setup/debian/po/eo.po ubiquity-2.6.10xcm1/d-i/source/apt-setup/debian/po/eo.po
    3225 --- ubiquity-2.6.10/d-i/source/apt-setup/debian/po/eo.po        2011-01-18 15:44:55.000000000 +0000
    3226 +++ ubiquity-2.6.10xcm1/d-i/source/apt-setup/debian/po/eo.po    2011-05-31 17:25:44.000000000 +0100
     3303diff -Naur ubiquity-2.6.10.orig//d-i/source/apt-setup/debian/po/eo.po ubiquity-2.6.10//d-i/source/apt-setup/debian/po/eo.po
     3304--- ubiquity-2.6.10.orig//d-i/source/apt-setup/debian/po/eo.po  2011-01-18 15:44:55.000000000 +0000
     3305+++ ubiquity-2.6.10//d-i/source/apt-setup/debian/po/eo.po       2011-07-14 11:47:08.287809365 +0100
    32273306@@ -211,7 +211,7 @@
    32283307 #| "Debian has two services that provide updates to releases: security and "
     
    34433522+"CaixaMagica. Tiu ĉi programaro ne apartenas al Caixa Magica, sed estas disponigata "
    34443523+"de CaixaMagica kaj koncernaj vendantoj kiel servon al Ubunt-uzantoj."
    3445 diff -Nru ubiquity-2.6.10/d-i/source/apt-setup/debian/po/es.po ubiquity-2.6.10xcm1/d-i/source/apt-setup/debian/po/es.po
    3446 --- ubiquity-2.6.10/d-i/source/apt-setup/debian/po/es.po        2011-01-18 15:44:55.000000000 +0000
    3447 +++ ubiquity-2.6.10xcm1/d-i/source/apt-setup/debian/po/es.po    2011-05-31 17:25:44.000000000 +0100
     3524diff -Naur ubiquity-2.6.10.orig//d-i/source/apt-setup/debian/po/es.po ubiquity-2.6.10//d-i/source/apt-setup/debian/po/es.po
     3525--- ubiquity-2.6.10.orig//d-i/source/apt-setup/debian/po/es.po  2011-01-18 15:44:55.000000000 +0000
     3526+++ ubiquity-2.6.10//d-i/source/apt-setup/debian/po/es.po       2011-07-14 11:47:08.287809365 +0100
    34483527@@ -246,7 +246,7 @@
    34493528 #| "Debian has two services that provide updates to releases: security and "
     
    36703749-"usuarios de Ubuntu."
    36713750+"usuarios de Caixa Magica."
    3672 diff -Nru ubiquity-2.6.10/d-i/source/apt-setup/debian/po/et.po ubiquity-2.6.10xcm1/d-i/source/apt-setup/debian/po/et.po
    3673 --- ubiquity-2.6.10/d-i/source/apt-setup/debian/po/et.po        2011-01-18 15:44:55.000000000 +0000
    3674 +++ ubiquity-2.6.10xcm1/d-i/source/apt-setup/debian/po/et.po    2011-05-31 17:25:44.000000000 +0100
     3751diff -Naur ubiquity-2.6.10.orig//d-i/source/apt-setup/debian/po/et.po ubiquity-2.6.10//d-i/source/apt-setup/debian/po/et.po
     3752--- ubiquity-2.6.10.orig//d-i/source/apt-setup/debian/po/et.po  2011-01-18 15:44:55.000000000 +0000
     3753+++ ubiquity-2.6.10//d-i/source/apt-setup/debian/po/et.po       2011-07-14 11:47:08.287809365 +0100
    36753754@@ -210,7 +210,7 @@
    36763755 #| "Debian has two services that provide updates to releases: security and "
     
    38943973+"ei kuulu Caixa Magicasse, kuigi seda edastab CaixaMagica ja edastajad, kes "
    38953974+"teenindavad Caixa Magica kasutajaid."
    3896 diff -Nru ubiquity-2.6.10/d-i/source/apt-setup/debian/po/eu.po ubiquity-2.6.10xcm1/d-i/source/apt-setup/debian/po/eu.po
    3897 --- ubiquity-2.6.10/d-i/source/apt-setup/debian/po/eu.po        2011-01-18 15:44:55.000000000 +0000
    3898 +++ ubiquity-2.6.10xcm1/d-i/source/apt-setup/debian/po/eu.po    2011-05-31 17:25:44.000000000 +0100
     3975diff -Naur ubiquity-2.6.10.orig//d-i/source/apt-setup/debian/po/eu.po ubiquity-2.6.10//d-i/source/apt-setup/debian/po/eu.po
     3976--- ubiquity-2.6.10.orig//d-i/source/apt-setup/debian/po/eu.po  2011-01-18 15:44:55.000000000 +0000
     3977+++ ubiquity-2.6.10//d-i/source/apt-setup/debian/po/eu.po       2011-07-14 11:47:08.287809365 +0100
    38993978@@ -215,7 +215,7 @@
    39003979 #| "Debian has two services that provide updates to releases: security and "
     
    41184197+"biltegian. Software hau ez da Caixa Magicaren zati, baina CaixaMagica-ek eta beste "
    41194198+"saltzaileek Caixa Magica erabiltzaileei zerbitzu bezala eskaintzen die."
    4120 diff -Nru ubiquity-2.6.10/d-i/source/apt-setup/debian/po/fa.po ubiquity-2.6.10xcm1/d-i/source/apt-setup/debian/po/fa.po
    4121 --- ubiquity-2.6.10/d-i/source/apt-setup/debian/po/fa.po        2011-01-18 15:44:55.000000000 +0000
    4122 +++ ubiquity-2.6.10xcm1/d-i/source/apt-setup/debian/po/fa.po    2011-05-31 17:25:44.000000000 +0100
     4199diff -Naur ubiquity-2.6.10.orig//d-i/source/apt-setup/debian/po/fa.po ubiquity-2.6.10//d-i/source/apt-setup/debian/po/fa.po
     4200--- ubiquity-2.6.10.orig//d-i/source/apt-setup/debian/po/fa.po  2011-01-18 15:44:55.000000000 +0000
     4201+++ ubiquity-2.6.10//d-i/source/apt-setup/debian/po/fa.po       2011-07-14 11:47:08.287809365 +0100
    41234202@@ -205,7 +205,7 @@
    41244203 #| "Debian has two services that provide updates to releases: security and "
     
    43784457ت ØšÙ‡ "
    43794458 "کارؚران اوؚونتو ٟی؎نهاد ؎ده‌اند."
    4380 diff -Nru ubiquity-2.6.10/d-i/source/apt-setup/debian/po/fi.po ubiquity-2.6.10xcm1/d-i/source/apt-setup/debian/po/fi.po
    4381 --- ubiquity-2.6.10/d-i/source/apt-setup/debian/po/fi.po        2011-01-18 15:44:55.000000000 +0000
    4382 +++ ubiquity-2.6.10xcm1/d-i/source/apt-setup/debian/po/fi.po    2011-05-31 17:25:44.000000000 +0100
     4459diff -Naur ubiquity-2.6.10.orig//d-i/source/apt-setup/debian/po/fi.po ubiquity-2.6.10//d-i/source/apt-setup/debian/po/fi.po
     4460--- ubiquity-2.6.10.orig//d-i/source/apt-setup/debian/po/fi.po  2011-01-18 15:44:55.000000000 +0000
     4461+++ ubiquity-2.6.10//d-i/source/apt-setup/debian/po/fi.po       2011-07-14 11:47:08.287809365 +0100
    43834462@@ -215,7 +215,7 @@
    43844463 #| "Debian has two services that provide updates to releases: security and "
     
    46024681+"varasto ei ole Caixa Magican osa, mutta CaixaMagica ja vastaavat toimittajat "
    46034682+"tarjoavat sen palveluna Caixa Magican kÀyttÀjille."
    4604 diff -Nru ubiquity-2.6.10/d-i/source/apt-setup/debian/po/fr.po ubiquity-2.6.10xcm1/d-i/source/apt-setup/debian/po/fr.po
    4605 --- ubiquity-2.6.10/d-i/source/apt-setup/debian/po/fr.po        2011-01-18 15:44:55.000000000 +0000
    4606 +++ ubiquity-2.6.10xcm1/d-i/source/apt-setup/debian/po/fr.po    2011-05-31 17:25:44.000000000 +0100
     4683diff -Naur ubiquity-2.6.10.orig//d-i/source/apt-setup/debian/po/fr.po ubiquity-2.6.10//d-i/source/apt-setup/debian/po/fr.po
     4684--- ubiquity-2.6.10.orig//d-i/source/apt-setup/debian/po/fr.po  2011-01-18 15:44:55.000000000 +0000
     4685+++ ubiquity-2.6.10//d-i/source/apt-setup/debian/po/fr.po       2011-07-14 11:47:08.287809365 +0100
    46074686@@ -218,7 +218,7 @@
    46084687 #| "Debian has two services that provide updates to releases: security and "
     
    48294908+"sont mis à disposition par CaixaMagica et les distributeurs concernés pour les "
    48304909+"utilisateurs d'Caixa Magica."
    4831 diff -Nru ubiquity-2.6.10/d-i/source/apt-setup/debian/po/ga.po ubiquity-2.6.10xcm1/d-i/source/apt-setup/debian/po/ga.po
    4832 --- ubiquity-2.6.10/d-i/source/apt-setup/debian/po/ga.po        2011-01-18 15:44:55.000000000 +0000
    4833 +++ ubiquity-2.6.10xcm1/d-i/source/apt-setup/debian/po/ga.po    2011-05-31 17:25:44.000000000 +0100
     4910diff -Naur ubiquity-2.6.10.orig//d-i/source/apt-setup/debian/po/ga.po ubiquity-2.6.10//d-i/source/apt-setup/debian/po/ga.po
     4911--- ubiquity-2.6.10.orig//d-i/source/apt-setup/debian/po/ga.po  2011-01-18 15:44:55.000000000 +0000
     4912+++ ubiquity-2.6.10//d-i/source/apt-setup/debian/po/ga.po       2011-07-14 11:47:08.297809365 +0100
    48344913@@ -208,7 +208,7 @@
    48354914 #| "Debian has two services that provide updates to releases: security and "
     
    50165095 "want to ship their latest software."
    50175096 msgstr ""
    5018 diff -Nru ubiquity-2.6.10/d-i/source/apt-setup/debian/po/gl.po ubiquity-2.6.10xcm1/d-i/source/apt-setup/debian/po/gl.po
    5019 --- ubiquity-2.6.10/d-i/source/apt-setup/debian/po/gl.po        2011-01-18 15:44:55.000000000 +0000
    5020 +++ ubiquity-2.6.10xcm1/d-i/source/apt-setup/debian/po/gl.po    2011-05-31 17:25:44.000000000 +0100
     5097diff -Naur ubiquity-2.6.10.orig//d-i/source/apt-setup/debian/po/gl.po ubiquity-2.6.10//d-i/source/apt-setup/debian/po/gl.po
     5098--- ubiquity-2.6.10.orig//d-i/source/apt-setup/debian/po/gl.po  2011-01-18 15:44:55.000000000 +0000
     5099+++ ubiquity-2.6.10//d-i/source/apt-setup/debian/po/gl.po       2011-07-14 11:47:08.297809365 +0100
    50215100@@ -214,7 +214,7 @@
    50225101 #| "Debian has two services that provide updates to releases: security and "
     
    52405319+"Este non é parte de Caixa Magica, pero ofréceno CaixaMagica e os respectivos "
    52415320+"fabricantes como un servizo para usuarios de Caixa Magica."
    5242 diff -Nru ubiquity-2.6.10/d-i/source/apt-setup/debian/po/gu.po ubiquity-2.6.10xcm1/d-i/source/apt-setup/debian/po/gu.po
    5243 --- ubiquity-2.6.10/d-i/source/apt-setup/debian/po/gu.po        2011-01-18 15:44:55.000000000 +0000
    5244 +++ ubiquity-2.6.10xcm1/d-i/source/apt-setup/debian/po/gu.po    2011-05-31 17:25:44.000000000 +0100
     5321diff -Naur ubiquity-2.6.10.orig//d-i/source/apt-setup/debian/po/gu.po ubiquity-2.6.10//d-i/source/apt-setup/debian/po/gu.po
     5322--- ubiquity-2.6.10.orig//d-i/source/apt-setup/debian/po/gu.po  2011-01-18 15:44:55.000000000 +0000
     5323+++ ubiquity-2.6.10//d-i/source/apt-setup/debian/po/gu.po       2011-07-14 11:47:08.297809365 +0100
    52455324@@ -209,7 +209,7 @@
    52465325 #| "Debian has two services that provide updates to releases: security and "
     
    54485527 msgstr ""
    54495528 "કેચોચિકલ ઀રફથી કેટલટક વધટરટચટં ઞોફ્ટવેર \"partner\" રેપોઝિટોરીમટં પ્રટપ્઀ છે. આ ઞોફ્ટવેર "
    5450 diff -Nru ubiquity-2.6.10/d-i/source/apt-setup/debian/po/he.po ubiquity-2.6.10xcm1/d-i/source/apt-setup/debian/po/he.po
    5451 --- ubiquity-2.6.10/d-i/source/apt-setup/debian/po/he.po        2011-01-18 15:44:55.000000000 +0000
    5452 +++ ubiquity-2.6.10xcm1/d-i/source/apt-setup/debian/po/he.po    2011-05-31 17:25:44.000000000 +0100
     5529diff -Naur ubiquity-2.6.10.orig//d-i/source/apt-setup/debian/po/he.po ubiquity-2.6.10//d-i/source/apt-setup/debian/po/he.po
     5530--- ubiquity-2.6.10.orig//d-i/source/apt-setup/debian/po/he.po  2011-01-18 15:44:55.000000000 +0000
     5531+++ ubiquity-2.6.10//d-i/source/apt-setup/debian/po/he.po       2011-07-14 11:47:08.297809365 +0100
    54535532@@ -214,7 +214,7 @@
    54545533 #| "Debian has two services that provide updates to releases: security and "
     
    56325711 "want to ship their latest software."
    56335712 msgstr ""
    5634 diff -Nru ubiquity-2.6.10/d-i/source/apt-setup/debian/po/hi.po ubiquity-2.6.10xcm1/d-i/source/apt-setup/debian/po/hi.po
    5635 --- ubiquity-2.6.10/d-i/source/apt-setup/debian/po/hi.po        2011-01-18 15:44:55.000000000 +0000
    5636 +++ ubiquity-2.6.10xcm1/d-i/source/apt-setup/debian/po/hi.po    2011-05-31 17:25:44.000000000 +0100
     5713diff -Naur ubiquity-2.6.10.orig//d-i/source/apt-setup/debian/po/hi.po ubiquity-2.6.10//d-i/source/apt-setup/debian/po/hi.po
     5714--- ubiquity-2.6.10.orig//d-i/source/apt-setup/debian/po/hi.po  2011-01-18 15:44:55.000000000 +0000
     5715+++ ubiquity-2.6.10//d-i/source/apt-setup/debian/po/hi.po       2011-07-14 11:47:08.297809365 +0100
    56375716@@ -215,7 +215,7 @@
    56385717 #| "Debian has two services that provide updates to releases: security and "
     
    58185897 "want to ship their latest software."
    58195898 msgstr ""
    5820 diff -Nru ubiquity-2.6.10/d-i/source/apt-setup/debian/po/hr.po ubiquity-2.6.10xcm1/d-i/source/apt-setup/debian/po/hr.po
    5821 --- ubiquity-2.6.10/d-i/source/apt-setup/debian/po/hr.po        2011-01-18 15:44:55.000000000 +0000
    5822 +++ ubiquity-2.6.10xcm1/d-i/source/apt-setup/debian/po/hr.po    2011-05-31 17:25:44.000000000 +0100
     5899diff -Naur ubiquity-2.6.10.orig//d-i/source/apt-setup/debian/po/hr.po ubiquity-2.6.10//d-i/source/apt-setup/debian/po/hr.po
     5900--- ubiquity-2.6.10.orig//d-i/source/apt-setup/debian/po/hr.po  2011-01-18 15:44:55.000000000 +0000
     5901+++ ubiquity-2.6.10//d-i/source/apt-setup/debian/po/hr.po       2011-07-14 11:47:08.297809365 +0100
    58235902@@ -208,7 +208,7 @@
    58245903 #| "Debian has two services that provide updates to releases: security and "
     
    60056084 "want to ship their latest software."
    60066085 msgstr ""
    6007 diff -Nru ubiquity-2.6.10/d-i/source/apt-setup/debian/po/hu.po ubiquity-2.6.10xcm1/d-i/source/apt-setup/debian/po/hu.po
    6008 --- ubiquity-2.6.10/d-i/source/apt-setup/debian/po/hu.po        2011-01-18 15:44:55.000000000 +0000
    6009 +++ ubiquity-2.6.10xcm1/d-i/source/apt-setup/debian/po/hu.po    2011-05-31 17:25:44.000000000 +0100
     6086diff -Naur ubiquity-2.6.10.orig//d-i/source/apt-setup/debian/po/hu.po ubiquity-2.6.10//d-i/source/apt-setup/debian/po/hu.po
     6087--- ubiquity-2.6.10.orig//d-i/source/apt-setup/debian/po/hu.po  2011-01-18 15:44:55.000000000 +0000
     6088+++ ubiquity-2.6.10//d-i/source/apt-setup/debian/po/hu.po       2011-07-14 11:47:08.297809365 +0100
    60106089@@ -210,7 +210,7 @@
    60116090 #| "Debian has two services that provide updates to releases: security and "
     
    61916270 "want to ship their latest software."
    61926271 msgstr ""
    6193 diff -Nru ubiquity-2.6.10/d-i/source/apt-setup/debian/po/id.po ubiquity-2.6.10xcm1/d-i/source/apt-setup/debian/po/id.po
    6194 --- ubiquity-2.6.10/d-i/source/apt-setup/debian/po/id.po        2011-01-18 15:44:55.000000000 +0000
    6195 +++ ubiquity-2.6.10xcm1/d-i/source/apt-setup/debian/po/id.po    2011-05-31 17:25:44.000000000 +0100
     6272diff -Naur ubiquity-2.6.10.orig//d-i/source/apt-setup/debian/po/id.po ubiquity-2.6.10//d-i/source/apt-setup/debian/po/id.po
     6273--- ubiquity-2.6.10.orig//d-i/source/apt-setup/debian/po/id.po  2011-01-18 15:44:55.000000000 +0000
     6274+++ ubiquity-2.6.10//d-i/source/apt-setup/debian/po/id.po       2011-07-14 11:47:08.297809365 +0100
    61966275@@ -218,7 +218,7 @@
    61976276 #| "Debian has two services that provide updates to releases: security and "
     
    63786457 "want to ship their latest software."
    63796458 msgstr ""
    6380 diff -Nru ubiquity-2.6.10/d-i/source/apt-setup/debian/po/is.po ubiquity-2.6.10xcm1/d-i/source/apt-setup/debian/po/is.po
    6381 --- ubiquity-2.6.10/d-i/source/apt-setup/debian/po/is.po        2011-01-18 15:44:55.000000000 +0000
    6382 +++ ubiquity-2.6.10xcm1/d-i/source/apt-setup/debian/po/is.po    2011-05-31 17:25:44.000000000 +0100
     6459diff -Naur ubiquity-2.6.10.orig//d-i/source/apt-setup/debian/po/is.po ubiquity-2.6.10//d-i/source/apt-setup/debian/po/is.po
     6460--- ubiquity-2.6.10.orig//d-i/source/apt-setup/debian/po/is.po  2011-01-18 15:44:55.000000000 +0000
     6461+++ ubiquity-2.6.10//d-i/source/apt-setup/debian/po/is.po       2011-07-14 11:47:08.297809365 +0100
    63836462@@ -214,7 +214,7 @@
    63846463 #| "Debian has two services that provide updates to releases: security and "
     
    65776656+"„samstarfsaðilum“ CaixaMagica. Þessi hugbúnaður er ekki hluti af Caixa Magica, en "
    65786657+"CaixaMagica bÜður hann sem ßjónustu fyrir notendur Caixa Magica."
    6579 diff -Nru ubiquity-2.6.10/d-i/source/apt-setup/debian/po/it.po ubiquity-2.6.10xcm1/d-i/source/apt-setup/debian/po/it.po
    6580 --- ubiquity-2.6.10/d-i/source/apt-setup/debian/po/it.po        2011-01-18 15:44:55.000000000 +0000
    6581 +++ ubiquity-2.6.10xcm1/d-i/source/apt-setup/debian/po/it.po    2011-05-31 17:25:44.000000000 +0100
     6658diff -Naur ubiquity-2.6.10.orig//d-i/source/apt-setup/debian/po/it.po ubiquity-2.6.10//d-i/source/apt-setup/debian/po/it.po
     6659--- ubiquity-2.6.10.orig//d-i/source/apt-setup/debian/po/it.po  2011-01-18 15:44:55.000000000 +0000
     6660+++ ubiquity-2.6.10//d-i/source/apt-setup/debian/po/it.po       2011-07-14 11:47:08.297809365 +0100
    65826661@@ -221,7 +221,7 @@
    65836662 #| "Debian has two services that provide updates to releases: security and "
     
    67986877+"CaixaMagica. Anche se tale software non fa parte di Caixa Magica, viene offerto da "
    67996878+"CaixaMagica e dai rispettivi fornitori come un servizio agli utenti di Caixa Magica."
    6800 diff -Nru ubiquity-2.6.10/d-i/source/apt-setup/debian/po/ja.po ubiquity-2.6.10xcm1/d-i/source/apt-setup/debian/po/ja.po
    6801 --- ubiquity-2.6.10/d-i/source/apt-setup/debian/po/ja.po        2011-01-18 15:44:55.000000000 +0000
    6802 +++ ubiquity-2.6.10xcm1/d-i/source/apt-setup/debian/po/ja.po    2011-05-31 17:25:44.000000000 +0100
     6879diff -Naur ubiquity-2.6.10.orig//d-i/source/apt-setup/debian/po/ja.po ubiquity-2.6.10//d-i/source/apt-setup/debian/po/ja.po
     6880--- ubiquity-2.6.10.orig//d-i/source/apt-setup/debian/po/ja.po  2011-01-18 15:44:55.000000000 +0000
     6881+++ ubiquity-2.6.10//d-i/source/apt-setup/debian/po/ja.po       2011-07-14 11:47:08.297809365 +0100
    68036882@@ -207,7 +207,7 @@
    68046883 #| "Debian has two services that provide updates to releases: security and "
     
    70227101+"たす。この゜フトりェアは Caixa Magica の䞀郚ではありたせんが、CaixaMagica および各ベ"
    70237102+"ンダによっお Caixa Magica ナヌザぞのサヌビスずしお提䟛されおいたす。"
    7024 diff -Nru ubiquity-2.6.10/d-i/source/apt-setup/debian/po/ka.po ubiquity-2.6.10xcm1/d-i/source/apt-setup/debian/po/ka.po
    7025 --- ubiquity-2.6.10/d-i/source/apt-setup/debian/po/ka.po        2011-01-18 15:44:55.000000000 +0000
    7026 +++ ubiquity-2.6.10xcm1/d-i/source/apt-setup/debian/po/ka.po    2011-05-31 17:25:44.000000000 +0100
     7103diff -Naur ubiquity-2.6.10.orig//d-i/source/apt-setup/debian/po/ka.po ubiquity-2.6.10//d-i/source/apt-setup/debian/po/ka.po
     7104--- ubiquity-2.6.10.orig//d-i/source/apt-setup/debian/po/ka.po  2011-01-18 15:44:55.000000000 +0000
     7105+++ ubiquity-2.6.10//d-i/source/apt-setup/debian/po/ka.po       2011-07-14 11:47:08.297809365 +0100
    70277106@@ -214,7 +214,7 @@
    70287107 #| "Debian has two services that provide updates to releases: security and "
     
    72117290 "want to ship their latest software."
    72127291 msgstr ""
    7213 diff -Nru ubiquity-2.6.10/d-i/source/apt-setup/debian/po/kk.po ubiquity-2.6.10xcm1/d-i/source/apt-setup/debian/po/kk.po
    7214 --- ubiquity-2.6.10/d-i/source/apt-setup/debian/po/kk.po        2011-01-18 15:44:55.000000000 +0000
    7215 +++ ubiquity-2.6.10xcm1/d-i/source/apt-setup/debian/po/kk.po    2011-05-31 17:25:44.000000000 +0100
     7292diff -Naur ubiquity-2.6.10.orig//d-i/source/apt-setup/debian/po/kk.po ubiquity-2.6.10//d-i/source/apt-setup/debian/po/kk.po
     7293--- ubiquity-2.6.10.orig//d-i/source/apt-setup/debian/po/kk.po  2011-01-18 15:44:55.000000000 +0000
     7294+++ ubiquity-2.6.10//d-i/source/apt-setup/debian/po/kk.po       2011-07-14 11:47:08.297809365 +0100
    72167295@@ -210,7 +210,7 @@
    72177296 #| "Debian has two services that provide updates to releases: security and "
     
    73987477 "want to ship their latest software."
    73997478 msgstr ""
    7400 diff -Nru ubiquity-2.6.10/d-i/source/apt-setup/debian/po/km.po ubiquity-2.6.10xcm1/d-i/source/apt-setup/debian/po/km.po
    7401 --- ubiquity-2.6.10/d-i/source/apt-setup/debian/po/km.po        2011-01-18 15:44:55.000000000 +0000
    7402 +++ ubiquity-2.6.10xcm1/d-i/source/apt-setup/debian/po/km.po    2011-05-31 17:25:44.000000000 +0100
     7479diff -Naur ubiquity-2.6.10.orig//d-i/source/apt-setup/debian/po/km.po ubiquity-2.6.10//d-i/source/apt-setup/debian/po/km.po
     7480--- ubiquity-2.6.10.orig//d-i/source/apt-setup/debian/po/km.po  2011-01-18 15:44:55.000000000 +0000
     7481+++ ubiquity-2.6.10//d-i/source/apt-setup/debian/po/km.po       2011-07-14 11:47:08.297809365 +0100
    74037482@@ -209,7 +209,7 @@
    74047483 #| "Debian has two services that provide updates to releases: security and "
     
    75917670 "want to ship their latest software."
    75927671 msgstr ""
    7593 diff -Nru ubiquity-2.6.10/d-i/source/apt-setup/debian/po/ko.po ubiquity-2.6.10xcm1/d-i/source/apt-setup/debian/po/ko.po
    7594 --- ubiquity-2.6.10/d-i/source/apt-setup/debian/po/ko.po        2011-01-18 15:44:55.000000000 +0000
    7595 +++ ubiquity-2.6.10xcm1/d-i/source/apt-setup/debian/po/ko.po    2011-05-31 17:25:44.000000000 +0100
     7672diff -Naur ubiquity-2.6.10.orig//d-i/source/apt-setup/debian/po/ko.po ubiquity-2.6.10//d-i/source/apt-setup/debian/po/ko.po
     7673--- ubiquity-2.6.10.orig//d-i/source/apt-setup/debian/po/ko.po  2011-01-18 15:44:55.000000000 +0000
     7674+++ ubiquity-2.6.10//d-i/source/apt-setup/debian/po/ko.po       2011-07-14 11:47:08.297809365 +0100
    75967675@@ -209,7 +209,7 @@
    75977676 #| "Debian has two services that provide updates to releases: security and "
     
    78027881 "캐ë
    78037882žë‹ˆì»¬ì˜ \"파튾너\" 저장고에 추가 소프튞웚얎가 음부 듀얎 있습니닀. 읎 소프"
    7804 diff -Nru ubiquity-2.6.10/d-i/source/apt-setup/debian/po/ku.po ubiquity-2.6.10xcm1/d-i/source/apt-setup/debian/po/ku.po
    7805 --- ubiquity-2.6.10/d-i/source/apt-setup/debian/po/ku.po        2011-01-18 15:44:55.000000000 +0000
    7806 +++ ubiquity-2.6.10xcm1/d-i/source/apt-setup/debian/po/ku.po    2011-05-31 17:25:44.000000000 +0100
     7883diff -Naur ubiquity-2.6.10.orig//d-i/source/apt-setup/debian/po/ku.po ubiquity-2.6.10//d-i/source/apt-setup/debian/po/ku.po
     7884--- ubiquity-2.6.10.orig//d-i/source/apt-setup/debian/po/ku.po  2011-01-18 15:44:55.000000000 +0000
     7885+++ ubiquity-2.6.10//d-i/source/apt-setup/debian/po/ku.po       2011-07-14 11:47:08.297809365 +0100
    78077886@@ -213,7 +213,7 @@
    78087887 #| "Debian has two services that provide updates to releases: security and "
     
    79838062 "want to ship their latest software."
    79848063 msgstr ""
    7985 diff -Nru ubiquity-2.6.10/d-i/source/apt-setup/debian/po/lt.po ubiquity-2.6.10xcm1/d-i/source/apt-setup/debian/po/lt.po
    7986 --- ubiquity-2.6.10/d-i/source/apt-setup/debian/po/lt.po        2011-01-18 15:44:55.000000000 +0000
    7987 +++ ubiquity-2.6.10xcm1/d-i/source/apt-setup/debian/po/lt.po    2011-05-31 17:25:44.000000000 +0100
     8064diff -Naur ubiquity-2.6.10.orig//d-i/source/apt-setup/debian/po/lt.po ubiquity-2.6.10//d-i/source/apt-setup/debian/po/lt.po
     8065--- ubiquity-2.6.10.orig//d-i/source/apt-setup/debian/po/lt.po  2011-01-18 15:44:55.000000000 +0000
     8066+++ ubiquity-2.6.10//d-i/source/apt-setup/debian/po/lt.po       2011-07-14 11:47:08.297809365 +0100
    79888067@@ -208,7 +208,7 @@
    79898068 #| "Debian has two services that provide updates to releases: security and "
     
    82138292+"CaixaMagica ir atitinkami tiekėjai siÅ«lo tai kaip paslaugÄ
    82148293 Caixa Magica naudotojams."
    8215 diff -Nru ubiquity-2.6.10/d-i/source/apt-setup/debian/po/lv.po ubiquity-2.6.10xcm1/d-i/source/apt-setup/debian/po/lv.po
    8216 --- ubiquity-2.6.10/d-i/source/apt-setup/debian/po/lv.po        2011-01-18 15:44:55.000000000 +0000
    8217 +++ ubiquity-2.6.10xcm1/d-i/source/apt-setup/debian/po/lv.po    2011-05-31 17:25:44.000000000 +0100
     8294diff -Naur ubiquity-2.6.10.orig//d-i/source/apt-setup/debian/po/lv.po ubiquity-2.6.10//d-i/source/apt-setup/debian/po/lv.po
     8295--- ubiquity-2.6.10.orig//d-i/source/apt-setup/debian/po/lv.po  2011-01-18 15:44:55.000000000 +0000
     8296+++ ubiquity-2.6.10//d-i/source/apt-setup/debian/po/lv.po       2011-07-14 11:47:08.297809365 +0100
    82188297@@ -211,7 +211,7 @@
    82198298 #| "Debian has two services that provide updates to releases: security and "
     
    84008479 "want to ship their latest software."
    84018480 msgstr ""
    8402 diff -Nru ubiquity-2.6.10/d-i/source/apt-setup/debian/po/mk.po ubiquity-2.6.10xcm1/d-i/source/apt-setup/debian/po/mk.po
    8403 --- ubiquity-2.6.10/d-i/source/apt-setup/debian/po/mk.po        2011-01-18 15:44:55.000000000 +0000
    8404 +++ ubiquity-2.6.10xcm1/d-i/source/apt-setup/debian/po/mk.po    2011-05-31 17:25:44.000000000 +0100
     8481diff -Naur ubiquity-2.6.10.orig//d-i/source/apt-setup/debian/po/mk.po ubiquity-2.6.10//d-i/source/apt-setup/debian/po/mk.po
     8482--- ubiquity-2.6.10.orig//d-i/source/apt-setup/debian/po/mk.po  2011-01-18 15:44:55.000000000 +0000
     8483+++ ubiquity-2.6.10//d-i/source/apt-setup/debian/po/mk.po       2011-07-14 11:47:08.297809365 +0100
    84058484@@ -211,7 +211,7 @@
    84068485 #| "Debian has two services that provide updates to releases: security and "
     
    85878666 "want to ship their latest software."
    85888667 msgstr ""
    8589 diff -Nru ubiquity-2.6.10/d-i/source/apt-setup/debian/po/ml.po ubiquity-2.6.10xcm1/d-i/source/apt-setup/debian/po/ml.po
    8590 --- ubiquity-2.6.10/d-i/source/apt-setup/debian/po/ml.po        2011-01-18 15:44:55.000000000 +0000
    8591 +++ ubiquity-2.6.10xcm1/d-i/source/apt-setup/debian/po/ml.po    2011-05-31 17:25:44.000000000 +0100
     8668diff -Naur ubiquity-2.6.10.orig//d-i/source/apt-setup/debian/po/ml.po ubiquity-2.6.10//d-i/source/apt-setup/debian/po/ml.po
     8669--- ubiquity-2.6.10.orig//d-i/source/apt-setup/debian/po/ml.po  2011-01-18 15:44:55.000000000 +0000
     8670+++ ubiquity-2.6.10//d-i/source/apt-setup/debian/po/ml.po       2011-07-14 11:47:08.297809365 +0100
    85928671@@ -215,7 +215,7 @@
    85938672 #| "Debian has two services that provide updates to releases: security and "
     
    87728851 "want to ship their latest software."
    87738852 msgstr ""
    8774 diff -Nru ubiquity-2.6.10/d-i/source/apt-setup/debian/po/mr.po ubiquity-2.6.10xcm1/d-i/source/apt-setup/debian/po/mr.po
    8775 --- ubiquity-2.6.10/d-i/source/apt-setup/debian/po/mr.po        2011-01-18 15:44:55.000000000 +0000
    8776 +++ ubiquity-2.6.10xcm1/d-i/source/apt-setup/debian/po/mr.po    2011-05-31 17:25:44.000000000 +0100
     8853diff -Naur ubiquity-2.6.10.orig//d-i/source/apt-setup/debian/po/mr.po ubiquity-2.6.10//d-i/source/apt-setup/debian/po/mr.po
     8854--- ubiquity-2.6.10.orig//d-i/source/apt-setup/debian/po/mr.po  2011-01-18 15:44:55.000000000 +0000
     8855+++ ubiquity-2.6.10//d-i/source/apt-setup/debian/po/mr.po       2011-07-14 11:47:08.297809365 +0100
    87778856@@ -210,7 +210,7 @@
    87788857 #| "Debian has two services that provide updates to releases: security and "
     
    89629041 "want to ship their latest software."
    89639042 msgstr ""
    8964 diff -Nru ubiquity-2.6.10/d-i/source/apt-setup/debian/po/nb.po ubiquity-2.6.10xcm1/d-i/source/apt-setup/debian/po/nb.po
    8965 --- ubiquity-2.6.10/d-i/source/apt-setup/debian/po/nb.po        2011-01-18 15:44:55.000000000 +0000
    8966 +++ ubiquity-2.6.10xcm1/d-i/source/apt-setup/debian/po/nb.po    2011-05-31 17:25:44.000000000 +0100
     9043diff -Naur ubiquity-2.6.10.orig//d-i/source/apt-setup/debian/po/nb.po ubiquity-2.6.10//d-i/source/apt-setup/debian/po/nb.po
     9044--- ubiquity-2.6.10.orig//d-i/source/apt-setup/debian/po/nb.po  2011-01-18 15:44:55.000000000 +0000
     9045+++ ubiquity-2.6.10//d-i/source/apt-setup/debian/po/nb.po       2011-07-14 11:47:08.297809365 +0100
    89679046@@ -213,7 +213,7 @@
    89689047 #| "Debian has two services that provide updates to releases: security and "
     
    91869265+"programvaren er ikke del av Caixa Magica, men tilbyes av CaixaMagica og de "
    91879266+"respektive leverandÞreren som en tjeneste til Caixa Magica-brukere."
    9188 diff -Nru ubiquity-2.6.10/d-i/source/apt-setup/debian/po/ne.po ubiquity-2.6.10xcm1/d-i/source/apt-setup/debian/po/ne.po
    9189 --- ubiquity-2.6.10/d-i/source/apt-setup/debian/po/ne.po        2011-01-18 15:44:55.000000000 +0000
    9190 +++ ubiquity-2.6.10xcm1/d-i/source/apt-setup/debian/po/ne.po    2011-05-31 17:25:44.000000000 +0100
     9267diff -Naur ubiquity-2.6.10.orig//d-i/source/apt-setup/debian/po/ne.po ubiquity-2.6.10//d-i/source/apt-setup/debian/po/ne.po
     9268--- ubiquity-2.6.10.orig//d-i/source/apt-setup/debian/po/ne.po  2011-01-18 15:44:55.000000000 +0000
     9269+++ ubiquity-2.6.10//d-i/source/apt-setup/debian/po/ne.po       2011-07-14 11:47:08.297809365 +0100
    91919270@@ -213,7 +213,7 @@
    91929271 #| "Debian has two services that provide updates to releases: security and "
     
    93739452 "want to ship their latest software."
    93749453 msgstr ""
    9375 diff -Nru ubiquity-2.6.10/d-i/source/apt-setup/debian/po/nl.po ubiquity-2.6.10xcm1/d-i/source/apt-setup/debian/po/nl.po
    9376 --- ubiquity-2.6.10/d-i/source/apt-setup/debian/po/nl.po        2011-01-18 15:44:55.000000000 +0000
    9377 +++ ubiquity-2.6.10xcm1/d-i/source/apt-setup/debian/po/nl.po    2011-05-31 17:25:44.000000000 +0100
     9454diff -Naur ubiquity-2.6.10.orig//d-i/source/apt-setup/debian/po/nl.po ubiquity-2.6.10//d-i/source/apt-setup/debian/po/nl.po
     9455--- ubiquity-2.6.10.orig//d-i/source/apt-setup/debian/po/nl.po  2011-01-18 15:44:55.000000000 +0000
     9456+++ ubiquity-2.6.10//d-i/source/apt-setup/debian/po/nl.po       2011-07-14 11:47:08.297809365 +0100
    93789457@@ -212,7 +212,7 @@
    93799458 #| "Debian has two services that provide updates to releases: security and "
     
    95969675+"wordt door CaixaMagica en de betreffende partners aangeboden als een service "
    95979676 "voor gebruikers."
    9598 diff -Nru ubiquity-2.6.10/d-i/source/apt-setup/debian/po/nn.po ubiquity-2.6.10xcm1/d-i/source/apt-setup/debian/po/nn.po
    9599 --- ubiquity-2.6.10/d-i/source/apt-setup/debian/po/nn.po        2011-01-18 15:44:55.000000000 +0000
    9600 +++ ubiquity-2.6.10xcm1/d-i/source/apt-setup/debian/po/nn.po    2011-05-31 17:25:44.000000000 +0100
     9677diff -Naur ubiquity-2.6.10.orig//d-i/source/apt-setup/debian/po/nn.po ubiquity-2.6.10//d-i/source/apt-setup/debian/po/nn.po
     9678--- ubiquity-2.6.10.orig//d-i/source/apt-setup/debian/po/nn.po  2011-01-18 15:44:55.000000000 +0000
     9679+++ ubiquity-2.6.10//d-i/source/apt-setup/debian/po/nn.po       2011-07-14 11:47:08.297809365 +0100
    96019680@@ -212,7 +212,7 @@
    96029681 #| "Debian has two services that provide updates to releases: security and "
     
    97839862 "want to ship their latest software."
    97849863 msgstr ""
    9785 diff -Nru ubiquity-2.6.10/d-i/source/apt-setup/debian/po/pa.po ubiquity-2.6.10xcm1/d-i/source/apt-setup/debian/po/pa.po
    9786 --- ubiquity-2.6.10/d-i/source/apt-setup/debian/po/pa.po        2011-01-18 15:44:55.000000000 +0000
    9787 +++ ubiquity-2.6.10xcm1/d-i/source/apt-setup/debian/po/pa.po    2011-05-31 17:25:44.000000000 +0100
     9864diff -Naur ubiquity-2.6.10.orig//d-i/source/apt-setup/debian/po/pa.po ubiquity-2.6.10//d-i/source/apt-setup/debian/po/pa.po
     9865--- ubiquity-2.6.10.orig//d-i/source/apt-setup/debian/po/pa.po  2011-01-18 15:44:55.000000000 +0000
     9866+++ ubiquity-2.6.10//d-i/source/apt-setup/debian/po/pa.po       2011-07-14 11:47:08.297809365 +0100
    97889867@@ -214,7 +214,7 @@
    97899868 #| "Debian has two services that provide updates to releases: security and "
     
    997310052 "want to ship their latest software."
    997410053 msgstr ""
    9975 diff -Nru ubiquity-2.6.10/d-i/source/apt-setup/debian/po/pl.po ubiquity-2.6.10xcm1/d-i/source/apt-setup/debian/po/pl.po
    9976 --- ubiquity-2.6.10/d-i/source/apt-setup/debian/po/pl.po        2011-01-18 15:44:55.000000000 +0000
    9977 +++ ubiquity-2.6.10xcm1/d-i/source/apt-setup/debian/po/pl.po    2011-05-31 17:25:44.000000000 +0100
     10054diff -Naur ubiquity-2.6.10.orig//d-i/source/apt-setup/debian/po/pl.po ubiquity-2.6.10//d-i/source/apt-setup/debian/po/pl.po
     10055--- ubiquity-2.6.10.orig//d-i/source/apt-setup/debian/po/pl.po  2011-01-18 15:44:55.000000000 +0000
     10056+++ ubiquity-2.6.10//d-i/source/apt-setup/debian/po/pl.po       2011-07-14 11:47:08.297809365 +0100
    997810057@@ -208,7 +208,7 @@
    997910058 #| "Debian has two services that provide updates to releases: security and "
     
    1019510274+"to część Caixa Magica, ale jest oferowane przez CaixaMagica i odpowiednich dostawców "
    1019610275+"jako usługa dla uÅŒytkowników Caixa Magica."
    10197 diff -Nru ubiquity-2.6.10/d-i/source/apt-setup/debian/po/pt_BR.po ubiquity-2.6.10xcm1/d-i/source/apt-setup/debian/po/pt_BR.po
    10198 --- ubiquity-2.6.10/d-i/source/apt-setup/debian/po/pt_BR.po     2011-01-18 15:44:55.000000000 +0000
    10199 +++ ubiquity-2.6.10xcm1/d-i/source/apt-setup/debian/po/pt_BR.po 2011-05-31 17:25:44.000000000 +0100
     10276diff -Naur ubiquity-2.6.10.orig//d-i/source/apt-setup/debian/po/pt_BR.po ubiquity-2.6.10//d-i/source/apt-setup/debian/po/pt_BR.po
     10277--- ubiquity-2.6.10.orig//d-i/source/apt-setup/debian/po/pt_BR.po       2011-01-18 15:44:55.000000000 +0000
     10278+++ ubiquity-2.6.10//d-i/source/apt-setup/debian/po/pt_BR.po    2011-07-14 11:47:08.297809365 +0100
    1020010279@@ -210,7 +210,7 @@
    1020110280 #| "Debian has two services that provide updates to releases: security and "
     
    1038310462 "want to ship their latest software."
    1038410463 msgstr ""
    10385 diff -Nru ubiquity-2.6.10/d-i/source/apt-setup/debian/po/pt.po ubiquity-2.6.10xcm1/d-i/source/apt-setup/debian/po/pt.po
    10386 --- ubiquity-2.6.10/d-i/source/apt-setup/debian/po/pt.po        2011-01-18 15:44:55.000000000 +0000
    10387 +++ ubiquity-2.6.10xcm1/d-i/source/apt-setup/debian/po/pt.po    2011-05-31 17:25:44.000000000 +0100
     10464diff -Naur ubiquity-2.6.10.orig//d-i/source/apt-setup/debian/po/pt.po ubiquity-2.6.10//d-i/source/apt-setup/debian/po/pt.po
     10465--- ubiquity-2.6.10.orig//d-i/source/apt-setup/debian/po/pt.po  2011-01-18 15:44:55.000000000 +0000
     10466+++ ubiquity-2.6.10//d-i/source/apt-setup/debian/po/pt.po       2011-07-14 11:47:08.307809365 +0100
    1038810467@@ -208,7 +208,7 @@
    1038910468 #| "Debian has two services that provide updates to releases: security and "
     
    1060610685+"CaixaMagica e respectivos fornecedores como um serviço aos utilizadores de "
    1060710686 "Ubunti."
    10608 diff -Nru ubiquity-2.6.10/d-i/source/apt-setup/debian/po/ro.po ubiquity-2.6.10xcm1/d-i/source/apt-setup/debian/po/ro.po
    10609 --- ubiquity-2.6.10/d-i/source/apt-setup/debian/po/ro.po        2011-01-18 15:44:55.000000000 +0000
    10610 +++ ubiquity-2.6.10xcm1/d-i/source/apt-setup/debian/po/ro.po    2011-05-31 17:25:44.000000000 +0100
     10687diff -Naur ubiquity-2.6.10.orig//d-i/source/apt-setup/debian/po/ro.po ubiquity-2.6.10//d-i/source/apt-setup/debian/po/ro.po
     10688--- ubiquity-2.6.10.orig//d-i/source/apt-setup/debian/po/ro.po  2011-01-18 15:44:55.000000000 +0000
     10689+++ ubiquity-2.6.10//d-i/source/apt-setup/debian/po/ro.po       2011-07-14 11:47:08.307809365 +0100
    1061110690@@ -224,7 +224,7 @@
    1061210691 #| "Debian has two services that provide updates to releases: security and "
     
    1079210871 "want to ship their latest software."
    1079310872 msgstr ""
    10794 diff -Nru ubiquity-2.6.10/d-i/source/apt-setup/debian/po/ru.po ubiquity-2.6.10xcm1/d-i/source/apt-setup/debian/po/ru.po
    10795 --- ubiquity-2.6.10/d-i/source/apt-setup/debian/po/ru.po        2011-01-18 15:44:55.000000000 +0000
    10796 +++ ubiquity-2.6.10xcm1/d-i/source/apt-setup/debian/po/ru.po    2011-05-31 17:25:44.000000000 +0100
     10873diff -Naur ubiquity-2.6.10.orig//d-i/source/apt-setup/debian/po/ru.po ubiquity-2.6.10//d-i/source/apt-setup/debian/po/ru.po
     10874--- ubiquity-2.6.10.orig//d-i/source/apt-setup/debian/po/ru.po  2011-01-18 15:44:55.000000000 +0000
     10875+++ ubiquity-2.6.10//d-i/source/apt-setup/debian/po/ru.po       2011-07-14 11:47:08.307809365 +0100
    1079710876@@ -216,7 +216,7 @@
    1079810877 #| "Debian has two services that provide updates to releases: security and "
     
    1101911098+"пПльзПвателяЌ Caixa Magica кПЌпаМОей CaixaMagica О сППтветствующОЌО прПОзвПЎОтеляЌО "
    1102011099 "как услуга."
    11021 diff -Nru ubiquity-2.6.10/d-i/source/apt-setup/debian/po/se.po ubiquity-2.6.10xcm1/d-i/source/apt-setup/debian/po/se.po
    11022 --- ubiquity-2.6.10/d-i/source/apt-setup/debian/po/se.po        2011-01-18 15:44:55.000000000 +0000
    11023 +++ ubiquity-2.6.10xcm1/d-i/source/apt-setup/debian/po/se.po    2011-05-31 17:25:44.000000000 +0100
     11100diff -Naur ubiquity-2.6.10.orig//d-i/source/apt-setup/debian/po/se.po ubiquity-2.6.10//d-i/source/apt-setup/debian/po/se.po
     11101--- ubiquity-2.6.10.orig//d-i/source/apt-setup/debian/po/se.po  2011-01-18 15:44:55.000000000 +0000
     11102+++ ubiquity-2.6.10//d-i/source/apt-setup/debian/po/se.po       2011-07-14 11:47:08.307809365 +0100
    1102411103@@ -193,7 +193,7 @@
    1102511104 #. :sl2:
     
    1120011279 "want to ship their latest software."
    1120111280 msgstr ""
    11202 diff -Nru ubiquity-2.6.10/d-i/source/apt-setup/debian/po/sk.po ubiquity-2.6.10xcm1/d-i/source/apt-setup/debian/po/sk.po
    11203 --- ubiquity-2.6.10/d-i/source/apt-setup/debian/po/sk.po        2011-01-18 15:44:55.000000000 +0000
    11204 +++ ubiquity-2.6.10xcm1/d-i/source/apt-setup/debian/po/sk.po    2011-05-31 17:25:44.000000000 +0100
     11281diff -Naur ubiquity-2.6.10.orig//d-i/source/apt-setup/debian/po/sk.po ubiquity-2.6.10//d-i/source/apt-setup/debian/po/sk.po
     11282--- ubiquity-2.6.10.orig//d-i/source/apt-setup/debian/po/sk.po  2011-01-18 15:44:55.000000000 +0000
     11283+++ ubiquity-2.6.10//d-i/source/apt-setup/debian/po/sk.po       2011-07-14 11:47:08.307809365 +0100
    1120511284@@ -211,7 +211,7 @@
    1120611285 #| "Debian has two services that provide updates to releases: security and "
     
    1142411503+"softvér nie je súčasťou Caixa Magica, ale CaixaMagica a príslušní poskytovatelia ho "
    1142511504+"ponúkajú ako sluşbu pouşívateğom Caixa Magica."
    11426 diff -Nru ubiquity-2.6.10/d-i/source/apt-setup/debian/po/sl.po ubiquity-2.6.10xcm1/d-i/source/apt-setup/debian/po/sl.po
    11427 --- ubiquity-2.6.10/d-i/source/apt-setup/debian/po/sl.po        2011-01-18 15:44:55.000000000 +0000
    11428 +++ ubiquity-2.6.10xcm1/d-i/source/apt-setup/debian/po/sl.po    2011-05-31 17:25:44.000000000 +0100
     11505diff -Naur ubiquity-2.6.10.orig//d-i/source/apt-setup/debian/po/sl.po ubiquity-2.6.10//d-i/source/apt-setup/debian/po/sl.po
     11506--- ubiquity-2.6.10.orig//d-i/source/apt-setup/debian/po/sl.po  2011-01-18 15:44:55.000000000 +0000
     11507+++ ubiquity-2.6.10//d-i/source/apt-setup/debian/po/sl.po       2011-07-14 11:47:08.307809365 +0100
    1142911508@@ -223,7 +223,7 @@
    1143011509 #| "Debian has two services that provide updates to releases: security and "
     
    1164511724+"CaixaMagica. Ta oprema ni del sistema Caixa Magica ampak jo ponujajo CaixaMagica in "
    1164611725+"drugi prodajalci kot uslugo uporabnikom sistema Caixa Magica."
    11647 diff -Nru ubiquity-2.6.10/d-i/source/apt-setup/debian/po/sq.po ubiquity-2.6.10xcm1/d-i/source/apt-setup/debian/po/sq.po
    11648 --- ubiquity-2.6.10/d-i/source/apt-setup/debian/po/sq.po        2011-01-18 15:44:55.000000000 +0000
    11649 +++ ubiquity-2.6.10xcm1/d-i/source/apt-setup/debian/po/sq.po    2011-05-31 17:25:44.000000000 +0100
     11726diff -Naur ubiquity-2.6.10.orig//d-i/source/apt-setup/debian/po/sq.po ubiquity-2.6.10//d-i/source/apt-setup/debian/po/sq.po
     11727--- ubiquity-2.6.10.orig//d-i/source/apt-setup/debian/po/sq.po  2011-01-18 15:44:55.000000000 +0000
     11728+++ ubiquity-2.6.10//d-i/source/apt-setup/debian/po/sq.po       2011-07-14 11:47:08.307809365 +0100
    1165011729@@ -208,7 +208,7 @@
    1165111730 #| "Debian has two services that provide updates to releases: security and "
     
    1186911948+"software nuk është pjese e Caixa Magica-së, por ofrohet nga CaixaMagica dhe nga "
    1187011949+"shitësit respektivë si një shërbim ndaj përdoruesve të Caixa Magica-së."
    11871 diff -Nru ubiquity-2.6.10/d-i/source/apt-setup/debian/po/sr.po ubiquity-2.6.10xcm1/d-i/source/apt-setup/debian/po/sr.po
    11872 --- ubiquity-2.6.10/d-i/source/apt-setup/debian/po/sr.po        2011-01-18 15:44:55.000000000 +0000
    11873 +++ ubiquity-2.6.10xcm1/d-i/source/apt-setup/debian/po/sr.po    2011-05-31 17:25:44.000000000 +0100
     11950diff -Naur ubiquity-2.6.10.orig//d-i/source/apt-setup/debian/po/sr.po ubiquity-2.6.10//d-i/source/apt-setup/debian/po/sr.po
     11951--- ubiquity-2.6.10.orig//d-i/source/apt-setup/debian/po/sr.po  2011-01-18 15:44:55.000000000 +0000
     11952+++ ubiquity-2.6.10//d-i/source/apt-setup/debian/po/sr.po       2011-07-14 11:47:08.307809365 +0100
    1187411953@@ -213,7 +213,7 @@
    1187511954 #| "Debian has two services that provide updates to releases: security and "
     
    1205812137 "want to ship their latest software."
    1205912138 msgstr ""
    12060 diff -Nru ubiquity-2.6.10/d-i/source/apt-setup/debian/po/sv.po ubiquity-2.6.10xcm1/d-i/source/apt-setup/debian/po/sv.po
    12061 --- ubiquity-2.6.10/d-i/source/apt-setup/debian/po/sv.po        2011-01-18 15:44:55.000000000 +0000
    12062 +++ ubiquity-2.6.10xcm1/d-i/source/apt-setup/debian/po/sv.po    2011-05-31 17:25:44.000000000 +0100
     12139diff -Naur ubiquity-2.6.10.orig//d-i/source/apt-setup/debian/po/sv.po ubiquity-2.6.10//d-i/source/apt-setup/debian/po/sv.po
     12140--- ubiquity-2.6.10.orig//d-i/source/apt-setup/debian/po/sv.po  2011-01-18 15:44:55.000000000 +0000
     12141+++ ubiquity-2.6.10//d-i/source/apt-setup/debian/po/sv.po       2011-07-14 11:47:08.307809365 +0100
    1206312142@@ -218,7 +218,7 @@
    1206412143 #| "Debian has two services that provide updates to releases: security and "
     
    1228212361+"förråd. Denna programvara Àr inte en del av Caixa Magica men den tillhandahålls av "
    1228312362+"CaixaMagica och respektive tillverkare som en tjÀnst till Caixa Magica-anvÀndare."
    12284 diff -Nru ubiquity-2.6.10/d-i/source/apt-setup/debian/po/ta.po ubiquity-2.6.10xcm1/d-i/source/apt-setup/debian/po/ta.po
    12285 --- ubiquity-2.6.10/d-i/source/apt-setup/debian/po/ta.po        2011-01-18 15:44:55.000000000 +0000
    12286 +++ ubiquity-2.6.10xcm1/d-i/source/apt-setup/debian/po/ta.po    2011-05-31 17:25:44.000000000 +0100
     12363diff -Naur ubiquity-2.6.10.orig//d-i/source/apt-setup/debian/po/ta.po ubiquity-2.6.10//d-i/source/apt-setup/debian/po/ta.po
     12364--- ubiquity-2.6.10.orig//d-i/source/apt-setup/debian/po/ta.po  2011-01-18 15:44:55.000000000 +0000
     12365+++ ubiquity-2.6.10//d-i/source/apt-setup/debian/po/ta.po       2011-07-14 11:47:08.307809365 +0100
    1228712366@@ -19,7 +19,7 @@
    1228812367 "POT-Creation-Date: 2009-06-26 22:47+0000\n"
     
    1247612555 "want to ship their latest software."
    1247712556 msgstr ""
    12478 diff -Nru ubiquity-2.6.10/d-i/source/apt-setup/debian/po/templates.pot ubiquity-2.6.10xcm1/d-i/source/apt-setup/debian/po/templates.pot
    12479 --- ubiquity-2.6.10/d-i/source/apt-setup/debian/po/templates.pot        2011-01-18 15:44:55.000000000 +0000
    12480 +++ ubiquity-2.6.10xcm1/d-i/source/apt-setup/debian/po/templates.pot    2011-05-31 17:25:44.000000000 +0100
     12557diff -Naur ubiquity-2.6.10.orig//d-i/source/apt-setup/debian/po/templates.pot ubiquity-2.6.10//d-i/source/apt-setup/debian/po/templates.pot
     12558--- ubiquity-2.6.10.orig//d-i/source/apt-setup/debian/po/templates.pot  2011-01-18 15:44:55.000000000 +0000
     12559+++ ubiquity-2.6.10//d-i/source/apt-setup/debian/po/templates.pot       2011-07-14 11:47:08.307809365 +0100
    1248112560@@ -184,7 +184,7 @@
    1248212561 #. :sl2:
     
    1265712736 "want to ship their latest software."
    1265812737 msgstr ""
    12659 diff -Nru ubiquity-2.6.10/d-i/source/apt-setup/debian/po/te.po ubiquity-2.6.10xcm1/d-i/source/apt-setup/debian/po/te.po
    12660 --- ubiquity-2.6.10/d-i/source/apt-setup/debian/po/te.po        2011-01-18 15:44:55.000000000 +0000
    12661 +++ ubiquity-2.6.10xcm1/d-i/source/apt-setup/debian/po/te.po    2011-05-31 17:25:44.000000000 +0100
     12738diff -Naur ubiquity-2.6.10.orig//d-i/source/apt-setup/debian/po/te.po ubiquity-2.6.10//d-i/source/apt-setup/debian/po/te.po
     12739--- ubiquity-2.6.10.orig//d-i/source/apt-setup/debian/po/te.po  2011-01-18 15:44:55.000000000 +0000
     12740+++ ubiquity-2.6.10//d-i/source/apt-setup/debian/po/te.po       2011-07-14 11:47:08.307809365 +0100
    1266212741@@ -9,7 +9,7 @@
    1266312742 # వీవెచ్ (Veeven) <launchpad.net>, 2007.
     
    1287712956ఊచపు ఞటఫ్ట్వేర్ కెచటచికల్   \"partner\" ఞంగ్రహంలో à°
    1287812957ంఊుబటటులో వుంఊి. ఇఊి ఉబుంటు లో   à°­à°Ÿà°—à°‚ "
    12879 diff -Nru ubiquity-2.6.10/d-i/source/apt-setup/debian/po/th.po ubiquity-2.6.10xcm1/d-i/source/apt-setup/debian/po/th.po
    12880 --- ubiquity-2.6.10/d-i/source/apt-setup/debian/po/th.po        2011-01-18 15:44:55.000000000 +0000
    12881 +++ ubiquity-2.6.10xcm1/d-i/source/apt-setup/debian/po/th.po    2011-05-31 17:25:44.000000000 +0100
     12958diff -Naur ubiquity-2.6.10.orig//d-i/source/apt-setup/debian/po/th.po ubiquity-2.6.10//d-i/source/apt-setup/debian/po/th.po
     12959--- ubiquity-2.6.10.orig//d-i/source/apt-setup/debian/po/th.po  2011-01-18 15:44:55.000000000 +0000
     12960+++ ubiquity-2.6.10//d-i/source/apt-setup/debian/po/th.po       2011-07-14 11:47:08.307809365 +0100
    1288212961@@ -208,7 +208,7 @@
    1288312962 #| "Debian has two services that provide updates to releases: security and "
     
    1310113180+"àž‹àž­àžŸàž•à¹Œà¹àž§àž£à¹Œà¹€àž«àž¥à¹ˆàž²àž™àžµà¹‰à¹„àž¡à¹ˆà¹ƒàžŠà¹ˆàžªà¹ˆàž§àž™àž«àž™àž¶à¹ˆàž‡àž‚àž­àž‡ Caixa Magica à¹àž•à¹ˆàžˆàž±àž”à¹€àž•àž£àžµàž¢àž¡à¹ƒàž«à¹‰à¹‚àž”àž¢ CaixaMagica à¹àž¥àž°àžœàž¹à¹‰àžˆàž±àž”àžˆàž³àž«àž™à¹ˆàž²àž¢àž­àž·à¹ˆàž™à¹† "
    1310213181+"à¹€àžžàž·à¹ˆàž­à¹€àž›à¹‡àž™àžšàž£àžŽàžàž²àž£àžªàž³àž«àž£àž±àžšàžœàž¹à¹‰à¹ƒàžŠà¹‰ Caixa Magica"
    13103 diff -Nru ubiquity-2.6.10/d-i/source/apt-setup/debian/po/tl.po ubiquity-2.6.10xcm1/d-i/source/apt-setup/debian/po/tl.po
    13104 --- ubiquity-2.6.10/d-i/source/apt-setup/debian/po/tl.po        2011-01-18 15:44:55.000000000 +0000
    13105 +++ ubiquity-2.6.10xcm1/d-i/source/apt-setup/debian/po/tl.po    2011-05-31 17:25:44.000000000 +0100
     13182diff -Naur ubiquity-2.6.10.orig//d-i/source/apt-setup/debian/po/tl.po ubiquity-2.6.10//d-i/source/apt-setup/debian/po/tl.po
     13183--- ubiquity-2.6.10.orig//d-i/source/apt-setup/debian/po/tl.po  2011-01-18 15:44:55.000000000 +0000
     13184+++ ubiquity-2.6.10//d-i/source/apt-setup/debian/po/tl.po       2011-07-14 11:47:08.307809365 +0100
    1310613185@@ -217,7 +217,7 @@
    1310713186 #| "Debian has two services that provide updates to releases: security and "
     
    1328213361 "want to ship their latest software."
    1328313362 msgstr ""
    13284 diff -Nru ubiquity-2.6.10/d-i/source/apt-setup/debian/po/tr.po ubiquity-2.6.10xcm1/d-i/source/apt-setup/debian/po/tr.po
    13285 --- ubiquity-2.6.10/d-i/source/apt-setup/debian/po/tr.po        2011-01-18 15:44:55.000000000 +0000
    13286 +++ ubiquity-2.6.10xcm1/d-i/source/apt-setup/debian/po/tr.po    2011-05-31 17:25:44.000000000 +0100
     13363diff -Naur ubiquity-2.6.10.orig//d-i/source/apt-setup/debian/po/tr.po ubiquity-2.6.10//d-i/source/apt-setup/debian/po/tr.po
     13364--- ubiquity-2.6.10.orig//d-i/source/apt-setup/debian/po/tr.po  2011-01-18 15:44:55.000000000 +0000
     13365+++ ubiquity-2.6.10//d-i/source/apt-setup/debian/po/tr.po       2011-07-14 11:47:08.307809365 +0100
    1328713366@@ -216,7 +216,7 @@
    1328813367 #| "Debian has two services that provide updates to releases: security and "
     
    1350613585+"Caixa Magica'nun bir parçası olmamakla birlikte Caixa Magica kullanıcılarına bir hizmet "
    1350713586+"olarak  CaixaMagica ve ilgili sağlayıcılar tarafından sunulurlar."
    13508 diff -Nru ubiquity-2.6.10/d-i/source/apt-setup/debian/po/uk.po ubiquity-2.6.10xcm1/d-i/source/apt-setup/debian/po/uk.po
    13509 --- ubiquity-2.6.10/d-i/source/apt-setup/debian/po/uk.po        2011-01-18 15:44:55.000000000 +0000
    13510 +++ ubiquity-2.6.10xcm1/d-i/source/apt-setup/debian/po/uk.po    2011-05-31 17:25:44.000000000 +0100
     13587diff -Naur ubiquity-2.6.10.orig//d-i/source/apt-setup/debian/po/uk.po ubiquity-2.6.10//d-i/source/apt-setup/debian/po/uk.po
     13588--- ubiquity-2.6.10.orig//d-i/source/apt-setup/debian/po/uk.po  2011-01-18 15:44:55.000000000 +0000
     13589+++ ubiquity-2.6.10//d-i/source/apt-setup/debian/po/uk.po       2011-07-14 11:47:08.307809365 +0100
    1351113590@@ -213,7 +213,7 @@
    1351213591 #| "Debian has two services that provide updates to releases: security and "
     
    1369513774 "want to ship their latest software."
    1369613775 msgstr ""
    13697 diff -Nru ubiquity-2.6.10/d-i/source/apt-setup/debian/po/vi.po ubiquity-2.6.10xcm1/d-i/source/apt-setup/debian/po/vi.po
    13698 --- ubiquity-2.6.10/d-i/source/apt-setup/debian/po/vi.po        2011-01-18 15:44:55.000000000 +0000
    13699 +++ ubiquity-2.6.10xcm1/d-i/source/apt-setup/debian/po/vi.po    2011-05-31 17:25:44.000000000 +0100
     13776diff -Naur ubiquity-2.6.10.orig//d-i/source/apt-setup/debian/po/vi.po ubiquity-2.6.10//d-i/source/apt-setup/debian/po/vi.po
     13777--- ubiquity-2.6.10.orig//d-i/source/apt-setup/debian/po/vi.po  2011-01-18 15:44:55.000000000 +0000
     13778+++ ubiquity-2.6.10//d-i/source/apt-setup/debian/po/vi.po       2011-07-14 11:47:08.307809365 +0100
    1370013779@@ -212,7 +212,7 @@
    1370113780 #| "Debian has two services that provide updates to releases: security and "
     
    1391913998+"mềm này khÃŽng phải thuộc về Caixa Magica, nhÆ°ng mà nó được cung cấp bởi CaixaMagica "
    1392013999+"và các nhà bán tương ứng để giúp các người dùng Caixa Magica."
    13921 diff -Nru ubiquity-2.6.10/d-i/source/apt-setup/debian/po/zh_CN.po ubiquity-2.6.10xcm1/d-i/source/apt-setup/debian/po/zh_CN.po
    13922 --- ubiquity-2.6.10/d-i/source/apt-setup/debian/po/zh_CN.po     2011-01-18 15:44:55.000000000 +0000
    13923 +++ ubiquity-2.6.10xcm1/d-i/source/apt-setup/debian/po/zh_CN.po 2011-05-31 17:25:44.000000000 +0100
     14000diff -Naur ubiquity-2.6.10.orig//d-i/source/apt-setup/debian/po/zh_CN.po ubiquity-2.6.10//d-i/source/apt-setup/debian/po/zh_CN.po
     14001--- ubiquity-2.6.10.orig//d-i/source/apt-setup/debian/po/zh_CN.po       2011-01-18 15:44:55.000000000 +0000
     14002+++ ubiquity-2.6.10//d-i/source/apt-setup/debian/po/zh_CN.po    2011-07-14 11:47:08.307809365 +0100
    1392414003@@ -207,7 +207,7 @@
    1392514004 #| "Debian has two services that provide updates to releases: security and "
     
    1413814217+"CaixaMagica 的“partner”仓库䞭有额倖的蜯件。这些蜯件䞍是 Caixa Magica 的组成郚分䜆是"
    1413914218+"是由 CaixaMagica 以及各䞪䟛应商䜜䞺 Caixa Magica 甚户的服务而提䟛的。"
    14140 diff -Nru ubiquity-2.6.10/d-i/source/apt-setup/debian/po/zh_TW.po ubiquity-2.6.10xcm1/d-i/source/apt-setup/debian/po/zh_TW.po
    14141 --- ubiquity-2.6.10/d-i/source/apt-setup/debian/po/zh_TW.po     2011-01-18 15:44:55.000000000 +0000
    14142 +++ ubiquity-2.6.10xcm1/d-i/source/apt-setup/debian/po/zh_TW.po 2011-05-31 17:25:44.000000000 +0100
     14219diff -Naur ubiquity-2.6.10.orig//d-i/source/apt-setup/debian/po/zh_TW.po ubiquity-2.6.10//d-i/source/apt-setup/debian/po/zh_TW.po
     14220--- ubiquity-2.6.10.orig//d-i/source/apt-setup/debian/po/zh_TW.po       2011-01-18 15:44:55.000000000 +0000
     14221+++ ubiquity-2.6.10//d-i/source/apt-setup/debian/po/zh_TW.po    2011-07-14 11:47:08.307809365 +0100
    1414314222@@ -202,7 +202,7 @@
    1414414223 #| "Debian has two services that provide updates to releases: security and "
     
    1437014449提䟛的䞀é 
    1437114450服務。"
    14372 diff -Nru ubiquity-2.6.10/d-i/source/apt-setup/generators/50mirror.ubuntu ubiquity-2.6.10xcm1/d-i/source/apt-setup/generators/50mirror.ubuntu
    14373 --- ubiquity-2.6.10/d-i/source/apt-setup/generators/50mirror.ubuntu     2011-01-18 15:44:55.000000000 +0000
    14374 +++ ubiquity-2.6.10xcm1/d-i/source/apt-setup/generators/50mirror.ubuntu 2011-05-31 17:25:44.000000000 +0100
     14451diff -Naur ubiquity-2.6.10.orig//d-i/source/apt-setup/generators/50mirror.ubuntu ubiquity-2.6.10//d-i/source/apt-setup/generators/50mirror.ubuntu
     14452--- ubiquity-2.6.10.orig//d-i/source/apt-setup/generators/50mirror.ubuntu       2011-01-18 15:44:55.000000000 +0000
     14453+++ ubiquity-2.6.10//d-i/source/apt-setup/generators/50mirror.ubuntu    2011-07-14 11:47:08.307809365 +0100
    1437514454@@ -98,7 +98,8 @@
    1437614455 db_get mirror/$protocol/hostname
     
    1445614535 
    1445714536 exit 0
    14458 diff -Nru ubiquity-2.6.10/d-i/source/apt-setup/generators/90services-select ubiquity-2.6.10xcm1/d-i/source/apt-setup/generators/90services-select
    14459 --- ubiquity-2.6.10/d-i/source/apt-setup/generators/90services-select   2011-04-08 12:35:58.000000000 +0100
    14460 +++ ubiquity-2.6.10xcm1/d-i/source/apt-setup/generators/90services-select       2011-05-31 17:25:44.000000000 +0100
     14537diff -Naur ubiquity-2.6.10.orig//d-i/source/apt-setup/generators/90services-select ubiquity-2.6.10//d-i/source/apt-setup/generators/90services-select
     14538--- ubiquity-2.6.10.orig//d-i/source/apt-setup/generators/90services-select     2011-04-08 12:35:58.000000000 +0100
     14539+++ ubiquity-2.6.10//d-i/source/apt-setup/generators/90services-select  2011-07-14 11:47:08.307809365 +0100
    1446114540@@ -50,8 +50,8 @@
    1446214541 if (! db_get apt-setup/restricted || [ "$RET" = false ]) && \
     
    1447014549 if db_get apt-setup/extras && [ "$RET" = true ]; then
    1447114550        enable_service extras
    14472 diff -Nru ubiquity-2.6.10/d-i/source/apt-setup/generators/91security ubiquity-2.6.10xcm1/d-i/source/apt-setup/generators/91security
    14473 --- ubiquity-2.6.10/d-i/source/apt-setup/generators/91security  2011-01-18 15:44:55.000000000 +0000
    14474 +++ ubiquity-2.6.10xcm1/d-i/source/apt-setup/generators/91security      2011-05-31 17:25:44.000000000 +0100
     14551diff -Naur ubiquity-2.6.10.orig//d-i/source/apt-setup/generators/91security ubiquity-2.6.10//d-i/source/apt-setup/generators/91security
     14552--- ubiquity-2.6.10.orig//d-i/source/apt-setup/generators/91security    2011-01-18 15:44:55.000000000 +0000
     14553+++ ubiquity-2.6.10//d-i/source/apt-setup/generators/91security 2011-07-14 11:47:08.307809365 +0100
    1447514554@@ -15,7 +15,7 @@
    1447614555 [ "$host" ] || exit
     
    1451714596 
    1451814597 exit 0
    14519 diff -Nru ubiquity-2.6.10/d-i/source/apt-setup/generators/93partner ubiquity-2.6.10xcm1/d-i/source/apt-setup/generators/93partner
    14520 --- ubiquity-2.6.10/d-i/source/apt-setup/generators/93partner   2011-01-18 13:51:56.000000000 +0000
    14521 +++ ubiquity-2.6.10xcm1/d-i/source/apt-setup/generators/93partner       2011-05-31 17:25:44.000000000 +0100
     14598diff -Naur ubiquity-2.6.10.orig//d-i/source/apt-setup/generators/93partner ubiquity-2.6.10//d-i/source/apt-setup/generators/93partner
     14599--- ubiquity-2.6.10.orig//d-i/source/apt-setup/generators/93partner     2011-01-18 13:51:56.000000000 +0000
     14600+++ ubiquity-2.6.10//d-i/source/apt-setup/generators/93partner  2011-07-14 11:47:08.307809365 +0100
    1452214601@@ -5,11 +5,11 @@
    1452314602 
     
    1456414643 
    1456514644 exit 0
    14566 diff -Nru ubiquity-2.6.10/d-i/source/apt-setup/generators/94extras ubiquity-2.6.10xcm1/d-i/source/apt-setup/generators/94extras
    14567 --- ubiquity-2.6.10/d-i/source/apt-setup/generators/94extras    2011-01-18 13:51:56.000000000 +0000
    14568 +++ ubiquity-2.6.10xcm1/d-i/source/apt-setup/generators/94extras        2011-05-31 17:25:44.000000000 +0100
     14645diff -Naur ubiquity-2.6.10.orig//d-i/source/apt-setup/generators/94extras ubiquity-2.6.10//d-i/source/apt-setup/generators/94extras
     14646--- ubiquity-2.6.10.orig//d-i/source/apt-setup/generators/94extras      2011-01-18 13:51:56.000000000 +0000
     14647+++ ubiquity-2.6.10//d-i/source/apt-setup/generators/94extras   2011-07-14 11:47:08.307809365 +0100
    1456914648@@ -10,24 +10,25 @@
    1457014649 fi
     
    1460714686 
    1460814687 exit 0
    14609 diff -Nru ubiquity-2.6.10/d-i/source/apt-setup/release-files/ftp.caixamagica.pt/horn/Release ubiquity-2.6.10xcm1/d-i/source/apt-setup/release-files/ftp.caixamagica.pt/horn/Release
    14610 --- ubiquity-2.6.10/d-i/source/apt-setup/release-files/ftp.caixamagica.pt/horn/Release  1970-01-01 01:00:00.000000000 +0100
    14611 +++ ubiquity-2.6.10xcm1/d-i/source/apt-setup/release-files/ftp.caixamagica.pt/horn/Release      2011-05-31 17:25:44.000000000 +0100
     14688diff -Naur ubiquity-2.6.10.orig//d-i/source/apt-setup/release-files/ftp.caixamagica.pt/horn/Release ubiquity-2.6.10//d-i/source/apt-setup/release-files/ftp.caixamagica.pt/horn/Release
     14689--- ubiquity-2.6.10.orig//d-i/source/apt-setup/release-files/ftp.caixamagica.pt/horn/Release    1970-01-01 01:00:00.000000000 +0100
     14690+++ ubiquity-2.6.10//d-i/source/apt-setup/release-files/ftp.caixamagica.pt/horn/Release 2011-07-14 11:47:08.307809365 +0100
    1461214691@@ -0,0 +1,196 @@
    1461314692+Origin: Caixa Magica <software@caixamagica.pt>
     
    1480714886+ 996fc15a74e5fd4b55e39361fac23ad219aab652b7bb0addd4e8c832e5150acb 295324057 Contents-amd64
    1480814887+ 8c8875b2c2dc648ad3c5ca40d1949d9a36e7891d9178af2210819d9394b39b2c 20363384 Contents-amd64.gz
    14809 diff -Nru ubiquity-2.6.10/d-i/source/apt-setup/release-files/ftp.caixamagica.pt/horn/Release.gpg ubiquity-2.6.10xcm1/d-i/source/apt-setup/release-files/ftp.caixamagica.pt/horn/Release.gpg
    14810 --- ubiquity-2.6.10/d-i/source/apt-setup/release-files/ftp.caixamagica.pt/horn/Release.gpg      1970-01-01 01:00:00.000000000 +0100
    14811 +++ ubiquity-2.6.10xcm1/d-i/source/apt-setup/release-files/ftp.caixamagica.pt/horn/Release.gpg  2011-05-31 17:25:44.000000000 +0100
     14888diff -Naur ubiquity-2.6.10.orig//d-i/source/apt-setup/release-files/ftp.caixamagica.pt/horn/Release.gpg ubiquity-2.6.10//d-i/source/apt-setup/release-files/ftp.caixamagica.pt/horn/Release.gpg
     14889--- ubiquity-2.6.10.orig//d-i/source/apt-setup/release-files/ftp.caixamagica.pt/horn/Release.gpg        1970-01-01 01:00:00.000000000 +0100
     14890+++ ubiquity-2.6.10//d-i/source/apt-setup/release-files/ftp.caixamagica.pt/horn/Release.gpg     2011-07-14 11:47:08.307809365 +0100
    1481214891@@ -0,0 +1,11 @@
    1481314892+-----BEGIN PGP SIGNATURE-----
     
    1482214901+=C6ze
    1482314902+-----END PGP SIGNATURE-----
    14824 diff -Nru ubiquity-2.6.10/d-i/source/apt-setup/release-files/ftp.caixamagica.pt/horn-backports/Release ubiquity-2.6.10xcm1/d-i/source/apt-setup/release-files/ftp.caixamagica.pt/horn-backports/Release
    14825 --- ubiquity-2.6.10/d-i/source/apt-setup/release-files/ftp.caixamagica.pt/horn-backports/Release        1970-01-01 01:00:00.000000000 +0100
    14826 +++ ubiquity-2.6.10xcm1/d-i/source/apt-setup/release-files/ftp.caixamagica.pt/horn-backports/Release    2011-05-31 17:25:44.000000000 +0100
     14903diff -Naur ubiquity-2.6.10.orig//d-i/source/apt-setup/release-files/ftp.caixamagica.pt/horn-backports/Release ubiquity-2.6.10//d-i/source/apt-setup/release-files/ftp.caixamagica.pt/horn-backports/Release
     14904--- ubiquity-2.6.10.orig//d-i/source/apt-setup/release-files/ftp.caixamagica.pt/horn-backports/Release  1970-01-01 01:00:00.000000000 +0100
     14905+++ ubiquity-2.6.10//d-i/source/apt-setup/release-files/ftp.caixamagica.pt/horn-backports/Release       2011-07-14 11:47:08.307809365 +0100
    1482714906@@ -0,0 +1,169 @@
    1482814907+Origin: Caixa Magica <software@caixamagica.pt>
     
    1499515074+ cf13e85fc3cdf7bc0182ba23034b735b2544edbc0074dcbe617974164ae3be9f 65 Contents-amd64
    1499615075+ 44818733e04c03289b19184fc4f4d7cd61e9496fd94bc254744cd5c7d10c2ab6 36 Contents-amd64.gz
    14997 diff -Nru ubiquity-2.6.10/d-i/source/apt-setup/release-files/ftp.caixamagica.pt/horn-backports/Release.gpg ubiquity-2.6.10xcm1/d-i/source/apt-setup/release-files/ftp.caixamagica.pt/horn-backports/Release.gpg
    14998 --- ubiquity-2.6.10/d-i/source/apt-setup/release-files/ftp.caixamagica.pt/horn-backports/Release.gpg    1970-01-01 01:00:00.000000000 +0100
    14999 +++ ubiquity-2.6.10xcm1/d-i/source/apt-setup/release-files/ftp.caixamagica.pt/horn-backports/Release.gpg        2011-05-31 17:25:44.000000000 +0100
     15076diff -Naur ubiquity-2.6.10.orig//d-i/source/apt-setup/release-files/ftp.caixamagica.pt/horn-backports/Release.gpg ubiquity-2.6.10//d-i/source/apt-setup/release-files/ftp.caixamagica.pt/horn-backports/Release.gpg
     15077--- ubiquity-2.6.10.orig//d-i/source/apt-setup/release-files/ftp.caixamagica.pt/horn-backports/Release.gpg      1970-01-01 01:00:00.000000000 +0100
     15078+++ ubiquity-2.6.10//d-i/source/apt-setup/release-files/ftp.caixamagica.pt/horn-backports/Release.gpg   2011-07-14 11:47:08.307809365 +0100
    1500015079@@ -0,0 +1,11 @@
    1500115080+-----BEGIN PGP SIGNATURE-----
     
    1501015089+=GUZS
    1501115090+-----END PGP SIGNATURE-----
    15012 diff -Nru ubiquity-2.6.10/d-i/source/apt-setup/release-files/ftp.caixamagica.pt/horn-backports-testing/Release ubiquity-2.6.10xcm1/d-i/source/apt-setup/release-files/ftp.caixamagica.pt/horn-backports-testing/Release
    15013 --- ubiquity-2.6.10/d-i/source/apt-setup/release-files/ftp.caixamagica.pt/horn-backports-testing/Release        1970-01-01 01:00:00.000000000 +0100
    15014 +++ ubiquity-2.6.10xcm1/d-i/source/apt-setup/release-files/ftp.caixamagica.pt/horn-backports-testing/Release    2011-05-31 17:25:44.000000000 +0100
     15091diff -Naur ubiquity-2.6.10.orig//d-i/source/apt-setup/release-files/ftp.caixamagica.pt/horn-backports-testing/Release ubiquity-2.6.10//d-i/source/apt-setup/release-files/ftp.caixamagica.pt/horn-backports-testing/Release
     15092--- ubiquity-2.6.10.orig//d-i/source/apt-setup/release-files/ftp.caixamagica.pt/horn-backports-testing/Release  1970-01-01 01:00:00.000000000 +0100
     15093+++ ubiquity-2.6.10//d-i/source/apt-setup/release-files/ftp.caixamagica.pt/horn-backports-testing/Release       2011-07-14 11:47:08.307809365 +0100
    1501515094@@ -0,0 +1,169 @@
    1501615095+Origin: Caixa Magica <software@caixamagica.pt>
     
    1518315262+ cf13e85fc3cdf7bc0182ba23034b735b2544edbc0074dcbe617974164ae3be9f 65 Contents-amd64
    1518415263+ 44818733e04c03289b19184fc4f4d7cd61e9496fd94bc254744cd5c7d10c2ab6 36 Contents-amd64.gz
    15185 diff -Nru ubiquity-2.6.10/d-i/source/apt-setup/release-files/ftp.caixamagica.pt/horn-backports-testing/Release.gpg ubiquity-2.6.10xcm1/d-i/source/apt-setup/release-files/ftp.caixamagica.pt/horn-backports-testing/Release.gpg
    15186 --- ubiquity-2.6.10/d-i/source/apt-setup/release-files/ftp.caixamagica.pt/horn-backports-testing/Release.gpg    1970-01-01 01:00:00.000000000 +0100
    15187 +++ ubiquity-2.6.10xcm1/d-i/source/apt-setup/release-files/ftp.caixamagica.pt/horn-backports-testing/Release.gpg        2011-05-31 17:25:44.000000000 +0100
     15264diff -Naur ubiquity-2.6.10.orig//d-i/source/apt-setup/release-files/ftp.caixamagica.pt/horn-backports-testing/Release.gpg ubiquity-2.6.10//d-i/source/apt-setup/release-files/ftp.caixamagica.pt/horn-backports-testing/Release.gpg
     15265--- ubiquity-2.6.10.orig//d-i/source/apt-setup/release-files/ftp.caixamagica.pt/horn-backports-testing/Release.gpg      1970-01-01 01:00:00.000000000 +0100
     15266+++ ubiquity-2.6.10//d-i/source/apt-setup/release-files/ftp.caixamagica.pt/horn-backports-testing/Release.gpg   2011-07-14 11:47:08.307809365 +0100
    1518815267@@ -0,0 +1,11 @@
    1518915268+-----BEGIN PGP SIGNATURE-----
     
    1519815277+=gYUn
    1519915278+-----END PGP SIGNATURE-----
    15200 diff -Nru ubiquity-2.6.10/d-i/source/apt-setup/release-files/ftp.caixamagica.pt/horn-proposed/Release ubiquity-2.6.10xcm1/d-i/source/apt-setup/release-files/ftp.caixamagica.pt/horn-proposed/Release
    15201 --- ubiquity-2.6.10/d-i/source/apt-setup/release-files/ftp.caixamagica.pt/horn-proposed/Release 1970-01-01 01:00:00.000000000 +0100
    15202 +++ ubiquity-2.6.10xcm1/d-i/source/apt-setup/release-files/ftp.caixamagica.pt/horn-proposed/Release     2011-05-31 17:25:44.000000000 +0100
     15279diff -Naur ubiquity-2.6.10.orig//d-i/source/apt-setup/release-files/ftp.caixamagica.pt/horn-proposed/Release ubiquity-2.6.10//d-i/source/apt-setup/release-files/ftp.caixamagica.pt/horn-proposed/Release
     15280--- ubiquity-2.6.10.orig//d-i/source/apt-setup/release-files/ftp.caixamagica.pt/horn-proposed/Release   1970-01-01 01:00:00.000000000 +0100
     15281+++ ubiquity-2.6.10//d-i/source/apt-setup/release-files/ftp.caixamagica.pt/horn-proposed/Release        2011-07-14 11:47:08.307809365 +0100
    1520315282@@ -0,0 +1,169 @@
    1520415283+Origin: Caixa Magica <software@caixamagica.pt>
     
    1537115450+ cf13e85fc3cdf7bc0182ba23034b735b2544edbc0074dcbe617974164ae3be9f 65 Contents-amd64
    1537215451+ 44818733e04c03289b19184fc4f4d7cd61e9496fd94bc254744cd5c7d10c2ab6 36 Contents-amd64.gz
    15373 diff -Nru ubiquity-2.6.10/d-i/source/apt-setup/release-files/ftp.caixamagica.pt/horn-proposed/Release.gpg ubiquity-2.6.10xcm1/d-i/source/apt-setup/release-files/ftp.caixamagica.pt/horn-proposed/Release.gpg
    15374 --- ubiquity-2.6.10/d-i/source/apt-setup/release-files/ftp.caixamagica.pt/horn-proposed/Release.gpg     1970-01-01 01:00:00.000000000 +0100
    15375 +++ ubiquity-2.6.10xcm1/d-i/source/apt-setup/release-files/ftp.caixamagica.pt/horn-proposed/Release.gpg 2011-05-31 17:25:44.000000000 +0100
     15452diff -Naur ubiquity-2.6.10.orig//d-i/source/apt-setup/release-files/ftp.caixamagica.pt/horn-proposed/Release.gpg ubiquity-2.6.10//d-i/source/apt-setup/release-files/ftp.caixamagica.pt/horn-proposed/Release.gpg
     15453--- ubiquity-2.6.10.orig//d-i/source/apt-setup/release-files/ftp.caixamagica.pt/horn-proposed/Release.gpg       1970-01-01 01:00:00.000000000 +0100
     15454+++ ubiquity-2.6.10//d-i/source/apt-setup/release-files/ftp.caixamagica.pt/horn-proposed/Release.gpg    2011-07-14 11:47:08.307809365 +0100
    1537615455@@ -0,0 +1,11 @@
    1537715456+-----BEGIN PGP SIGNATURE-----
     
    1538615465+=WTNl
    1538715466+-----END PGP SIGNATURE-----
    15388 diff -Nru ubiquity-2.6.10/d-i/source/apt-setup/release-files/ftp.caixamagica.pt/horn-proposed-testing/Release ubiquity-2.6.10xcm1/d-i/source/apt-setup/release-files/ftp.caixamagica.pt/horn-proposed-testing/Release
    15389 --- ubiquity-2.6.10/d-i/source/apt-setup/release-files/ftp.caixamagica.pt/horn-proposed-testing/Release 1970-01-01 01:00:00.000000000 +0100
    15390 +++ ubiquity-2.6.10xcm1/d-i/source/apt-setup/release-files/ftp.caixamagica.pt/horn-proposed-testing/Release     2011-05-31 17:25:44.000000000 +0100
     15467diff -Naur ubiquity-2.6.10.orig//d-i/source/apt-setup/release-files/ftp.caixamagica.pt/horn-proposed-testing/Release ubiquity-2.6.10//d-i/source/apt-setup/release-files/ftp.caixamagica.pt/horn-proposed-testing/Release
     15468--- ubiquity-2.6.10.orig//d-i/source/apt-setup/release-files/ftp.caixamagica.pt/horn-proposed-testing/Release   1970-01-01 01:00:00.000000000 +0100
     15469+++ ubiquity-2.6.10//d-i/source/apt-setup/release-files/ftp.caixamagica.pt/horn-proposed-testing/Release        2011-07-14 11:47:08.307809365 +0100
    1539115470@@ -0,0 +1,169 @@
    1539215471+Origin: Caixa Magica <software@caixamagica.pt>
     
    1555915638+ cf13e85fc3cdf7bc0182ba23034b735b2544edbc0074dcbe617974164ae3be9f 65 Contents-amd64
    1556015639+ 44818733e04c03289b19184fc4f4d7cd61e9496fd94bc254744cd5c7d10c2ab6 36 Contents-amd64.gz
    15561 diff -Nru ubiquity-2.6.10/d-i/source/apt-setup/release-files/ftp.caixamagica.pt/horn-proposed-testing/Release.gpg ubiquity-2.6.10xcm1/d-i/source/apt-setup/release-files/ftp.caixamagica.pt/horn-proposed-testing/Release.gpg
    15562 --- ubiquity-2.6.10/d-i/source/apt-setup/release-files/ftp.caixamagica.pt/horn-proposed-testing/Release.gpg     1970-01-01 01:00:00.000000000 +0100
    15563 +++ ubiquity-2.6.10xcm1/d-i/source/apt-setup/release-files/ftp.caixamagica.pt/horn-proposed-testing/Release.gpg 2011-05-31 17:25:44.000000000 +0100
     15640diff -Naur ubiquity-2.6.10.orig//d-i/source/apt-setup/release-files/ftp.caixamagica.pt/horn-proposed-testing/Release.gpg ubiquity-2.6.10//d-i/source/apt-setup/release-files/ftp.caixamagica.pt/horn-proposed-testing/Release.gpg
     15641--- ubiquity-2.6.10.orig//d-i/source/apt-setup/release-files/ftp.caixamagica.pt/horn-proposed-testing/Release.gpg       1970-01-01 01:00:00.000000000 +0100
     15642+++ ubiquity-2.6.10//d-i/source/apt-setup/release-files/ftp.caixamagica.pt/horn-proposed-testing/Release.gpg    2011-07-14 11:47:08.307809365 +0100
    1556415643@@ -0,0 +1,11 @@
    1556515644+-----BEGIN PGP SIGNATURE-----
     
    1557415653+=2QrQ
    1557515654+-----END PGP SIGNATURE-----
    15576 diff -Nru ubiquity-2.6.10/d-i/source/apt-setup/release-files/ftp.caixamagica.pt/horn-rollback/Release ubiquity-2.6.10xcm1/d-i/source/apt-setup/release-files/ftp.caixamagica.pt/horn-rollback/Release
    15577 --- ubiquity-2.6.10/d-i/source/apt-setup/release-files/ftp.caixamagica.pt/horn-rollback/Release 1970-01-01 01:00:00.000000000 +0100
    15578 +++ ubiquity-2.6.10xcm1/d-i/source/apt-setup/release-files/ftp.caixamagica.pt/horn-rollback/Release     2011-05-31 17:25:44.000000000 +0100
     15655diff -Naur ubiquity-2.6.10.orig//d-i/source/apt-setup/release-files/ftp.caixamagica.pt/horn-rollback/Release ubiquity-2.6.10//d-i/source/apt-setup/release-files/ftp.caixamagica.pt/horn-rollback/Release
     15656--- ubiquity-2.6.10.orig//d-i/source/apt-setup/release-files/ftp.caixamagica.pt/horn-rollback/Release   1970-01-01 01:00:00.000000000 +0100
     15657+++ ubiquity-2.6.10//d-i/source/apt-setup/release-files/ftp.caixamagica.pt/horn-rollback/Release        2011-07-14 11:47:08.307809365 +0100
    1557915658@@ -0,0 +1,42 @@
    1558015659+Architectures: i386 amd64 source
     
    1562015699+ 8e32ab467dde2fba6561ad5aaa2baf722bedbc6aa55e6331025b1e4f18efe974          5503548 rollback/source/Sources.bz2
    1562115700+ 57a18ac57a55096d08093911e49c024b1aa121db37fe55e1870420d85861afc2          6912604 rollback/source/Sources.gz
    15622 diff -Nru ubiquity-2.6.10/d-i/source/apt-setup/release-files/ftp.caixamagica.pt/horn-rollback/Release.gpg ubiquity-2.6.10xcm1/d-i/source/apt-setup/release-files/ftp.caixamagica.pt/horn-rollback/Release.gpg
    15623 --- ubiquity-2.6.10/d-i/source/apt-setup/release-files/ftp.caixamagica.pt/horn-rollback/Release.gpg     1970-01-01 01:00:00.000000000 +0100
    15624 +++ ubiquity-2.6.10xcm1/d-i/source/apt-setup/release-files/ftp.caixamagica.pt/horn-rollback/Release.gpg 2011-05-31 17:25:44.000000000 +0100
     15701diff -Naur ubiquity-2.6.10.orig//d-i/source/apt-setup/release-files/ftp.caixamagica.pt/horn-rollback/Release.gpg ubiquity-2.6.10//d-i/source/apt-setup/release-files/ftp.caixamagica.pt/horn-rollback/Release.gpg
     15702--- ubiquity-2.6.10.orig//d-i/source/apt-setup/release-files/ftp.caixamagica.pt/horn-rollback/Release.gpg       1970-01-01 01:00:00.000000000 +0100
     15703+++ ubiquity-2.6.10//d-i/source/apt-setup/release-files/ftp.caixamagica.pt/horn-rollback/Release.gpg    2011-07-14 11:47:08.307809365 +0100
    1562515704@@ -0,0 +1,11 @@
    1562615705+-----BEGIN PGP SIGNATURE-----
     
    1563515714+=4XWt
    1563615715+-----END PGP SIGNATURE-----
    15637 diff -Nru ubiquity-2.6.10/d-i/source/apt-setup/release-files/ftp.caixamagica.pt/horn-security/Release ubiquity-2.6.10xcm1/d-i/source/apt-setup/release-files/ftp.caixamagica.pt/horn-security/Release
    15638 --- ubiquity-2.6.10/d-i/source/apt-setup/release-files/ftp.caixamagica.pt/horn-security/Release 1970-01-01 01:00:00.000000000 +0100
    15639 +++ ubiquity-2.6.10xcm1/d-i/source/apt-setup/release-files/ftp.caixamagica.pt/horn-security/Release     2011-05-31 17:25:44.000000000 +0100
     15716diff -Naur ubiquity-2.6.10.orig//d-i/source/apt-setup/release-files/ftp.caixamagica.pt/horn-security/Release ubiquity-2.6.10//d-i/source/apt-setup/release-files/ftp.caixamagica.pt/horn-security/Release
     15717--- ubiquity-2.6.10.orig//d-i/source/apt-setup/release-files/ftp.caixamagica.pt/horn-security/Release   1970-01-01 01:00:00.000000000 +0100
     15718+++ ubiquity-2.6.10//d-i/source/apt-setup/release-files/ftp.caixamagica.pt/horn-security/Release        2011-07-14 11:47:08.307809365 +0100
    1564015719@@ -0,0 +1,169 @@
    1564115720+Origin: Caixa Magica <software@caixamagica.pt>
     
    1580815887+ cf13e85fc3cdf7bc0182ba23034b735b2544edbc0074dcbe617974164ae3be9f 65 Contents-amd64
    1580915888+ 44818733e04c03289b19184fc4f4d7cd61e9496fd94bc254744cd5c7d10c2ab6 36 Contents-amd64.gz
    15810 diff -Nru ubiquity-2.6.10/d-i/source/apt-setup/release-files/ftp.caixamagica.pt/horn-security/Release.gpg ubiquity-2.6.10xcm1/d-i/source/apt-setup/release-files/ftp.caixamagica.pt/horn-security/Release.gpg
    15811 --- ubiquity-2.6.10/d-i/source/apt-setup/release-files/ftp.caixamagica.pt/horn-security/Release.gpg     1970-01-01 01:00:00.000000000 +0100
    15812 +++ ubiquity-2.6.10xcm1/d-i/source/apt-setup/release-files/ftp.caixamagica.pt/horn-security/Release.gpg 2011-05-31 17:25:44.000000000 +0100
     15889diff -Naur ubiquity-2.6.10.orig//d-i/source/apt-setup/release-files/ftp.caixamagica.pt/horn-security/Release.gpg ubiquity-2.6.10//d-i/source/apt-setup/release-files/ftp.caixamagica.pt/horn-security/Release.gpg
     15890--- ubiquity-2.6.10.orig//d-i/source/apt-setup/release-files/ftp.caixamagica.pt/horn-security/Release.gpg       1970-01-01 01:00:00.000000000 +0100
     15891+++ ubiquity-2.6.10//d-i/source/apt-setup/release-files/ftp.caixamagica.pt/horn-security/Release.gpg    2011-07-14 11:47:08.307809365 +0100
    1581315892@@ -0,0 +1,11 @@
    1581415893+-----BEGIN PGP SIGNATURE-----
     
    1582315902+=rR0q
    1582415903+-----END PGP SIGNATURE-----
    15825 diff -Nru ubiquity-2.6.10/d-i/source/apt-setup/release-files/ftp.caixamagica.pt/horn-security-testing/Release ubiquity-2.6.10xcm1/d-i/source/apt-setup/release-files/ftp.caixamagica.pt/horn-security-testing/Release
    15826 --- ubiquity-2.6.10/d-i/source/apt-setup/release-files/ftp.caixamagica.pt/horn-security-testing/Release 1970-01-01 01:00:00.000000000 +0100
    15827 +++ ubiquity-2.6.10xcm1/d-i/source/apt-setup/release-files/ftp.caixamagica.pt/horn-security-testing/Release     2011-05-31 17:25:44.000000000 +0100
     15904diff -Naur ubiquity-2.6.10.orig//d-i/source/apt-setup/release-files/ftp.caixamagica.pt/horn-security-testing/Release ubiquity-2.6.10//d-i/source/apt-setup/release-files/ftp.caixamagica.pt/horn-security-testing/Release
     15905--- ubiquity-2.6.10.orig//d-i/source/apt-setup/release-files/ftp.caixamagica.pt/horn-security-testing/Release   1970-01-01 01:00:00.000000000 +0100
     15906+++ ubiquity-2.6.10//d-i/source/apt-setup/release-files/ftp.caixamagica.pt/horn-security-testing/Release        2011-07-14 11:47:08.307809365 +0100
    1582815907@@ -0,0 +1,169 @@
    1582915908+Origin: Caixa Magica <software@caixamagica.pt>
     
    1599616075+ cf13e85fc3cdf7bc0182ba23034b735b2544edbc0074dcbe617974164ae3be9f 65 Contents-amd64
    1599716076+ 44818733e04c03289b19184fc4f4d7cd61e9496fd94bc254744cd5c7d10c2ab6 36 Contents-amd64.gz
    15998 diff -Nru ubiquity-2.6.10/d-i/source/apt-setup/release-files/ftp.caixamagica.pt/horn-security-testing/Release.gpg ubiquity-2.6.10xcm1/d-i/source/apt-setup/release-files/ftp.caixamagica.pt/horn-security-testing/Release.gpg
    15999 --- ubiquity-2.6.10/d-i/source/apt-setup/release-files/ftp.caixamagica.pt/horn-security-testing/Release.gpg     1970-01-01 01:00:00.000000000 +0100
    16000 +++ ubiquity-2.6.10xcm1/d-i/source/apt-setup/release-files/ftp.caixamagica.pt/horn-security-testing/Release.gpg 2011-05-31 17:25:44.000000000 +0100
     16077diff -Naur ubiquity-2.6.10.orig//d-i/source/apt-setup/release-files/ftp.caixamagica.pt/horn-security-testing/Release.gpg ubiquity-2.6.10//d-i/source/apt-setup/release-files/ftp.caixamagica.pt/horn-security-testing/Release.gpg
     16078--- ubiquity-2.6.10.orig//d-i/source/apt-setup/release-files/ftp.caixamagica.pt/horn-security-testing/Release.gpg       1970-01-01 01:00:00.000000000 +0100
     16079+++ ubiquity-2.6.10//d-i/source/apt-setup/release-files/ftp.caixamagica.pt/horn-security-testing/Release.gpg    2011-07-14 11:47:08.317809365 +0100
    1600116080@@ -0,0 +1,11 @@
    1600216081+-----BEGIN PGP SIGNATURE-----
     
    1601116090+=lG4R
    1601216091+-----END PGP SIGNATURE-----
    16013 diff -Nru ubiquity-2.6.10/d-i/source/apt-setup/release-files/ftp.caixamagica.pt/horn-testing/Release ubiquity-2.6.10xcm1/d-i/source/apt-setup/release-files/ftp.caixamagica.pt/horn-testing/Release
    16014 --- ubiquity-2.6.10/d-i/source/apt-setup/release-files/ftp.caixamagica.pt/horn-testing/Release  1970-01-01 01:00:00.000000000 +0100
    16015 +++ ubiquity-2.6.10xcm1/d-i/source/apt-setup/release-files/ftp.caixamagica.pt/horn-testing/Release      2011-05-31 17:25:44.000000000 +0100
     16092diff -Naur ubiquity-2.6.10.orig//d-i/source/apt-setup/release-files/ftp.caixamagica.pt/horn-testing/Release ubiquity-2.6.10//d-i/source/apt-setup/release-files/ftp.caixamagica.pt/horn-testing/Release
     16093--- ubiquity-2.6.10.orig//d-i/source/apt-setup/release-files/ftp.caixamagica.pt/horn-testing/Release    1970-01-01 01:00:00.000000000 +0100
     16094+++ ubiquity-2.6.10//d-i/source/apt-setup/release-files/ftp.caixamagica.pt/horn-testing/Release 2011-07-14 11:47:08.317809365 +0100
    1601616095@@ -0,0 +1,196 @@
    1601716096+Origin: Caixa Magica <software@caixamagica.pt>
     
    1621116290+ cf13e85fc3cdf7bc0182ba23034b735b2544edbc0074dcbe617974164ae3be9f 65 Contents-amd64
    1621216291+ 44818733e04c03289b19184fc4f4d7cd61e9496fd94bc254744cd5c7d10c2ab6 36 Contents-amd64.gz
    16213 diff -Nru ubiquity-2.6.10/d-i/source/apt-setup/release-files/ftp.caixamagica.pt/horn-testing/Release.gpg ubiquity-2.6.10xcm1/d-i/source/apt-setup/release-files/ftp.caixamagica.pt/horn-testing/Release.gpg
    16214 --- ubiquity-2.6.10/d-i/source/apt-setup/release-files/ftp.caixamagica.pt/horn-testing/Release.gpg      1970-01-01 01:00:00.000000000 +0100
    16215 +++ ubiquity-2.6.10xcm1/d-i/source/apt-setup/release-files/ftp.caixamagica.pt/horn-testing/Release.gpg  2011-05-31 17:25:44.000000000 +0100
     16292diff -Naur ubiquity-2.6.10.orig//d-i/source/apt-setup/release-files/ftp.caixamagica.pt/horn-testing/Release.gpg ubiquity-2.6.10//d-i/source/apt-setup/release-files/ftp.caixamagica.pt/horn-testing/Release.gpg
     16293--- ubiquity-2.6.10.orig//d-i/source/apt-setup/release-files/ftp.caixamagica.pt/horn-testing/Release.gpg        1970-01-01 01:00:00.000000000 +0100
     16294+++ ubiquity-2.6.10//d-i/source/apt-setup/release-files/ftp.caixamagica.pt/horn-testing/Release.gpg     2011-07-14 11:47:08.317809365 +0100
    1621616295@@ -0,0 +1,11 @@
    1621716296+-----BEGIN PGP SIGNATURE-----
     
    1622616305+=bd4+
    1622716306+-----END PGP SIGNATURE-----
    16228 diff -Nru ubiquity-2.6.10/d-i/source/apt-setup/release-files/ftp.caixamagica.pt/horn-updates/Release ubiquity-2.6.10xcm1/d-i/source/apt-setup/release-files/ftp.caixamagica.pt/horn-updates/Release
    16229 --- ubiquity-2.6.10/d-i/source/apt-setup/release-files/ftp.caixamagica.pt/horn-updates/Release  1970-01-01 01:00:00.000000000 +0100
    16230 +++ ubiquity-2.6.10xcm1/d-i/source/apt-setup/release-files/ftp.caixamagica.pt/horn-updates/Release      2011-05-31 17:25:44.000000000 +0100
     16307diff -Naur ubiquity-2.6.10.orig//d-i/source/apt-setup/release-files/ftp.caixamagica.pt/horn-updates/Release ubiquity-2.6.10//d-i/source/apt-setup/release-files/ftp.caixamagica.pt/horn-updates/Release
     16308--- ubiquity-2.6.10.orig//d-i/source/apt-setup/release-files/ftp.caixamagica.pt/horn-updates/Release    1970-01-01 01:00:00.000000000 +0100
     16309+++ ubiquity-2.6.10//d-i/source/apt-setup/release-files/ftp.caixamagica.pt/horn-updates/Release 2011-07-14 11:47:08.317809365 +0100
    1623116310@@ -0,0 +1,169 @@
    1623216311+Origin: Caixa Magica <software@caixamagica.pt>
     
    1639916478+ cf13e85fc3cdf7bc0182ba23034b735b2544edbc0074dcbe617974164ae3be9f 65 Contents-amd64
    1640016479+ 44818733e04c03289b19184fc4f4d7cd61e9496fd94bc254744cd5c7d10c2ab6 36 Contents-amd64.gz
    16401 diff -Nru ubiquity-2.6.10/d-i/source/apt-setup/release-files/ftp.caixamagica.pt/horn-updates/Release.gpg ubiquity-2.6.10xcm1/d-i/source/apt-setup/release-files/ftp.caixamagica.pt/horn-updates/Release.gpg
    16402 --- ubiquity-2.6.10/d-i/source/apt-setup/release-files/ftp.caixamagica.pt/horn-updates/Release.gpg      1970-01-01 01:00:00.000000000 +0100
    16403 +++ ubiquity-2.6.10xcm1/d-i/source/apt-setup/release-files/ftp.caixamagica.pt/horn-updates/Release.gpg  2011-05-31 17:25:44.000000000 +0100
     16480diff -Naur ubiquity-2.6.10.orig//d-i/source/apt-setup/release-files/ftp.caixamagica.pt/horn-updates/Release.gpg ubiquity-2.6.10//d-i/source/apt-setup/release-files/ftp.caixamagica.pt/horn-updates/Release.gpg
     16481--- ubiquity-2.6.10.orig//d-i/source/apt-setup/release-files/ftp.caixamagica.pt/horn-updates/Release.gpg        1970-01-01 01:00:00.000000000 +0100
     16482+++ ubiquity-2.6.10//d-i/source/apt-setup/release-files/ftp.caixamagica.pt/horn-updates/Release.gpg     2011-07-14 11:47:08.317809365 +0100
    1640416483@@ -0,0 +1,11 @@
    1640516484+-----BEGIN PGP SIGNATURE-----
     
    1641416493+=9uXw
    1641516494+-----END PGP SIGNATURE-----
    16416 diff -Nru ubiquity-2.6.10/d-i/source/apt-setup/release-files/ftp.caixamagica.pt/horn-updates-testing/Release ubiquity-2.6.10xcm1/d-i/source/apt-setup/release-files/ftp.caixamagica.pt/horn-updates-testing/Release
    16417 --- ubiquity-2.6.10/d-i/source/apt-setup/release-files/ftp.caixamagica.pt/horn-updates-testing/Release  1970-01-01 01:00:00.000000000 +0100
    16418 +++ ubiquity-2.6.10xcm1/d-i/source/apt-setup/release-files/ftp.caixamagica.pt/horn-updates-testing/Release      2011-05-31 17:25:44.000000000 +0100
     16495diff -Naur ubiquity-2.6.10.orig//d-i/source/apt-setup/release-files/ftp.caixamagica.pt/horn-updates-testing/Release ubiquity-2.6.10//d-i/source/apt-setup/release-files/ftp.caixamagica.pt/horn-updates-testing/Release
     16496--- ubiquity-2.6.10.orig//d-i/source/apt-setup/release-files/ftp.caixamagica.pt/horn-updates-testing/Release    1970-01-01 01:00:00.000000000 +0100
     16497+++ ubiquity-2.6.10//d-i/source/apt-setup/release-files/ftp.caixamagica.pt/horn-updates-testing/Release 2011-07-14 11:47:08.317809365 +0100
    1641916498@@ -0,0 +1,169 @@
    1642016499+Origin: Caixa Magica <software@caixamagica.pt>
     
    1658716666+ cf13e85fc3cdf7bc0182ba23034b735b2544edbc0074dcbe617974164ae3be9f 65 Contents-amd64
    1658816667+ 44818733e04c03289b19184fc4f4d7cd61e9496fd94bc254744cd5c7d10c2ab6 36 Contents-amd64.gz
    16589 diff -Nru ubiquity-2.6.10/d-i/source/apt-setup/release-files/ftp.caixamagica.pt/horn-updates-testing/Release.gpg ubiquity-2.6.10xcm1/d-i/source/apt-setup/release-files/ftp.caixamagica.pt/horn-updates-testing/Release.gpg
    16590 --- ubiquity-2.6.10/d-i/source/apt-setup/release-files/ftp.caixamagica.pt/horn-updates-testing/Release.gpg      1970-01-01 01:00:00.000000000 +0100
    16591 +++ ubiquity-2.6.10xcm1/d-i/source/apt-setup/release-files/ftp.caixamagica.pt/horn-updates-testing/Release.gpg  2011-05-31 17:25:44.000000000 +0100
     16668diff -Naur ubiquity-2.6.10.orig//d-i/source/apt-setup/release-files/ftp.caixamagica.pt/horn-updates-testing/Release.gpg ubiquity-2.6.10//d-i/source/apt-setup/release-files/ftp.caixamagica.pt/horn-updates-testing/Release.gpg
     16669--- ubiquity-2.6.10.orig//d-i/source/apt-setup/release-files/ftp.caixamagica.pt/horn-updates-testing/Release.gpg        1970-01-01 01:00:00.000000000 +0100
     16670+++ ubiquity-2.6.10//d-i/source/apt-setup/release-files/ftp.caixamagica.pt/horn-updates-testing/Release.gpg     2011-07-14 11:47:08.317809365 +0100
    1659216671@@ -0,0 +1,11 @@
    1659316672+-----BEGIN PGP SIGNATURE-----
     
    1660216681+=1bqi
    1660316682+-----END PGP SIGNATURE-----
    16604 diff -Nru ubiquity-2.6.10/d-i/source/choose-mirror/choose-mirror.c ubiquity-2.6.10xcm1/d-i/source/choose-mirror/choose-mirror.c
    16605 --- ubiquity-2.6.10/d-i/source/choose-mirror/choose-mirror.c    2011-01-18 16:59:21.000000000 +0000
    16606 +++ ubiquity-2.6.10xcm1/d-i/source/choose-mirror/choose-mirror.c        2011-05-31 17:25:44.000000000 +0100
     16683diff -Naur ubiquity-2.6.10.orig//d-i/source/choose-mirror/choose-mirror.c ubiquity-2.6.10//d-i/source/choose-mirror/choose-mirror.c
     16684--- ubiquity-2.6.10.orig//d-i/source/choose-mirror/choose-mirror.c      2011-01-18 16:59:21.000000000 +0000
     16685+++ ubiquity-2.6.10//d-i/source/choose-mirror/choose-mirror.c   2011-07-14 11:47:08.317809365 +0100
    1660716686@@ -511,7 +511,7 @@
    1660816687 
     
    1665216731                debconf_input(debconf, base_on_cd ? "medium" : "high", mir);
    1665316732                free(mir);
    16654 diff -Nru ubiquity-2.6.10/d-i/source/choose-mirror/debian/changelog ubiquity-2.6.10xcm1/d-i/source/choose-mirror/debian/changelog
    16655 --- ubiquity-2.6.10/d-i/source/choose-mirror/debian/changelog   2011-04-14 15:06:38.000000000 +0100
    16656 +++ ubiquity-2.6.10xcm1/d-i/source/choose-mirror/debian/changelog       2011-05-31 17:25:44.000000000 +0100
     16733diff -Naur ubiquity-2.6.10.orig//d-i/source/choose-mirror/debian/changelog ubiquity-2.6.10//d-i/source/choose-mirror/debian/changelog
     16734--- ubiquity-2.6.10.orig//d-i/source/choose-mirror/debian/changelog     2011-04-14 15:06:38.000000000 +0100
     16735+++ ubiquity-2.6.10//d-i/source/choose-mirror/debian/changelog  2011-07-14 11:47:08.317809365 +0100
    1665716736@@ -1,3 +1,11 @@
    1665816737+choose-mirror (2.37xcm2) horn; urgency=low
     
    1666716746 
    1666816747   * Record a dummy "GB" entry in templates files for non-country-specific
    16669 diff -Nru ubiquity-2.6.10/d-i/source/choose-mirror/debian/choose-mirror-bin.templates.ftp.base-in ubiquity-2.6.10xcm1/d-i/source/choose-mirror/debian/choose-mirror-bin.templates.ftp.base-in
    16670 --- ubiquity-2.6.10/d-i/source/choose-mirror/debian/choose-mirror-bin.templates.ftp.base-in     2011-01-31 18:08:50.000000000 +0000
    16671 +++ ubiquity-2.6.10xcm1/d-i/source/choose-mirror/debian/choose-mirror-bin.templates.ftp.base-in 2011-05-31 17:25:44.000000000 +0100
     16748diff -Naur ubiquity-2.6.10.orig//d-i/source/choose-mirror/debian/choose-mirror-bin.templates.ftp.base-in ubiquity-2.6.10//d-i/source/choose-mirror/debian/choose-mirror-bin.templates.ftp.base-in
     16749--- ubiquity-2.6.10.orig//d-i/source/choose-mirror/debian/choose-mirror-bin.templates.ftp.base-in       2011-01-31 18:08:50.000000000 +0000
     16750+++ ubiquity-2.6.10//d-i/source/choose-mirror/debian/choose-mirror-bin.templates.ftp.base-in    2011-07-14 11:47:08.317809365 +0100
    1667216751@@ -4,20 +4,20 @@
    1667316752 Type: string
     
    1669816777 
    1669916778 Template: mirror/ftp/proxy
    16700 diff -Nru ubiquity-2.6.10/d-i/source/choose-mirror/debian/choose-mirror-bin.templates.ftp.sel-in ubiquity-2.6.10xcm1/d-i/source/choose-mirror/debian/choose-mirror-bin.templates.ftp.sel-in
    16701 --- ubiquity-2.6.10/d-i/source/choose-mirror/debian/choose-mirror-bin.templates.ftp.sel-in      2011-01-18 16:59:21.000000000 +0000
    16702 +++ ubiquity-2.6.10xcm1/d-i/source/choose-mirror/debian/choose-mirror-bin.templates.ftp.sel-in  2011-05-31 17:25:44.000000000 +0100
     16779diff -Naur ubiquity-2.6.10.orig//d-i/source/choose-mirror/debian/choose-mirror-bin.templates.ftp.sel-in ubiquity-2.6.10//d-i/source/choose-mirror/debian/choose-mirror-bin.templates.ftp.sel-in
     16780--- ubiquity-2.6.10.orig//d-i/source/choose-mirror/debian/choose-mirror-bin.templates.ftp.sel-in        2011-01-18 16:59:21.000000000 +0000
     16781+++ ubiquity-2.6.10//d-i/source/choose-mirror/debian/choose-mirror-bin.templates.ftp.sel-in     2011-07-14 11:47:08.317809365 +0100
    1670316782@@ -7,8 +7,8 @@
    1670416783 Choices-C: manual
     
    1674416823- Usually, <your country code>.archive.ubuntu.com is a good choice.
    1674516824+ Usually, ftp.caixamagica.pt is a good choice.
    16746 diff -Nru ubiquity-2.6.10/d-i/source/choose-mirror/debian/choose-mirror-bin.templates.http-in ubiquity-2.6.10xcm1/d-i/source/choose-mirror/debian/choose-mirror-bin.templates.http-in
    16747 --- ubiquity-2.6.10/d-i/source/choose-mirror/debian/choose-mirror-bin.templates.http-in 2011-01-31 18:08:50.000000000 +0000
    16748 +++ ubiquity-2.6.10xcm1/d-i/source/choose-mirror/debian/choose-mirror-bin.templates.http-in     2011-05-31 17:25:44.000000000 +0100
     16825diff -Naur ubiquity-2.6.10.orig//d-i/source/choose-mirror/debian/choose-mirror-bin.templates.http-in ubiquity-2.6.10//d-i/source/choose-mirror/debian/choose-mirror-bin.templates.http-in
     16826--- ubiquity-2.6.10.orig//d-i/source/choose-mirror/debian/choose-mirror-bin.templates.http-in   2011-01-31 18:08:50.000000000 +0000
     16827+++ ubiquity-2.6.10//d-i/source/choose-mirror/debian/choose-mirror-bin.templates.http-in        2011-07-14 11:47:08.317809365 +0100
    1674916828@@ -6,8 +6,8 @@
    1675016829 Choices-C: manual
     
    1681916898 
    1682016899 Template: mirror/http/proxy
    16821 diff -Nru ubiquity-2.6.10/d-i/source/choose-mirror/debian/choose-mirror-bin.templates-in ubiquity-2.6.10xcm1/d-i/source/choose-mirror/debian/choose-mirror-bin.templates-in
    16822 --- ubiquity-2.6.10/d-i/source/choose-mirror/debian/choose-mirror-bin.templates-in      2011-01-18 16:59:21.000000000 +0000
    16823 +++ ubiquity-2.6.10xcm1/d-i/source/choose-mirror/debian/choose-mirror-bin.templates-in  2011-05-31 17:25:44.000000000 +0100
     16900diff -Naur ubiquity-2.6.10.orig//d-i/source/choose-mirror/debian/choose-mirror-bin.templates-in ubiquity-2.6.10//d-i/source/choose-mirror/debian/choose-mirror-bin.templates-in
     16901--- ubiquity-2.6.10.orig//d-i/source/choose-mirror/debian/choose-mirror-bin.templates-in        2011-01-18 16:59:21.000000000 +0000
     16902+++ ubiquity-2.6.10//d-i/source/choose-mirror/debian/choose-mirror-bin.templates-in     2011-07-14 11:47:08.317809365 +0100
    1682416903@@ -12,9 +12,9 @@
    1682516904 Type: select
     
    1688416963-_Description: Choose a mirror of the Ubuntu archive
    1688516964+_Description: Choose a mirror of the Caixa Magica archive
    16886 diff -Nru ubiquity-2.6.10/d-i/source/choose-mirror/Mirrors.masterlist.ubuntu ubiquity-2.6.10xcm1/d-i/source/choose-mirror/Mirrors.masterlist.ubuntu
    16887 --- ubiquity-2.6.10/d-i/source/choose-mirror/Mirrors.masterlist.ubuntu  2010-10-22 11:29:38.000000000 +0100
    16888 +++ ubiquity-2.6.10xcm1/d-i/source/choose-mirror/Mirrors.masterlist.ubuntu      2011-05-31 17:25:44.000000000 +0100
     16965diff -Naur ubiquity-2.6.10.orig//d-i/source/choose-mirror/Mirrors.masterlist.ubuntu ubiquity-2.6.10//d-i/source/choose-mirror/Mirrors.masterlist.ubuntu
     16966--- ubiquity-2.6.10.orig//d-i/source/choose-mirror/Mirrors.masterlist.ubuntu    2010-10-22 11:29:38.000000000 +0100
     16967+++ ubiquity-2.6.10//d-i/source/choose-mirror/Mirrors.masterlist.ubuntu 2011-07-14 11:47:08.317809365 +0100
    1688916968@@ -1,23 +1,15 @@
    1689016969-Site: archive.ubuntu.com
     
    1692117000-Country: ${UCC} ${CNAME}
    1692217001+Country: PT Portugal
    16923 diff -Nru ubiquity-2.6.10/d-i/source/partman-auto/automatically_partition/replace/choices ubiquity-2.6.10xcm1/d-i/source/partman-auto/automatically_partition/replace/choices
    16924 --- ubiquity-2.6.10/d-i/source/partman-auto/automatically_partition/replace/choices     2011-04-10 21:16:21.000000000 +0100
    16925 +++ ubiquity-2.6.10xcm1/d-i/source/partman-auto/automatically_partition/replace/choices 2011-05-31 17:25:44.000000000 +0100
     17002diff -Naur ubiquity-2.6.10.orig//d-i/source/partman-auto/automatically_partition/replace/choices ubiquity-2.6.10//d-i/source/partman-auto/automatically_partition/replace/choices
     17003--- ubiquity-2.6.10.orig//d-i/source/partman-auto/automatically_partition/replace/choices       2011-04-10 21:16:21.000000000 +0100
     17004+++ ubiquity-2.6.10//d-i/source/partman-auto/automatically_partition/replace/choices    2011-07-14 11:47:08.317809365 +0100
    1692617005@@ -43,8 +43,9 @@
    1692717006        open_dialog PARTITIONS
     
    1694417023        close_dialog
    1694517024 done
    16946 diff -Nru ubiquity-2.6.10/d-i/source/partman-auto/automatically_partition/reuse/choices ubiquity-2.6.10xcm1/d-i/source/partman-auto/automatically_partition/reuse/choices
    16947 --- ubiquity-2.6.10/d-i/source/partman-auto/automatically_partition/reuse/choices       2011-04-10 21:16:21.000000000 +0100
    16948 +++ ubiquity-2.6.10xcm1/d-i/source/partman-auto/automatically_partition/reuse/choices   2011-05-31 17:25:44.000000000 +0100
     17025diff -Naur ubiquity-2.6.10.orig//d-i/source/partman-auto/automatically_partition/reuse/choices ubiquity-2.6.10//d-i/source/partman-auto/automatically_partition/reuse/choices
     17026--- ubiquity-2.6.10.orig//d-i/source/partman-auto/automatically_partition/reuse/choices 2011-04-10 21:16:21.000000000 +0100
     17027+++ ubiquity-2.6.10//d-i/source/partman-auto/automatically_partition/reuse/choices      2011-07-14 11:47:08.317809365 +0100
    1694917028@@ -43,8 +43,9 @@
    1695017029        open_dialog PARTITIONS
     
    1696717046        close_dialog
    1696817047 done
    16969 diff -Nru ubiquity-2.6.10/d-i/source/partman-auto/debian/changelog ubiquity-2.6.10xcm1/d-i/source/partman-auto/debian/changelog
    16970 --- ubiquity-2.6.10/d-i/source/partman-auto/debian/changelog    2011-04-20 17:51:00.000000000 +0100
    16971 +++ ubiquity-2.6.10xcm1/d-i/source/partman-auto/debian/changelog        2011-05-31 17:25:44.000000000 +0100
     17048diff -Naur ubiquity-2.6.10.orig//d-i/source/partman-auto/debian/changelog ubiquity-2.6.10//d-i/source/partman-auto/debian/changelog
     17049--- ubiquity-2.6.10.orig//d-i/source/partman-auto/debian/changelog      2011-04-20 17:51:00.000000000 +0100
     17050+++ ubiquity-2.6.10//d-i/source/partman-auto/debian/changelog   2011-07-14 11:47:08.317809365 +0100
    1697217051@@ -1,3 +1,13 @@
    1697317052+partman-auto (93ubuntu16) natty; urgency=low
     
    1698417063 
    1698517064   * Add $reusemethod internal specifier, which excludes the partition if a
    16986 diff -Nru ubiquity-2.6.10/d-i/source/partman-auto/debian/po/pt.po ubiquity-2.6.10xcm1/d-i/source/partman-auto/debian/po/pt.po
    16987 --- ubiquity-2.6.10/d-i/source/partman-auto/debian/po/pt.po     2011-01-19 13:20:05.000000000 +0000
    16988 +++ ubiquity-2.6.10xcm1/d-i/source/partman-auto/debian/po/pt.po 2011-05-31 17:25:44.000000000 +0100
     17065diff -Naur ubiquity-2.6.10.orig//d-i/source/partman-auto/debian/po/pt.po ubiquity-2.6.10//d-i/source/partman-auto/debian/po/pt.po
     17066--- ubiquity-2.6.10.orig//d-i/source/partman-auto/debian/po/pt.po       2011-01-19 13:20:05.000000000 +0000
     17067+++ ubiquity-2.6.10//d-i/source/partman-auto/debian/po/pt.po    2011-07-14 11:47:08.317809365 +0100
    1698917068@@ -268,7 +268,7 @@
    1699017069 #: ../partman-auto.templates:167
     
    1699617075 #. Type: error
    1699717076 #. Description
    16998 diff -Nru ubiquity-2.6.10/d-i/source/partman-basicfilesystems/debian/po/pt.po ubiquity-2.6.10xcm1/d-i/source/partman-basicfilesystems/debian/po/pt.po
    16999 --- ubiquity-2.6.10/d-i/source/partman-basicfilesystems/debian/po/pt.po 2011-01-20 14:25:32.000000000 +0000
    17000 +++ ubiquity-2.6.10xcm1/d-i/source/partman-basicfilesystems/debian/po/pt.po     2011-05-31 17:25:44.000000000 +0100
     17077diff -Naur ubiquity-2.6.10.orig//d-i/source/partman-basicfilesystems/debian/po/pt.po ubiquity-2.6.10//d-i/source/partman-basicfilesystems/debian/po/pt.po
     17078--- ubiquity-2.6.10.orig//d-i/source/partman-basicfilesystems/debian/po/pt.po   2011-01-20 14:25:32.000000000 +0000
     17079+++ ubiquity-2.6.10//d-i/source/partman-basicfilesystems/debian/po/pt.po        2011-07-14 11:47:08.317809365 +0100
    1700117080@@ -511,7 +511,7 @@
    1700217081 #. :sl2:
     
    1700817087 #. Type: text
    1700917088 #. Description
    17010 diff -Nru ubiquity-2.6.10/d-i/sources.list ubiquity-2.6.10xcm1/d-i/sources.list
    17011 --- ubiquity-2.6.10/d-i/sources.list    2010-11-08 13:56:15.000000000 +0000
    17012 +++ ubiquity-2.6.10xcm1/d-i/sources.list        2011-05-31 17:25:44.000000000 +0100
    17013 @@ -1 +1 @@
     17089diff -Naur ubiquity-2.6.10.orig//d-i/sources.list ubiquity-2.6.10//d-i/sources.list
     17090--- ubiquity-2.6.10.orig//d-i/sources.list      2010-11-08 13:56:15.000000000 +0000
     17091+++ ubiquity-2.6.10//d-i/sources.list   2011-07-14 11:47:57.227809344 +0100
     17092@@ -1 +1,3 @@
    1701417093-deb-src http://archive.ubuntu.com/ubuntu natty main
    1701517094+deb-src http://ftp.caixamagica.pt/caixamagica horn main
    17016 diff -Nru ubiquity-2.6.10/gui/gtk/stepLanguage.ui ubiquity-2.6.10xcm1/gui/gtk/stepLanguage.ui
    17017 --- ubiquity-2.6.10/gui/gtk/stepLanguage.ui     2010-09-08 00:03:52.000000000 +0100
    17018 +++ ubiquity-2.6.10xcm1/gui/gtk/stepLanguage.ui 2011-05-31 17:25:44.000000000 +0100
     17095+deb-src http://ftp.caixamagica.pt/caixamagica horn-updates main
     17096+deb-src http://ftp.caixamagica.pt/caixamagica horn-security main
     17097diff -Naur ubiquity-2.6.10.orig//gui/gtk/stepLanguage.ui ubiquity-2.6.10//gui/gtk/stepLanguage.ui
     17098--- ubiquity-2.6.10.orig//gui/gtk/stepLanguage.ui       2010-09-08 00:03:52.000000000 +0100
     17099+++ ubiquity-2.6.10//gui/gtk/stepLanguage.ui    2011-07-14 11:47:08.317809365 +0100
    1701917100@@ -60,7 +60,7 @@
    1702017101                       <object class="GtkImage" id="image2">
     
    1702617107                       <packing>
    1702717108                         <property name="left_attach">1</property>
    17028 diff -Nru ubiquity-2.6.10/gui/gtk/stepPartAsk.ui ubiquity-2.6.10xcm1/gui/gtk/stepPartAsk.ui
    17029 --- ubiquity-2.6.10/gui/gtk/stepPartAsk.ui      2011-03-28 10:30:24.000000000 +0100
    17030 +++ ubiquity-2.6.10xcm1/gui/gtk/stepPartAsk.ui  2011-05-31 17:25:44.000000000 +0100
     17109diff -Naur ubiquity-2.6.10.orig//gui/gtk/stepPartAsk.ui ubiquity-2.6.10//gui/gtk/stepPartAsk.ui
     17110--- ubiquity-2.6.10.orig//gui/gtk/stepPartAsk.ui        2011-03-28 10:30:24.000000000 +0100
     17111+++ ubiquity-2.6.10//gui/gtk/stepPartAsk.ui     2011-07-14 11:47:08.317809365 +0100
    1703117112@@ -21,7 +21,7 @@
    1703217113             <property name="can_focus">False</property>
     
    1711017191                             <property name="wrap">True</property>
    1711117192                             <property name="max_width_chars">40</property>
    17112 diff -Nru ubiquity-2.6.10/gui/gtk/stepPartAuto.ui ubiquity-2.6.10xcm1/gui/gtk/stepPartAuto.ui
    17113 --- ubiquity-2.6.10/gui/gtk/stepPartAuto.ui     2011-03-01 23:09:25.000000000 +0000
    17114 +++ ubiquity-2.6.10xcm1/gui/gtk/stepPartAuto.ui 2011-05-31 17:25:44.000000000 +0100
     17193diff -Naur ubiquity-2.6.10.orig//gui/gtk/stepPartAuto.ui ubiquity-2.6.10//gui/gtk/stepPartAuto.ui
     17194--- ubiquity-2.6.10.orig//gui/gtk/stepPartAuto.ui       2011-03-01 23:09:25.000000000 +0000
     17195+++ ubiquity-2.6.10//gui/gtk/stepPartAuto.ui    2011-07-14 11:47:08.317809365 +0100
    1711517196@@ -106,7 +106,7 @@
    1711617197                             <property name="visible">True</property>
     
    1712217203                           <packing>
    1712317204                             <property name="position">1</property>
    17124 diff -Nru ubiquity-2.6.10/gui/gtk/stepPrepare.ui ubiquity-2.6.10xcm1/gui/gtk/stepPrepare.ui
    17125 --- ubiquity-2.6.10/gui/gtk/stepPrepare.ui      2010-09-14 11:30:55.000000000 +0100
    17126 +++ ubiquity-2.6.10xcm1/gui/gtk/stepPrepare.ui  2011-05-31 17:25:44.000000000 +0100
     17205diff -Naur ubiquity-2.6.10.orig//gui/gtk/stepPrepare.ui ubiquity-2.6.10//gui/gtk/stepPrepare.ui
     17206--- ubiquity-2.6.10.orig//gui/gtk/stepPrepare.ui        2010-09-14 11:30:55.000000000 +0100
     17207+++ ubiquity-2.6.10//gui/gtk/stepPrepare.ui     2011-07-14 11:47:08.317809365 +0100
    1712717208@@ -90,11 +90,11 @@
    1712817209             </child>
     
    1716717248                             <property name="yalign">0</property>
    1716817249                             <property name="label" translatable="yes">&lt;small&gt;Fluendo MP3 plugin includes MPEG Layer-3 audio decoding technology licensed from Fraunhofer IIS and Thomson.&lt;/small&gt;</property>
    17169 diff -Nru ubiquity-2.6.10/gui/qt/app.ui ubiquity-2.6.10xcm1/gui/qt/app.ui
    17170 --- ubiquity-2.6.10/gui/qt/app.ui       2010-09-24 14:52:39.000000000 +0100
    17171 +++ ubiquity-2.6.10xcm1/gui/qt/app.ui   2011-05-31 17:25:44.000000000 +0100
     17250diff -Naur ubiquity-2.6.10.orig//gui/qt/app.ui ubiquity-2.6.10//gui/qt/app.ui
     17251--- ubiquity-2.6.10.orig//gui/qt/app.ui 2010-09-24 14:52:39.000000000 +0100
     17252+++ ubiquity-2.6.10//gui/qt/app.ui      2011-07-14 11:47:08.317809365 +0100
    1717217253@@ -107,7 +107,7 @@
    1717317254                 <item>
     
    1717917260                   <property name="scaledContents">
    1718017261                    <bool>false</bool>
    17181 diff -Nru ubiquity-2.6.10/gui/qt/images/graphics.svg ubiquity-2.6.10xcm1/gui/qt/images/graphics.svg
    17182 --- ubiquity-2.6.10/gui/qt/images/graphics.svg  2009-11-09 17:39:45.000000000 +0000
    17183 +++ ubiquity-2.6.10xcm1/gui/qt/images/graphics.svg      2011-05-31 17:25:44.000000000 +0100
     17262diff -Naur ubiquity-2.6.10.orig//gui/qt/images/graphics.svg ubiquity-2.6.10//gui/qt/images/graphics.svg
     17263--- ubiquity-2.6.10.orig//gui/qt/images/graphics.svg    2009-11-09 17:39:45.000000000 +0000
     17264+++ ubiquity-2.6.10//gui/qt/images/graphics.svg 2011-07-14 11:47:08.317809365 +0100
    1718417265@@ -1414,7 +1414,7 @@
    1718517266          y="145.02063"
     
    1719117272        sodipodi:linespacing="125%"
    1719217273        id="text3752-7"
    17193 diff -Nru ubiquity-2.6.10/gui/qt/stepPartAuto.ui ubiquity-2.6.10xcm1/gui/qt/stepPartAuto.ui
    17194 --- ubiquity-2.6.10/gui/qt/stepPartAuto.ui      2010-09-08 16:29:22.000000000 +0100
    17195 +++ ubiquity-2.6.10xcm1/gui/qt/stepPartAuto.ui  2011-05-31 17:25:44.000000000 +0100
     17274diff -Naur ubiquity-2.6.10.orig//gui/qt/stepPartAuto.ui ubiquity-2.6.10//gui/qt/stepPartAuto.ui
     17275--- ubiquity-2.6.10.orig//gui/qt/stepPartAuto.ui        2010-09-08 16:29:22.000000000 +0100
     17276+++ ubiquity-2.6.10//gui/qt/stepPartAuto.ui     2011-07-14 11:47:08.317809365 +0100
    1719617277@@ -31,7 +31,7 @@
    1719717278    <item>
     
    1720317284     </widget>
    1720417285    </item>
    17205 diff -Nru ubiquity-2.6.10/gui/qt/stepPartMan.ui ubiquity-2.6.10xcm1/gui/qt/stepPartMan.ui
    17206 --- ubiquity-2.6.10/gui/qt/stepPartMan.ui       2011-01-31 16:38:18.000000000 +0000
    17207 +++ ubiquity-2.6.10xcm1/gui/qt/stepPartMan.ui   2011-05-31 17:25:44.000000000 +0100
     17286diff -Naur ubiquity-2.6.10.orig//gui/qt/stepPartMan.ui ubiquity-2.6.10//gui/qt/stepPartMan.ui
     17287--- ubiquity-2.6.10.orig//gui/qt/stepPartMan.ui 2011-01-31 16:38:18.000000000 +0000
     17288+++ ubiquity-2.6.10//gui/qt/stepPartMan.ui      2011-07-14 11:47:08.317809365 +0100
    1720817289@@ -127,7 +127,7 @@
    1720917290          <item>
     
    1721517296           </widget>
    1721617297          </item>
    17217 diff -Nru ubiquity-2.6.10/gui/qt/stepUserSetup.ui ubiquity-2.6.10xcm1/gui/qt/stepUserSetup.ui
    17218 --- ubiquity-2.6.10/gui/qt/stepUserSetup.ui     2010-02-15 20:58:56.000000000 +0000
    17219 +++ ubiquity-2.6.10xcm1/gui/qt/stepUserSetup.ui 2011-05-31 17:25:44.000000000 +0100
     17298diff -Naur ubiquity-2.6.10.orig//gui/qt/stepUserSetup.ui ubiquity-2.6.10//gui/qt/stepUserSetup.ui
     17299--- ubiquity-2.6.10.orig//gui/qt/stepUserSetup.ui       2010-02-15 20:58:56.000000000 +0000
     17300+++ ubiquity-2.6.10//gui/qt/stepUserSetup.ui    2011-07-14 11:47:08.317809365 +0100
    1722017301@@ -162,7 +162,7 @@
    1722117302         <string>font-weight: normal</string>
     
    1723617317        <property name="wordWrap">
    1723717318         <bool>true</bool>
    17238 diff -Nru ubiquity-2.6.10/scripts/plugininstall.py ubiquity-2.6.10xcm1/scripts/plugininstall.py
    17239 --- ubiquity-2.6.10/scripts/plugininstall.py    2011-04-20 15:08:31.000000000 +0100
    17240 +++ ubiquity-2.6.10xcm1/scripts/plugininstall.py        2011-05-31 17:25:44.000000000 +0100
     17319diff -Naur ubiquity-2.6.10.orig//scripts/plugininstall.py ubiquity-2.6.10//scripts/plugininstall.py
     17320--- ubiquity-2.6.10.orig//scripts/plugininstall.py      2011-04-20 15:08:31.000000000 +0100
     17321+++ ubiquity-2.6.10//scripts/plugininstall.py   2011-07-14 11:47:08.317809365 +0100
    1724117322@@ -281,7 +281,7 @@
    1724217323         except debconf.DebconfError:
     
    1725717338         casper_user_wallpaper_cache_dir = os.path.join(casper_user_home,
    1725817339                                                        '.cache', 'wallpaper')
    17259 diff -Nru ubiquity-2.6.10/ubiquity/auto_update.py ubiquity-2.6.10xcm1/ubiquity/auto_update.py
    17260 --- ubiquity-2.6.10/ubiquity/auto_update.py     2010-12-17 14:28:14.000000000 +0000
    17261 +++ ubiquity-2.6.10xcm1/ubiquity/auto_update.py 2011-05-31 17:25:44.000000000 +0100
     17340diff -Naur ubiquity-2.6.10.orig//src/panel/panel.c ubiquity-2.6.10//src/panel/panel.c
     17341--- ubiquity-2.6.10.orig//src/panel/panel.c     2011-04-06 11:25:49.000000000 +0100
     17342+++ ubiquity-2.6.10//src/panel/panel.c  2011-07-14 12:06:45.387808845 +0100
     17343@@ -228,7 +228,7 @@
     17344        GtkPixmap *pixmap;
     17345        pixbuf = gdk_pixbuf_new_from_file("/usr/share/themes/Ambiance/gtk-2.0/apps/img/panel.png", NULL);
     17346        if (!pixbuf) {
     17347-               pixbuf = gdk_pixbuf_new_from_file("/usr/share/lxpanel/images/lubuntu-background.png", NULL);
     17348+               pixbuf = gdk_pixbuf_new_from_file("/usr/share/lxpanel/images/caixamagicalxde-background.png", NULL);
     17349        }
     17350        if (pixbuf) {
     17351                gdk_pixbuf_render_pixmap_and_mask(pixbuf, &pixmap, NULL, 0);
     17352diff -Naur ubiquity-2.6.10.orig//ubiquity/auto_update.py ubiquity-2.6.10//ubiquity/auto_update.py
     17353--- ubiquity-2.6.10.orig//ubiquity/auto_update.py       2010-12-17 14:28:14.000000000 +0000
     17354+++ ubiquity-2.6.10//ubiquity/auto_update.py    2011-07-14 11:47:08.317809365 +0100
    1726217355@@ -34,7 +34,7 @@
    1726317356                  "ubiquity-frontend-debconf",
     
    1726917362 
    1727017363 
    17271 diff -Nru ubiquity-2.6.10/ubiquity/frontend/kde_components/PartAuto.py ubiquity-2.6.10xcm1/ubiquity/frontend/kde_components/PartAuto.py
    17272 --- ubiquity-2.6.10/ubiquity/frontend/kde_components/PartAuto.py        2011-03-01 23:09:25.000000000 +0000
    17273 +++ ubiquity-2.6.10xcm1/ubiquity/frontend/kde_components/PartAuto.py    2011-05-31 17:25:44.000000000 +0100
     17364diff -Naur ubiquity-2.6.10.orig//ubiquity/frontend/kde_components/PartAuto.py ubiquity-2.6.10//ubiquity/frontend/kde_components/PartAuto.py
     17365--- ubiquity-2.6.10.orig//ubiquity/frontend/kde_components/PartAuto.py  2011-03-01 23:09:25.000000000 +0000
     17366+++ ubiquity-2.6.10//ubiquity/frontend/kde_components/PartAuto.py       2011-07-14 11:47:08.317809365 +0100
    1727417367@@ -16,10 +16,10 @@
    1727517368 
     
    1728517378 
    1728617379     parent.layout().addWidget(frame)
    17287 diff -Nru ubiquity-2.6.10/ubiquity/frontend/kde_components/PartitionBar.py ubiquity-2.6.10xcm1/ubiquity/frontend/kde_components/PartitionBar.py
    17288 --- ubiquity-2.6.10/ubiquity/frontend/kde_components/PartitionBar.py    2011-03-30 14:49:21.000000000 +0100
    17289 +++ ubiquity-2.6.10xcm1/ubiquity/frontend/kde_components/PartitionBar.py        2011-05-31 17:26:45.000000000 +0100
     17380diff -Naur ubiquity-2.6.10.orig//ubiquity/frontend/kde_components/PartitionBar.py ubiquity-2.6.10//ubiquity/frontend/kde_components/PartitionBar.py
     17381--- ubiquity-2.6.10.orig//ubiquity/frontend/kde_components/PartitionBar.py      2011-03-30 14:49:21.000000000 +0100
     17382+++ ubiquity-2.6.10//ubiquity/frontend/kde_components/PartitionBar.py   2011-07-14 11:47:08.317809365 +0100
    1729017383@@ -254,7 +254,7 @@
    1729117384 
     
    1729717390             part.next = p
    1729817391 
    17299 diff -Nru ubiquity-2.6.10/ubiquity/frontend/kde_ui.py ubiquity-2.6.10xcm1/ubiquity/frontend/kde_ui.py
    17300 --- ubiquity-2.6.10/ubiquity/frontend/kde_ui.py 2011-04-20 15:08:31.000000000 +0100
    17301 +++ ubiquity-2.6.10xcm1/ubiquity/frontend/kde_ui.py     2011-05-31 17:25:44.000000000 +0100
     17392diff -Naur ubiquity-2.6.10.orig//ubiquity/frontend/kde_ui.py ubiquity-2.6.10//ubiquity/frontend/kde_ui.py
     17393--- ubiquity-2.6.10.orig//ubiquity/frontend/kde_ui.py   2011-04-20 15:08:31.000000000 +0100
     17394+++ ubiquity-2.6.10//ubiquity/frontend/kde_ui.py        2011-07-14 11:47:08.317809365 +0100
    1730217395@@ -68,7 +68,7 @@
    1730317396         # this to be restartable.
     
    1731817411 
    1731917412     def paintEvent(self, pe):
    17320 diff -Nru ubiquity-2.6.10/ubiquity/plugins/ubi-prepare.py ubiquity-2.6.10xcm1/ubiquity/plugins/ubi-prepare.py
    17321 --- ubiquity-2.6.10/ubiquity/plugins/ubi-prepare.py     2011-04-10 00:45:58.000000000 +0100
    17322 +++ ubiquity-2.6.10xcm1/ubiquity/plugins/ubi-prepare.py 2011-05-31 17:25:44.000000000 +0100
     17413diff -Naur ubiquity-2.6.10.orig//ubiquity/gtkwidgets.py ubiquity-2.6.10//ubiquity/gtkwidgets.py
     17414--- ubiquity-2.6.10.orig//ubiquity/gtkwidgets.py        2010-12-17 14:28:14.000000000 +0000
     17415+++ ubiquity-2.6.10//ubiquity/gtkwidgets.py     2011-07-14 11:49:13.887809310 +0100
     17416@@ -1013,7 +1013,7 @@
     17417     a.set_spacing(5)
     17418     a.set_border_width(20)
     17419     
     17420-    # Prepare to install Ubuntu.
     17421+    # Prepare to install CaixaMagica.
     17422     space = StateBox(options[0])
     17423     power = StateBox(options[1])
     17424     inet = StateBox(options[2])
     17425@@ -1022,7 +1022,7 @@
     17426 
     17427     # Partition resizing.
     17428     existing_part = PartitionBox('Files (20 MB)', '', 'folder')
     17429-    new_part = PartitionBox('Ubuntu 10.10', '/dev/sda2 (btrfs)', 'distributor-logo')
     17430+    new_part = PartitionBox('CaixaMagica 16', '/dev/sda2 (btrfs)', 'distributor-logo')
     17431     hb = ResizeWidget(2**64, 2**64/4, 2**64/1.25, existing_part, new_part)
     17432     a.pack_start(hb, expand=False)
     17433     button = gtk.Button('Install')
     17434diff -Naur ubiquity-2.6.10.orig//ubiquity/misc.py ubiquity-2.6.10//ubiquity/misc.py
     17435--- ubiquity-2.6.10.orig//ubiquity/misc.py      2011-03-25 17:48:02.000000000 +0000
     17436+++ ubiquity-2.6.10//ubiquity/misc.py   2011-07-14 12:08:04.757808810 +0100
     17437@@ -374,7 +374,7 @@
     17438         result = subp.communicate()[0].splitlines()
     17439         for res in result:
     17440             res = res.split(':')
     17441-            if res[2] == 'Ubuntu':
     17442+            if res[2] == 'CaixaMagica':
     17443                 # Get rid of the superfluous (development version) (11.04)
     17444                 text = re.sub('\s*\(.*\).*', '', res[1])
     17445                 _os_prober_oslist[res[0]] = text
     17446@@ -422,7 +422,7 @@
     17447             syslog.syslog(syslog.LOG_ERR, 'Unable to determine the release.')
     17448 
     17449         if not get_release.release_info:
     17450-            get_release.release_info = ReleaseInfo(name='Ubuntu', version='')
     17451+            get_release.release_info = ReleaseInfo(name='CaixaMagica', version='')
     17452     return get_release.release_info
     17453 get_release.release_info = None
     17454 
     17455@@ -450,7 +450,7 @@
     17456             if fp:
     17457                 fp.close()
     17458         if not get_release_name.release_name:
     17459-            get_release_name.release_name = 'Ubuntu'
     17460+            get_release_name.release_name = 'CaixaMagica'
     17461     return get_release_name.release_name
     17462 get_release_name.release_name = ''
     17463 
     17464diff -Naur ubiquity-2.6.10.orig//ubiquity/plugins/ubi-language.py ubiquity-2.6.10//ubiquity/plugins/ubi-language.py
     17465--- ubiquity-2.6.10.orig//ubiquity/plugins/ubi-language.py      2011-04-10 23:32:38.000000000 +0100
     17466+++ ubiquity-2.6.10//ubiquity/plugins/ubi-language.py   2011-07-14 12:10:09.017808755 +0100
     17467@@ -636,7 +636,7 @@
     17468                 text = widget.text()
     17469                 text = text.replace('${RELEASE}', release.name)
     17470                 text = text.replace('${MEDIUM}', install_medium)
     17471-                text = text.replace('Ubuntu', 'Kubuntu')
     17472+                text = text.replace('CaixaMagica', 'CaixaMagicaKDE')
     17473                 widget.setText(text)
     17474                 
     17475         self.update_release_notes_label()
     17476diff -Naur ubiquity-2.6.10.orig//ubiquity/plugins/ubi-prepare.py ubiquity-2.6.10//ubiquity/plugins/ubi-prepare.py
     17477--- ubiquity-2.6.10.orig//ubiquity/plugins/ubi-prepare.py       2011-04-10 00:45:58.000000000 +0100
     17478+++ ubiquity-2.6.10//ubiquity/plugins/ubi-prepare.py    2011-07-14 11:50:25.167809278 +0100
     17479@@ -110,7 +110,7 @@
     17480         self.prepare_network_connection.set_property('label', ether)
     17481 
     17482 class PageGtk(PreparePageBase):
     17483-    restricted_package_name = 'ubuntu-restricted-addons'
     17484+    restricted_package_name = 'caixamagica-restricted-addons'
     17485     def __init__(self, controller, *args, **kwargs):
     17486         if 'UBIQUITY_AUTOMATIC' in os.environ:
     17487             self.page = None
     17488@@ -189,7 +189,7 @@
     17489 
     17490 class PageKde(PreparePageBase):
     17491     plugin_breadcrumb = 'ubiquity/text/breadcrumb_prepare'
     17492-    restricted_package_name = 'kubuntu-restricted-addons'
     17493+    restricted_package_name = 'caixamagicakde-restricted-addons'
     17494 
     17495     def __init__(self, controller, *args, **kwargs):
     17496         from ubiquity.qtwidgets import StateBox
    1732317497@@ -204,6 +204,8 @@
    1732417498             self.prepare_nonfree_software = self.page.prepare_nonfree_software
     
    1733017504             # TODO we should set these up and tear them down while on this page.
    1733117505             try:
    17332 @@ -269,7 +271,7 @@
     17506@@ -269,10 +271,10 @@
    1733317507         #gtk does the ${RELEASE} replace for the title in gtk_ui but we do it per plugin because our title widget is per plugin
    1733417508         #also add Bold here (not sure how the gtk side keeps that formatting)
     
    1733817512             text = widget.text()
    1733917513             text = text.replace('${RELEASE}', release.name)
    17340              text = text.replace('Ubuntu', 'Kubuntu')
     17514-            text = text.replace('Ubuntu', 'Kubuntu')
     17515+            text = text.replace('CaixaMagica', 'CaixaMagicaKDE')
     17516             text = "<b>" + text + "</b>"
     17517             widget.setText(text)
     17518 
     17519@@ -328,7 +330,7 @@
     17520         self.preseed_bool('ubiquity/download_updates', download_updates)
     17521         if use_nonfree:
     17522             with misc.raised_privileges():
     17523-                # Install ubuntu-restricted-addons.
     17524+                # Install caixamagica-restricted-addons.
     17525                 self.preseed_bool('apt-setup/universe', True)
     17526                 self.preseed_bool('apt-setup/multiverse', True)
     17527                 self.preseed('ubiquity/nonfree_package',
  • packages/cm16/ubiquity/repo

    r4609 r4824  
    1 src-main-horn_updates
     1src-main-horn_updates_testing
Note: See TracChangeset for help on using the changeset viewer.