Changeset 1168


Ignore:
Timestamp:
Apr 11, 2016, 1:03:17 PM (3 years ago)
Author:
daduve
Message:

update ubiquity

Location:
ubiquity/trunk/fuentes
Files:
17 edited

Legend:

Unmodified
Added
Removed
  • ubiquity/trunk/fuentes/d-i/manifest

    r1053 r1168  
    22base-installer 1.158ubuntu2
    33bterm-unifont 1.4
    4 choose-mirror 2.65ubuntu5
     4choose-mirror 2.65ubuntu6
    55clock-setup 0.126ubuntu1
    6 console-setup 1.108ubuntu12
     6console-setup 1.108ubuntu13
    77debian-installer-utils 1.113ubuntu1
    88flash-kernel 3.0~rc.4ubuntu62
    99grub-installer 1.128ubuntu5
    10 hw-detect 1.114ubuntu4
     10hw-detect 1.117ubuntu1
    1111localechooser 2.65ubuntu3
    12 netcfg 1.135ubuntu1
     12netcfg 1.135ubuntu2
    1313partconf 1.49
    1414partman-auto 134ubuntu1
  • ubiquity/trunk/fuentes/d-i/source/choose-mirror/Mirrors.masterlist.ubuntu

    r1053 r1168  
    2727Archive-ftp: /ubuntu-ports/
    2828Archive-rsync: ubuntu-ports/
    29 Archive-architecture: arm64 armhf powerpc ppc64el
     29Archive-architecture: arm64 armhf powerpc ppc64el s390x
    3030Country: ${UCC} ${CNAME}
  • ubiquity/trunk/fuentes/d-i/source/choose-mirror/debian/changelog

    r1053 r1168  
     1choose-mirror (2.65ubuntu6) xenial; urgency=medium
     2
     3  * Add s390x to CC.ports.ubuntu.com.
     4
     5 -- Dimitri John Ledkov <xnox@ubuntu.com>  Tue, 05 Apr 2016 20:22:43 +0100
     6
    17choose-mirror (2.65ubuntu5) xenial; urgency=medium
    28
  • ubiquity/trunk/fuentes/d-i/source/console-setup/debian/changelog

    r1053 r1168  
     1console-setup (1.108ubuntu13) xenial; urgency=medium
     2
     3  * debian/keyboard-configuration.config: run grep with -a (to deal with files
     4    as ASCII data) when searching for keyboard, locale, and layout names.
     5    (LP: #1549529)
     6
     7 -- Mathieu Trudel-Lapierre <cyphermox@ubuntu.com>  Mon, 04 Apr 2016 13:47:04 -0400
     8
    19console-setup (1.108ubuntu12) xenial; urgency=medium
    210
  • ubiquity/trunk/fuentes/d-i/source/console-setup/debian/keyboard-configuration.config

    r1053 r1168  
    196196$add"
    197197
    198     choices1=`echo "$kbdnames" | grep "^$prefix\*" |
     198    choices1=`echo "$kbdnames" | grep -a "^$prefix\*" |
    199199        sed -e "s/^$prefix\*[^\*]*\*//" -e 's/,/\\\\,/g' | sort`
    200     choices2=`echo "$add" | grep "^$prefix\*" |
     200    choices2=`echo "$add" | grep -a "^$prefix\*" |
    201201        sed -e "s/^$prefix\*[^\*]*\*//" -e 's/,/\\\\,/g'`
    202202    choices=`echo "$choices1
     
    206206    choices=`echo $choices | sed 's/,$//'`
    207207
    208     if echo "$choices" | grep '[^\\\\],' >/dev/null; then
     208    if echo "$choices" | grep -a '[^\\\\],' >/dev/null; then
    209209        db_subst $template CHOICES "$choices"
    210210        default_description=`echo "$kbdnames$add" | 
    211             grep "^$prefix\*${default_code}\*" |
     211            grep -a "^$prefix\*${default_code}\*" |
    212212            sed -e "s/^$prefix\*${default_code}\*//" |
    213213            regex_unescape`
     
    215215            # For XkbVariant the empty string is usually a sensible default
    216216            default_description=`echo "$kbdnames$add" | 
    217                 grep "^$prefix\*\*" |
     217                grep -a "^$prefix\*\*" |
    218218                sed -e "s/^$prefix\*\*//" |
    219219                regex_unescape `
     
    237237
    238238    RET=`echo "$RET" | regex_pattern_escape`
    239     RET=`echo "$kbdnames$add" | grep "^$prefix\*[^\*]*\*" |
     239    RET=`echo "$kbdnames$add" | grep -a "^$prefix\*[^\*]*\*" |
    240240             sed 's/  */ /g' |
    241              grep "\*$RET\$" |
     241             grep -a "\*$RET\$" |
    242242             sed -e "s/^$prefix\*\([^\*]*\)\*.*/\1/" |
    243243             regex_unescape`
     
    370370messages_country=$(echo $messages | sed 's/.*_//;s/\..*//;s/@.*//')
    371371messages_modif=
    372 echo $messages | grep -v -q @ || messages_modif=$(echo $messages | sed 's/.*@//')
     372echo $messages | grep -a -v -q @ || messages_modif=$(echo $messages | sed 's/.*@//')
    373373
    374374lang_kbdnames () {
    375375    all_kbdnames | \
    376376        regex_escape | \
    377         grep "^$1[*]" | \
     377        grep -a "^$1[*]" | \
    378378        sed "s/^$1[*]//"
    379379}
     
    11801180if \
    11811181    ! echo "$kbdnames" \
    1182     | grep "variant[*]$debconf_layout[*]$debconf_variant[*]" >/dev/null
     1182    | grep -a "variant[*]$debconf_layout[*]$debconf_variant[*]" >/dev/null
    11831183then
    11841184    unsupported_layout=yes
     
    11861186    if \
    11871187        ! echo "$kbdnames" \
    1188         | grep "layout[*]$debconf_layout[*]" >/dev/null
     1188        | grep -a "layout[*]$debconf_layout[*]" >/dev/null
    11891189    then
    11901190        debconf_layout=us
  • ubiquity/trunk/fuentes/d-i/source/hw-detect/Makefile

    r1053 r1168  
    111111
    112112devnames-static.gz: devnames-static.txt
    113         grep -v '^#' $< | gzip -9c > $@
     113        grep -v '^#' $< | gzip -9cn > $@
  • ubiquity/trunk/fuentes/d-i/source/hw-detect/debian/changelog

    r1053 r1168  
     1hw-detect (1.117ubuntu1) xenial; urgency=low
     2
     3  * Merge 1.117 from debian to pick up fix for LP: #1559193.
     4
     5  * Resynchronise with Debian.  Remaining changes:
     6    - Add an 'archdetect-deb' package, containing /usr/bin/archdetect.  Add
     7      an archdetect(1) manual page.
     8    - Add support for activating fakeraid devices with mdadm.
     9    - disk-detect.sh: Do not check the kernel command line for any option
     10      to enable dmraid support. If functional dmraid arrays are found, the
     11      user will be asked if they wish to activate them.
     12    - 'dmraid -c -s' changed its output format; cope with both old and new.
     13    - Make dmraid logging a bit neater.
     14    - Offer iSCSI targets for preseeding if partman-iscsi is available and
     15      no disk devices are found.
     16    - disk-detect.sh: Use mpath[a-z] now rather than mpath[0-9] to identify
     17      multipath devices and thus know to install partman-multipath.
     18    - disk-detect.sh: run update-dev after installing multipath and sg3.
     19    - debian/control: Depends on multipath-udeb (>= 0.5.0), which introduces
     20      the multipath device naming changes above.
     21    - Remove dm-emc from the multipath modules, since it's gone since
     22      2.6.27.
     23    - Improve checks for dm-* drivers being present to avoid relying on them
     24      being built as modules.
     25    - Bump question to load driver injection disk from medium to high, and
     26      raise driver-injection-disk package priority to standard. Thus the
     27      udeb will be loaded by default, but before installing any debs from
     28      the OEMDRV a confirmation question will be asked (default true, can be
     29      pre-seeded)
     30    - Drop priorities of a couple of ethdetect questions to medium.
     31    - Exit zero if you continue all the way through ethdetect's errors about
     32      having no network interfaces.
     33    - Remove FireWire Ethernet support.
     34    - disk-detect.sh: multipath: reload udev rules before re-add devices
     35      to guarantee all devices may get new udev properties
     36    - disk-detect.sh: multipath: deactivate LVM volumes before multipath
     37      discovery to unlock individual paths
     38    - disk-detect.sh: multipath: deactivate md arrays before multipath
     39      discovery to unlock individual paths
     40    - disk-detect.sh: use iscsi-start wrapper in partman-iscsi to be able to set
     41      a custom iSCSI initiatorName from the installer.
     42    - disk-detect.sh: load SCSI device handlers before SCSI low-level
     43      device drivers.
     44
     45 -- Dimitri John Ledkov <xnox@ubuntu.com>  Mon, 04 Apr 2016 14:37:02 +0100
     46
     47hw-detect (1.117) unstable; urgency=medium
     48
     49  * Team upload
     50
     51  [ Hendrik Brueckner ]
     52  * Improve and split harddrive detection into DASD and SCSI dependency
     53    on s390x (Closes: #818586)
     54
     55 -- Philipp Kern <pkern@debian.org>  Sun, 03 Apr 2016 11:40:24 +0200
     56
     57hw-detect (1.116) unstable; urgency=medium
     58
     59  [ Colin Watson ]
     60  * Use HTTPS for Vcs-* URLs, and link to cgit rather than gitweb.
     61
     62 -- Christian Perrier <bubulle@debian.org>  Tue, 02 Feb 2016 07:04:13 +0100
     63
     64hw-detect (1.115) unstable; urgency=medium
     65
     66  [ Colin Watson ]
     67  * Compress devnames-static.gz using "gzip -n" (Lintian).
     68
     69 -- Christian Perrier <bubulle@debian.org>  Sun, 17 Jan 2016 21:31:03 +0100
     70
    171hw-detect (1.114ubuntu4) xenial; urgency=medium
    272
     
    49965066
    49975067 -- David Whedon <dwhedon@gordian.com>  Mon, 13 Nov 2000 23:46:39 -0800
     5068
  • ubiquity/trunk/fuentes/d-i/source/hw-detect/debian/control

    r1053 r1168  
    66Uploaders: Petter Reinholdtsen <pere@debian.org>, Colin Watson <cjwatson@debian.org>, Christian Perrier <bubulle@debian.org>
    77Build-Depends: debhelper (>= 9), dpkg-dev (>= 1.9.0), po-debconf (>= 0.5.0), libdebian-installer4-dev (>= 0.76)
    8 XS-Debian-Vcs-Browser: http://anonscm.debian.org/gitweb/?p=d-i/hw-detect.git
    9 XS-Debian-Vcs-Git: git://anonscm.debian.org/d-i/hw-detect.git
     8XS-Debian-Vcs-Browser: https://anonscm.debian.org/cgit/d-i/hw-detect.git
     9XS-Debian-Vcs-Git: https://anonscm.debian.org/git/d-i/hw-detect.git
    1010Vcs-Bzr: http://bazaar.launchpad.net/~ubuntu-core-dev/hw-detect/ubuntu
    1111
     
    2727Package: disk-detect
    2828Package-Type: udeb
    29 Architecture: all
    30 Depends: cdebconf-udeb (>= 0.38), hw-detect, di-utils (>= 1.13), pciutils-udeb
     29Architecture: any
     30Depends: cdebconf-udeb (>= 0.38), hw-detect, di-utils (>= 1.13), pciutils-udeb,
     31         harddrive-detection-dasd [s390x],
     32         harddrive-detection-zfcp [s390x]
    3133Priority: optional
    3234Provides: harddrive-detection
  • ubiquity/trunk/fuentes/d-i/source/netcfg/Makefile

    r1053 r1168  
    2929
    3030ifneq ($(WIRELESS),0)
    31 LDOPTS          += -liw
     31LDOPTS          += -liw -lm
    3232CFLAGS          += -DWIRELESS
    3333endif
  • ubiquity/trunk/fuentes/d-i/source/netcfg/debian/changelog

    r1053 r1168  
     1netcfg (1.135ubuntu2) xenial; urgency=medium
     2
     3  Cherrypick commits from debian netcfg master.
     4
     5  [ Hendrik Brueckner ]
     6  * common/ipaddr: remove leading and trailing whitespaces
     7  * static: trim user-specified values for IP and other addresses
     8  * Closes: #818611, LP: #1541955
     9
     10  [ Dimitri John Ledkov ]
     11  * Makefile: link with -lm to resolve undefined log and other functions
     12
     13 -- Dimitri John Ledkov <xnox@ubuntu.com>  Thu, 31 Mar 2016 13:55:14 +0100
     14
    115netcfg (1.135ubuntu1) xenial; urgency=medium
    216
  • ubiquity/trunk/fuentes/d-i/source/netcfg/netcfg-common.c

    r1053 r1168  
    15781578    struct in6_addr addr6;
    15791579    int ok;
    1580     char *maskptr, addrstr[NETCFG_ADDRSTRLEN];
     1580    char *maskptr, *addrstr, addrbuf[NETCFG_ADDRSTRLEN];
    15811581    int i;
    15821582   
    1583     strncpy(addrstr, address, NETCFG_ADDRSTRLEN);
     1583    strncpy(addrbuf, address, NETCFG_ADDRSTRLEN);
     1584    addrstr = strtrim(addrbuf);
    15841585   
    15851586    if ((maskptr = strchr(addrstr, '/'))) {
     
    17401741        n = strlen(s) - 1;
    17411742       
    1742         while (isspace(s[n])) {
     1743        while (n >= 0 && isspace(s[n])) {
    17431744                s[n] = '\0';
     1745                n--;
    17441746        }
    17451747}
     1748
     1749char *strtrim(char *s)
     1750{
     1751        size_t len;
     1752
     1753        len = strlen(s);
     1754        if (!len)
     1755                return s;
     1756
     1757        rtrim(s);
     1758
     1759        while (*s && isspace(*s))
     1760                s++;
     1761
     1762        return s;
     1763}
  • ubiquity/trunk/fuentes/d-i/source/netcfg/netcfg.h

    r1053 r1168  
    250250
    251251extern void rtrim(char *);
     252extern char *strtrim(char *s);
    252253
    253254/* ipv6.c */
  • ubiquity/trunk/fuentes/d-i/source/netcfg/static.c

    r1053 r1168  
    4040    int ret, ok = 0;
    4141    union inX_addr addr;
     42    char *ptr;
    4243   
    4344    while (!ok) {
     
    4950
    5051        debconf_get(client, "netcfg/get_pointopoint");
    51 
    52         if (empty_str(client->value)) {           /* No P-P is ok */
     52        ptr = strtrim(client->value);
     53
     54        if (empty_str(ptr)) {           /* No P-P is ok */
    5355            interface->pointopoint[0] = '\0';
    5456            return 0;
    5557        }
    5658
    57         ok = inet_pton (interface->address_family, client->value, &addr);
     59        ok = inet_pton (interface->address_family, ptr, &addr);
    5860
    5961        if (!ok) {
     
    7375    int ret, ok = 0;
    7476    union inX_addr addr;
     77    char *ptr;
    7578
    7679    /* Preseed a vaguely sensible looking default netmask if one wasn't
     
    7881     */
    7982    debconf_get (client, "netcfg/get_netmask");
    80     if (empty_str(client->value)) {
     83    ptr = strtrim(client->value);
     84    if (empty_str(ptr)) {
    8185        if (interface->address_family == AF_INET) {
    8286            debconf_set(client, "netcfg/get_netmask", "255.255.255.0");
     
    9599        debconf_get (client, "netcfg/get_netmask");
    96100
    97         ok = inet_pton (interface->address_family, client->value, &addr);
     101        ptr = strtrim(client->value);
     102        ok = inet_pton (interface->address_family, ptr, &addr);
    98103
    99104        if (!ok) {
     
    105110    }
    106111
    107     inet_ptom(interface->address_family, client->value, &(interface->masklen));
     112    inet_ptom(interface->address_family, ptr, &(interface->masklen));
    108113    return 0;
    109114}
     
    164169
    165170        debconf_get(client, "netcfg/get_gateway");
    166         ptr = client->value;
     171        ptr = strtrim(client->value);
    167172
    168173        if (empty_str(ptr) || /* No gateway, that's fine */
  • ubiquity/trunk/fuentes/d-i/source/netcfg/test/test_netcfg_parse_cidr_address.c

    r1053 r1168  
    102102END_TEST
    103103
     104START_TEST(test_parse_cidr_ignore_leading_trailing_spaces)
     105{
     106        struct netcfg_interface interface;
     107        netcfg_interface_init(&interface);
     108        int rv;
     109
     110        interface.masklen = 7;
     111        rv = netcfg_parse_cidr_address("   192.0.2.12   ", &interface);
     112
     113        fail_unless (rv,
     114                     "parsing failed, rv = %i", rv);
     115
     116        fail_unless (interface.masklen == 0,
     117                     "masklen was %i, should have been 0",
     118                     interface.masklen);
     119
     120        fail_unless (strcmp("192.0.2.12", interface.ipaddress) == 0,
     121                     "IP address was %s, should have been 192.10.2.12",
     122                     interface.ipaddress);
     123
     124        fail_unless (interface.address_family == AF_INET,
     125                     "Address family should have been AF_INET");
     126}
     127END_TEST
     128
    104129Suite *test_netcfg_parse_cidr_address_suite (void)
    105130{
     
    111136        tcase_add_test (tc, test_parse_standalone_v6_address);
    112137        tcase_add_test (tc, test_parse_cidr_v6_address);
     138        tcase_add_test (tc, test_parse_cidr_ignore_leading_trailing_spaces);
    113139       
    114140        suite_add_tcase (s, tc);
  • ubiquity/trunk/fuentes/debian/changelog

    r1161 r1168  
    1 ubiquity (2.21.54-lliurex1) xenial; urgency=medium
    2 
    3   * Upgrade to install
    4 
    5  -- M.Angel Juan <m.angel.juan@gmail.com>  Wed, 06 Apr 2016 14:26:29 +0200
    6 
    7 ubiquity (2.21.53-lliurex1) xenial; urgency=medium
    8 
    9   * Ported & patched for xenial release
    10 
    11  -- M.Angel Juan <m.angel.juan@gmail.com>  Fri, 01 Apr 2016 14:25:37 +0200
     1ubiquity (2.21.54) xenial; urgency=medium
     2
     3  * ubiquity/frontends/gtk_ui.py:
     4    - Extend keyboard shortcut code for accessibility profiles to work with
     5      flavours other than Ubuntu/Unity (LP: #1546317)
     6    - Disable the screen reader activation keyboard shortcut in Unity, GNOME,
     7      and Mate flavours. In almost all cases, the settings daemon catches the
     8      keystroke before Ubiquity gets it, and was preventing the blindness
     9      profile from being properly activated
     10  * Drop unused profile set method that was missed previously
     11  * Automatic update of included source packages: console-setup
     12    1.108ubuntu13, hw-detect 1.117ubuntu1, netcfg 1.135ubuntu2,
     13    choose-mirror 2.65ubuntu6.
     14
     15 -- Luke Yelavich <themuso@ubuntu.com>  Wed, 06 Apr 2016 14:07:33 +1000
    1216
    1317ubiquity (2.21.53) xenial; urgency=medium
  • ubiquity/trunk/fuentes/debian/rules

    r1091 r1168  
    3939        dh_autoreconf -- ./autogen.sh
    4040        dh_auto_configure -- --libexecdir=\$${prefix}/lib
    41         dh_auto_build --parallel
    42         $(MAKE) -j4 -C d-i build
     41        dh_auto_build
     42        $(MAKE) -C d-i build
    4343        convert -resize 32x32 data/ubiquity.svg pixmaps/ubiquity.xpm
    4444
  • ubiquity/trunk/fuentes/ubiquity/frontend/gtk_ui.py

    r1053 r1168  
    531531        gsettings.set(gs_schema, gs_key, gs_value)
    532532
     533    def disable_screen_reader(self):
     534        gs_key = 'screenreader'
     535        for gs_schema in 'org.gnome.settings-daemon.plugins.media-keys', \
     536                         'org.mate.SettingsDaemon.plugins.media-keys':
     537            gs_previous = '%s/%s' % (gs_schema, gs_key)
     538            if gs_previous in self.gsettings_previous:
     539                return
     540
     541            gs_value = gsettings.get(gs_schema, gs_key)
     542            self.gsettings_previous[gs_previous] = gs_value
     543
     544            if gs_value:
     545                gsettings.set(gs_schema, gs_key, '')
     546
     547        atexit.register(self.enable_screen_reader)
     548
     549    def enable_screen_reader(self):
     550        gs_key = 'screenreader'
     551        for gs_schema in 'org.gnome.settings-daemon.plugins.media-keys', \
     552                         'org.mate.SettingsDaemon.plugins.media-keys':
     553            gs_previous = '%s/%s' % (gs_schema, gs_key)
     554            gs_value = self.gsettings_previous[gs_previous]
     555
     556            gsettings.set(gs_schema, gs_key, gs_value)
     557
    533558    def disable_screensaver(self):
    534559        gs_schema = 'org.gnome.desktop.screensaver'
     
    663688            for line in subp.stdout:
    664689                value = line.rstrip('\n')
    665                 if value == 'high-contrast':
     690                if value.endswith('high-contrast'):
    666691                    hc_profile_found = True
    667                 if value == 'blindness':
     692                    self.hc_profile_name = value
     693                if value.endswith('blindness'):
    668694                    sr_profile_found = True
     695                    self.sr_profile_name = value
    669696
    670697            if (hc_profile_found is True and event.state &
     
    683710
    684711    def a11y_profile_high_contrast_activate(self):
    685         self.a11y_profile_set("high-contrast")
     712        self.a11y_profile_set(self.hc_profile_name)
    686713
    687714    def a11y_profile_screen_reader_activate(self, widget=None):
    688         self.a11y_profile_set("blindness")
     715        self.a11y_profile_set(self.sr_profile_name)
    689716        os.environ['UBIQUITY_A11Y_PROFILE'] = 'screen-reader'
    690 
    691     def a11y_profile_onscreen_keyboard_activate(self, widget=None):
    692         self.a11y_profile_set("onscreen-keyboard")
    693717
    694718    def run(self):
     
    707731        self.disable_screensaver()
    708732        self.disable_powermgr()
     733        self.disable_screen_reader()
    709734
    710735        if 'UBIQUITY_ONLY' in os.environ:
Note: See TracChangeset for help on using the changeset viewer.