Changeset 4828


Ignore:
Timestamp:
Jul 14, 2011, 5:13:15 PM (9 years ago)
Author:
fasma
Message:

Added support to lxde background to standalone ubiquity-gtk

Location:
packages/cm16/ubiquity
Files:
4 added
1 edited

Legend:

Unmodified
Added
Removed
  • packages/cm16/ubiquity/cmiffy/debdiff.patch

    r4825 r4828  
    11diff -Naur ubiquity-2.6.10.orig//bin/oem-config-remaster ubiquity-2.6.10//bin/oem-config-remaster
    22--- 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
     3+++ ubiquity-2.6.10//bin/oem-config-remaster    2011-07-14 17:03:27.757800972 +0100
    44@@ -1,6 +1,6 @@
    55 #!/bin/sh
     
    2828diff -Naur ubiquity-2.6.10.orig//bin/oem-config-remove ubiquity-2.6.10//bin/oem-config-remove
    2929--- 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
     30+++ ubiquity-2.6.10//bin/oem-config-remove      2011-07-14 17:03:27.757800972 +0100
    3131@@ -18,7 +18,7 @@
    3232 
     
    4040diff -Naur ubiquity-2.6.10.orig//bin/oem-config-remove-gtk ubiquity-2.6.10//bin/oem-config-remove-gtk
    4141--- 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
     42+++ ubiquity-2.6.10//bin/oem-config-remove-gtk  2011-07-14 17:03:27.757800972 +0100
    4343@@ -60,8 +60,8 @@
    4444 def main():
     
    5454diff -Naur ubiquity-2.6.10.orig//bin/ubiquity ubiquity-2.6.10//bin/ubiquity
    5555--- 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
     56+++ ubiquity-2.6.10//bin/ubiquity       2011-07-14 17:03:27.757800972 +0100
    5757@@ -3,7 +3,7 @@
    5858 '''
     
    6666diff -Naur ubiquity-2.6.10.orig//bin/ubiquity-dm ubiquity-2.6.10//bin/ubiquity-dm
    6767--- 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
    69 @@ -21,7 +21,7 @@
     68+++ ubiquity-2.6.10//bin/ubiquity-dm    2011-07-14 17:04:05.457800955 +0100
     69@@ -21,8 +21,13 @@
    7070 from ubiquity.casper import get_casper
    7171 from ubiquity.debconfcommunicator import DebconfCommunicator
    7272 
    7373-background = '/usr/share/backgrounds/warty-final-ubuntu.png'
    74 +background = '/usr/share/backgrounds/horn-final-caixamagica.png'
    75  
     74+#background = '/usr/share/backgrounds/horn-final-caixamagica.png'
     75 
     76+if os.path.exists("/usr/share/caixamagicalxde/wallpapers/caixamagicalxde-default-wallpaper.png"):
     77+       background = '/usr/share/caixamagicalxde/wallpapers/caixamagicalxde-default-wallpaper.png'
     78+else:
     79+       background = '/usr/share/backgrounds/horn-final-caixamagica.png'
     80+       
    7681 def ck_open_session(uid):
    7782     import dbus
    78 @@ -350,12 +350,12 @@
     83     bus = dbus.SystemBus ()
     84@@ -327,7 +332,7 @@
     85                         preexec_fn=self.drop_privileges))
     86                     os.environ['GTK_MODULES'] = 'gail:atk-bridge'
     87 
     88-            # Don't show the background image in v1 accessibility profile. It
     89+            # Do't show the background image in v1 accessibility profile. It
     90             # is not shown in the GNOME desktop after all.
     91             with open('/proc/cmdline', 'r') as fp:
     92                 exists = os.access(background, os.R_OK)
     93@@ -350,12 +355,12 @@
    7994                 wm_cmd = ['xfwm4']
    8095             elif osextras.find_on_path('matchbox-window-manager'):
     
    92107                 stdin=null, stdout=logfile, stderr=logfile,
    93108                 preexec_fn=self.drop_privileges)
    94 @@ -380,13 +380,13 @@
     109@@ -380,13 +385,13 @@
    95110 
    96111             if osextras.find_on_path('lxsession'):
     
    108123                         ['/usr/lib/ubiquity/panel'],
    109124                         stdin=null, stdout=logfile, stderr=logfile,
    110 @@ -415,7 +415,7 @@
     125@@ -415,7 +420,7 @@
    111126             # Don't show the background image in v1 accessibility profile.
    112127             os.setegid(self.gid)
     
    119134diff -Naur ubiquity-2.6.10.orig//bin/ubiquity-greeter-gtk ubiquity-2.6.10//bin/ubiquity-greeter-gtk
    120135--- 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
     136+++ ubiquity-2.6.10//bin/ubiquity-greeter-gtk   2011-07-14 17:03:27.757800972 +0100
    122137@@ -1,5 +1,4 @@
    123138 #! /usr/bin/python
     
    153168diff -Naur ubiquity-2.6.10.orig//debian/changelog ubiquity-2.6.10//debian/changelog
    154169--- 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
     170+++ ubiquity-2.6.10//debian/changelog   2011-07-14 17:03:27.757800972 +0100
    156171@@ -1,3 +1,11 @@
    157172+ubiquity (2.6.10xcm1) horn; urgency=low
     
    168183diff -Naur ubiquity-2.6.10.orig//debian/control ubiquity-2.6.10//debian/control
    169184--- 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
     185+++ ubiquity-2.6.10//debian/control     2011-07-14 17:03:27.757800972 +0100
    171186@@ -1,7 +1,7 @@
    172187 Source: ubiquity
     
    208223diff -Naur ubiquity-2.6.10.orig//debian/real-po/pt.po ubiquity-2.6.10//debian/real-po/pt.po
    209224--- 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
     225+++ ubiquity-2.6.10//debian/real-po/pt.po       2011-07-14 17:03:27.757800972 +0100
    211226@@ -1568,6 +1568,8 @@
    212227 "Documents, music, and other personal files will be kept. You can choose "
     
    220235diff -Naur ubiquity-2.6.10.orig//debian/rules ubiquity-2.6.10//debian/rules
    221236--- 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
     237+++ ubiquity-2.6.10//debian/rules       2011-07-14 17:03:27.757800972 +0100
    223238@@ -212,6 +212,9 @@
    224239                cp desktop/hi$${size}-app-ubiquity.png debian/ubiquity-frontend-kde/usr/share/icons/hicolor/$${size}x$${size}/apps/ubiquity.png; \
     
    233248diff -Naur ubiquity-2.6.10.orig//debian/ubiquity-caixamagica-artwork.install ubiquity-2.6.10//debian/ubiquity-caixamagica-artwork.install
    234249--- 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
     250+++ ubiquity-2.6.10//debian/ubiquity-caixamagica-artwork.install        2011-07-14 17:03:27.757800972 +0100
    236251@@ -0,0 +1,3 @@
    237252+desktop/ubiquity.png usr/share/pixmaps
     
    240255diff -Naur ubiquity-2.6.10.orig//debian/ubiquity-frontend-gtk.install ubiquity-2.6.10//debian/ubiquity-frontend-gtk.install
    241256--- 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
     257+++ ubiquity-2.6.10//debian/ubiquity-frontend-gtk.install       2011-07-14 17:03:27.757800972 +0100
    243258@@ -4,7 +4,7 @@
    244259 gui/gtk/*.ui usr/share/ubiquity/gtk
     
    252267diff -Naur ubiquity-2.6.10.orig//debian/ubiquity.ubiquity.upstart ubiquity-2.6.10//debian/ubiquity.ubiquity.upstart
    253268--- 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
     269+++ ubiquity-2.6.10//debian/ubiquity.ubiquity.upstart   2011-07-14 17:03:27.757800972 +0100
    255270@@ -1,10 +1,10 @@
    256271-# ubiquity - Ubuntu live CD installer
     
    285300diff -Naur ubiquity-2.6.10.orig//desktop/ubiquity-kdeui.desktop.in ubiquity-2.6.10//desktop/ubiquity-kdeui.desktop.in
    286301--- 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
     302+++ ubiquity-2.6.10//desktop/ubiquity-kdeui.desktop.in  2011-07-14 17:03:27.757800972 +0100
    288303@@ -9,4 +9,3 @@
    289304 Terminal=false
     
    293308diff -Naur ubiquity-2.6.10.orig//d-i/manifest ubiquity-2.6.10//d-i/manifest
    294309--- 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
     310+++ ubiquity-2.6.10//d-i/manifest       2011-07-14 17:03:27.757800972 +0100
    296311@@ -1,7 +1,7 @@
    297312-apt-setup 1:0.49ubuntu4
     
    315330diff -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
    316331--- 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
     332+++ ubiquity-2.6.10//d-i/source/apt-setup/debian/apt-mirror-setup.install       2011-07-14 17:03:27.757800972 +0100
    318333@@ -1,3 +1,4 @@
    319334 generators/50mirror.ubuntu usr/lib/apt-setup/generators
     
    323338diff -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
    324339--- 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
     340+++ ubiquity-2.6.10//d-i/source/apt-setup/debian/apt-mirror-setup.templates-ubuntu      2011-07-14 17:03:27.757800972 +0100
    326341@@ -1,7 +1,7 @@
    327342 Template: apt-setup/restricted
     
    402417diff -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
    403418--- 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
     419+++ ubiquity-2.6.10//d-i/source/apt-setup/debian/apt-setup-udeb.templates       2011-07-14 17:03:27.757800972 +0100
    405420@@ -34,13 +34,13 @@
    406421 
     
    447462diff -Naur ubiquity-2.6.10.orig//d-i/source/apt-setup/debian/changelog ubiquity-2.6.10//d-i/source/apt-setup/debian/changelog
    448463--- 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
     464+++ ubiquity-2.6.10//d-i/source/apt-setup/debian/changelog      2011-07-14 17:03:27.757800972 +0100
    450465@@ -1,3 +1,10 @@
    451466+apt-setup (1:0.49xcm4) horn; urgency=low
     
    461476diff -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
    462477--- 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
     478+++ ubiquity-2.6.10//d-i/source/apt-setup/debian/po/am.po       2011-07-14 17:03:27.767800972 +0100
    464479@@ -202,7 +202,7 @@
    465480 #| "Debian has two services that provide updates to releases: security and "
     
    646661diff -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
    647662--- 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
     663+++ ubiquity-2.6.10//d-i/source/apt-setup/debian/po/ar.po       2011-07-14 17:03:27.767800972 +0100
    649664@@ -205,7 +205,7 @@
    650665 #| "Debian has two services that provide updates to releases: security and "
     
    911926diff -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
    912927--- 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
     928+++ ubiquity-2.6.10//d-i/source/apt-setup/debian/po/ast.po      2011-07-14 17:03:27.767800972 +0100
    914929@@ -211,7 +211,7 @@
    915930 #| "Debian has two services that provide updates to releases: security and "
     
    11361151diff -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
    11371152--- 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
     1153+++ ubiquity-2.6.10//d-i/source/apt-setup/debian/po/be.po       2011-07-14 17:03:27.767800972 +0100
    11391154@@ -219,7 +219,7 @@
    11401155 #| "Debian has two services that provide updates to releases: security and "
     
    13601375diff -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
    13611376--- 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
     1377+++ ubiquity-2.6.10//d-i/source/apt-setup/debian/po/bg.po       2011-07-14 17:03:27.767800972 +0100
    13631378@@ -214,7 +214,7 @@
    13641379 #| "Debian has two services that provide updates to releases: security and "
     
    15861601diff -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
    15871602--- 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
     1603+++ ubiquity-2.6.10//d-i/source/apt-setup/debian/po/bn.po       2011-07-14 17:03:27.767800972 +0100
    15891604@@ -230,7 +230,7 @@
    15901605 #| "Debian has two services that provide updates to releases: security and "
     
    17971812diff -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
    17981813--- 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
     1814+++ ubiquity-2.6.10//d-i/source/apt-setup/debian/po/bs.po       2011-07-14 17:03:27.767800972 +0100
    18001815@@ -211,7 +211,7 @@
    18011816 #| "Debian has two services that provide updates to releases: security and "
     
    19841999diff -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
    19852000--- 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
     2001+++ ubiquity-2.6.10//d-i/source/apt-setup/debian/po/ca.po       2011-07-14 17:03:27.767800972 +0100
    19872002@@ -211,7 +211,7 @@
    19882003 #| "Debian has two services that provide updates to releases: security and "
     
    21712186diff -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
    21722187--- 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
     2188+++ ubiquity-2.6.10//d-i/source/apt-setup/debian/po/cs.po       2011-07-14 17:03:27.767800972 +0100
    21742189@@ -208,7 +208,7 @@
    21752190 #| "Debian has two services that provide updates to releases: security and "
     
    23952410diff -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
    23962411--- 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
     2412+++ ubiquity-2.6.10//d-i/source/apt-setup/debian/po/da.po       2011-07-14 17:03:27.767800972 +0100
    23982413@@ -219,7 +219,7 @@
    23992414 #| "Debian has two services that provide updates to releases: security and "
     
    26192634diff -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
    26202635--- 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
     2636+++ ubiquity-2.6.10//d-i/source/apt-setup/debian/po/de.po       2011-07-14 17:03:27.767800972 +0100
    26222637@@ -223,7 +223,7 @@
    26232638 #| "Debian has two services that provide updates to releases: security and "
     
    28432858diff -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
    28442859--- 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
     2860+++ ubiquity-2.6.10//d-i/source/apt-setup/debian/po/dz.po       2011-07-14 17:03:27.767800972 +0100
    28462861@@ -208,7 +208,7 @@
    28472862 #| "Debian has two services that provide updates to releases: security and "
     
    30313046diff -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
    30323047--- 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
     3048+++ ubiquity-2.6.10//d-i/source/apt-setup/debian/po/el.po       2011-07-14 17:03:27.767800972 +0100
    30343049@@ -220,7 +220,7 @@
    30353050 #| "Debian has two services that provide updates to releases: security and "
     
    33033318diff -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
    33043319--- 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
     3320+++ ubiquity-2.6.10//d-i/source/apt-setup/debian/po/eo.po       2011-07-14 17:03:27.767800972 +0100
    33063321@@ -211,7 +211,7 @@
    33073322 #| "Debian has two services that provide updates to releases: security and "
     
    35243539diff -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
    35253540--- 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
     3541+++ ubiquity-2.6.10//d-i/source/apt-setup/debian/po/es.po       2011-07-14 17:03:27.767800972 +0100
    35273542@@ -246,7 +246,7 @@
    35283543 #| "Debian has two services that provide updates to releases: security and "
     
    37513766diff -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
    37523767--- 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
     3768+++ ubiquity-2.6.10//d-i/source/apt-setup/debian/po/et.po       2011-07-14 17:03:27.767800972 +0100
    37543769@@ -210,7 +210,7 @@
    37553770 #| "Debian has two services that provide updates to releases: security and "
     
    39753990diff -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
    39763991--- 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
     3992+++ ubiquity-2.6.10//d-i/source/apt-setup/debian/po/eu.po       2011-07-14 17:03:27.777800972 +0100
    39783993@@ -215,7 +215,7 @@
    39793994 #| "Debian has two services that provide updates to releases: security and "
     
    41994214diff -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
    42004215--- 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
     4216+++ ubiquity-2.6.10//d-i/source/apt-setup/debian/po/fa.po       2011-07-14 17:03:27.777800972 +0100
    42024217@@ -205,7 +205,7 @@
    42034218 #| "Debian has two services that provide updates to releases: security and "
     
    44594474diff -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
    44604475--- 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
     4476+++ ubiquity-2.6.10//d-i/source/apt-setup/debian/po/fi.po       2011-07-14 17:03:27.777800972 +0100
    44624477@@ -215,7 +215,7 @@
    44634478 #| "Debian has two services that provide updates to releases: security and "
     
    46834698diff -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
    46844699--- 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
     4700+++ ubiquity-2.6.10//d-i/source/apt-setup/debian/po/fr.po       2011-07-14 17:03:27.777800972 +0100
    46864701@@ -218,7 +218,7 @@
    46874702 #| "Debian has two services that provide updates to releases: security and "
     
    49104925diff -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
    49114926--- 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
     4927+++ ubiquity-2.6.10//d-i/source/apt-setup/debian/po/ga.po       2011-07-14 17:03:27.777800972 +0100
    49134928@@ -208,7 +208,7 @@
    49144929 #| "Debian has two services that provide updates to releases: security and "
     
    50975112diff -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
    50985113--- 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
     5114+++ ubiquity-2.6.10//d-i/source/apt-setup/debian/po/gl.po       2011-07-14 17:03:27.777800972 +0100
    51005115@@ -214,7 +214,7 @@
    51015116 #| "Debian has two services that provide updates to releases: security and "
     
    53215336diff -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
    53225337--- 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
     5338+++ ubiquity-2.6.10//d-i/source/apt-setup/debian/po/gu.po       2011-07-14 17:03:27.777800972 +0100
    53245339@@ -209,7 +209,7 @@
    53255340 #| "Debian has two services that provide updates to releases: security and "
     
    55295544diff -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
    55305545--- 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
     5546+++ ubiquity-2.6.10//d-i/source/apt-setup/debian/po/he.po       2011-07-14 17:03:27.777800972 +0100
    55325547@@ -214,7 +214,7 @@
    55335548 #| "Debian has two services that provide updates to releases: security and "
     
    57135728diff -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
    57145729--- 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
     5730+++ ubiquity-2.6.10//d-i/source/apt-setup/debian/po/hi.po       2011-07-14 17:03:27.777800972 +0100
    57165731@@ -215,7 +215,7 @@
    57175732 #| "Debian has two services that provide updates to releases: security and "
     
    58995914diff -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
    59005915--- 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
     5916+++ ubiquity-2.6.10//d-i/source/apt-setup/debian/po/hr.po       2011-07-14 17:03:27.777800972 +0100
    59025917@@ -208,7 +208,7 @@
    59035918 #| "Debian has two services that provide updates to releases: security and "
     
    60866101diff -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
    60876102--- 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
     6103+++ ubiquity-2.6.10//d-i/source/apt-setup/debian/po/hu.po       2011-07-14 17:03:27.777800972 +0100
    60896104@@ -210,7 +210,7 @@
    60906105 #| "Debian has two services that provide updates to releases: security and "
     
    62726287diff -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
    62736288--- 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
     6289+++ ubiquity-2.6.10//d-i/source/apt-setup/debian/po/id.po       2011-07-14 17:03:27.777800972 +0100
    62756290@@ -218,7 +218,7 @@
    62766291 #| "Debian has two services that provide updates to releases: security and "
     
    64596474diff -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
    64606475--- 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
     6476+++ ubiquity-2.6.10//d-i/source/apt-setup/debian/po/is.po       2011-07-14 17:03:27.777800972 +0100
    64626477@@ -214,7 +214,7 @@
    64636478 #| "Debian has two services that provide updates to releases: security and "
     
    66586673diff -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
    66596674--- 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
     6675+++ ubiquity-2.6.10//d-i/source/apt-setup/debian/po/it.po       2011-07-14 17:03:27.777800972 +0100
    66616676@@ -221,7 +221,7 @@
    66626677 #| "Debian has two services that provide updates to releases: security and "
     
    68796894diff -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
    68806895--- 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
     6896+++ ubiquity-2.6.10//d-i/source/apt-setup/debian/po/ja.po       2011-07-14 17:03:27.777800972 +0100
    68826897@@ -207,7 +207,7 @@
    68836898 #| "Debian has two services that provide updates to releases: security and "
     
    71037118diff -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
    71047119--- 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
     7120+++ ubiquity-2.6.10//d-i/source/apt-setup/debian/po/ka.po       2011-07-14 17:03:27.777800972 +0100
    71067121@@ -214,7 +214,7 @@
    71077122 #| "Debian has two services that provide updates to releases: security and "
     
    72927307diff -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
    72937308--- 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
     7309+++ ubiquity-2.6.10//d-i/source/apt-setup/debian/po/kk.po       2011-07-14 17:03:27.777800972 +0100
    72957310@@ -210,7 +210,7 @@
    72967311 #| "Debian has two services that provide updates to releases: security and "
     
    74797494diff -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
    74807495--- 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
     7496+++ ubiquity-2.6.10//d-i/source/apt-setup/debian/po/km.po       2011-07-14 17:03:27.777800972 +0100
    74827497@@ -209,7 +209,7 @@
    74837498 #| "Debian has two services that provide updates to releases: security and "
     
    76727687diff -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
    76737688--- 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
     7689+++ ubiquity-2.6.10//d-i/source/apt-setup/debian/po/ko.po       2011-07-14 17:03:27.777800972 +0100
    76757690@@ -209,7 +209,7 @@
    76767691 #| "Debian has two services that provide updates to releases: security and "
     
    78837898diff -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
    78847899--- 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
     7900+++ ubiquity-2.6.10//d-i/source/apt-setup/debian/po/ku.po       2011-07-14 17:03:27.777800972 +0100
    78867901@@ -213,7 +213,7 @@
    78877902 #| "Debian has two services that provide updates to releases: security and "
     
    80648079diff -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
    80658080--- 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
     8081+++ ubiquity-2.6.10//d-i/source/apt-setup/debian/po/lt.po       2011-07-14 17:03:27.777800972 +0100
    80678082@@ -208,7 +208,7 @@
    80688083 #| "Debian has two services that provide updates to releases: security and "
     
    82948309diff -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
    82958310--- 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
     8311+++ ubiquity-2.6.10//d-i/source/apt-setup/debian/po/lv.po       2011-07-14 17:03:27.777800972 +0100
    82978312@@ -211,7 +211,7 @@
    82988313 #| "Debian has two services that provide updates to releases: security and "
     
    84818496diff -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
    84828497--- 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
     8498+++ ubiquity-2.6.10//d-i/source/apt-setup/debian/po/mk.po       2011-07-14 17:03:27.777800972 +0100
    84848499@@ -211,7 +211,7 @@
    84858500 #| "Debian has two services that provide updates to releases: security and "
     
    86688683diff -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
    86698684--- 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
     8685+++ ubiquity-2.6.10//d-i/source/apt-setup/debian/po/ml.po       2011-07-14 17:03:27.777800972 +0100
    86718686@@ -215,7 +215,7 @@
    86728687 #| "Debian has two services that provide updates to releases: security and "
     
    88538868diff -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
    88548869--- 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
     8870+++ ubiquity-2.6.10//d-i/source/apt-setup/debian/po/mr.po       2011-07-14 17:03:27.777800972 +0100
    88568871@@ -210,7 +210,7 @@
    88578872 #| "Debian has two services that provide updates to releases: security and "
     
    90439058diff -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
    90449059--- 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
     9060+++ ubiquity-2.6.10//d-i/source/apt-setup/debian/po/nb.po       2011-07-14 17:03:27.787800972 +0100
    90469061@@ -213,7 +213,7 @@
    90479062 #| "Debian has two services that provide updates to releases: security and "
     
    92679282diff -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
    92689283--- 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
     9284+++ ubiquity-2.6.10//d-i/source/apt-setup/debian/po/ne.po       2011-07-14 17:03:27.787800972 +0100
    92709285@@ -213,7 +213,7 @@
    92719286 #| "Debian has two services that provide updates to releases: security and "
     
    94549469diff -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
    94559470--- 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
     9471+++ ubiquity-2.6.10//d-i/source/apt-setup/debian/po/nl.po       2011-07-14 17:03:27.787800972 +0100
    94579472@@ -212,7 +212,7 @@
    94589473 #| "Debian has two services that provide updates to releases: security and "
     
    96779692diff -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
    96789693--- 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
     9694+++ ubiquity-2.6.10//d-i/source/apt-setup/debian/po/nn.po       2011-07-14 17:03:27.787800972 +0100
    96809695@@ -212,7 +212,7 @@
    96819696 #| "Debian has two services that provide updates to releases: security and "
     
    98649879diff -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
    98659880--- 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
     9881+++ ubiquity-2.6.10//d-i/source/apt-setup/debian/po/pa.po       2011-07-14 17:03:27.787800972 +0100
    98679882@@ -214,7 +214,7 @@
    98689883 #| "Debian has two services that provide updates to releases: security and "
     
    1005410069diff -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
    1005510070--- 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
     10071+++ ubiquity-2.6.10//d-i/source/apt-setup/debian/po/pl.po       2011-07-14 17:03:27.787800972 +0100
    1005710072@@ -208,7 +208,7 @@
    1005810073 #| "Debian has two services that provide updates to releases: security and "
     
    1027610291diff -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
    1027710292--- 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
     10293+++ ubiquity-2.6.10//d-i/source/apt-setup/debian/po/pt_BR.po    2011-07-14 17:03:27.787800972 +0100
    1027910294@@ -210,7 +210,7 @@
    1028010295 #| "Debian has two services that provide updates to releases: security and "
     
    1046410479diff -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
    1046510480--- 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
     10481+++ ubiquity-2.6.10//d-i/source/apt-setup/debian/po/pt.po       2011-07-14 17:03:27.787800972 +0100
    1046710482@@ -208,7 +208,7 @@
    1046810483 #| "Debian has two services that provide updates to releases: security and "
     
    1068710702diff -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
    1068810703--- 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
     10704+++ ubiquity-2.6.10//d-i/source/apt-setup/debian/po/ro.po       2011-07-14 17:03:27.787800972 +0100
    1069010705@@ -224,7 +224,7 @@
    1069110706 #| "Debian has two services that provide updates to releases: security and "
     
    1087310888diff -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
    1087410889--- 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
     10890+++ ubiquity-2.6.10//d-i/source/apt-setup/debian/po/ru.po       2011-07-14 17:03:27.787800972 +0100
    1087610891@@ -216,7 +216,7 @@
    1087710892 #| "Debian has two services that provide updates to releases: security and "
     
    1110011115diff -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
    1110111116--- 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
     11117+++ ubiquity-2.6.10//d-i/source/apt-setup/debian/po/se.po       2011-07-14 17:03:27.787800972 +0100
    1110311118@@ -193,7 +193,7 @@
    1110411119 #. :sl2:
     
    1128111296diff -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
    1128211297--- 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
     11298+++ ubiquity-2.6.10//d-i/source/apt-setup/debian/po/sk.po       2011-07-14 17:03:27.787800972 +0100
    1128411299@@ -211,7 +211,7 @@
    1128511300 #| "Debian has two services that provide updates to releases: security and "
     
    1150511520diff -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
    1150611521--- 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
     11522+++ ubiquity-2.6.10//d-i/source/apt-setup/debian/po/sl.po       2011-07-14 17:03:27.787800972 +0100
    1150811523@@ -223,7 +223,7 @@
    1150911524 #| "Debian has two services that provide updates to releases: security and "
     
    1172611741diff -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
    1172711742--- 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
     11743+++ ubiquity-2.6.10//d-i/source/apt-setup/debian/po/sq.po       2011-07-14 17:03:27.787800972 +0100
    1172911744@@ -208,7 +208,7 @@
    1173011745 #| "Debian has two services that provide updates to releases: security and "
     
    1195011965diff -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
    1195111966--- 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
     11967+++ ubiquity-2.6.10//d-i/source/apt-setup/debian/po/sr.po       2011-07-14 17:03:27.787800972 +0100
    1195311968@@ -213,7 +213,7 @@
    1195411969 #| "Debian has two services that provide updates to releases: security and "
     
    1213912154diff -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
    1214012155--- 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
     12156+++ ubiquity-2.6.10//d-i/source/apt-setup/debian/po/sv.po       2011-07-14 17:03:27.787800972 +0100
    1214212157@@ -218,7 +218,7 @@
    1214312158 #| "Debian has two services that provide updates to releases: security and "
     
    1236312378diff -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
    1236412379--- 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
     12380+++ ubiquity-2.6.10//d-i/source/apt-setup/debian/po/ta.po       2011-07-14 17:03:27.787800972 +0100
    1236612381@@ -19,7 +19,7 @@
    1236712382 "POT-Creation-Date: 2009-06-26 22:47+0000\n"
     
    1255712572diff -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
    1255812573--- 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
     12574+++ ubiquity-2.6.10//d-i/source/apt-setup/debian/po/templates.pot       2011-07-14 17:03:27.787800972 +0100
    1256012575@@ -184,7 +184,7 @@
    1256112576 #. :sl2:
     
    1273812753diff -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
    1273912754--- 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
     12755+++ ubiquity-2.6.10//d-i/source/apt-setup/debian/po/te.po       2011-07-14 17:03:27.787800972 +0100
    1274112756@@ -9,7 +9,7 @@
    1274212757 # వీవెచ్ (Veeven) <launchpad.net>, 2007.
     
    1295812973diff -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
    1295912974--- 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
     12975+++ ubiquity-2.6.10//d-i/source/apt-setup/debian/po/th.po       2011-07-14 17:03:27.787800972 +0100
    1296112976@@ -208,7 +208,7 @@
    1296212977 #| "Debian has two services that provide updates to releases: security and "
     
    1318213197diff -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
    1318313198--- 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
     13199+++ ubiquity-2.6.10//d-i/source/apt-setup/debian/po/tl.po       2011-07-14 17:03:27.787800972 +0100
    1318513200@@ -217,7 +217,7 @@
    1318613201 #| "Debian has two services that provide updates to releases: security and "
     
    1336313378diff -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
    1336413379--- 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
     13380+++ ubiquity-2.6.10//d-i/source/apt-setup/debian/po/tr.po       2011-07-14 17:03:27.787800972 +0100
    1336613381@@ -216,7 +216,7 @@
    1336713382 #| "Debian has two services that provide updates to releases: security and "
     
    1358713602diff -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
    1358813603--- 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
     13604+++ ubiquity-2.6.10//d-i/source/apt-setup/debian/po/uk.po       2011-07-14 17:03:27.787800972 +0100
    1359013605@@ -213,7 +213,7 @@
    1359113606 #| "Debian has two services that provide updates to releases: security and "
     
    1377613791diff -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
    1377713792--- 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
     13793+++ ubiquity-2.6.10//d-i/source/apt-setup/debian/po/vi.po       2011-07-14 17:03:27.787800972 +0100
    1377913794@@ -212,7 +212,7 @@
    1378013795 #| "Debian has two services that provide updates to releases: security and "
     
    1400014015diff -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
    1400114016--- 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
     14017+++ ubiquity-2.6.10//d-i/source/apt-setup/debian/po/zh_CN.po    2011-07-14 17:03:27.787800972 +0100
    1400314018@@ -207,7 +207,7 @@
    1400414019 #| "Debian has two services that provide updates to releases: security and "
     
    1421914234diff -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
    1422014235--- 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
     14236+++ ubiquity-2.6.10//d-i/source/apt-setup/debian/po/zh_TW.po    2011-07-14 17:03:27.787800972 +0100
    1422214237@@ -202,7 +202,7 @@
    1422314238 #| "Debian has two services that provide updates to releases: security and "
     
    1445114466diff -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
    1445214467--- 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
     14468+++ ubiquity-2.6.10//d-i/source/apt-setup/generators/50mirror.ubuntu    2011-07-14 17:03:27.797800972 +0100
    1445414469@@ -98,7 +98,8 @@
    1445514470 db_get mirror/$protocol/hostname
     
    1453714552diff -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
    1453814553--- 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
     14554+++ ubiquity-2.6.10//d-i/source/apt-setup/generators/90services-select  2011-07-14 17:03:27.797800972 +0100
    1454014555@@ -50,8 +50,8 @@
    1454114556 if (! db_get apt-setup/restricted || [ "$RET" = false ]) && \
     
    1455114566diff -Naur ubiquity-2.6.10.orig//d-i/source/apt-setup/generators/91security ubiquity-2.6.10//d-i/source/apt-setup/generators/91security
    1455214567--- 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
     14568+++ ubiquity-2.6.10//d-i/source/apt-setup/generators/91security 2011-07-14 17:03:27.797800972 +0100
    1455414569@@ -15,7 +15,7 @@
    1455514570 [ "$host" ] || exit
     
    1459814613diff -Naur ubiquity-2.6.10.orig//d-i/source/apt-setup/generators/93partner ubiquity-2.6.10//d-i/source/apt-setup/generators/93partner
    1459914614--- 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
     14615+++ ubiquity-2.6.10//d-i/source/apt-setup/generators/93partner  2011-07-14 17:03:27.797800972 +0100
    1460114616@@ -5,11 +5,11 @@
    1460214617 
     
    1464514660diff -Naur ubiquity-2.6.10.orig//d-i/source/apt-setup/generators/94extras ubiquity-2.6.10//d-i/source/apt-setup/generators/94extras
    1464614661--- 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
     14662+++ ubiquity-2.6.10//d-i/source/apt-setup/generators/94extras   2011-07-14 17:03:27.797800972 +0100
    1464814663@@ -10,24 +10,25 @@
    1464914664 fi
     
    1468814703diff -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
    1468914704--- 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
     14705+++ ubiquity-2.6.10//d-i/source/apt-setup/release-files/ftp.caixamagica.pt/horn/Release 2011-07-14 17:03:27.797800972 +0100
    1469114706@@ -0,0 +1,196 @@
    1469214707+Origin: Caixa Magica <software@caixamagica.pt>
     
    1488814903diff -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
    1488914904--- 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
     14905+++ ubiquity-2.6.10//d-i/source/apt-setup/release-files/ftp.caixamagica.pt/horn/Release.gpg     2011-07-14 17:03:27.797800972 +0100
    1489114906@@ -0,0 +1,11 @@
    1489214907+-----BEGIN PGP SIGNATURE-----
     
    1490314918diff -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
    1490414919--- 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
     14920+++ ubiquity-2.6.10//d-i/source/apt-setup/release-files/ftp.caixamagica.pt/horn-backports/Release       2011-07-14 17:03:27.797800972 +0100
    1490614921@@ -0,0 +1,169 @@
    1490714922+Origin: Caixa Magica <software@caixamagica.pt>
     
    1507615091diff -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
    1507715092--- 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
     15093+++ ubiquity-2.6.10//d-i/source/apt-setup/release-files/ftp.caixamagica.pt/horn-backports/Release.gpg   2011-07-14 17:03:27.797800972 +0100
    1507915094@@ -0,0 +1,11 @@
    1508015095+-----BEGIN PGP SIGNATURE-----
     
    1509115106diff -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
    1509215107--- 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
     15108+++ ubiquity-2.6.10//d-i/source/apt-setup/release-files/ftp.caixamagica.pt/horn-backports-testing/Release       2011-07-14 17:03:27.797800972 +0100
    1509415109@@ -0,0 +1,169 @@
    1509515110+Origin: Caixa Magica <software@caixamagica.pt>
     
    1526415279diff -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
    1526515280--- 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
     15281+++ ubiquity-2.6.10//d-i/source/apt-setup/release-files/ftp.caixamagica.pt/horn-backports-testing/Release.gpg   2011-07-14 17:03:27.797800972 +0100
    1526715282@@ -0,0 +1,11 @@
    1526815283+-----BEGIN PGP SIGNATURE-----
     
    1527915294diff -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
    1528015295--- 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
     15296+++ ubiquity-2.6.10//d-i/source/apt-setup/release-files/ftp.caixamagica.pt/horn-proposed/Release        2011-07-14 17:03:27.797800972 +0100
    1528215297@@ -0,0 +1,169 @@
    1528315298+Origin: Caixa Magica <software@caixamagica.pt>
     
    1545215467diff -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
    1545315468--- 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
     15469+++ ubiquity-2.6.10//d-i/source/apt-setup/release-files/ftp.caixamagica.pt/horn-proposed/Release.gpg    2011-07-14 17:03:27.797800972 +0100
    1545515470@@ -0,0 +1,11 @@
    1545615471+-----BEGIN PGP SIGNATURE-----
     
    1546715482diff -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
    1546815483--- 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
     15484+++ ubiquity-2.6.10//d-i/source/apt-setup/release-files/ftp.caixamagica.pt/horn-proposed-testing/Release        2011-07-14 17:03:27.797800972 +0100
    1547015485@@ -0,0 +1,169 @@
    1547115486+Origin: Caixa Magica <software@caixamagica.pt>
     
    1564015655diff -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
    1564115656--- 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
     15657+++ ubiquity-2.6.10//d-i/source/apt-setup/release-files/ftp.caixamagica.pt/horn-proposed-testing/Release.gpg    2011-07-14 17:03:27.797800972 +0100
    1564315658@@ -0,0 +1,11 @@
    1564415659+-----BEGIN PGP SIGNATURE-----
     
    1565515670diff -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
    1565615671--- 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
     15672+++ ubiquity-2.6.10//d-i/source/apt-setup/release-files/ftp.caixamagica.pt/horn-rollback/Release        2011-07-14 17:03:27.797800972 +0100
    1565815673@@ -0,0 +1,42 @@
    1565915674+Architectures: i386 amd64 source
     
    1570115716diff -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
    1570215717--- 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
     15718+++ ubiquity-2.6.10//d-i/source/apt-setup/release-files/ftp.caixamagica.pt/horn-rollback/Release.gpg    2011-07-14 17:03:27.797800972 +0100
    1570415719@@ -0,0 +1,11 @@
    1570515720+-----BEGIN PGP SIGNATURE-----
     
    1571615731diff -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
    1571715732--- 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
     15733+++ ubiquity-2.6.10//d-i/source/apt-setup/release-files/ftp.caixamagica.pt/horn-security/Release        2011-07-14 17:03:27.797800972 +0100
    1571915734@@ -0,0 +1,169 @@
    1572015735+Origin: Caixa Magica <software@caixamagica.pt>
     
    1588915904diff -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
    1589015905--- 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
     15906+++ ubiquity-2.6.10//d-i/source/apt-setup/release-files/ftp.caixamagica.pt/horn-security/Release.gpg    2011-07-14 17:03:27.797800972 +0100
    1589215907@@ -0,0 +1,11 @@
    1589315908+-----BEGIN PGP SIGNATURE-----
     
    1590415919diff -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
    1590515920--- 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
     15921+++ ubiquity-2.6.10//d-i/source/apt-setup/release-files/ftp.caixamagica.pt/horn-security-testing/Release        2011-07-14 17:03:27.797800972 +0100
    1590715922@@ -0,0 +1,169 @@
    1590815923+Origin: Caixa Magica <software@caixamagica.pt>
     
    1607716092diff -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
    1607816093--- 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
     16094+++ ubiquity-2.6.10//d-i/source/apt-setup/release-files/ftp.caixamagica.pt/horn-security-testing/Release.gpg    2011-07-14 17:03:27.797800972 +0100
    1608016095@@ -0,0 +1,11 @@
    1608116096+-----BEGIN PGP SIGNATURE-----
     
    1609216107diff -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
    1609316108--- 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
     16109+++ ubiquity-2.6.10//d-i/source/apt-setup/release-files/ftp.caixamagica.pt/horn-testing/Release 2011-07-14 17:03:27.797800972 +0100
    1609516110@@ -0,0 +1,196 @@
    1609616111+Origin: Caixa Magica <software@caixamagica.pt>
     
    1629216307diff -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
    1629316308--- 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
     16309+++ ubiquity-2.6.10//d-i/source/apt-setup/release-files/ftp.caixamagica.pt/horn-testing/Release.gpg     2011-07-14 17:03:27.797800972 +0100
    1629516310@@ -0,0 +1,11 @@
    1629616311+-----BEGIN PGP SIGNATURE-----
     
    1630716322diff -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
    1630816323--- 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
     16324+++ ubiquity-2.6.10//d-i/source/apt-setup/release-files/ftp.caixamagica.pt/horn-updates/Release 2011-07-14 17:03:27.797800972 +0100
    1631016325@@ -0,0 +1,169 @@
    1631116326+Origin: Caixa Magica <software@caixamagica.pt>
     
    1648016495diff -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
    1648116496--- 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
     16497+++ ubiquity-2.6.10//d-i/source/apt-setup/release-files/ftp.caixamagica.pt/horn-updates/Release.gpg     2011-07-14 17:03:27.797800972 +0100
    1648316498@@ -0,0 +1,11 @@
    1648416499+-----BEGIN PGP SIGNATURE-----
     
    1649516510diff -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
    1649616511--- 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
     16512+++ ubiquity-2.6.10//d-i/source/apt-setup/release-files/ftp.caixamagica.pt/horn-updates-testing/Release 2011-07-14 17:03:27.797800972 +0100
    1649816513@@ -0,0 +1,169 @@
    1649916514+Origin: Caixa Magica <software@caixamagica.pt>
     
    1666816683diff -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
    1666916684--- 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
     16685+++ ubiquity-2.6.10//d-i/source/apt-setup/release-files/ftp.caixamagica.pt/horn-updates-testing/Release.gpg     2011-07-14 17:03:27.797800972 +0100
    1667116686@@ -0,0 +1,11 @@
    1667216687+-----BEGIN PGP SIGNATURE-----
     
    1668316698diff -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
    1668416699--- 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
     16700+++ ubiquity-2.6.10//d-i/source/choose-mirror/choose-mirror.c   2011-07-14 17:03:27.797800972 +0100
    1668616701@@ -511,7 +511,7 @@
    1668716702 
     
    1673316748diff -Naur ubiquity-2.6.10.orig//d-i/source/choose-mirror/debian/changelog ubiquity-2.6.10//d-i/source/choose-mirror/debian/changelog
    1673416749--- 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
     16750+++ ubiquity-2.6.10//d-i/source/choose-mirror/debian/changelog  2011-07-14 17:03:27.797800972 +0100
    1673616751@@ -1,3 +1,11 @@
    1673716752+choose-mirror (2.37xcm2) horn; urgency=low
     
    1674816763diff -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
    1674916764--- 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
     16765+++ ubiquity-2.6.10//d-i/source/choose-mirror/debian/choose-mirror-bin.templates.ftp.base-in    2011-07-14 17:03:27.797800972 +0100
    1675116766@@ -4,20 +4,20 @@
    1675216767 Type: string
     
    1677916794diff -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
    1678016795--- 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
     16796+++ ubiquity-2.6.10//d-i/source/choose-mirror/debian/choose-mirror-bin.templates.ftp.sel-in     2011-07-14 17:03:27.797800972 +0100
    1678216797@@ -7,8 +7,8 @@
    1678316798 Choices-C: manual
     
    1682516840diff -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
    1682616841--- 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
     16842+++ ubiquity-2.6.10//d-i/source/choose-mirror/debian/choose-mirror-bin.templates.http-in        2011-07-14 17:03:27.797800972 +0100
    1682816843@@ -6,8 +6,8 @@
    1682916844 Choices-C: manual
     
    1690016915diff -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
    1690116916--- 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
     16917+++ ubiquity-2.6.10//d-i/source/choose-mirror/debian/choose-mirror-bin.templates-in     2011-07-14 17:03:27.797800972 +0100
    1690316918@@ -12,9 +12,9 @@
    1690416919 Type: select
     
    1696516980diff -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
    1696616981--- 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
     16982+++ ubiquity-2.6.10//d-i/source/choose-mirror/Mirrors.masterlist.ubuntu 2011-07-14 17:03:27.797800972 +0100
    1696816983@@ -1,23 +1,15 @@
    1696916984-Site: archive.ubuntu.com
     
    1700217017diff -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
    1700317018--- 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
     17019+++ ubiquity-2.6.10//d-i/source/partman-auto/automatically_partition/replace/choices    2011-07-14 17:03:27.797800972 +0100
    1700517020@@ -43,8 +43,9 @@
    1700617021        open_dialog PARTITIONS
     
    1702517040diff -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
    1702617041--- 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
     17042+++ ubiquity-2.6.10//d-i/source/partman-auto/automatically_partition/reuse/choices      2011-07-14 17:03:27.797800972 +0100
    1702817043@@ -43,8 +43,9 @@
    1702917044        open_dialog PARTITIONS
     
    1704817063diff -Naur ubiquity-2.6.10.orig//d-i/source/partman-auto/debian/changelog ubiquity-2.6.10//d-i/source/partman-auto/debian/changelog
    1704917064--- 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
     17065+++ ubiquity-2.6.10//d-i/source/partman-auto/debian/changelog   2011-07-14 17:03:27.797800972 +0100
    1705117066@@ -1,3 +1,13 @@
    1705217067+partman-auto (93ubuntu16) natty; urgency=low
     
    1706517080diff -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
    1706617081--- 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
     17082+++ ubiquity-2.6.10//d-i/source/partman-auto/debian/po/pt.po    2011-07-14 17:03:27.797800972 +0100
    1706817083@@ -268,7 +268,7 @@
    1706917084 #: ../partman-auto.templates:167
     
    1707717092diff -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
    1707817093--- 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
     17094+++ ubiquity-2.6.10//d-i/source/partman-basicfilesystems/debian/po/pt.po        2011-07-14 17:03:27.797800972 +0100
    1708017095@@ -511,7 +511,7 @@
    1708117096 #. :sl2:
     
    1708917104diff -Naur ubiquity-2.6.10.orig//d-i/sources.list ubiquity-2.6.10//d-i/sources.list
    1709017105--- 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
     17106+++ ubiquity-2.6.10//d-i/sources.list   2011-07-14 17:03:27.797800972 +0100
    1709217107@@ -1 +1,3 @@
    1709317108-deb-src http://archive.ubuntu.com/ubuntu natty main
     
    1709717112diff -Naur ubiquity-2.6.10.orig//gui/gtk/stepLanguage.ui ubiquity-2.6.10//gui/gtk/stepLanguage.ui
    1709817113--- 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
     17114+++ ubiquity-2.6.10//gui/gtk/stepLanguage.ui    2011-07-14 17:03:27.797800972 +0100
    1710017115@@ -60,7 +60,7 @@
    1710117116                       <object class="GtkImage" id="image2">
     
    1710917124diff -Naur ubiquity-2.6.10.orig//gui/gtk/stepPartAsk.ui ubiquity-2.6.10//gui/gtk/stepPartAsk.ui
    1711017125--- 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
     17126+++ ubiquity-2.6.10//gui/gtk/stepPartAsk.ui     2011-07-14 17:03:27.797800972 +0100
    1711217127@@ -21,7 +21,7 @@
    1711317128             <property name="can_focus">False</property>
     
    1719317208diff -Naur ubiquity-2.6.10.orig//gui/gtk/stepPartAuto.ui ubiquity-2.6.10//gui/gtk/stepPartAuto.ui
    1719417209--- 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
     17210+++ ubiquity-2.6.10//gui/gtk/stepPartAuto.ui    2011-07-14 17:03:27.797800972 +0100
    1719617211@@ -106,7 +106,7 @@
    1719717212                             <property name="visible">True</property>
     
    1720517220diff -Naur ubiquity-2.6.10.orig//gui/gtk/stepPrepare.ui ubiquity-2.6.10//gui/gtk/stepPrepare.ui
    1720617221--- 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
     17222+++ ubiquity-2.6.10//gui/gtk/stepPrepare.ui     2011-07-14 17:03:27.797800972 +0100
    1720817223@@ -90,11 +90,11 @@
    1720917224             </child>
     
    1725017265diff -Naur ubiquity-2.6.10.orig//gui/qt/app.ui ubiquity-2.6.10//gui/qt/app.ui
    1725117266--- 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
     17267+++ ubiquity-2.6.10//gui/qt/app.ui      2011-07-14 17:03:27.797800972 +0100
    1725317268@@ -107,7 +107,7 @@
    1725417269                 <item>
     
    1726217277diff -Naur ubiquity-2.6.10.orig//gui/qt/images/graphics.svg ubiquity-2.6.10//gui/qt/images/graphics.svg
    1726317278--- 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
     17279+++ ubiquity-2.6.10//gui/qt/images/graphics.svg 2011-07-14 17:03:27.797800972 +0100
    1726517280@@ -1414,7 +1414,7 @@
    1726617281          y="145.02063"
     
    1727417289diff -Naur ubiquity-2.6.10.orig//gui/qt/stepPartAuto.ui ubiquity-2.6.10//gui/qt/stepPartAuto.ui
    1727517290--- 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
     17291+++ ubiquity-2.6.10//gui/qt/stepPartAuto.ui     2011-07-14 17:03:27.807800972 +0100
    1727717292@@ -31,7 +31,7 @@
    1727817293    <item>
     
    1728617301diff -Naur ubiquity-2.6.10.orig//gui/qt/stepPartMan.ui ubiquity-2.6.10//gui/qt/stepPartMan.ui
    1728717302--- 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
     17303+++ ubiquity-2.6.10//gui/qt/stepPartMan.ui      2011-07-14 17:03:27.807800972 +0100
    1728917304@@ -127,7 +127,7 @@
    1729017305          <item>
     
    1729817313diff -Naur ubiquity-2.6.10.orig//gui/qt/stepUserSetup.ui ubiquity-2.6.10//gui/qt/stepUserSetup.ui
    1729917314--- 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
     17315+++ ubiquity-2.6.10//gui/qt/stepUserSetup.ui    2011-07-14 17:03:27.807800972 +0100
    1730117316@@ -162,7 +162,7 @@
    1730217317         <string>font-weight: normal</string>
     
    1731917334diff -Naur ubiquity-2.6.10.orig//scripts/plugininstall.py ubiquity-2.6.10//scripts/plugininstall.py
    1732017335--- 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
     17336+++ ubiquity-2.6.10//scripts/plugininstall.py   2011-07-14 17:03:27.807800972 +0100
    1732217337@@ -281,7 +281,7 @@
    1732317338         except debconf.DebconfError:
     
    1734017355diff -Naur ubiquity-2.6.10.orig//src/panel/panel.c ubiquity-2.6.10//src/panel/panel.c
    1734117356--- 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
     17357+++ ubiquity-2.6.10//src/panel/panel.c  2011-07-14 17:03:27.807800972 +0100
    1734317358@@ -228,7 +228,7 @@
    1734417359        GtkPixmap *pixmap;
     
    1735217367diff -Naur ubiquity-2.6.10.orig//ubiquity/auto_update.py ubiquity-2.6.10//ubiquity/auto_update.py
    1735317368--- 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
     17369+++ ubiquity-2.6.10//ubiquity/auto_update.py    2011-07-14 17:03:27.807800972 +0100
    1735517370@@ -34,7 +34,7 @@
    1735617371                  "ubiquity-frontend-debconf",
     
    1736417379diff -Naur ubiquity-2.6.10.orig//ubiquity/frontend/kde_components/PartAuto.py ubiquity-2.6.10//ubiquity/frontend/kde_components/PartAuto.py
    1736517380--- 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
     17381+++ ubiquity-2.6.10//ubiquity/frontend/kde_components/PartAuto.py       2011-07-14 17:03:27.807800972 +0100
    1736717382@@ -16,10 +16,10 @@
    1736817383 
     
    1738017395diff -Naur ubiquity-2.6.10.orig//ubiquity/frontend/kde_components/PartitionBar.py ubiquity-2.6.10//ubiquity/frontend/kde_components/PartitionBar.py
    1738117396--- 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
     17397+++ ubiquity-2.6.10//ubiquity/frontend/kde_components/PartitionBar.py   2011-07-14 17:03:27.807800972 +0100
    1738317398@@ -254,7 +254,7 @@
    1738417399 
     
    1739217407diff -Naur ubiquity-2.6.10.orig//ubiquity/frontend/kde_ui.py ubiquity-2.6.10//ubiquity/frontend/kde_ui.py
    1739317408--- 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
     17409+++ ubiquity-2.6.10//ubiquity/frontend/kde_ui.py        2011-07-14 17:03:27.807800972 +0100
    1739517410@@ -68,7 +68,7 @@
    1739617411         # this to be restartable.
     
    1741317428diff -Naur ubiquity-2.6.10.orig//ubiquity/gtkwidgets.py ubiquity-2.6.10//ubiquity/gtkwidgets.py
    1741417429--- 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
     17430+++ ubiquity-2.6.10//ubiquity/gtkwidgets.py     2011-07-14 17:03:27.807800972 +0100
    1741617431@@ -1013,7 +1013,7 @@
    1741717432     a.set_spacing(5)
     
    1743417449diff -Naur ubiquity-2.6.10.orig//ubiquity/plugins/ubi-language.py ubiquity-2.6.10//ubiquity/plugins/ubi-language.py
    1743517450--- ubiquity-2.6.10.orig//ubiquity/plugins/ubi-language.py      2011-04-10 23:32:38.000000000 +0100
    17436 +++ ubiquity-2.6.10//ubiquity/plugins/ubi-language.py   2011-07-14 12:10:09.017808755 +0100
     17451+++ ubiquity-2.6.10//ubiquity/plugins/ubi-language.py   2011-07-14 17:03:27.807800972 +0100
    1743717452@@ -636,7 +636,7 @@
    1743817453                 text = widget.text()
     
    1744617461diff -Naur ubiquity-2.6.10.orig//ubiquity/plugins/ubi-prepare.py ubiquity-2.6.10//ubiquity/plugins/ubi-prepare.py
    1744717462--- ubiquity-2.6.10.orig//ubiquity/plugins/ubi-prepare.py       2011-04-10 00:45:58.000000000 +0100
    17448 +++ ubiquity-2.6.10//ubiquity/plugins/ubi-prepare.py    2011-07-14 11:50:25.167809278 +0100
     17463+++ ubiquity-2.6.10//ubiquity/plugins/ubi-prepare.py    2011-07-14 17:03:27.807800972 +0100
    1744917464@@ -110,7 +110,7 @@
    1745017465         self.prepare_network_connection.set_property('label', ether)
Note: See TracChangeset for help on using the changeset viewer.